From c4d5b01acfe0cac31f94743a57e8e619178ba563 Mon Sep 17 00:00:00 2001 From: Kitson Kelly Date: Tue, 25 Aug 2020 09:43:54 +1000 Subject: [PATCH] feat: update to TypeScript 4.0 (#6514) --- .eslintrc.json | 2 + cli/dts/lib.dom.d.ts | 116 +- cli/dts/lib.es2015.core.d.ts | 28 +- cli/dts/lib.es2017.sharedmemory.d.ts | 5 +- cli/dts/lib.es2020.bigint.d.ts | 143 +- cli/dts/lib.es2020.d.ts | 1 + cli/dts/lib.es2020.intl.d.ts | 296 + cli/dts/lib.es5.d.ts | 326 +- cli/dts/lib.esnext.array.d.ts | 223 - cli/dts/lib.esnext.asynciterable.d.ts | 44 - cli/dts/lib.esnext.bigint.d.ts | 629 - cli/dts/lib.esnext.symbol.d.ts | 26 - cli/dts/lib.webworker.d.ts | 48 +- cli/dts/typescript.d.ts | 4166 +- cli/op_fetch_asset.rs | 5 +- cli/tests/complex_permissions_test.ts | 3 +- ...rror_014_catch_dynamic_import_error.js.out | 4 +- cli/tests/esm_imports_b.js | 1 + cli/tests/hash.ts | 2 +- cli/tests/performance_stats.out | 2 +- cli/tests/permission_test.ts | 3 +- cli/tests/subdir/throws.js | 1 + cli/tests/unit/blob_test.ts | 9 +- cli/tests/unit/error_stack_test.ts | 2 + cli/tests/unit/globals_test.ts | 6 +- cli/tests/unit/timers_test.ts | 11 +- cli/tsc/00_typescript.js | 48894 +++++++++------- std/_util/deep_assign.ts | 23 +- std/encoding/_yaml/dumper/dumper.ts | 9 +- std/encoding/_yaml/example/sample_document.ts | 3 +- std/encoding/_yaml/loader/loader.ts | 2 +- std/encoding/_yaml/loader/loader_state.ts | 3 +- std/encoding/_yaml/stringify.ts | 5 +- std/encoding/_yaml/type.ts | 4 +- std/encoding/_yaml/utils.ts | 2 +- std/encoding/toml.ts | 20 +- std/encoding/toml_test.ts | 4 +- std/examples/catj.ts | 13 +- std/fmt/printf.ts | 2 +- std/hash/_sha3/sha3.ts | 2 - std/hash/sha3.ts | 1 - std/hash/sha3_test.ts | 2 +- std/log/logger.ts | 34 +- std/log/mod.ts | 21 +- std/node/_fs/_fs_access.ts | 6 +- std/node/_fs/_fs_common.ts | 8 +- std/node/_fs/_fs_dir.ts | 6 +- std/node/_util/_util_promisify.ts | 6 +- std/node/_util/_util_promisify_test.ts | 24 +- std/node/buffer.ts | 8 +- std/node/events.ts | 68 +- std/node/events_test.ts | 2 +- std/node/process.ts | 1 + std/node/querystring.ts | 3 +- std/testing/asserts_test.ts | 10 +- std/testing/bench.ts | 6 +- std/testing/bench_test.ts | 8 + third_party | 2 +- 58 files changed, 30837 insertions(+), 24467 deletions(-) create mode 100644 cli/dts/lib.es2020.intl.d.ts delete mode 100644 cli/dts/lib.esnext.array.d.ts delete mode 100644 cli/dts/lib.esnext.asynciterable.d.ts delete mode 100644 cli/dts/lib.esnext.bigint.d.ts delete mode 100644 cli/dts/lib.esnext.symbol.d.ts diff --git a/.eslintrc.json b/.eslintrc.json index 6bab124cfe..34a06f4505 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -12,7 +12,9 @@ ], "rules": { "@typescript-eslint/array-type": ["error", { "default": "array-simple" }], + "@typescript-eslint/ban-ts-comment": ["off"], "@typescript-eslint/explicit-member-accessibility": ["off"], + "@typescript-eslint/explicit-module-boundary-types": ["off"], "@typescript-eslint/no-non-null-assertion": ["off"], "@typescript-eslint/no-use-before-define": ["off"], "@typescript-eslint/no-parameter-properties": ["off"], diff --git a/cli/dts/lib.dom.d.ts b/cli/dts/lib.dom.d.ts index 86c4043631..dcb43e13d6 100644 --- a/cli/dts/lib.dom.d.ts +++ b/cli/dts/lib.dom.d.ts @@ -825,8 +825,8 @@ interface MediaTrackSupportedConstraints { width?: boolean; } -interface MessageEventInit extends EventInit { - data?: any; +interface MessageEventInit extends EventInit { + data?: T; lastEventId?: string; origin?: string; ports?: MessagePort[]; @@ -2978,6 +2978,11 @@ interface CSSStyleDeclaration { overflowWrap: string; overflowX: string; overflowY: string; + overscrollBehavior: string; + overscrollBehaviorBlock: string; + overscrollBehaviorInline: string; + overscrollBehaviorX: string; + overscrollBehaviorY: string; padding: string; paddingBlockEnd: string; paddingBlockStart: string; @@ -3938,7 +3943,16 @@ declare var DOMMatrixReadOnly: { /** Provides the ability to parse XML or HTML source code from a string into a DOM Document. */ interface DOMParser { - parseFromString(str: string, type: SupportedType): Document; + /** + * Parses string using either the HTML or XML parser, according to type, and returns the resulting Document. type can be "text/html" (which will invoke the HTML parser), or any of "text/xml", "application/xml", "application/xhtml+xml", or "image/svg+xml" (which will invoke the XML parser). + * + * For the XML parser, if string cannot be parsed, then the returned Document will contain elements describing the resulting error. + * + * Note that script elements are not evaluated during parsing, and the resulting document's encoding will always be UTF-8. + * + * Values other than the above for type will cause a TypeError exception to be thrown. + */ + parseFromString(string: string, type: DOMParserSupportedType): Document; } declare var DOMParser: { @@ -4549,10 +4563,6 @@ interface Document extends Node, DocumentAndElementEventHandlers, DocumentOrShad */ onreadystatechange: ((this: Document, ev: Event) => any) | null; onvisibilitychange: ((this: Document, ev: Event) => any) | null; - /** - * Returns document's origin. - */ - readonly origin: string; readonly ownerDocument: null; /** * Return an HTMLCollection of the embed elements in the Document. @@ -5085,7 +5095,7 @@ interface ElementEventMap { } /** Element is the most general base class from which all objects in a Document inherit. It only has methods and properties common to all kinds of elements. More specific classes inherit from Element. */ -interface Element extends Node, Animatable, ChildNode, InnerHTML, NonDocumentTypeChildNode, ParentNode, Slotable { +interface Element extends Node, Animatable, ChildNode, InnerHTML, NonDocumentTypeChildNode, ParentNode, Slottable { readonly assignedSlot: HTMLSlotElement | null; readonly attributes: NamedNodeMap; /** @@ -5252,6 +5262,7 @@ interface ElementCSSInlineStyle { interface ElementContentEditable { contentEditable: string; + enterKeyHint: string; inputMode: string; readonly isContentEditable: boolean; } @@ -7084,6 +7095,7 @@ interface HTMLImageElement extends HTMLElement { * Sets or retrieves whether the image is a server-side image map. */ isMap: boolean; + loading: string; /** * Sets or retrieves a Uniform Resource Identifier (URI) to a long description of the object. */ @@ -10404,11 +10416,11 @@ declare var MessageChannel: { }; /** A message received by a target object. */ -interface MessageEvent extends Event { +interface MessageEvent extends Event { /** * Returns the data of the message. */ - readonly data: any; + readonly data: T; /** * Returns the last event ID string, for server-sent events. */ @@ -10429,7 +10441,7 @@ interface MessageEvent extends Event { declare var MessageEvent: { prototype: MessageEvent; - new(type: string, eventInitDict?: MessageEventInit): MessageEvent; + new(type: string, eventInitDict?: MessageEventInit): MessageEvent; }; interface MessagePortEventMap { @@ -14357,8 +14369,8 @@ interface SVGSVGElement extends SVGGraphicsElement, DocumentEvent, SVGFitToViewB getComputedStyle(elt: Element, pseudoElt?: string | null): CSSStyleDeclaration; getCurrentTime(): number; getElementById(elementId: string): Element; - getEnclosureList(rect: SVGRect, referenceElement: SVGElement): NodeListOf; - getIntersectionList(rect: SVGRect, referenceElement: SVGElement): NodeListOf; + getEnclosureList(rect: SVGRect, referenceElement: SVGElement | null): NodeListOf; + getIntersectionList(rect: SVGRect, referenceElement: SVGElement | null): NodeListOf; pauseAnimations(): void; setCurrentTime(seconds: number): void; /** @deprecated */ @@ -14981,7 +14993,7 @@ declare var SharedWorker: { new(scriptURL: string, options?: string | WorkerOptions): SharedWorker; }; -interface Slotable { +interface Slottable { readonly assignedSlot: HTMLSlotElement | null; } @@ -15069,7 +15081,7 @@ interface SpeechRecognitionEventMap { "audioend": Event; "audiostart": Event; "end": Event; - "error": Event; + "error": ErrorEvent; "nomatch": SpeechRecognitionEvent; "result": SpeechRecognitionEvent; "soundend": Event; @@ -15088,7 +15100,7 @@ interface SpeechRecognition extends EventTarget { onaudioend: ((this: SpeechRecognition, ev: Event) => any) | null; onaudiostart: ((this: SpeechRecognition, ev: Event) => any) | null; onend: ((this: SpeechRecognition, ev: Event) => any) | null; - onerror: ((this: SpeechRecognition, ev: Event) => any) | null; + onerror: ((this: SpeechRecognition, ev: ErrorEvent) => any) | null; onnomatch: ((this: SpeechRecognition, ev: SpeechRecognitionEvent) => any) | null; onresult: ((this: SpeechRecognition, ev: SpeechRecognitionEvent) => any) | null; onsoundend: ((this: SpeechRecognition, ev: Event) => any) | null; @@ -15386,24 +15398,24 @@ declare var StyleSheetList: { /** This Web Crypto API interface provides a number of low-level cryptographic functions. It is accessed via the Crypto.subtle properties available in a window context (via Window.crypto). */ interface SubtleCrypto { - decrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike; - deriveBits(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, length: number): PromiseLike; - deriveKey(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: string | AesDerivedKeyParams | HmacImportParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - digest(algorithm: AlgorithmIdentifier, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike; - encrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike; - exportKey(format: "jwk", key: CryptoKey): PromiseLike; - exportKey(format: "raw" | "pkcs8" | "spki", key: CryptoKey): PromiseLike; - exportKey(format: string, key: CryptoKey): PromiseLike; - generateKey(algorithm: AlgorithmIdentifier, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams | DhKeyGenParams, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - generateKey(algorithm: AesKeyGenParams | HmacKeyGenParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - importKey(format: "jwk", keyData: JsonWebKey, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - importKey(format: "raw" | "pkcs8" | "spki", keyData: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - importKey(format: string, keyData: JsonWebKey | Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - sign(algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike; - unwrapKey(format: "raw" | "pkcs8" | "spki" | "jwk" | string, wrappedKey: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, unwrappingKey: CryptoKey, unwrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, unwrappedKeyAlgorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - verify(algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, signature: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike; - wrapKey(format: "raw" | "pkcs8" | "spki" | "jwk" | string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams): PromiseLike; + decrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): Promise; + deriveBits(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, length: number): Promise; + deriveKey(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: string | AesDerivedKeyParams | HmacImportParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): Promise; + digest(algorithm: AlgorithmIdentifier, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): Promise; + encrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): Promise; + exportKey(format: "jwk", key: CryptoKey): Promise; + exportKey(format: "raw" | "pkcs8" | "spki", key: CryptoKey): Promise; + exportKey(format: string, key: CryptoKey): Promise; + generateKey(algorithm: AlgorithmIdentifier, extractable: boolean, keyUsages: KeyUsage[]): Promise; + generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams | DhKeyGenParams, extractable: boolean, keyUsages: KeyUsage[]): Promise; + generateKey(algorithm: AesKeyGenParams | HmacKeyGenParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): Promise; + importKey(format: "jwk", keyData: JsonWebKey, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): Promise; + importKey(format: "raw" | "pkcs8" | "spki", keyData: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): Promise; + importKey(format: string, keyData: JsonWebKey | Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): Promise; + sign(algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): Promise; + unwrapKey(format: "raw" | "pkcs8" | "spki" | "jwk" | string, wrappedKey: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, unwrappingKey: CryptoKey, unwrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, unwrappedKeyAlgorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): Promise; + verify(algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, signature: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): Promise; + wrapKey(format: "raw" | "pkcs8" | "spki" | "jwk" | string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams): Promise; } declare var SubtleCrypto: { @@ -15423,7 +15435,7 @@ declare var SyncManager: { }; /** The textual content of Element or Attr. If an element has no markup within its content, it has a single child implementing Text that contains the element's text. However, if the element contains markup, it is parsed into information items and Text nodes that form its children. */ -interface Text extends CharacterData, Slotable { +interface Text extends CharacterData, Slottable { readonly assignedSlot: HTMLSlotElement | null; /** * Returns the combined data of all direct Text node siblings. @@ -16166,6 +16178,32 @@ declare var VideoPlaybackQuality: { new(): VideoPlaybackQuality; }; +interface VisualViewportEventMap { + "resize": UIEvent; + "scroll": Event; +} + +interface VisualViewport extends EventTarget { + readonly height: number; + readonly offsetLeft: number; + readonly offsetTop: number; + onresize: ((this: VisualViewport, ev: UIEvent) => any) | null; + onscroll: ((this: VisualViewport, ev: Event) => any) | null; + readonly pageLeft: number; + readonly pageTop: number; + readonly scale: number; + readonly width: number; + addEventListener(type: K, listener: (this: VisualViewport, ev: VisualViewportEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; + addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void; + removeEventListener(type: K, listener: (this: VisualViewport, ev: VisualViewportEventMap[K]) => any, options?: boolean | EventListenerOptions): void; + removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void; +} + +declare var VisualViewport: { + prototype: VisualViewport; + new(): VisualViewport; +}; + interface WEBGL_color_buffer_float { readonly FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT: GLenum; readonly RGBA32F_EXT: GLenum; @@ -18474,6 +18512,7 @@ interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandler readonly styleMedia: StyleMedia; readonly toolbar: BarProp; readonly top: Window; + readonly visualViewport: VisualViewport; readonly window: Window & typeof globalThis; alert(message?: any): void; blur(): void; @@ -18497,7 +18536,7 @@ interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandler /** @deprecated */ releaseEvents(): void; resizeBy(x: number, y: number): void; - resizeTo(x: number, y: number): void; + resizeTo(width: number, height: number): void; scroll(options?: ScrollToOptions): void; scroll(x: number, y: number): void; scrollBy(options?: ScrollToOptions): void; @@ -19502,6 +19541,7 @@ declare var statusbar: BarProp; declare var styleMedia: StyleMedia; declare var toolbar: BarProp; declare var top: Window; +declare var visualViewport: VisualViewport; declare var window: Window & typeof globalThis; declare function alert(message?: any): void; declare function blur(): void; @@ -19525,7 +19565,7 @@ declare function prompt(message?: string, _default?: string): string | null; /** @deprecated */ declare function releaseEvents(): void; declare function resizeBy(x: number, y: number): void; -declare function resizeTo(x: number, y: number): void; +declare function resizeTo(width: number, height: number): void; declare function scroll(options?: ScrollToOptions): void; declare function scroll(x: number, y: number): void; declare function scrollBy(options?: ScrollToOptions): void; @@ -19936,6 +19976,7 @@ type ColorSpaceConversion = "default" | "none"; type CompositeOperation = "accumulate" | "add" | "replace"; type CompositeOperationOrAuto = "accumulate" | "add" | "auto" | "replace"; type CredentialMediationRequirement = "optional" | "required" | "silent"; +type DOMParserSupportedType = "application/xhtml+xml" | "application/xml" | "image/svg+xml" | "text/html" | "text/xml"; type DirectionSetting = "" | "lr" | "rl"; type DisplayCaptureSurfaceType = "application" | "browser" | "monitor" | "window"; type DistanceModelType = "exponential" | "inverse" | "linear"; @@ -20036,7 +20077,6 @@ type ServiceWorkerState = "activated" | "activating" | "installed" | "installing type ServiceWorkerUpdateViaCache = "all" | "imports" | "none"; type ShadowRootMode = "closed" | "open"; type SpeechSynthesisErrorCode = "audio-busy" | "audio-hardware" | "canceled" | "interrupted" | "invalid-argument" | "language-unavailable" | "network" | "not-allowed" | "synthesis-failed" | "synthesis-unavailable" | "text-too-long" | "voice-unavailable"; -type SupportedType = "application/xhtml+xml" | "application/xml" | "image/svg+xml" | "text/html" | "text/xml"; type TextTrackKind = "captions" | "chapters" | "descriptions" | "metadata" | "subtitles"; type TextTrackMode = "disabled" | "hidden" | "showing"; type TouchType = "direct" | "stylus"; diff --git a/cli/dts/lib.es2015.core.d.ts b/cli/dts/lib.es2015.core.d.ts index d8601c0ee6..f33038d6df 100644 --- a/cli/dts/lib.es2015.core.d.ts +++ b/cli/dts/lib.es2015.core.d.ts @@ -454,48 +454,48 @@ interface String { startsWith(searchString: string, position?: number): boolean; /** - * Returns an HTML anchor element and sets the name attribute to the text value + * Returns an `` HTML anchor element and sets the name attribute to the text value * @param name */ anchor(name: string): string; - /** Returns a HTML element */ + /** Returns a `` HTML element */ big(): string; - /** Returns a HTML element */ + /** Returns a `` HTML element */ blink(): string; - /** Returns a HTML element */ + /** Returns a `` HTML element */ bold(): string; - /** Returns a HTML element */ + /** Returns a `` HTML element */ fixed(): string; - /** Returns a HTML element and sets the color attribute value */ + /** Returns a `` HTML element and sets the color attribute value */ fontcolor(color: string): string; - /** Returns a HTML element and sets the size attribute value */ + /** Returns a `` HTML element and sets the size attribute value */ fontsize(size: number): string; - /** Returns a HTML element and sets the size attribute value */ + /** Returns a `` HTML element and sets the size attribute value */ fontsize(size: string): string; - /** Returns an HTML element */ + /** Returns an `` HTML element */ italics(): string; - /** Returns an HTML element and sets the href attribute value */ + /** Returns an `` HTML element and sets the href attribute value */ link(url: string): string; - /** Returns a HTML element */ + /** Returns a `` HTML element */ small(): string; - /** Returns a HTML element */ + /** Returns a `` HTML element */ strike(): string; - /** Returns a HTML element */ + /** Returns a `` HTML element */ sub(): string; - /** Returns a HTML element */ + /** Returns a `` HTML element */ sup(): string; } diff --git a/cli/dts/lib.es2017.sharedmemory.d.ts b/cli/dts/lib.es2017.sharedmemory.d.ts index f9adca0324..43689e7c8a 100644 --- a/cli/dts/lib.es2017.sharedmemory.d.ts +++ b/cli/dts/lib.es2017.sharedmemory.d.ts @@ -122,8 +122,11 @@ interface Atomics { /** * Wakes up sleeping agents that are waiting on the given index of the array, returning the * number of agents that were awoken. + * @param typedArray A shared Int32Array. + * @param index The position in the typedArray to wake up on. + * @param count The number of sleeping agents to notify. Defaults to +Infinity. */ - notify(typedArray: Int32Array, index: number, count: number): number; + notify(typedArray: Int32Array, index: number, count?: number): number; /** * Stores the bitwise XOR of a value with the value at the given position in the array, diff --git a/cli/dts/lib.es2020.bigint.d.ts b/cli/dts/lib.es2020.bigint.d.ts index ad59be008d..6dc8b25acf 100644 --- a/cli/dts/lib.es2020.bigint.d.ts +++ b/cli/dts/lib.es2020.bigint.d.ts @@ -18,6 +18,92 @@ and limitations under the License. /// +interface BigIntToLocaleStringOptions { + /** + * The locale matching algorithm to use.The default is "best fit". For information about this option, see the {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_negotiation Intl page}. + */ + localeMatcher?: string; + /** + * The formatting style to use , the default is "decimal". + */ + style?: string; + + numberingSystem?: string; + /** + * The unit to use in unit formatting, Possible values are core unit identifiers, defined in UTS #35, Part 2, Section 6. A subset of units from the full list was selected for use in ECMAScript. Pairs of simple units can be concatenated with "-per-" to make a compound unit. There is no default value; if the style is "unit", the unit property must be provided. + */ + unit?: string; + + /** + * The unit formatting style to use in unit formatting, the defaults is "short". + */ + unitDisplay?: string; + + /** + * The currency to use in currency formatting. Possible values are the ISO 4217 currency codes, such as "USD" for the US dollar, "EUR" for the euro, or "CNY" for the Chinese RMB — see the Current currency & funds code list. There is no default value; if the style is "currency", the currency property must be provided. It is only used when [[Style]] has the value "currency". + */ + currency?: string; + + /** + * How to display the currency in currency formatting. It is only used when [[Style]] has the value "currency". The default is "symbol". + * + * "symbol" to use a localized currency symbol such as €, + * + * "code" to use the ISO currency code, + * + * "name" to use a localized currency name such as "dollar" + */ + currencyDisplay?: string; + + /** + * Whether to use grouping separators, such as thousands separators or thousand/lakh/crore separators. The default is true. + */ + useGrouping?: boolean; + + /** + * The minimum number of integer digits to use. Possible values are from 1 to 21; the default is 1. + */ + minimumIntegerDigits?: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21; + + /** + * The minimum number of fraction digits to use. Possible values are from 0 to 20; the default for plain number and percent formatting is 0; the default for currency formatting is the number of minor unit digits provided by the {@link http://www.currency-iso.org/en/home/tables/table-a1.html ISO 4217 currency codes list} (2 if the list doesn't provide that information). + */ + minimumFractionDigits?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; + + /** + * The maximum number of fraction digits to use. Possible values are from 0 to 20; the default for plain number formatting is the larger of minimumFractionDigits and 3; the default for currency formatting is the larger of minimumFractionDigits and the number of minor unit digits provided by the {@link http://www.currency-iso.org/en/home/tables/table-a1.html ISO 4217 currency codes list} (2 if the list doesn't provide that information); the default for percent formatting is the larger of minimumFractionDigits and 0. + */ + maximumFractionDigits?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20; + + /** + * The minimum number of significant digits to use. Possible values are from 1 to 21; the default is 1. + */ + minimumSignificantDigits?: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21; + + /** + * The maximum number of significant digits to use. Possible values are from 1 to 21; the default is 21. + */ + maximumSignificantDigits?: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21; + + /** + * The formatting that should be displayed for the number, the defaults is "standard" + * + * "standard" plain number formatting + * + * "scientific" return the order-of-magnitude for formatted number. + * + * "engineering" return the exponent of ten when divisible by three + * + * "compact" string representing exponent, defaults is using the "short" form + */ + notation?: string; + + /** + * used only when notation is "compact" + */ + compactDisplay?: string; +} + interface BigInt { /** * Returns a string representation of an object. @@ -26,7 +112,7 @@ interface BigInt { toString(radix?: number): string; /** Returns a string representation appropriate to the host environment's current locale. */ - toLocaleString(): string; + toLocaleString(locales?: string, options?: BigIntToLocaleStringOptions): string; /** Returns the primitive value of the specified object. */ valueOf(): bigint; @@ -89,13 +175,13 @@ interface BigInt64Array { /** * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns false, + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns false, * or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - every(callbackfn: (value: bigint, index: number, array: BigInt64Array) => boolean, thisArg?: any): boolean; + every(predicate: (value: bigint, index: number, array: BigInt64Array) => boolean, thisArg?: any): boolean; /** * Returns the this object after filling the section identified by start and end with value @@ -109,12 +195,12 @@ interface BigInt64Array { /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param predicate A function that accepts up to three arguments. The filter method calls + * the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: bigint, index: number, array: BigInt64Array) => any, thisArg?: any): BigInt64Array; + filter(predicate: (value: bigint, index: number, array: BigInt64Array) => any, thisArg?: any): BigInt64Array; /** * Returns the value of the first element in the array where predicate is true, and undefined @@ -260,13 +346,13 @@ interface BigInt64Array { /** * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the - * callbackfn function for each element in the array until the callbackfn returns true, or until + * @param predicate A function that accepts up to three arguments. The some method calls the + * predicate function for each element in the array until the predicate returns true, or until * the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - some(callbackfn: (value: bigint, index: number, array: BigInt64Array) => boolean, thisArg?: any): boolean; + some(predicate: (value: bigint, index: number, array: BigInt64Array) => boolean, thisArg?: any): boolean; /** * Sorts the array. @@ -361,13 +447,13 @@ interface BigUint64Array { /** * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns false, + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns false, * or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - every(callbackfn: (value: bigint, index: number, array: BigUint64Array) => boolean, thisArg?: any): boolean; + every(predicate: (value: bigint, index: number, array: BigUint64Array) => boolean, thisArg?: any): boolean; /** * Returns the this object after filling the section identified by start and end with value @@ -381,12 +467,12 @@ interface BigUint64Array { /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param predicate A function that accepts up to three arguments. The filter method calls + * the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: bigint, index: number, array: BigUint64Array) => any, thisArg?: any): BigUint64Array; + filter(predicate: (value: bigint, index: number, array: BigUint64Array) => any, thisArg?: any): BigUint64Array; /** * Returns the value of the first element in the array where predicate is true, and undefined @@ -532,13 +618,13 @@ interface BigUint64Array { /** * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the - * callbackfn function for each element in the array until the callbackfn returns true, or until + * @param predicate A function that accepts up to three arguments. The some method calls the + * predicate function for each element in the array until the predicate returns true, or until * the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - some(callbackfn: (value: bigint, index: number, array: BigUint64Array) => boolean, thisArg?: any): boolean; + some(predicate: (value: bigint, index: number, array: BigUint64Array) => boolean, thisArg?: any): boolean; /** * Sorts the array. @@ -633,3 +719,10 @@ interface DataView { */ setBigUint64(byteOffset: number, value: bigint, littleEndian?: boolean): void; } + +declare namespace Intl{ + interface NumberFormat { + format(value: number | bigint): string; + resolvedOptions(): ResolvedNumberFormatOptions; + } +} diff --git a/cli/dts/lib.es2020.d.ts b/cli/dts/lib.es2020.d.ts index c72f14812e..307c7d1b52 100644 --- a/cli/dts/lib.es2020.d.ts +++ b/cli/dts/lib.es2020.d.ts @@ -23,3 +23,4 @@ and limitations under the License. /// /// /// +/// diff --git a/cli/dts/lib.es2020.intl.d.ts b/cli/dts/lib.es2020.intl.d.ts new file mode 100644 index 0000000000..4b1093db2a --- /dev/null +++ b/cli/dts/lib.es2020.intl.d.ts @@ -0,0 +1,296 @@ +/*! ***************************************************************************** +Copyright (c) Microsoft Corporation. All rights reserved. +Licensed under the Apache License, Version 2.0 (the "License"); you may not use +this file except in compliance with the License. You may obtain a copy of the +License at http://www.apache.org/licenses/LICENSE-2.0 + +THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED +WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, +MERCHANTABLITY OR NON-INFRINGEMENT. + +See the Apache Version 2.0 License for specific language governing permissions +and limitations under the License. +***************************************************************************** */ + + + +/// + + +declare namespace Intl { + + /** + * [BCP 47 language tag](http://tools.ietf.org/html/rfc5646) definition. + * + * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#locales_argument). + * + * [Wikipedia](https://en.wikipedia.org/wiki/IETF_language_tag). + */ + type BCP47LanguageTag = string; + + /** + * Unit to use in the relative time internationalized message. + * + * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/format#Parameters). + * + * [Specification](https://tc39.es/ecma402/#sec-singularrelativetimeunit). + */ + type RelativeTimeFormatUnit = + | "year" | "years" + | "quarter" | "quarters" + | "month" | "months" + | "week" | "weeks" + | "day" | "days" + | "hour" | "hours" + | "minute" | "minutes" + | "second" | "seconds" + ; + + /** + * The locale matching algorithm to use. + * + * [MDN](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_negotiation). + * + * [Specification](https://tc39.es/ecma402/#sec-InitializeRelativeTimeFormat). + */ + type RelativeTimeFormatLocaleMatcher = "lookup" | "best fit"; + + /** + * The format of output message. + * + * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/RelativeTimeFormat#Parameters). + * + * [Specification](https://tc39.es/ecma402/#sec-InitializeRelativeTimeFormat). + */ + type RelativeTimeFormatNumeric = "always" | "auto"; + + /** + * The length of the internationalized message. + * + * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/RelativeTimeFormat#Parameters). + * + * [Specification](https://tc39.es/ecma402/#sec-InitializeRelativeTimeFormat). + */ + type RelativeTimeFormatStyle = "long" | "short" | "narrow"; + + /** + * An object with some or all of properties of `options` parameter + * of `Intl.RelativeTimeFormat` constructor. + * + * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/RelativeTimeFormat#Parameters). + * + * [Specification](https://tc39.es/ecma402/#sec-InitializeRelativeTimeFormat). + */ + interface RelativeTimeFormatOptions { + localeMatcher?: RelativeTimeFormatLocaleMatcher; + numeric?: RelativeTimeFormatNumeric; + style?: RelativeTimeFormatStyle; + } + + /** + * An object with properties reflecting the locale + * and formatting options computed during initialization + * of the `Intel.RelativeTimeFormat` object + * + * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/resolvedOptions#Description). + * + * [Specification](https://tc39.es/ecma402/#table-relativetimeformat-resolvedoptions-properties) + */ + interface ResolvedRelativeTimeFormatOptions { + locale: BCP47LanguageTag; + style: RelativeTimeFormatStyle; + numeric: RelativeTimeFormatNumeric; + numberingSystem: string; + } + + /** + * An object representing the relative time format in parts + * that can be used for custom locale-aware formatting. + * + * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/formatToParts#Using_formatToParts). + * + * [Specification](https://tc39.es/ecma402/#sec-FormatRelativeTimeToParts). + */ + interface RelativeTimeFormatPart { + type: string; + value: string; + unit?: RelativeTimeFormatUnit; + } + + interface RelativeTimeFormat { + /** + * Formats a value and a unit according to the locale + * and formatting options of the given + * [`Intl.RelativeTimeFormat`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/RelativeTimeFormat) + * object. + * + * While this method automatically provides the correct plural forms, + * the grammatical form is otherwise as neutral as possible. + * It is the caller's responsibility to handle cut-off logic + * such as deciding between displaying "in 7 days" or "in 1 week". + * This API does not support relative dates involving compound units. + * e.g "in 5 days and 4 hours". + * + * @param value - Numeric value to use in the internationalized relative time message + * + * @param unit - [Unit](https://tc39.es/ecma402/#sec-singularrelativetimeunit) + * to use in the relative time internationalized message. + * Possible values are: `"year"`, `"quarter"`, `"month"`, `"week"`, + * `"day"`, `"hour"`, `"minute"`, `"second"`. + * Plural forms are also permitted. + * + * @throws `RangeError` if `unit` was given something other than `unit` possible values + * + * @returns Internationalized relative time message as string + * + * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/format). + * + * [Specification](https://tc39.es/ecma402/#sec-Intl.RelativeTimeFormat.prototype.format). + */ + format( + value: number, + unit: RelativeTimeFormatUnit, + ): string; + + /** + * A version of the format method which it returns an array of objects + * which represent "parts" of the object, + * separating the formatted number into its constituent parts + * and separating it from other surrounding text. + * These objects have two properties: + * `type` a NumberFormat formatToParts type, and `value`, + * which is the String which is the component of the output. + * If a "part" came from NumberFormat, + * it will have a unit property which indicates the `unit` being formatted; + * literals which are part of the larger frame will not have this property. + * + * @param value - Numeric value to use in the internationalized relative time message + * + * @param unit - [Unit](https://tc39.es/ecma402/#sec-singularrelativetimeunit) + * to use in the relative time internationalized message. + * Possible values are: `"year"`, `"quarter"`, `"month"`, `"week"`, + * `"day"`, `"hour"`, `"minute"`, `"second"`. + * Plural forms are also permitted. + * + * @throws `RangeError` if `unit` was given something other than `unit` possible values + * + * @returns Array of [FormatRelativeTimeToParts](https://tc39.es/ecma402/#sec-FormatRelativeTimeToParts) + * + * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/formatToParts). + * + * [Specification](https://tc39.es/ecma402/#sec-Intl.RelativeTimeFormat.prototype.formatToParts). + */ + formatToParts( + value: number, + unit: RelativeTimeFormatUnit, + ): RelativeTimeFormatPart[]; + + /** + * Provides access to the locale and options computed during initialization of this `Intl.RelativeTimeFormat` object. + * + * @returns A new object with properties reflecting the locale + * and formatting options computed during initialization + * of the `Intel.RelativeTimeFormat` object. + * + * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/resolvedOptions). + * + * [Specification](https://tc39.es/ecma402/#sec-intl.relativetimeformat.prototype.resolvedoptions) + */ + resolvedOptions(): ResolvedRelativeTimeFormatOptions; + } + + /** + * The [`Intl.RelativeTimeFormat`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/RelativeTimeFormat) + * object is a constructor for objects that enable language-sensitive relative time formatting. + * + * Part of [Intl object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl) + * namespace and the [ECMAScript Internationalization API](https://www.ecma-international.org/publications/standards/Ecma-402.htm). + * + * [Compatibility](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat#Browser_compatibility). + * + * [Polyfills](https://github.com/tc39/proposal-intl-relative-time#polyfills). + */ + const RelativeTimeFormat: { + /** + * Constructor creates [Intl.RelativeTimeFormat](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RelativeTimeFormat) + * objects + * + * @param locales - A string with a [BCP 47 language tag](http://tools.ietf.org/html/rfc5646), or an array of such strings. + * For the general form and interpretation of the locales argument, + * see the [`Intl` page](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_identification_and_negotiation). + * + * @param options - An [object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/RelativeTimeFormat#Parameters) + * with some or all of options of the formatting. + * An object with some or all of the following properties: + * - `localeMatcher` - The locale matching algorithm to use. + * Possible values are `"lookup"` and `"best fit"`; the default is `"best fit"`. + * For information about this option, see [Intl page](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_negotiation). + * - `numeric` - The format of output message. + * Possible values are: `"always"` (default, e.g., `1 day ago`) or `"auto"` (e.g., `yesterday`). + * The `"auto"` value allows to not always have to use numeric values in the output. + * - `style` - The length of the internationalized message. Possible values are: + * `"long"` (default, e.g., in 1 month), + * `"short"` (e.g., in 1 mo.) + * or `"narrow"` (e.g., in 1 mo.). The narrow style could be similar to the short style for some locales. + * + * @returns [Intl.RelativeTimeFormat](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RelativeTimeFormat) object. + * + * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/RelativeTimeFormat). + * + * [Specification](https://tc39.es/ecma402/#sec-intl-relativetimeformat-constructor). + */ + new( + locales?: BCP47LanguageTag | BCP47LanguageTag[], + options?: RelativeTimeFormatOptions, + ): RelativeTimeFormat; + + /** + * Returns an array containing those of the provided locales + * that are supported in date and time formatting + * without having to fall back to the runtime's default locale. + * + * @param locales - A string with a [BCP 47 language tag](http://tools.ietf.org/html/rfc5646), or an array of such strings. + * For the general form and interpretation of the locales argument, + * see the [`Intl` page](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_identification_and_negotiation). + * + * @param options - An [object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/RelativeTimeFormat#Parameters) + * with some or all of options of the formatting. + * An object with some or all of the following properties: + * - `localeMatcher` - The locale matching algorithm to use. + * Possible values are `"lookup"` and `"best fit"`; the default is `"best fit"`. + * For information about this option, see [Intl page](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_negotiation). + * - `numeric` - The format of output message. + * Possible values are: `"always"` (default, e.g., `1 day ago`) or `"auto"` (e.g., `yesterday`). + * The `"auto"` value allows to not always have to use numeric values in the output. + * - `style` - The length of the internationalized message. Possible values are: + * `"long"` (default, e.g., in 1 month), + * `"short"` (e.g., in 1 mo.) + * or `"narrow"` (e.g., in 1 mo.). The narrow style could be similar to the short style for some locales. + * + * @returns An array containing those of the provided locales + * that are supported in date and time formatting + * without having to fall back to the runtime's default locale. + * + * [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/supportedLocalesOf). + * + * [Specification](https://tc39.es/ecma402/#sec-Intl.RelativeTimeFormat.supportedLocalesOf). + */ + supportedLocalesOf( + locales: BCP47LanguageTag | BCP47LanguageTag[], + options?: RelativeTimeFormatOptions, + ): BCP47LanguageTag[]; + }; + + interface NumberFormatOptions { + notation?: string; + unit?: string; + unitDisplay?: string; + } + + interface ResolvedNumberFormatOptions { + notation?: string; + unit?: string; + unitDisplay?: string; + } +} diff --git a/cli/dts/lib.es5.d.ts b/cli/dts/lib.es5.d.ts index ec5e1a5723..9b359f8bca 100644 --- a/cli/dts/lib.es5.d.ts +++ b/cli/dts/lib.es5.d.ts @@ -1131,22 +1131,31 @@ interface ReadonlyArray { lastIndexOf(searchElement: T, fromIndex?: number): number; /** * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value false, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - every(callbackfn: (value: T, index: number, array: readonly T[]) => unknown, thisArg?: any): boolean; + every(predicate: (value: T, index: number, array: readonly T[]) => value is S, thisArg?: any): this is readonly S[]; + /** + * Determines whether all the members of an array satisfy the specified test. + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns a value + * which is coercible to the Boolean value false, or until the end of the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. + * If thisArg is omitted, undefined is used as the this value. + */ + every(predicate: (value: T, index: number, array: readonly T[]) => unknown, thisArg?: any): boolean; /** * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The some method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value true, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - some(callbackfn: (value: T, index: number, array: readonly T[]) => unknown, thisArg?: any): boolean; + some(predicate: (value: T, index: number, array: readonly T[]) => unknown, thisArg?: any): boolean; /** * Performs the specified action for each element in an array. * @param callbackfn A function that accepts up to three arguments. forEach calls the callbackfn function one time for each element in the array. @@ -1161,16 +1170,16 @@ interface ReadonlyArray { map(callbackfn: (value: T, index: number, array: readonly T[]) => U, thisArg?: any): U[]; /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. + * @param predicate A function that accepts up to three arguments. The filter method calls the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: T, index: number, array: readonly T[]) => value is S, thisArg?: any): S[]; + filter(predicate: (value: T, index: number, array: readonly T[]) => value is S, thisArg?: any): S[]; /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. + * @param predicate A function that accepts up to three arguments. The filter method calls the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: T, index: number, array: readonly T[]) => unknown, thisArg?: any): T[]; + filter(predicate: (value: T, index: number, array: readonly T[]) => unknown, thisArg?: any): T[]; /** * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array. @@ -1301,22 +1310,31 @@ interface Array { lastIndexOf(searchElement: T, fromIndex?: number): number; /** * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value false, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - every(callbackfn: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean; + every(predicate: (value: T, index: number, array: T[]) => value is S, thisArg?: any): this is S[]; + /** + * Determines whether all the members of an array satisfy the specified test. + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns a value + * which is coercible to the Boolean value false, or until the end of the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. + * If thisArg is omitted, undefined is used as the this value. + */ + every(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean; /** * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The some method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value true, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - some(callbackfn: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean; + some(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): boolean; /** * Performs the specified action for each element in an array. * @param callbackfn A function that accepts up to three arguments. forEach calls the callbackfn function one time for each element in the array. @@ -1331,16 +1349,16 @@ interface Array { map(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[]; /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. + * @param predicate A function that accepts up to three arguments. The filter method calls the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: T, index: number, array: T[]) => value is S, thisArg?: any): S[]; + filter(predicate: (value: T, index: number, array: T[]) => value is S, thisArg?: any): S[]; /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. + * @param predicate A function that accepts up to three arguments. The filter method calls the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: T, index: number, array: T[]) => unknown, thisArg?: any): T[]; + filter(predicate: (value: T, index: number, array: T[]) => unknown, thisArg?: any): T[]; /** * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array. @@ -1736,13 +1754,13 @@ interface Int8Array { /** * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value false, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - every(callbackfn: (value: number, index: number, array: Int8Array) => unknown, thisArg?: any): boolean; + every(predicate: (value: number, index: number, array: Int8Array) => unknown, thisArg?: any): boolean; /** * Returns the this object after filling the section identified by start and end with value @@ -1756,12 +1774,12 @@ interface Int8Array { /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param predicate A function that accepts up to three arguments. The filter method calls + * the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: number, index: number, array: Int8Array) => any, thisArg?: any): Int8Array; + filter(predicate: (value: number, index: number, array: Int8Array) => any, thisArg?: any): Int8Array; /** * Returns the value of the first element in the array where predicate is true, and undefined @@ -1903,13 +1921,13 @@ interface Int8Array { /** * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The some method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value true, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - some(callbackfn: (value: number, index: number, array: Int8Array) => unknown, thisArg?: any): boolean; + some(predicate: (value: number, index: number, array: Int8Array) => unknown, thisArg?: any): boolean; /** * Sorts an array. @@ -1948,8 +1966,8 @@ interface Int8Array { interface Int8ArrayConstructor { readonly prototype: Int8Array; new(length: number): Int8Array; - new(arrayOrArrayBuffer: ArrayLike | ArrayBufferLike): Int8Array; - new(buffer: ArrayBufferLike, byteOffset: number, length?: number): Int8Array; + new(array: ArrayLike | ArrayBufferLike): Int8Array; + new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Int8Array; /** * The size in bytes of each element in the array. @@ -2018,13 +2036,13 @@ interface Uint8Array { /** * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value false, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - every(callbackfn: (value: number, index: number, array: Uint8Array) => unknown, thisArg?: any): boolean; + every(predicate: (value: number, index: number, array: Uint8Array) => unknown, thisArg?: any): boolean; /** * Returns the this object after filling the section identified by start and end with value @@ -2038,12 +2056,12 @@ interface Uint8Array { /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param predicate A function that accepts up to three arguments. The filter method calls + * the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: number, index: number, array: Uint8Array) => any, thisArg?: any): Uint8Array; + filter(predicate: (value: number, index: number, array: Uint8Array) => any, thisArg?: any): Uint8Array; /** * Returns the value of the first element in the array where predicate is true, and undefined @@ -2185,13 +2203,13 @@ interface Uint8Array { /** * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The some method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value true, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - some(callbackfn: (value: number, index: number, array: Uint8Array) => unknown, thisArg?: any): boolean; + some(predicate: (value: number, index: number, array: Uint8Array) => unknown, thisArg?: any): boolean; /** * Sorts an array. @@ -2231,8 +2249,8 @@ interface Uint8Array { interface Uint8ArrayConstructor { readonly prototype: Uint8Array; new(length: number): Uint8Array; - new(arrayOrArrayBuffer: ArrayLike | ArrayBufferLike): Uint8Array; - new(buffer: ArrayBufferLike, byteOffset: number, length?: number): Uint8Array; + new(array: ArrayLike | ArrayBufferLike): Uint8Array; + new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Uint8Array; /** * The size in bytes of each element in the array. @@ -2300,13 +2318,13 @@ interface Uint8ClampedArray { /** * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value false, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - every(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => unknown, thisArg?: any): boolean; + every(predicate: (value: number, index: number, array: Uint8ClampedArray) => unknown, thisArg?: any): boolean; /** * Returns the this object after filling the section identified by start and end with value @@ -2320,12 +2338,12 @@ interface Uint8ClampedArray { /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param predicate A function that accepts up to three arguments. The filter method calls + * the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => any, thisArg?: any): Uint8ClampedArray; + filter(predicate: (value: number, index: number, array: Uint8ClampedArray) => any, thisArg?: any): Uint8ClampedArray; /** * Returns the value of the first element in the array where predicate is true, and undefined @@ -2467,13 +2485,13 @@ interface Uint8ClampedArray { /** * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The some method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value true, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - some(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => unknown, thisArg?: any): boolean; + some(predicate: (value: number, index: number, array: Uint8ClampedArray) => unknown, thisArg?: any): boolean; /** * Sorts an array. @@ -2513,8 +2531,8 @@ interface Uint8ClampedArray { interface Uint8ClampedArrayConstructor { readonly prototype: Uint8ClampedArray; new(length: number): Uint8ClampedArray; - new(arrayOrArrayBuffer: ArrayLike | ArrayBufferLike): Uint8ClampedArray; - new(buffer: ArrayBufferLike, byteOffset: number, length?: number): Uint8ClampedArray; + new(array: ArrayLike | ArrayBufferLike): Uint8ClampedArray; + new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Uint8ClampedArray; /** * The size in bytes of each element in the array. @@ -2581,13 +2599,13 @@ interface Int16Array { /** * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value false, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - every(callbackfn: (value: number, index: number, array: Int16Array) => unknown, thisArg?: any): boolean; + every(predicate: (value: number, index: number, array: Int16Array) => unknown, thisArg?: any): boolean; /** * Returns the this object after filling the section identified by start and end with value @@ -2601,12 +2619,12 @@ interface Int16Array { /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param predicate A function that accepts up to three arguments. The filter method calls + * the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: number, index: number, array: Int16Array) => any, thisArg?: any): Int16Array; + filter(predicate: (value: number, index: number, array: Int16Array) => any, thisArg?: any): Int16Array; /** * Returns the value of the first element in the array where predicate is true, and undefined @@ -2747,13 +2765,13 @@ interface Int16Array { /** * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The some method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value true, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - some(callbackfn: (value: number, index: number, array: Int16Array) => unknown, thisArg?: any): boolean; + some(predicate: (value: number, index: number, array: Int16Array) => unknown, thisArg?: any): boolean; /** * Sorts an array. @@ -2793,8 +2811,8 @@ interface Int16Array { interface Int16ArrayConstructor { readonly prototype: Int16Array; new(length: number): Int16Array; - new(arrayOrArrayBuffer: ArrayLike | ArrayBufferLike): Int16Array; - new(buffer: ArrayBufferLike, byteOffset: number, length?: number): Int16Array; + new(array: ArrayLike | ArrayBufferLike): Int16Array; + new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Int16Array; /** * The size in bytes of each element in the array. @@ -2863,13 +2881,13 @@ interface Uint16Array { /** * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value false, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - every(callbackfn: (value: number, index: number, array: Uint16Array) => unknown, thisArg?: any): boolean; + every(predicate: (value: number, index: number, array: Uint16Array) => unknown, thisArg?: any): boolean; /** * Returns the this object after filling the section identified by start and end with value @@ -2883,12 +2901,12 @@ interface Uint16Array { /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param predicate A function that accepts up to three arguments. The filter method calls + * the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: number, index: number, array: Uint16Array) => any, thisArg?: any): Uint16Array; + filter(predicate: (value: number, index: number, array: Uint16Array) => any, thisArg?: any): Uint16Array; /** * Returns the value of the first element in the array where predicate is true, and undefined @@ -3030,13 +3048,13 @@ interface Uint16Array { /** * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The some method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value true, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - some(callbackfn: (value: number, index: number, array: Uint16Array) => unknown, thisArg?: any): boolean; + some(predicate: (value: number, index: number, array: Uint16Array) => unknown, thisArg?: any): boolean; /** * Sorts an array. @@ -3076,8 +3094,8 @@ interface Uint16Array { interface Uint16ArrayConstructor { readonly prototype: Uint16Array; new(length: number): Uint16Array; - new(arrayOrArrayBuffer: ArrayLike | ArrayBufferLike): Uint16Array; - new(buffer: ArrayBufferLike, byteOffset: number, length?: number): Uint16Array; + new(array: ArrayLike | ArrayBufferLike): Uint16Array; + new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Uint16Array; /** * The size in bytes of each element in the array. @@ -3145,13 +3163,13 @@ interface Int32Array { /** * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value false, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - every(callbackfn: (value: number, index: number, array: Int32Array) => unknown, thisArg?: any): boolean; + every(predicate: (value: number, index: number, array: Int32Array) => unknown, thisArg?: any): boolean; /** * Returns the this object after filling the section identified by start and end with value @@ -3165,12 +3183,12 @@ interface Int32Array { /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param predicate A function that accepts up to three arguments. The filter method calls + * the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: number, index: number, array: Int32Array) => any, thisArg?: any): Int32Array; + filter(predicate: (value: number, index: number, array: Int32Array) => any, thisArg?: any): Int32Array; /** * Returns the value of the first element in the array where predicate is true, and undefined @@ -3312,13 +3330,13 @@ interface Int32Array { /** * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The some method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value true, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - some(callbackfn: (value: number, index: number, array: Int32Array) => unknown, thisArg?: any): boolean; + some(predicate: (value: number, index: number, array: Int32Array) => unknown, thisArg?: any): boolean; /** * Sorts an array. @@ -3358,8 +3376,8 @@ interface Int32Array { interface Int32ArrayConstructor { readonly prototype: Int32Array; new(length: number): Int32Array; - new(arrayOrArrayBuffer: ArrayLike | ArrayBufferLike): Int32Array; - new(buffer: ArrayBufferLike, byteOffset: number, length?: number): Int32Array; + new(array: ArrayLike | ArrayBufferLike): Int32Array; + new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Int32Array; /** * The size in bytes of each element in the array. @@ -3427,13 +3445,13 @@ interface Uint32Array { /** * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value false, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - every(callbackfn: (value: number, index: number, array: Uint32Array) => unknown, thisArg?: any): boolean; + every(predicate: (value: number, index: number, array: Uint32Array) => unknown, thisArg?: any): boolean; /** * Returns the this object after filling the section identified by start and end with value @@ -3447,12 +3465,12 @@ interface Uint32Array { /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param predicate A function that accepts up to three arguments. The filter method calls + * the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: number, index: number, array: Uint32Array) => any, thisArg?: any): Uint32Array; + filter(predicate: (value: number, index: number, array: Uint32Array) => any, thisArg?: any): Uint32Array; /** * Returns the value of the first element in the array where predicate is true, and undefined @@ -3593,13 +3611,13 @@ interface Uint32Array { /** * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The some method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value true, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - some(callbackfn: (value: number, index: number, array: Uint32Array) => unknown, thisArg?: any): boolean; + some(predicate: (value: number, index: number, array: Uint32Array) => unknown, thisArg?: any): boolean; /** * Sorts an array. @@ -3639,8 +3657,8 @@ interface Uint32Array { interface Uint32ArrayConstructor { readonly prototype: Uint32Array; new(length: number): Uint32Array; - new(arrayOrArrayBuffer: ArrayLike | ArrayBufferLike): Uint32Array; - new(buffer: ArrayBufferLike, byteOffset: number, length?: number): Uint32Array; + new(array: ArrayLike | ArrayBufferLike): Uint32Array; + new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Uint32Array; /** * The size in bytes of each element in the array. @@ -3708,13 +3726,13 @@ interface Float32Array { /** * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value false, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - every(callbackfn: (value: number, index: number, array: Float32Array) => unknown, thisArg?: any): boolean; + every(predicate: (value: number, index: number, array: Float32Array) => unknown, thisArg?: any): boolean; /** * Returns the this object after filling the section identified by start and end with value @@ -3728,12 +3746,12 @@ interface Float32Array { /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param predicate A function that accepts up to three arguments. The filter method calls + * the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: number, index: number, array: Float32Array) => any, thisArg?: any): Float32Array; + filter(predicate: (value: number, index: number, array: Float32Array) => any, thisArg?: any): Float32Array; /** * Returns the value of the first element in the array where predicate is true, and undefined @@ -3875,13 +3893,13 @@ interface Float32Array { /** * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The some method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value true, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - some(callbackfn: (value: number, index: number, array: Float32Array) => unknown, thisArg?: any): boolean; + some(predicate: (value: number, index: number, array: Float32Array) => unknown, thisArg?: any): boolean; /** * Sorts an array. @@ -3921,8 +3939,8 @@ interface Float32Array { interface Float32ArrayConstructor { readonly prototype: Float32Array; new(length: number): Float32Array; - new(arrayOrArrayBuffer: ArrayLike | ArrayBufferLike): Float32Array; - new(buffer: ArrayBufferLike, byteOffset: number, length?: number): Float32Array; + new(array: ArrayLike | ArrayBufferLike): Float32Array; + new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Float32Array; /** * The size in bytes of each element in the array. @@ -3991,13 +4009,13 @@ interface Float64Array { /** * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The every method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value false, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - every(callbackfn: (value: number, index: number, array: Float64Array) => unknown, thisArg?: any): boolean; + every(predicate: (value: number, index: number, array: Float64Array) => unknown, thisArg?: any): boolean; /** * Returns the this object after filling the section identified by start and end with value @@ -4011,12 +4029,12 @@ interface Float64Array { /** * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param predicate A function that accepts up to three arguments. The filter method calls + * the predicate function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - filter(callbackfn: (value: number, index: number, array: Float64Array) => any, thisArg?: any): Float64Array; + filter(predicate: (value: number, index: number, array: Float64Array) => any, thisArg?: any): Float64Array; /** * Returns the value of the first element in the array where predicate is true, and undefined @@ -4158,13 +4176,13 @@ interface Float64Array { /** * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls - * the callbackfn function for each element in the array until the callbackfn returns a value + * @param predicate A function that accepts up to three arguments. The some method calls + * the predicate function for each element in the array until the predicate returns a value * which is coercible to the Boolean value true, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. + * @param thisArg An object to which the this keyword can refer in the predicate function. * If thisArg is omitted, undefined is used as the this value. */ - some(callbackfn: (value: number, index: number, array: Float64Array) => unknown, thisArg?: any): boolean; + some(predicate: (value: number, index: number, array: Float64Array) => unknown, thisArg?: any): boolean; /** * Sorts an array. @@ -4195,8 +4213,8 @@ interface Float64Array { interface Float64ArrayConstructor { readonly prototype: Float64Array; new(length: number): Float64Array; - new(arrayOrArrayBuffer: ArrayLike | ArrayBufferLike): Float64Array; - new(buffer: ArrayBufferLike, byteOffset: number, length?: number): Float64Array; + new(array: ArrayLike | ArrayBufferLike): Float64Array; + new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Float64Array; /** * The size in bytes of each element in the array. diff --git a/cli/dts/lib.esnext.array.d.ts b/cli/dts/lib.esnext.array.d.ts deleted file mode 100644 index 6c75122320..0000000000 --- a/cli/dts/lib.esnext.array.d.ts +++ /dev/null @@ -1,223 +0,0 @@ -/*! ***************************************************************************** -Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at http://www.apache.org/licenses/LICENSE-2.0 - -THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED -WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, -MERCHANTABLITY OR NON-INFRINGEMENT. - -See the Apache Version 2.0 License for specific language governing permissions -and limitations under the License. -***************************************************************************** */ - - - -/// - - -interface ReadonlyArray { - - /** - * Calls a defined callback function on each element of an array. Then, flattens the result into - * a new array. - * This is identical to a map followed by flat with depth 1. - * - * @param callback A function that accepts up to three arguments. The flatMap method calls the - * callback function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callback function. If - * thisArg is omitted, undefined is used as the this value. - */ - flatMap ( - callback: (this: This, value: T, index: number, array: T[]) => U|ReadonlyArray, - thisArg?: This - ): U[] - - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. - * - * @param depth The maximum recursion depth - */ - flat(this: - ReadonlyArray | - - ReadonlyArray> | - ReadonlyArray[]> | - ReadonlyArray[][]> | - ReadonlyArray[][][]> | - - ReadonlyArray>> | - ReadonlyArray[][]>> | - ReadonlyArray>[][]> | - ReadonlyArray[]>[]> | - ReadonlyArray>[]> | - ReadonlyArray[]>> | - - ReadonlyArray>>> | - ReadonlyArray[]>>> | - ReadonlyArray>[]>> | - ReadonlyArray>>[]> | - - ReadonlyArray>>>>, - depth: 4): U[]; - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. - * - * @param depth The maximum recursion depth - */ - flat(this: - ReadonlyArray | - - ReadonlyArray[][]> | - ReadonlyArray[]> | - ReadonlyArray> | - - ReadonlyArray>> | - ReadonlyArray[]>> | - ReadonlyArray>[]> | - - ReadonlyArray>>>, - depth: 3): U[]; - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. - * - * @param depth The maximum recursion depth - */ - flat(this: - ReadonlyArray | - - ReadonlyArray> | - ReadonlyArray[]> | - - ReadonlyArray>>, - depth: 2): U[]; - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. - * - * @param depth The maximum recursion depth - */ - flat(this: - ReadonlyArray | - ReadonlyArray>, - depth?: 1 - ): U[]; - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. - * - * @param depth The maximum recursion depth - */ - flat(this: - ReadonlyArray, - depth: 0 - ): U[]; - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. If no depth is provided, flat method defaults to the depth of 1. - * - * @param depth The maximum recursion depth - */ - flat(depth?: number): any[]; - } - -interface Array { - - /** - * Calls a defined callback function on each element of an array. Then, flattens the result into - * a new array. - * This is identical to a map followed by flat with depth 1. - * - * @param callback A function that accepts up to three arguments. The flatMap method calls the - * callback function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callback function. If - * thisArg is omitted, undefined is used as the this value. - */ - flatMap ( - callback: (this: This, value: T, index: number, array: T[]) => U|ReadonlyArray, - thisArg?: This - ): U[] - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. - * - * @param depth The maximum recursion depth - */ - flat(this: U[][][][][][][][], depth: 7): U[]; - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. - * - * @param depth The maximum recursion depth - */ - flat(this: U[][][][][][][], depth: 6): U[]; - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. - * - * @param depth The maximum recursion depth - */ - flat(this: U[][][][][][], depth: 5): U[]; - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. - * - * @param depth The maximum recursion depth - */ - flat(this: U[][][][][], depth: 4): U[]; - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. - * - * @param depth The maximum recursion depth - */ - flat(this: U[][][][], depth: 3): U[]; - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. - * - * @param depth The maximum recursion depth - */ - flat(this: U[][][], depth: 2): U[]; - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. - * - * @param depth The maximum recursion depth - */ - flat(this: U[][], depth?: 1): U[]; - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. - * - * @param depth The maximum recursion depth - */ - flat(this: U[], depth: 0): U[]; - - /** - * Returns a new array with all sub-array elements concatenated into it recursively up to the - * specified depth. If no depth is provided, flat method defaults to the depth of 1. - * - * @param depth The maximum recursion depth - */ - flat(depth?: number): any[]; -} diff --git a/cli/dts/lib.esnext.asynciterable.d.ts b/cli/dts/lib.esnext.asynciterable.d.ts deleted file mode 100644 index 38e12a7caf..0000000000 --- a/cli/dts/lib.esnext.asynciterable.d.ts +++ /dev/null @@ -1,44 +0,0 @@ -/*! ***************************************************************************** -Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at http://www.apache.org/licenses/LICENSE-2.0 - -THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED -WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, -MERCHANTABLITY OR NON-INFRINGEMENT. - -See the Apache Version 2.0 License for specific language governing permissions -and limitations under the License. -***************************************************************************** */ - - - -/// - - -/// -/// - -interface SymbolConstructor { - /** - * A method that returns the default async iterator for an object. Called by the semantics of - * the for-await-of statement. - */ - readonly asyncIterator: symbol; -} - -interface AsyncIterator { - next(value?: any): Promise>; - return?(value?: any): Promise>; - throw?(e?: any): Promise>; -} - -interface AsyncIterable { - [Symbol.asyncIterator](): AsyncIterator; -} - -interface AsyncIterableIterator extends AsyncIterator { - [Symbol.asyncIterator](): AsyncIterableIterator; -} \ No newline at end of file diff --git a/cli/dts/lib.esnext.bigint.d.ts b/cli/dts/lib.esnext.bigint.d.ts deleted file mode 100644 index 50967de98f..0000000000 --- a/cli/dts/lib.esnext.bigint.d.ts +++ /dev/null @@ -1,629 +0,0 @@ -/*! ***************************************************************************** -Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at http://www.apache.org/licenses/LICENSE-2.0 - -THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED -WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, -MERCHANTABLITY OR NON-INFRINGEMENT. - -See the Apache Version 2.0 License for specific language governing permissions -and limitations under the License. -***************************************************************************** */ - - - -/// - - -interface BigInt { - /** - * Returns a string representation of an object. - * @param radix Specifies a radix for converting numeric values to strings. - */ - toString(radix?: number): string; - - /** Returns a string representation appropriate to the host environment's current locale. */ - toLocaleString(): string; - - /** Returns the primitive value of the specified object. */ - valueOf(): bigint; - - readonly [Symbol.toStringTag]: "BigInt"; -} - -interface BigIntConstructor { - (value?: any): bigint; - readonly prototype: BigInt; - - /** - * Interprets the low bits of a BigInt as a 2's-complement signed integer. - * All higher bits are discarded. - * @param bits The number of low bits to use - * @param int The BigInt whose bits to extract - */ - asIntN(bits: number, int: bigint): bigint; - /** - * Interprets the low bits of a BigInt as an unsigned integer. - * All higher bits are discarded. - * @param bits The number of low bits to use - * @param int The BigInt whose bits to extract - */ - asUintN(bits: number, int: bigint): bigint; -} - -declare var BigInt: BigIntConstructor; - -/** - * A typed array of 64-bit signed integer values. The contents are initialized to 0. If the - * requested number of bytes could not be allocated, an exception is raised. - */ -interface BigInt64Array { - /** The size in bytes of each element in the array. */ - readonly BYTES_PER_ELEMENT: number; - - /** The ArrayBuffer instance referenced by the array. */ - readonly buffer: ArrayBufferLike; - - /** The length in bytes of the array. */ - readonly byteLength: number; - - /** The offset in bytes of the array. */ - readonly byteOffset: number; - - /** - * Returns the this object after copying a section of the array identified by start and end - * to the same array starting at position target - * @param target If target is negative, it is treated as length+target where length is the - * length of the array. - * @param start If start is negative, it is treated as length+start. If end is negative, it - * is treated as length+end. - * @param end If not specified, length of the this object is used as its default value. - */ - copyWithin(target: number, start: number, end?: number): this; - - /** Yields index, value pairs for every entry in the array. */ - entries(): IterableIterator<[number, bigint]>; - - /** - * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns false, - * or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - every(callbackfn: (value: bigint, index: number, array: BigInt64Array) => boolean, thisArg?: any): boolean; - - /** - * Returns the this object after filling the section identified by start and end with value - * @param value value to fill array section with - * @param start index to start filling the array at. If start is negative, it is treated as - * length+start where length is the length of the array. - * @param end index to stop filling the array at. If end is negative, it is treated as - * length+end. - */ - fill(value: bigint, start?: number, end?: number): this; - - /** - * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - filter(callbackfn: (value: bigint, index: number, array: BigInt64Array) => any, thisArg?: any): BigInt64Array; - - /** - * Returns the value of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - find(predicate: (value: bigint, index: number, array: BigInt64Array) => boolean, thisArg?: any): bigint | undefined; - - /** - * Returns the index of the first element in the array where predicate is true, and -1 - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, - * findIndex immediately returns that element index. Otherwise, findIndex returns -1. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - findIndex(predicate: (value: bigint, index: number, array: BigInt64Array) => boolean, thisArg?: any): number; - - /** - * Performs the specified action for each element in an array. - * @param callbackfn A function that accepts up to three arguments. forEach calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - forEach(callbackfn: (value: bigint, index: number, array: BigInt64Array) => void, thisArg?: any): void; - - /** - * Determines whether an array includes a certain element, returning true or false as appropriate. - * @param searchElement The element to search for. - * @param fromIndex The position in this array at which to begin searching for searchElement. - */ - includes(searchElement: bigint, fromIndex?: number): boolean; - - /** - * Returns the index of the first occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - indexOf(searchElement: bigint, fromIndex?: number): number; - - /** - * Adds all the elements of an array separated by the specified separator string. - * @param separator A string used to separate one element of an array from the next in the - * resulting String. If omitted, the array elements are separated with a comma. - */ - join(separator?: string): string; - - /** Yields each index in the array. */ - keys(): IterableIterator; - - /** - * Returns the index of the last occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - lastIndexOf(searchElement: bigint, fromIndex?: number): number; - - /** The length of the array. */ - readonly length: number; - - /** - * Calls a defined callback function on each element of an array, and returns an array that - * contains the results. - * @param callbackfn A function that accepts up to three arguments. The map method calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - map(callbackfn: (value: bigint, index: number, array: BigInt64Array) => bigint, thisArg?: any): BigInt64Array; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: bigint, currentValue: bigint, currentIndex: number, array: BigInt64Array) => bigint): bigint; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: U, currentValue: bigint, currentIndex: number, array: BigInt64Array) => U, initialValue: U): U; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an - * argument instead of an array value. - */ - reduceRight(callbackfn: (previousValue: bigint, currentValue: bigint, currentIndex: number, array: BigInt64Array) => bigint): bigint; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduceRight(callbackfn: (previousValue: U, currentValue: bigint, currentIndex: number, array: BigInt64Array) => U, initialValue: U): U; - - /** Reverses the elements in the array. */ - reverse(): this; - - /** - * Sets a value or an array of values. - * @param array A typed or untyped array of values to set. - * @param offset The index in the current array at which the values are to be written. - */ - set(array: ArrayLike, offset?: number): void; - - /** - * Returns a section of an array. - * @param start The beginning of the specified portion of the array. - * @param end The end of the specified portion of the array. - */ - slice(start?: number, end?: number): BigInt64Array; - - /** - * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the - * callbackfn function for each element in the array until the callbackfn returns true, or until - * the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - some(callbackfn: (value: bigint, index: number, array: BigInt64Array) => boolean, thisArg?: any): boolean; - - /** - * Sorts the array. - * @param compareFn The function used to determine the order of the elements. If omitted, the elements are sorted in ascending order. - */ - sort(compareFn?: (a: bigint, b: bigint) => number | bigint): this; - - /** - * Gets a new BigInt64Array view of the ArrayBuffer store for this array, referencing the elements - * at begin, inclusive, up to end, exclusive. - * @param begin The index of the beginning of the array. - * @param end The index of the end of the array. - */ - subarray(begin: number, end?: number): BigInt64Array; - - /** Converts the array to a string by using the current locale. */ - toLocaleString(): string; - - /** Returns a string representation of the array. */ - toString(): string; - - /** Yields each value in the array. */ - values(): IterableIterator; - - [Symbol.iterator](): IterableIterator; - - readonly [Symbol.toStringTag]: "BigInt64Array"; - - [index: number]: bigint; -} - -interface BigInt64ArrayConstructor { - readonly prototype: BigInt64Array; - new(length?: number): BigInt64Array; - new(array: Iterable): BigInt64Array; - new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): BigInt64Array; - - /** The size in bytes of each element in the array. */ - readonly BYTES_PER_ELEMENT: number; - - /** - * Returns a new array from a set of elements. - * @param items A set of elements to include in the new array object. - */ - of(...items: bigint[]): BigInt64Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: ArrayLike): BigInt64Array; - from(arrayLike: ArrayLike, mapfn: (v: U, k: number) => bigint, thisArg?: any): BigInt64Array; -} - -declare var BigInt64Array: BigInt64ArrayConstructor; - -/** - * A typed array of 64-bit unsigned integer values. The contents are initialized to 0. If the - * requested number of bytes could not be allocated, an exception is raised. - */ -interface BigUint64Array { - /** The size in bytes of each element in the array. */ - readonly BYTES_PER_ELEMENT: number; - - /** The ArrayBuffer instance referenced by the array. */ - readonly buffer: ArrayBufferLike; - - /** The length in bytes of the array. */ - readonly byteLength: number; - - /** The offset in bytes of the array. */ - readonly byteOffset: number; - - /** - * Returns the this object after copying a section of the array identified by start and end - * to the same array starting at position target - * @param target If target is negative, it is treated as length+target where length is the - * length of the array. - * @param start If start is negative, it is treated as length+start. If end is negative, it - * is treated as length+end. - * @param end If not specified, length of the this object is used as its default value. - */ - copyWithin(target: number, start: number, end?: number): this; - - /** Yields index, value pairs for every entry in the array. */ - entries(): IterableIterator<[number, bigint]>; - - /** - * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in the array until the callbackfn returns false, - * or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - every(callbackfn: (value: bigint, index: number, array: BigUint64Array) => boolean, thisArg?: any): boolean; - - /** - * Returns the this object after filling the section identified by start and end with value - * @param value value to fill array section with - * @param start index to start filling the array at. If start is negative, it is treated as - * length+start where length is the length of the array. - * @param end index to stop filling the array at. If end is negative, it is treated as - * length+end. - */ - fill(value: bigint, start?: number, end?: number): this; - - /** - * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - filter(callbackfn: (value: bigint, index: number, array: BigUint64Array) => any, thisArg?: any): BigUint64Array; - - /** - * Returns the value of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - find(predicate: (value: bigint, index: number, array: BigUint64Array) => boolean, thisArg?: any): bigint | undefined; - - /** - * Returns the index of the first element in the array where predicate is true, and -1 - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, - * findIndex immediately returns that element index. Otherwise, findIndex returns -1. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - findIndex(predicate: (value: bigint, index: number, array: BigUint64Array) => boolean, thisArg?: any): number; - - /** - * Performs the specified action for each element in an array. - * @param callbackfn A function that accepts up to three arguments. forEach calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - forEach(callbackfn: (value: bigint, index: number, array: BigUint64Array) => void, thisArg?: any): void; - - /** - * Determines whether an array includes a certain element, returning true or false as appropriate. - * @param searchElement The element to search for. - * @param fromIndex The position in this array at which to begin searching for searchElement. - */ - includes(searchElement: bigint, fromIndex?: number): boolean; - - /** - * Returns the index of the first occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - indexOf(searchElement: bigint, fromIndex?: number): number; - - /** - * Adds all the elements of an array separated by the specified separator string. - * @param separator A string used to separate one element of an array from the next in the - * resulting String. If omitted, the array elements are separated with a comma. - */ - join(separator?: string): string; - - /** Yields each index in the array. */ - keys(): IterableIterator; - - /** - * Returns the index of the last occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - lastIndexOf(searchElement: bigint, fromIndex?: number): number; - - /** The length of the array. */ - readonly length: number; - - /** - * Calls a defined callback function on each element of an array, and returns an array that - * contains the results. - * @param callbackfn A function that accepts up to three arguments. The map method calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - map(callbackfn: (value: bigint, index: number, array: BigUint64Array) => bigint, thisArg?: any): BigUint64Array; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: bigint, currentValue: bigint, currentIndex: number, array: BigUint64Array) => bigint): bigint; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: U, currentValue: bigint, currentIndex: number, array: BigUint64Array) => U, initialValue: U): U; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an - * argument instead of an array value. - */ - reduceRight(callbackfn: (previousValue: bigint, currentValue: bigint, currentIndex: number, array: BigUint64Array) => bigint): bigint; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduceRight(callbackfn: (previousValue: U, currentValue: bigint, currentIndex: number, array: BigUint64Array) => U, initialValue: U): U; - - /** Reverses the elements in the array. */ - reverse(): this; - - /** - * Sets a value or an array of values. - * @param array A typed or untyped array of values to set. - * @param offset The index in the current array at which the values are to be written. - */ - set(array: ArrayLike, offset?: number): void; - - /** - * Returns a section of an array. - * @param start The beginning of the specified portion of the array. - * @param end The end of the specified portion of the array. - */ - slice(start?: number, end?: number): BigUint64Array; - - /** - * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the - * callbackfn function for each element in the array until the callbackfn returns true, or until - * the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - some(callbackfn: (value: bigint, index: number, array: BigUint64Array) => boolean, thisArg?: any): boolean; - - /** - * Sorts the array. - * @param compareFn The function used to determine the order of the elements. If omitted, the elements are sorted in ascending order. - */ - sort(compareFn?: (a: bigint, b: bigint) => number | bigint): this; - - /** - * Gets a new BigUint64Array view of the ArrayBuffer store for this array, referencing the elements - * at begin, inclusive, up to end, exclusive. - * @param begin The index of the beginning of the array. - * @param end The index of the end of the array. - */ - subarray(begin: number, end?: number): BigUint64Array; - - /** Converts the array to a string by using the current locale. */ - toLocaleString(): string; - - /** Returns a string representation of the array. */ - toString(): string; - - /** Yields each value in the array. */ - values(): IterableIterator; - - [Symbol.iterator](): IterableIterator; - - readonly [Symbol.toStringTag]: "BigUint64Array"; - - [index: number]: bigint; -} - -interface BigUint64ArrayConstructor { - readonly prototype: BigUint64Array; - new(length?: number): BigUint64Array; - new(array: Iterable): BigUint64Array; - new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): BigUint64Array; - - /** The size in bytes of each element in the array. */ - readonly BYTES_PER_ELEMENT: number; - - /** - * Returns a new array from a set of elements. - * @param items A set of elements to include in the new array object. - */ - of(...items: bigint[]): BigUint64Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: ArrayLike): BigUint64Array; - from(arrayLike: ArrayLike, mapfn: (v: U, k: number) => bigint, thisArg?: any): BigUint64Array; -} - -declare var BigUint64Array: BigUint64ArrayConstructor; - -interface DataView { - /** - * Gets the BigInt64 value at the specified byte offset from the start of the view. There is - * no alignment constraint; multi-byte values may be fetched from any offset. - * @param byteOffset The place in the buffer at which the value should be retrieved. - */ - getBigInt64(byteOffset: number, littleEndian?: boolean): bigint; - - /** - * Gets the BigUint64 value at the specified byte offset from the start of the view. There is - * no alignment constraint; multi-byte values may be fetched from any offset. - * @param byteOffset The place in the buffer at which the value should be retrieved. - */ - getBigUint64(byteOffset: number, littleEndian?: boolean): bigint; - - /** - * Stores a BigInt64 value at the specified byte offset from the start of the view. - * @param byteOffset The place in the buffer at which the value should be set. - * @param value The value to set. - * @param littleEndian If false or undefined, a big-endian value should be written, - * otherwise a little-endian value should be written. - */ - setBigInt64(byteOffset: number, value: bigint, littleEndian?: boolean): void; - - /** - * Stores a BigUint64 value at the specified byte offset from the start of the view. - * @param byteOffset The place in the buffer at which the value should be set. - * @param value The value to set. - * @param littleEndian If false or undefined, a big-endian value should be written, - * otherwise a little-endian value should be written. - */ - setBigUint64(byteOffset: number, value: bigint, littleEndian?: boolean): void; -} diff --git a/cli/dts/lib.esnext.symbol.d.ts b/cli/dts/lib.esnext.symbol.d.ts deleted file mode 100644 index 98293eaf57..0000000000 --- a/cli/dts/lib.esnext.symbol.d.ts +++ /dev/null @@ -1,26 +0,0 @@ -/*! ***************************************************************************** -Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at http://www.apache.org/licenses/LICENSE-2.0 - -THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED -WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, -MERCHANTABLITY OR NON-INFRINGEMENT. - -See the Apache Version 2.0 License for specific language governing permissions -and limitations under the License. -***************************************************************************** */ - - - -/// - - -interface Symbol { - /** - * expose the [[Description]] internal slot of a symbol directly - */ - readonly description: string; -} diff --git a/cli/dts/lib.webworker.d.ts b/cli/dts/lib.webworker.d.ts index 88def7ad32..50be901ae2 100644 --- a/cli/dts/lib.webworker.d.ts +++ b/cli/dts/lib.webworker.d.ts @@ -282,8 +282,8 @@ interface KeyAlgorithm { name: string; } -interface MessageEventInit extends EventInit { - data?: any; +interface MessageEventInit extends EventInit { + data?: T; lastEventId?: string; origin?: string; ports?: MessagePort[]; @@ -913,7 +913,7 @@ declare var Client: { /** Provides access to Client objects. Access it via self.clients within a service worker. */ interface Clients { claim(): Promise; - get(id: string): Promise; + get(id: string): Promise; matchAll(options?: ClientQueryOptions): Promise>; openWindow(url: string): Promise; } @@ -2241,11 +2241,11 @@ declare var MessageChannel: { }; /** A message received by a target object. */ -interface MessageEvent extends Event { +interface MessageEvent extends Event { /** * Returns the data of the message. */ - readonly data: any; + readonly data: T; /** * Returns the last event ID string, for server-sent events. */ @@ -2266,7 +2266,7 @@ interface MessageEvent extends Event { declare var MessageEvent: { prototype: MessageEvent; - new(type: string, eventInitDict?: MessageEventInit): MessageEvent; + new(type: string, eventInitDict?: MessageEventInit): MessageEvent; }; interface MessagePortEventMap { @@ -3053,24 +3053,24 @@ declare var StorageManager: { /** This Web Crypto API interface provides a number of low-level cryptographic functions. It is accessed via the Crypto.subtle properties available in a window context (via Window.crypto). */ interface SubtleCrypto { - decrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike; - deriveBits(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, length: number): PromiseLike; - deriveKey(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: string | AesDerivedKeyParams | HmacImportParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - digest(algorithm: AlgorithmIdentifier, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike; - encrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike; - exportKey(format: "jwk", key: CryptoKey): PromiseLike; - exportKey(format: "raw" | "pkcs8" | "spki", key: CryptoKey): PromiseLike; - exportKey(format: string, key: CryptoKey): PromiseLike; - generateKey(algorithm: AlgorithmIdentifier, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams | DhKeyGenParams, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - generateKey(algorithm: AesKeyGenParams | HmacKeyGenParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - importKey(format: "jwk", keyData: JsonWebKey, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - importKey(format: "raw" | "pkcs8" | "spki", keyData: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - importKey(format: string, keyData: JsonWebKey | Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - sign(algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike; - unwrapKey(format: "raw" | "pkcs8" | "spki" | "jwk" | string, wrappedKey: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, unwrappingKey: CryptoKey, unwrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, unwrappedKeyAlgorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike; - verify(algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, signature: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike; - wrapKey(format: "raw" | "pkcs8" | "spki" | "jwk" | string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams): PromiseLike; + decrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): Promise; + deriveBits(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, length: number): Promise; + deriveKey(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: string | AesDerivedKeyParams | HmacImportParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): Promise; + digest(algorithm: AlgorithmIdentifier, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): Promise; + encrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): Promise; + exportKey(format: "jwk", key: CryptoKey): Promise; + exportKey(format: "raw" | "pkcs8" | "spki", key: CryptoKey): Promise; + exportKey(format: string, key: CryptoKey): Promise; + generateKey(algorithm: AlgorithmIdentifier, extractable: boolean, keyUsages: KeyUsage[]): Promise; + generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams | DhKeyGenParams, extractable: boolean, keyUsages: KeyUsage[]): Promise; + generateKey(algorithm: AesKeyGenParams | HmacKeyGenParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): Promise; + importKey(format: "jwk", keyData: JsonWebKey, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): Promise; + importKey(format: "raw" | "pkcs8" | "spki", keyData: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): Promise; + importKey(format: string, keyData: JsonWebKey | Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): Promise; + sign(algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): Promise; + unwrapKey(format: "raw" | "pkcs8" | "spki" | "jwk" | string, wrappedKey: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, unwrappingKey: CryptoKey, unwrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, unwrappedKeyAlgorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): Promise; + verify(algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, signature: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): Promise; + wrapKey(format: "raw" | "pkcs8" | "spki" | "jwk" | string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams): Promise; } declare var SubtleCrypto: { diff --git a/cli/dts/typescript.d.ts b/cli/dts/typescript.d.ts index 62e8560ae4..67e35224b4 100644 --- a/cli/dts/typescript.d.ts +++ b/cli/dts/typescript.d.ts @@ -14,7 +14,7 @@ and limitations under the License. ***************************************************************************** */ declare namespace ts { - const versionMajorMinor = "3.9"; + const versionMajorMinor = "4.0"; /** The version of the TypeScript compiler release */ const version: string; /** @@ -31,21 +31,49 @@ declare namespace ts { interface SortedArray extends Array { " __sortedArrayBrand": any; } - /** ES6 Map interface, only read methods included. */ - interface ReadonlyMap { - get(key: string): T | undefined; - has(key: string): boolean; - forEach(action: (value: T, key: string) => void): void; + /** Common read methods for ES6 Map/Set. */ + interface ReadonlyCollection { readonly size: number; - keys(): Iterator; - values(): Iterator; - entries(): Iterator<[string, T]>; + has(key: K): boolean; + keys(): Iterator; + } + /** Common write methods for ES6 Map/Set. */ + interface Collection extends ReadonlyCollection { + delete(key: K): boolean; + clear(): void; + } + /** ES6 Map interface, only read methods included. */ + interface ReadonlyESMap extends ReadonlyCollection { + get(key: K): V | undefined; + values(): Iterator; + entries(): Iterator<[K, V]>; + forEach(action: (value: V, key: K) => void): void; + } + /** + * ES6 Map interface, only read methods included. + */ + interface ReadonlyMap extends ReadonlyESMap { } /** ES6 Map interface. */ - interface Map extends ReadonlyMap { - set(key: string, value: T): this; - delete(key: string): boolean; - clear(): void; + interface ESMap extends ReadonlyESMap, Collection { + set(key: K, value: V): this; + } + /** + * ES6 Map interface. + */ + interface Map extends ESMap { + } + /** ES6 Set interface, only read methods included. */ + interface ReadonlySet extends ReadonlyCollection { + has(value: T): boolean; + values(): Iterator; + entries(): Iterator<[T, T]>; + forEach(action: (value: T, key: T) => void): void; + } + /** ES6 Set interface. */ + interface Set extends ReadonlySet, Collection { + add(value: T): this; + delete(value: T): boolean; } /** ES6 Iterator type. */ interface Iterator { @@ -70,9 +98,10 @@ declare namespace ts { pos: number; end: number; } - export type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.Unknown | KeywordSyntaxKind; - export type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.AssertsKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InferKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.OfKeyword; - export type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken; + export interface ReadonlyTextRange { + readonly pos: number; + readonly end: number; + } export enum SyntaxKind { Unknown = 0, EndOfFileToken = 1, @@ -149,280 +178,285 @@ declare namespace ts { GreaterThanGreaterThanGreaterThanEqualsToken = 71, AmpersandEqualsToken = 72, BarEqualsToken = 73, - CaretEqualsToken = 74, - Identifier = 75, - PrivateIdentifier = 76, - BreakKeyword = 77, - CaseKeyword = 78, - CatchKeyword = 79, - ClassKeyword = 80, - ConstKeyword = 81, - ContinueKeyword = 82, - DebuggerKeyword = 83, - DefaultKeyword = 84, - DeleteKeyword = 85, - DoKeyword = 86, - ElseKeyword = 87, - EnumKeyword = 88, - ExportKeyword = 89, - ExtendsKeyword = 90, - FalseKeyword = 91, - FinallyKeyword = 92, - ForKeyword = 93, - FunctionKeyword = 94, - IfKeyword = 95, - ImportKeyword = 96, - InKeyword = 97, - InstanceOfKeyword = 98, - NewKeyword = 99, - NullKeyword = 100, - ReturnKeyword = 101, - SuperKeyword = 102, - SwitchKeyword = 103, - ThisKeyword = 104, - ThrowKeyword = 105, - TrueKeyword = 106, - TryKeyword = 107, - TypeOfKeyword = 108, - VarKeyword = 109, - VoidKeyword = 110, - WhileKeyword = 111, - WithKeyword = 112, - ImplementsKeyword = 113, - InterfaceKeyword = 114, - LetKeyword = 115, - PackageKeyword = 116, - PrivateKeyword = 117, - ProtectedKeyword = 118, - PublicKeyword = 119, - StaticKeyword = 120, - YieldKeyword = 121, - AbstractKeyword = 122, - AsKeyword = 123, - AssertsKeyword = 124, - AnyKeyword = 125, - AsyncKeyword = 126, - AwaitKeyword = 127, - BooleanKeyword = 128, - ConstructorKeyword = 129, - DeclareKeyword = 130, - GetKeyword = 131, - InferKeyword = 132, - IsKeyword = 133, - KeyOfKeyword = 134, - ModuleKeyword = 135, - NamespaceKeyword = 136, - NeverKeyword = 137, - ReadonlyKeyword = 138, - RequireKeyword = 139, - NumberKeyword = 140, - ObjectKeyword = 141, - SetKeyword = 142, - StringKeyword = 143, - SymbolKeyword = 144, - TypeKeyword = 145, - UndefinedKeyword = 146, - UniqueKeyword = 147, - UnknownKeyword = 148, - FromKeyword = 149, - GlobalKeyword = 150, - BigIntKeyword = 151, - OfKeyword = 152, - QualifiedName = 153, - ComputedPropertyName = 154, - TypeParameter = 155, - Parameter = 156, - Decorator = 157, - PropertySignature = 158, - PropertyDeclaration = 159, - MethodSignature = 160, - MethodDeclaration = 161, - Constructor = 162, - GetAccessor = 163, - SetAccessor = 164, - CallSignature = 165, - ConstructSignature = 166, - IndexSignature = 167, - TypePredicate = 168, - TypeReference = 169, - FunctionType = 170, - ConstructorType = 171, - TypeQuery = 172, - TypeLiteral = 173, - ArrayType = 174, - TupleType = 175, - OptionalType = 176, - RestType = 177, - UnionType = 178, - IntersectionType = 179, - ConditionalType = 180, - InferType = 181, - ParenthesizedType = 182, - ThisType = 183, - TypeOperator = 184, - IndexedAccessType = 185, - MappedType = 186, - LiteralType = 187, - ImportType = 188, - ObjectBindingPattern = 189, - ArrayBindingPattern = 190, - BindingElement = 191, - ArrayLiteralExpression = 192, - ObjectLiteralExpression = 193, - PropertyAccessExpression = 194, - ElementAccessExpression = 195, - CallExpression = 196, - NewExpression = 197, - TaggedTemplateExpression = 198, - TypeAssertionExpression = 199, - ParenthesizedExpression = 200, - FunctionExpression = 201, - ArrowFunction = 202, - DeleteExpression = 203, - TypeOfExpression = 204, - VoidExpression = 205, - AwaitExpression = 206, - PrefixUnaryExpression = 207, - PostfixUnaryExpression = 208, - BinaryExpression = 209, - ConditionalExpression = 210, - TemplateExpression = 211, - YieldExpression = 212, - SpreadElement = 213, - ClassExpression = 214, - OmittedExpression = 215, - ExpressionWithTypeArguments = 216, - AsExpression = 217, - NonNullExpression = 218, - MetaProperty = 219, - SyntheticExpression = 220, - TemplateSpan = 221, - SemicolonClassElement = 222, - Block = 223, - EmptyStatement = 224, - VariableStatement = 225, - ExpressionStatement = 226, - IfStatement = 227, - DoStatement = 228, - WhileStatement = 229, - ForStatement = 230, - ForInStatement = 231, - ForOfStatement = 232, - ContinueStatement = 233, - BreakStatement = 234, - ReturnStatement = 235, - WithStatement = 236, - SwitchStatement = 237, - LabeledStatement = 238, - ThrowStatement = 239, - TryStatement = 240, - DebuggerStatement = 241, - VariableDeclaration = 242, - VariableDeclarationList = 243, - FunctionDeclaration = 244, - ClassDeclaration = 245, - InterfaceDeclaration = 246, - TypeAliasDeclaration = 247, - EnumDeclaration = 248, - ModuleDeclaration = 249, - ModuleBlock = 250, - CaseBlock = 251, - NamespaceExportDeclaration = 252, - ImportEqualsDeclaration = 253, - ImportDeclaration = 254, - ImportClause = 255, - NamespaceImport = 256, - NamedImports = 257, - ImportSpecifier = 258, - ExportAssignment = 259, - ExportDeclaration = 260, - NamedExports = 261, - NamespaceExport = 262, - ExportSpecifier = 263, - MissingDeclaration = 264, - ExternalModuleReference = 265, - JsxElement = 266, - JsxSelfClosingElement = 267, - JsxOpeningElement = 268, - JsxClosingElement = 269, - JsxFragment = 270, - JsxOpeningFragment = 271, - JsxClosingFragment = 272, - JsxAttribute = 273, - JsxAttributes = 274, - JsxSpreadAttribute = 275, - JsxExpression = 276, - CaseClause = 277, - DefaultClause = 278, - HeritageClause = 279, - CatchClause = 280, - PropertyAssignment = 281, - ShorthandPropertyAssignment = 282, - SpreadAssignment = 283, - EnumMember = 284, - UnparsedPrologue = 285, - UnparsedPrepend = 286, - UnparsedText = 287, - UnparsedInternalText = 288, - UnparsedSyntheticReference = 289, - SourceFile = 290, - Bundle = 291, - UnparsedSource = 292, - InputFiles = 293, - JSDocTypeExpression = 294, - JSDocAllType = 295, - JSDocUnknownType = 296, - JSDocNullableType = 297, - JSDocNonNullableType = 298, - JSDocOptionalType = 299, - JSDocFunctionType = 300, - JSDocVariadicType = 301, - JSDocNamepathType = 302, - JSDocComment = 303, - JSDocTypeLiteral = 304, - JSDocSignature = 305, - JSDocTag = 306, - JSDocAugmentsTag = 307, - JSDocImplementsTag = 308, - JSDocAuthorTag = 309, - JSDocClassTag = 310, - JSDocPublicTag = 311, - JSDocPrivateTag = 312, - JSDocProtectedTag = 313, - JSDocReadonlyTag = 314, - JSDocCallbackTag = 315, - JSDocEnumTag = 316, - JSDocParameterTag = 317, - JSDocReturnTag = 318, - JSDocThisTag = 319, - JSDocTypeTag = 320, - JSDocTemplateTag = 321, - JSDocTypedefTag = 322, - JSDocPropertyTag = 323, - SyntaxList = 324, - NotEmittedStatement = 325, - PartiallyEmittedExpression = 326, - CommaListExpression = 327, - MergeDeclarationMarker = 328, - EndOfDeclarationMarker = 329, - SyntheticReferenceExpression = 330, - Count = 331, + BarBarEqualsToken = 74, + AmpersandAmpersandEqualsToken = 75, + QuestionQuestionEqualsToken = 76, + CaretEqualsToken = 77, + Identifier = 78, + PrivateIdentifier = 79, + BreakKeyword = 80, + CaseKeyword = 81, + CatchKeyword = 82, + ClassKeyword = 83, + ConstKeyword = 84, + ContinueKeyword = 85, + DebuggerKeyword = 86, + DefaultKeyword = 87, + DeleteKeyword = 88, + DoKeyword = 89, + ElseKeyword = 90, + EnumKeyword = 91, + ExportKeyword = 92, + ExtendsKeyword = 93, + FalseKeyword = 94, + FinallyKeyword = 95, + ForKeyword = 96, + FunctionKeyword = 97, + IfKeyword = 98, + ImportKeyword = 99, + InKeyword = 100, + InstanceOfKeyword = 101, + NewKeyword = 102, + NullKeyword = 103, + ReturnKeyword = 104, + SuperKeyword = 105, + SwitchKeyword = 106, + ThisKeyword = 107, + ThrowKeyword = 108, + TrueKeyword = 109, + TryKeyword = 110, + TypeOfKeyword = 111, + VarKeyword = 112, + VoidKeyword = 113, + WhileKeyword = 114, + WithKeyword = 115, + ImplementsKeyword = 116, + InterfaceKeyword = 117, + LetKeyword = 118, + PackageKeyword = 119, + PrivateKeyword = 120, + ProtectedKeyword = 121, + PublicKeyword = 122, + StaticKeyword = 123, + YieldKeyword = 124, + AbstractKeyword = 125, + AsKeyword = 126, + AssertsKeyword = 127, + AnyKeyword = 128, + AsyncKeyword = 129, + AwaitKeyword = 130, + BooleanKeyword = 131, + ConstructorKeyword = 132, + DeclareKeyword = 133, + GetKeyword = 134, + InferKeyword = 135, + IsKeyword = 136, + KeyOfKeyword = 137, + ModuleKeyword = 138, + NamespaceKeyword = 139, + NeverKeyword = 140, + ReadonlyKeyword = 141, + RequireKeyword = 142, + NumberKeyword = 143, + ObjectKeyword = 144, + SetKeyword = 145, + StringKeyword = 146, + SymbolKeyword = 147, + TypeKeyword = 148, + UndefinedKeyword = 149, + UniqueKeyword = 150, + UnknownKeyword = 151, + FromKeyword = 152, + GlobalKeyword = 153, + BigIntKeyword = 154, + OfKeyword = 155, + QualifiedName = 156, + ComputedPropertyName = 157, + TypeParameter = 158, + Parameter = 159, + Decorator = 160, + PropertySignature = 161, + PropertyDeclaration = 162, + MethodSignature = 163, + MethodDeclaration = 164, + Constructor = 165, + GetAccessor = 166, + SetAccessor = 167, + CallSignature = 168, + ConstructSignature = 169, + IndexSignature = 170, + TypePredicate = 171, + TypeReference = 172, + FunctionType = 173, + ConstructorType = 174, + TypeQuery = 175, + TypeLiteral = 176, + ArrayType = 177, + TupleType = 178, + OptionalType = 179, + RestType = 180, + UnionType = 181, + IntersectionType = 182, + ConditionalType = 183, + InferType = 184, + ParenthesizedType = 185, + ThisType = 186, + TypeOperator = 187, + IndexedAccessType = 188, + MappedType = 189, + LiteralType = 190, + NamedTupleMember = 191, + ImportType = 192, + ObjectBindingPattern = 193, + ArrayBindingPattern = 194, + BindingElement = 195, + ArrayLiteralExpression = 196, + ObjectLiteralExpression = 197, + PropertyAccessExpression = 198, + ElementAccessExpression = 199, + CallExpression = 200, + NewExpression = 201, + TaggedTemplateExpression = 202, + TypeAssertionExpression = 203, + ParenthesizedExpression = 204, + FunctionExpression = 205, + ArrowFunction = 206, + DeleteExpression = 207, + TypeOfExpression = 208, + VoidExpression = 209, + AwaitExpression = 210, + PrefixUnaryExpression = 211, + PostfixUnaryExpression = 212, + BinaryExpression = 213, + ConditionalExpression = 214, + TemplateExpression = 215, + YieldExpression = 216, + SpreadElement = 217, + ClassExpression = 218, + OmittedExpression = 219, + ExpressionWithTypeArguments = 220, + AsExpression = 221, + NonNullExpression = 222, + MetaProperty = 223, + SyntheticExpression = 224, + TemplateSpan = 225, + SemicolonClassElement = 226, + Block = 227, + EmptyStatement = 228, + VariableStatement = 229, + ExpressionStatement = 230, + IfStatement = 231, + DoStatement = 232, + WhileStatement = 233, + ForStatement = 234, + ForInStatement = 235, + ForOfStatement = 236, + ContinueStatement = 237, + BreakStatement = 238, + ReturnStatement = 239, + WithStatement = 240, + SwitchStatement = 241, + LabeledStatement = 242, + ThrowStatement = 243, + TryStatement = 244, + DebuggerStatement = 245, + VariableDeclaration = 246, + VariableDeclarationList = 247, + FunctionDeclaration = 248, + ClassDeclaration = 249, + InterfaceDeclaration = 250, + TypeAliasDeclaration = 251, + EnumDeclaration = 252, + ModuleDeclaration = 253, + ModuleBlock = 254, + CaseBlock = 255, + NamespaceExportDeclaration = 256, + ImportEqualsDeclaration = 257, + ImportDeclaration = 258, + ImportClause = 259, + NamespaceImport = 260, + NamedImports = 261, + ImportSpecifier = 262, + ExportAssignment = 263, + ExportDeclaration = 264, + NamedExports = 265, + NamespaceExport = 266, + ExportSpecifier = 267, + MissingDeclaration = 268, + ExternalModuleReference = 269, + JsxElement = 270, + JsxSelfClosingElement = 271, + JsxOpeningElement = 272, + JsxClosingElement = 273, + JsxFragment = 274, + JsxOpeningFragment = 275, + JsxClosingFragment = 276, + JsxAttribute = 277, + JsxAttributes = 278, + JsxSpreadAttribute = 279, + JsxExpression = 280, + CaseClause = 281, + DefaultClause = 282, + HeritageClause = 283, + CatchClause = 284, + PropertyAssignment = 285, + ShorthandPropertyAssignment = 286, + SpreadAssignment = 287, + EnumMember = 288, + UnparsedPrologue = 289, + UnparsedPrepend = 290, + UnparsedText = 291, + UnparsedInternalText = 292, + UnparsedSyntheticReference = 293, + SourceFile = 294, + Bundle = 295, + UnparsedSource = 296, + InputFiles = 297, + JSDocTypeExpression = 298, + JSDocAllType = 299, + JSDocUnknownType = 300, + JSDocNullableType = 301, + JSDocNonNullableType = 302, + JSDocOptionalType = 303, + JSDocFunctionType = 304, + JSDocVariadicType = 305, + JSDocNamepathType = 306, + JSDocComment = 307, + JSDocTypeLiteral = 308, + JSDocSignature = 309, + JSDocTag = 310, + JSDocAugmentsTag = 311, + JSDocImplementsTag = 312, + JSDocAuthorTag = 313, + JSDocDeprecatedTag = 314, + JSDocClassTag = 315, + JSDocPublicTag = 316, + JSDocPrivateTag = 317, + JSDocProtectedTag = 318, + JSDocReadonlyTag = 319, + JSDocCallbackTag = 320, + JSDocEnumTag = 321, + JSDocParameterTag = 322, + JSDocReturnTag = 323, + JSDocThisTag = 324, + JSDocTypeTag = 325, + JSDocTemplateTag = 326, + JSDocTypedefTag = 327, + JSDocPropertyTag = 328, + SyntaxList = 329, + NotEmittedStatement = 330, + PartiallyEmittedExpression = 331, + CommaListExpression = 332, + MergeDeclarationMarker = 333, + EndOfDeclarationMarker = 334, + SyntheticReferenceExpression = 335, + Count = 336, FirstAssignment = 62, - LastAssignment = 74, + LastAssignment = 77, FirstCompoundAssignment = 63, - LastCompoundAssignment = 74, - FirstReservedWord = 77, - LastReservedWord = 112, - FirstKeyword = 77, - LastKeyword = 152, - FirstFutureReservedWord = 113, - LastFutureReservedWord = 121, - FirstTypeNode = 168, - LastTypeNode = 188, + LastCompoundAssignment = 77, + FirstReservedWord = 80, + LastReservedWord = 115, + FirstKeyword = 80, + LastKeyword = 155, + FirstFutureReservedWord = 116, + LastFutureReservedWord = 124, + FirstTypeNode = 171, + LastTypeNode = 192, FirstPunctuation = 18, - LastPunctuation = 74, + LastPunctuation = 77, FirstToken = 0, - LastToken = 152, + LastToken = 155, FirstTriviaToken = 2, LastTriviaToken = 7, FirstLiteralToken = 8, @@ -430,15 +464,25 @@ declare namespace ts { FirstTemplateToken = 14, LastTemplateToken = 17, FirstBinaryOperator = 29, - LastBinaryOperator = 74, - FirstStatement = 225, - LastStatement = 241, - FirstNode = 153, - FirstJSDocNode = 294, - LastJSDocNode = 323, - FirstJSDocTagNode = 306, - LastJSDocTagNode = 323, + LastBinaryOperator = 77, + FirstStatement = 229, + LastStatement = 245, + FirstNode = 156, + FirstJSDocNode = 298, + LastJSDocNode = 328, + FirstJSDocTagNode = 310, + LastJSDocTagNode = 328, } + export type TriviaSyntaxKind = SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia | SyntaxKind.NewLineTrivia | SyntaxKind.WhitespaceTrivia | SyntaxKind.ShebangTrivia | SyntaxKind.ConflictMarkerTrivia; + export type LiteralSyntaxKind = SyntaxKind.NumericLiteral | SyntaxKind.BigIntLiteral | SyntaxKind.StringLiteral | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.RegularExpressionLiteral | SyntaxKind.NoSubstitutionTemplateLiteral; + export type PseudoLiteralSyntaxKind = SyntaxKind.TemplateHead | SyntaxKind.TemplateMiddle | SyntaxKind.TemplateTail; + export type PunctuationSyntaxKind = SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.OpenParenToken | SyntaxKind.CloseParenToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.DotToken | SyntaxKind.DotDotDotToken | SyntaxKind.SemicolonToken | SyntaxKind.CommaToken | SyntaxKind.QuestionDotToken | SyntaxKind.LessThanToken | SyntaxKind.LessThanSlashToken | SyntaxKind.GreaterThanToken | SyntaxKind.LessThanEqualsToken | SyntaxKind.GreaterThanEqualsToken | SyntaxKind.EqualsEqualsToken | SyntaxKind.ExclamationEqualsToken | SyntaxKind.EqualsEqualsEqualsToken | SyntaxKind.ExclamationEqualsEqualsToken | SyntaxKind.EqualsGreaterThanToken | SyntaxKind.PlusToken | SyntaxKind.MinusToken | SyntaxKind.AsteriskToken | SyntaxKind.AsteriskAsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken | SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken | SyntaxKind.LessThanLessThanToken | SyntaxKind.GreaterThanGreaterThanToken | SyntaxKind.GreaterThanGreaterThanGreaterThanToken | SyntaxKind.AmpersandToken | SyntaxKind.BarToken | SyntaxKind.CaretToken | SyntaxKind.ExclamationToken | SyntaxKind.TildeToken | SyntaxKind.AmpersandAmpersandToken | SyntaxKind.BarBarToken | SyntaxKind.QuestionQuestionToken | SyntaxKind.QuestionToken | SyntaxKind.ColonToken | SyntaxKind.AtToken | SyntaxKind.BacktickToken | SyntaxKind.EqualsToken | SyntaxKind.PlusEqualsToken | SyntaxKind.MinusEqualsToken | SyntaxKind.AsteriskEqualsToken | SyntaxKind.AsteriskAsteriskEqualsToken | SyntaxKind.SlashEqualsToken | SyntaxKind.PercentEqualsToken | SyntaxKind.LessThanLessThanEqualsToken | SyntaxKind.GreaterThanGreaterThanEqualsToken | SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken | SyntaxKind.AmpersandEqualsToken | SyntaxKind.BarEqualsToken | SyntaxKind.CaretEqualsToken; + export type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.AssertsKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InferKeyword | SyntaxKind.InKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.OfKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword; + export type ModifierSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.ConstKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.ExportKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.StaticKeyword; + export type KeywordTypeSyntaxKind = SyntaxKind.AnyKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.StringKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VoidKeyword; + export type TokenSyntaxKind = SyntaxKind.Unknown | SyntaxKind.EndOfFileToken | TriviaSyntaxKind | LiteralSyntaxKind | PseudoLiteralSyntaxKind | PunctuationSyntaxKind | SyntaxKind.Identifier | KeywordSyntaxKind; + export type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken; + export type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.Unknown | KeywordSyntaxKind; export enum NodeFlags { None = 0, Let = 1, @@ -482,13 +526,15 @@ declare namespace ts { Async = 256, Default = 512, Const = 2048, + HasComputedJSDocModifiers = 4096, + Deprecated = 8192, HasComputedFlags = 536870912, AccessibilityModifier = 28, ParameterPropertyModifier = 92, NonPublicAccessibilityModifier = 24, TypeScriptModifier = 2270, ExportDefault = 513, - All = 3071 + All = 11263 } export enum JsxFlags { None = 0, @@ -498,60 +544,91 @@ declare namespace ts { IntrinsicIndexedElement = 2, IntrinsicElement = 3 } - export interface Node extends TextRange { - kind: SyntaxKind; - flags: NodeFlags; - decorators?: NodeArray; - modifiers?: ModifiersArray; - parent: Node; + export interface Node extends ReadonlyTextRange { + readonly kind: SyntaxKind; + readonly flags: NodeFlags; + readonly decorators?: NodeArray; + readonly modifiers?: ModifiersArray; + readonly parent: Node; } export interface JSDocContainer { } - export type HasJSDoc = ParameterDeclaration | CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | PropertySignature | ArrowFunction | ParenthesizedExpression | SpreadAssignment | ShorthandPropertyAssignment | PropertyAssignment | FunctionExpression | LabeledStatement | ExpressionStatement | VariableStatement | FunctionDeclaration | ConstructorDeclaration | MethodDeclaration | PropertyDeclaration | AccessorDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | EnumMember | EnumDeclaration | ModuleDeclaration | ImportEqualsDeclaration | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | ExportDeclaration | EndOfFileToken; + export type HasJSDoc = ParameterDeclaration | CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | PropertySignature | ArrowFunction | ParenthesizedExpression | SpreadAssignment | ShorthandPropertyAssignment | PropertyAssignment | FunctionExpression | LabeledStatement | ExpressionStatement | VariableStatement | FunctionDeclaration | ConstructorDeclaration | MethodDeclaration | PropertyDeclaration | AccessorDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | EnumMember | EnumDeclaration | ModuleDeclaration | ImportEqualsDeclaration | ImportDeclaration | NamespaceExportDeclaration | ExportAssignment | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | ExportDeclaration | NamedTupleMember | EndOfFileToken; export type HasType = SignatureDeclaration | VariableDeclaration | ParameterDeclaration | PropertySignature | PropertyDeclaration | TypePredicateNode | ParenthesizedTypeNode | TypeOperatorNode | MappedTypeNode | AssertionExpression | TypeAliasDeclaration | JSDocTypeExpression | JSDocNonNullableType | JSDocNullableType | JSDocOptionalType | JSDocVariadicType; export type HasTypeArguments = CallExpression | NewExpression | TaggedTemplateExpression | JsxOpeningElement | JsxSelfClosingElement; export type HasInitializer = HasExpressionInitializer | ForStatement | ForInStatement | ForOfStatement | JsxAttribute; export type HasExpressionInitializer = VariableDeclaration | ParameterDeclaration | BindingElement | PropertySignature | PropertyDeclaration | PropertyAssignment | EnumMember; - export interface NodeArray extends ReadonlyArray, TextRange { + export interface NodeArray extends ReadonlyArray, ReadonlyTextRange { hasTrailingComma?: boolean; } export interface Token extends Node { - kind: TKind; + readonly kind: TKind; } - export type DotToken = Token; - export type DotDotDotToken = Token; - export type QuestionToken = Token; - export type QuestionDotToken = Token; - export type ExclamationToken = Token; - export type ColonToken = Token; - export type EqualsToken = Token; - export type AsteriskToken = Token; - export type EqualsGreaterThanToken = Token; export type EndOfFileToken = Token & JSDocContainer; - export type ReadonlyToken = Token; - export type AwaitKeywordToken = Token; - export type PlusToken = Token; - export type MinusToken = Token; - export type AssertsToken = Token; - export type Modifier = Token | Token | Token | Token | Token | Token | Token | Token | Token | Token | Token; + export interface PunctuationToken extends Token { + } + export type DotToken = PunctuationToken; + export type DotDotDotToken = PunctuationToken; + export type QuestionToken = PunctuationToken; + export type ExclamationToken = PunctuationToken; + export type ColonToken = PunctuationToken; + export type EqualsToken = PunctuationToken; + export type AsteriskToken = PunctuationToken; + export type EqualsGreaterThanToken = PunctuationToken; + export type PlusToken = PunctuationToken; + export type MinusToken = PunctuationToken; + export type QuestionDotToken = PunctuationToken; + export interface KeywordToken extends Token { + } + export type AssertsKeyword = KeywordToken; + export type AwaitKeyword = KeywordToken; + /** @deprecated Use `AwaitKeyword` instead. */ + export type AwaitKeywordToken = AwaitKeyword; + /** @deprecated Use `AssertsKeyword` instead. */ + export type AssertsToken = AssertsKeyword; + export interface ModifierToken extends KeywordToken { + } + export type AbstractKeyword = ModifierToken; + export type AsyncKeyword = ModifierToken; + export type ConstKeyword = ModifierToken; + export type DeclareKeyword = ModifierToken; + export type DefaultKeyword = ModifierToken; + export type ExportKeyword = ModifierToken; + export type PrivateKeyword = ModifierToken; + export type ProtectedKeyword = ModifierToken; + export type PublicKeyword = ModifierToken; + export type ReadonlyKeyword = ModifierToken; + export type StaticKeyword = ModifierToken; + /** @deprecated Use `ReadonlyKeyword` instead. */ + export type ReadonlyToken = ReadonlyKeyword; + export type Modifier = AbstractKeyword | AsyncKeyword | ConstKeyword | DeclareKeyword | DefaultKeyword | ExportKeyword | PrivateKeyword | ProtectedKeyword | PublicKeyword | ReadonlyKeyword | StaticKeyword; + export type AccessibilityModifier = PublicKeyword | PrivateKeyword | ProtectedKeyword; + export type ParameterPropertyModifier = AccessibilityModifier | ReadonlyKeyword; + export type ClassMemberModifier = AccessibilityModifier | ReadonlyKeyword | StaticKeyword; export type ModifiersArray = NodeArray; + export enum GeneratedIdentifierFlags { + None = 0, + ReservedInNestedScopes = 8, + Optimistic = 16, + FileLevel = 32 + } export interface Identifier extends PrimaryExpression, Declaration { - kind: SyntaxKind.Identifier; + readonly kind: SyntaxKind.Identifier; /** * Prefer to use `id.unescapedText`. (Note: This is available only in services, not internally to the TypeScript compiler.) * Text of identifier, but if the identifier begins with two underscores, this will begin with three. */ - escapedText: __String; - originalKeywordKind?: SyntaxKind; + readonly escapedText: __String; + readonly originalKeywordKind?: SyntaxKind; isInJSDocNamespace?: boolean; } export interface TransientIdentifier extends Identifier { resolvedSymbol: Symbol; } export interface QualifiedName extends Node { - kind: SyntaxKind.QualifiedName; - left: EntityName; - right: Identifier; + readonly kind: SyntaxKind.QualifiedName; + readonly left: EntityName; + readonly right: Identifier; } export type EntityName = Identifier | QualifiedName; export type PropertyName = Identifier | StringLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier; @@ -560,135 +637,136 @@ declare namespace ts { _declarationBrand: any; } export interface NamedDeclaration extends Declaration { - name?: DeclarationName; + readonly name?: DeclarationName; } export interface DeclarationStatement extends NamedDeclaration, Statement { - name?: Identifier | StringLiteral | NumericLiteral; + readonly name?: Identifier | StringLiteral | NumericLiteral; } export interface ComputedPropertyName extends Node { - parent: Declaration; - kind: SyntaxKind.ComputedPropertyName; - expression: Expression; + readonly kind: SyntaxKind.ComputedPropertyName; + readonly parent: Declaration; + readonly expression: Expression; } export interface PrivateIdentifier extends Node { - kind: SyntaxKind.PrivateIdentifier; - escapedText: __String; + readonly kind: SyntaxKind.PrivateIdentifier; + readonly escapedText: __String; } export interface Decorator extends Node { - kind: SyntaxKind.Decorator; - parent: NamedDeclaration; - expression: LeftHandSideExpression; + readonly kind: SyntaxKind.Decorator; + readonly parent: NamedDeclaration; + readonly expression: LeftHandSideExpression; } export interface TypeParameterDeclaration extends NamedDeclaration { - kind: SyntaxKind.TypeParameter; - parent: DeclarationWithTypeParameterChildren | InferTypeNode; - name: Identifier; + readonly kind: SyntaxKind.TypeParameter; + readonly parent: DeclarationWithTypeParameterChildren | InferTypeNode; + readonly name: Identifier; /** Note: Consider calling `getEffectiveConstraintOfTypeParameter` */ - constraint?: TypeNode; - default?: TypeNode; + readonly constraint?: TypeNode; + readonly default?: TypeNode; expression?: Expression; } export interface SignatureDeclarationBase extends NamedDeclaration, JSDocContainer { - kind: SignatureDeclaration["kind"]; - name?: PropertyName; - typeParameters?: NodeArray; - parameters: NodeArray; - type?: TypeNode; + readonly kind: SignatureDeclaration["kind"]; + readonly name?: PropertyName; + readonly typeParameters?: NodeArray; + readonly parameters: NodeArray; + readonly type?: TypeNode; } export type SignatureDeclaration = CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | FunctionDeclaration | MethodDeclaration | ConstructorDeclaration | AccessorDeclaration | FunctionExpression | ArrowFunction; export interface CallSignatureDeclaration extends SignatureDeclarationBase, TypeElement { - kind: SyntaxKind.CallSignature; + readonly kind: SyntaxKind.CallSignature; } export interface ConstructSignatureDeclaration extends SignatureDeclarationBase, TypeElement { - kind: SyntaxKind.ConstructSignature; + readonly kind: SyntaxKind.ConstructSignature; } export type BindingName = Identifier | BindingPattern; export interface VariableDeclaration extends NamedDeclaration { - kind: SyntaxKind.VariableDeclaration; - parent: VariableDeclarationList | CatchClause; - name: BindingName; - exclamationToken?: ExclamationToken; - type?: TypeNode; - initializer?: Expression; + readonly kind: SyntaxKind.VariableDeclaration; + readonly parent: VariableDeclarationList | CatchClause; + readonly name: BindingName; + readonly exclamationToken?: ExclamationToken; + readonly type?: TypeNode; + readonly initializer?: Expression; } export interface VariableDeclarationList extends Node { - kind: SyntaxKind.VariableDeclarationList; - parent: VariableStatement | ForStatement | ForOfStatement | ForInStatement; - declarations: NodeArray; + readonly kind: SyntaxKind.VariableDeclarationList; + readonly parent: VariableStatement | ForStatement | ForOfStatement | ForInStatement; + readonly declarations: NodeArray; } export interface ParameterDeclaration extends NamedDeclaration, JSDocContainer { - kind: SyntaxKind.Parameter; - parent: SignatureDeclaration; - dotDotDotToken?: DotDotDotToken; - name: BindingName; - questionToken?: QuestionToken; - type?: TypeNode; - initializer?: Expression; + readonly kind: SyntaxKind.Parameter; + readonly parent: SignatureDeclaration; + readonly dotDotDotToken?: DotDotDotToken; + readonly name: BindingName; + readonly questionToken?: QuestionToken; + readonly type?: TypeNode; + readonly initializer?: Expression; } export interface BindingElement extends NamedDeclaration { - kind: SyntaxKind.BindingElement; - parent: BindingPattern; - propertyName?: PropertyName; - dotDotDotToken?: DotDotDotToken; - name: BindingName; - initializer?: Expression; + readonly kind: SyntaxKind.BindingElement; + readonly parent: BindingPattern; + readonly propertyName?: PropertyName; + readonly dotDotDotToken?: DotDotDotToken; + readonly name: BindingName; + readonly initializer?: Expression; } export interface PropertySignature extends TypeElement, JSDocContainer { - kind: SyntaxKind.PropertySignature; - name: PropertyName; - questionToken?: QuestionToken; - type?: TypeNode; + readonly kind: SyntaxKind.PropertySignature; + readonly name: PropertyName; + readonly questionToken?: QuestionToken; + readonly type?: TypeNode; initializer?: Expression; } export interface PropertyDeclaration extends ClassElement, JSDocContainer { - kind: SyntaxKind.PropertyDeclaration; - parent: ClassLikeDeclaration; - name: PropertyName; - questionToken?: QuestionToken; - exclamationToken?: ExclamationToken; - type?: TypeNode; - initializer?: Expression; + readonly kind: SyntaxKind.PropertyDeclaration; + readonly parent: ClassLikeDeclaration; + readonly name: PropertyName; + readonly questionToken?: QuestionToken; + readonly exclamationToken?: ExclamationToken; + readonly type?: TypeNode; + readonly initializer?: Expression; } export interface ObjectLiteralElement extends NamedDeclaration { _objectLiteralBrand: any; - name?: PropertyName; + readonly name?: PropertyName; } /** Unlike ObjectLiteralElement, excludes JSXAttribute and JSXSpreadAttribute. */ export type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment | MethodDeclaration | AccessorDeclaration; export interface PropertyAssignment extends ObjectLiteralElement, JSDocContainer { - parent: ObjectLiteralExpression; - kind: SyntaxKind.PropertyAssignment; - name: PropertyName; - questionToken?: QuestionToken; - initializer: Expression; + readonly kind: SyntaxKind.PropertyAssignment; + readonly parent: ObjectLiteralExpression; + readonly name: PropertyName; + readonly questionToken?: QuestionToken; + readonly exclamationToken?: ExclamationToken; + readonly initializer: Expression; } export interface ShorthandPropertyAssignment extends ObjectLiteralElement, JSDocContainer { - parent: ObjectLiteralExpression; - kind: SyntaxKind.ShorthandPropertyAssignment; - name: Identifier; - questionToken?: QuestionToken; - exclamationToken?: ExclamationToken; - equalsToken?: Token; - objectAssignmentInitializer?: Expression; + readonly kind: SyntaxKind.ShorthandPropertyAssignment; + readonly parent: ObjectLiteralExpression; + readonly name: Identifier; + readonly questionToken?: QuestionToken; + readonly exclamationToken?: ExclamationToken; + readonly equalsToken?: EqualsToken; + readonly objectAssignmentInitializer?: Expression; } export interface SpreadAssignment extends ObjectLiteralElement, JSDocContainer { - parent: ObjectLiteralExpression; - kind: SyntaxKind.SpreadAssignment; - expression: Expression; + readonly kind: SyntaxKind.SpreadAssignment; + readonly parent: ObjectLiteralExpression; + readonly expression: Expression; } export type VariableLikeDeclaration = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyDeclaration | PropertyAssignment | PropertySignature | JsxAttribute | ShorthandPropertyAssignment | EnumMember | JSDocPropertyTag | JSDocParameterTag; export interface PropertyLikeDeclaration extends NamedDeclaration { - name: PropertyName; + readonly name: PropertyName; } export interface ObjectBindingPattern extends Node { - kind: SyntaxKind.ObjectBindingPattern; - parent: VariableDeclaration | ParameterDeclaration | BindingElement; - elements: NodeArray; + readonly kind: SyntaxKind.ObjectBindingPattern; + readonly parent: VariableDeclaration | ParameterDeclaration | BindingElement; + readonly elements: NodeArray; } export interface ArrayBindingPattern extends Node { - kind: SyntaxKind.ArrayBindingPattern; - parent: VariableDeclaration | ParameterDeclaration | BindingElement; - elements: NodeArray; + readonly kind: SyntaxKind.ArrayBindingPattern; + readonly parent: VariableDeclaration | ParameterDeclaration | BindingElement; + readonly elements: NodeArray; } export type BindingPattern = ObjectBindingPattern | ArrayBindingPattern; export type ArrayBindingElement = BindingElement | OmittedExpression; @@ -702,180 +780,189 @@ declare namespace ts { */ export interface FunctionLikeDeclarationBase extends SignatureDeclarationBase { _functionLikeDeclarationBrand: any; - asteriskToken?: AsteriskToken; - questionToken?: QuestionToken; - exclamationToken?: ExclamationToken; - body?: Block | Expression; + readonly asteriskToken?: AsteriskToken; + readonly questionToken?: QuestionToken; + readonly exclamationToken?: ExclamationToken; + readonly body?: Block | Expression; } export type FunctionLikeDeclaration = FunctionDeclaration | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | ConstructorDeclaration | FunctionExpression | ArrowFunction; /** @deprecated Use SignatureDeclaration */ export type FunctionLike = SignatureDeclaration; export interface FunctionDeclaration extends FunctionLikeDeclarationBase, DeclarationStatement { - kind: SyntaxKind.FunctionDeclaration; - name?: Identifier; - body?: FunctionBody; + readonly kind: SyntaxKind.FunctionDeclaration; + readonly name?: Identifier; + readonly body?: FunctionBody; } export interface MethodSignature extends SignatureDeclarationBase, TypeElement { - kind: SyntaxKind.MethodSignature; - parent: ObjectTypeDeclaration; - name: PropertyName; + readonly kind: SyntaxKind.MethodSignature; + readonly parent: ObjectTypeDeclaration; + readonly name: PropertyName; } export interface MethodDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer { - kind: SyntaxKind.MethodDeclaration; - parent: ClassLikeDeclaration | ObjectLiteralExpression; - name: PropertyName; - body?: FunctionBody; + readonly kind: SyntaxKind.MethodDeclaration; + readonly parent: ClassLikeDeclaration | ObjectLiteralExpression; + readonly name: PropertyName; + readonly body?: FunctionBody; } export interface ConstructorDeclaration extends FunctionLikeDeclarationBase, ClassElement, JSDocContainer { - kind: SyntaxKind.Constructor; - parent: ClassLikeDeclaration; - body?: FunctionBody; + readonly kind: SyntaxKind.Constructor; + readonly parent: ClassLikeDeclaration; + readonly body?: FunctionBody; } /** For when we encounter a semicolon in a class declaration. ES6 allows these as class elements. */ export interface SemicolonClassElement extends ClassElement { - kind: SyntaxKind.SemicolonClassElement; - parent: ClassLikeDeclaration; + readonly kind: SyntaxKind.SemicolonClassElement; + readonly parent: ClassLikeDeclaration; } export interface GetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer { - kind: SyntaxKind.GetAccessor; - parent: ClassLikeDeclaration | ObjectLiteralExpression; - name: PropertyName; - body?: FunctionBody; + readonly kind: SyntaxKind.GetAccessor; + readonly parent: ClassLikeDeclaration | ObjectLiteralExpression; + readonly name: PropertyName; + readonly body?: FunctionBody; } export interface SetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer { - kind: SyntaxKind.SetAccessor; - parent: ClassLikeDeclaration | ObjectLiteralExpression; - name: PropertyName; - body?: FunctionBody; + readonly kind: SyntaxKind.SetAccessor; + readonly parent: ClassLikeDeclaration | ObjectLiteralExpression; + readonly name: PropertyName; + readonly body?: FunctionBody; } export type AccessorDeclaration = GetAccessorDeclaration | SetAccessorDeclaration; export interface IndexSignatureDeclaration extends SignatureDeclarationBase, ClassElement, TypeElement { - kind: SyntaxKind.IndexSignature; - parent: ObjectTypeDeclaration; + readonly kind: SyntaxKind.IndexSignature; + readonly parent: ObjectTypeDeclaration; + readonly type: TypeNode; } export interface TypeNode extends Node { _typeNodeBrand: any; } - export interface KeywordTypeNode extends TypeNode { - kind: SyntaxKind.AnyKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.NumberKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.StringKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.VoidKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.NullKeyword | SyntaxKind.NeverKeyword; + export interface KeywordTypeNode extends KeywordToken, TypeNode { + readonly kind: TKind; } export interface ImportTypeNode extends NodeWithTypeArguments { - kind: SyntaxKind.ImportType; - isTypeOf?: boolean; - argument: TypeNode; - qualifier?: EntityName; + readonly kind: SyntaxKind.ImportType; + readonly isTypeOf: boolean; + readonly argument: TypeNode; + readonly qualifier?: EntityName; } export interface ThisTypeNode extends TypeNode { - kind: SyntaxKind.ThisType; + readonly kind: SyntaxKind.ThisType; } export type FunctionOrConstructorTypeNode = FunctionTypeNode | ConstructorTypeNode; export interface FunctionOrConstructorTypeNodeBase extends TypeNode, SignatureDeclarationBase { - kind: SyntaxKind.FunctionType | SyntaxKind.ConstructorType; - type: TypeNode; + readonly kind: SyntaxKind.FunctionType | SyntaxKind.ConstructorType; + readonly type: TypeNode; } export interface FunctionTypeNode extends FunctionOrConstructorTypeNodeBase { - kind: SyntaxKind.FunctionType; + readonly kind: SyntaxKind.FunctionType; } export interface ConstructorTypeNode extends FunctionOrConstructorTypeNodeBase { - kind: SyntaxKind.ConstructorType; + readonly kind: SyntaxKind.ConstructorType; } export interface NodeWithTypeArguments extends TypeNode { - typeArguments?: NodeArray; + readonly typeArguments?: NodeArray; } export type TypeReferenceType = TypeReferenceNode | ExpressionWithTypeArguments; export interface TypeReferenceNode extends NodeWithTypeArguments { - kind: SyntaxKind.TypeReference; - typeName: EntityName; + readonly kind: SyntaxKind.TypeReference; + readonly typeName: EntityName; } export interface TypePredicateNode extends TypeNode { - kind: SyntaxKind.TypePredicate; - parent: SignatureDeclaration | JSDocTypeExpression; - assertsModifier?: AssertsToken; - parameterName: Identifier | ThisTypeNode; - type?: TypeNode; + readonly kind: SyntaxKind.TypePredicate; + readonly parent: SignatureDeclaration | JSDocTypeExpression; + readonly assertsModifier?: AssertsToken; + readonly parameterName: Identifier | ThisTypeNode; + readonly type?: TypeNode; } export interface TypeQueryNode extends TypeNode { - kind: SyntaxKind.TypeQuery; - exprName: EntityName; + readonly kind: SyntaxKind.TypeQuery; + readonly exprName: EntityName; } export interface TypeLiteralNode extends TypeNode, Declaration { - kind: SyntaxKind.TypeLiteral; - members: NodeArray; + readonly kind: SyntaxKind.TypeLiteral; + readonly members: NodeArray; } export interface ArrayTypeNode extends TypeNode { - kind: SyntaxKind.ArrayType; - elementType: TypeNode; + readonly kind: SyntaxKind.ArrayType; + readonly elementType: TypeNode; } export interface TupleTypeNode extends TypeNode { - kind: SyntaxKind.TupleType; - elementTypes: NodeArray; + readonly kind: SyntaxKind.TupleType; + readonly elements: NodeArray; + } + export interface NamedTupleMember extends TypeNode, JSDocContainer, Declaration { + readonly kind: SyntaxKind.NamedTupleMember; + readonly dotDotDotToken?: Token; + readonly name: Identifier; + readonly questionToken?: Token; + readonly type: TypeNode; } export interface OptionalTypeNode extends TypeNode { - kind: SyntaxKind.OptionalType; - type: TypeNode; + readonly kind: SyntaxKind.OptionalType; + readonly type: TypeNode; } export interface RestTypeNode extends TypeNode { - kind: SyntaxKind.RestType; - type: TypeNode; + readonly kind: SyntaxKind.RestType; + readonly type: TypeNode; } export type UnionOrIntersectionTypeNode = UnionTypeNode | IntersectionTypeNode; export interface UnionTypeNode extends TypeNode { - kind: SyntaxKind.UnionType; - types: NodeArray; + readonly kind: SyntaxKind.UnionType; + readonly types: NodeArray; } export interface IntersectionTypeNode extends TypeNode { - kind: SyntaxKind.IntersectionType; - types: NodeArray; + readonly kind: SyntaxKind.IntersectionType; + readonly types: NodeArray; } export interface ConditionalTypeNode extends TypeNode { - kind: SyntaxKind.ConditionalType; - checkType: TypeNode; - extendsType: TypeNode; - trueType: TypeNode; - falseType: TypeNode; + readonly kind: SyntaxKind.ConditionalType; + readonly checkType: TypeNode; + readonly extendsType: TypeNode; + readonly trueType: TypeNode; + readonly falseType: TypeNode; } export interface InferTypeNode extends TypeNode { - kind: SyntaxKind.InferType; - typeParameter: TypeParameterDeclaration; + readonly kind: SyntaxKind.InferType; + readonly typeParameter: TypeParameterDeclaration; } export interface ParenthesizedTypeNode extends TypeNode { - kind: SyntaxKind.ParenthesizedType; - type: TypeNode; + readonly kind: SyntaxKind.ParenthesizedType; + readonly type: TypeNode; } export interface TypeOperatorNode extends TypeNode { - kind: SyntaxKind.TypeOperator; - operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.ReadonlyKeyword; - type: TypeNode; + readonly kind: SyntaxKind.TypeOperator; + readonly operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.ReadonlyKeyword; + readonly type: TypeNode; } export interface IndexedAccessTypeNode extends TypeNode { - kind: SyntaxKind.IndexedAccessType; - objectType: TypeNode; - indexType: TypeNode; + readonly kind: SyntaxKind.IndexedAccessType; + readonly objectType: TypeNode; + readonly indexType: TypeNode; } export interface MappedTypeNode extends TypeNode, Declaration { - kind: SyntaxKind.MappedType; - readonlyToken?: ReadonlyToken | PlusToken | MinusToken; - typeParameter: TypeParameterDeclaration; - questionToken?: QuestionToken | PlusToken | MinusToken; - type?: TypeNode; + readonly kind: SyntaxKind.MappedType; + readonly readonlyToken?: ReadonlyToken | PlusToken | MinusToken; + readonly typeParameter: TypeParameterDeclaration; + readonly questionToken?: QuestionToken | PlusToken | MinusToken; + readonly type?: TypeNode; } export interface LiteralTypeNode extends TypeNode { - kind: SyntaxKind.LiteralType; - literal: BooleanLiteral | LiteralExpression | PrefixUnaryExpression; + readonly kind: SyntaxKind.LiteralType; + readonly literal: NullLiteral | BooleanLiteral | LiteralExpression | PrefixUnaryExpression; } export interface StringLiteral extends LiteralExpression, Declaration { - kind: SyntaxKind.StringLiteral; + readonly kind: SyntaxKind.StringLiteral; } export type StringLiteralLike = StringLiteral | NoSubstitutionTemplateLiteral; + export type PropertyNameLiteral = Identifier | StringLiteralLike | NumericLiteral; export interface Expression extends Node { _expressionBrand: any; } export interface OmittedExpression extends Expression { - kind: SyntaxKind.OmittedExpression; + readonly kind: SyntaxKind.OmittedExpression; } export interface PartiallyEmittedExpression extends LeftHandSideExpression { - kind: SyntaxKind.PartiallyEmittedExpression; - expression: Expression; + readonly kind: SyntaxKind.PartiallyEmittedExpression; + readonly expression: Expression; } export interface UnaryExpression extends Expression { _unaryExpressionBrand: any; @@ -887,15 +974,15 @@ declare namespace ts { } export type PrefixUnaryOperator = SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken | SyntaxKind.PlusToken | SyntaxKind.MinusToken | SyntaxKind.TildeToken | SyntaxKind.ExclamationToken; export interface PrefixUnaryExpression extends UpdateExpression { - kind: SyntaxKind.PrefixUnaryExpression; - operator: PrefixUnaryOperator; - operand: UnaryExpression; + readonly kind: SyntaxKind.PrefixUnaryExpression; + readonly operator: PrefixUnaryOperator; + readonly operand: UnaryExpression; } export type PostfixUnaryOperator = SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken; export interface PostfixUnaryExpression extends UpdateExpression { - kind: SyntaxKind.PostfixUnaryExpression; - operand: LeftHandSideExpression; - operator: PostfixUnaryOperator; + readonly kind: SyntaxKind.PostfixUnaryExpression; + readonly operand: LeftHandSideExpression; + readonly operator: PostfixUnaryOperator; } export interface LeftHandSideExpression extends UpdateExpression { _leftHandSideExpressionBrand: any; @@ -906,46 +993,51 @@ declare namespace ts { export interface PrimaryExpression extends MemberExpression { _primaryExpressionBrand: any; } - export interface NullLiteral extends PrimaryExpression, TypeNode { - kind: SyntaxKind.NullKeyword; + export interface NullLiteral extends PrimaryExpression { + readonly kind: SyntaxKind.NullKeyword; } - export interface BooleanLiteral extends PrimaryExpression, TypeNode { - kind: SyntaxKind.TrueKeyword | SyntaxKind.FalseKeyword; + export interface TrueLiteral extends PrimaryExpression { + readonly kind: SyntaxKind.TrueKeyword; } - export interface ThisExpression extends PrimaryExpression, KeywordTypeNode { - kind: SyntaxKind.ThisKeyword; + export interface FalseLiteral extends PrimaryExpression { + readonly kind: SyntaxKind.FalseKeyword; + } + export type BooleanLiteral = TrueLiteral | FalseLiteral; + export interface ThisExpression extends PrimaryExpression { + readonly kind: SyntaxKind.ThisKeyword; } export interface SuperExpression extends PrimaryExpression { - kind: SyntaxKind.SuperKeyword; + readonly kind: SyntaxKind.SuperKeyword; } export interface ImportExpression extends PrimaryExpression { - kind: SyntaxKind.ImportKeyword; + readonly kind: SyntaxKind.ImportKeyword; } export interface DeleteExpression extends UnaryExpression { - kind: SyntaxKind.DeleteExpression; - expression: UnaryExpression; + readonly kind: SyntaxKind.DeleteExpression; + readonly expression: UnaryExpression; } export interface TypeOfExpression extends UnaryExpression { - kind: SyntaxKind.TypeOfExpression; - expression: UnaryExpression; + readonly kind: SyntaxKind.TypeOfExpression; + readonly expression: UnaryExpression; } export interface VoidExpression extends UnaryExpression { - kind: SyntaxKind.VoidExpression; - expression: UnaryExpression; + readonly kind: SyntaxKind.VoidExpression; + readonly expression: UnaryExpression; } export interface AwaitExpression extends UnaryExpression { - kind: SyntaxKind.AwaitExpression; - expression: UnaryExpression; + readonly kind: SyntaxKind.AwaitExpression; + readonly expression: UnaryExpression; } export interface YieldExpression extends Expression { - kind: SyntaxKind.YieldExpression; - asteriskToken?: AsteriskToken; - expression?: Expression; + readonly kind: SyntaxKind.YieldExpression; + readonly asteriskToken?: AsteriskToken; + readonly expression?: Expression; } export interface SyntheticExpression extends Expression { - kind: SyntaxKind.SyntheticExpression; - isSpread: boolean; - type: Type; + readonly kind: SyntaxKind.SyntheticExpression; + readonly isSpread: boolean; + readonly type: Type; + readonly tupleNameSource?: ParameterDeclaration | NamedTupleMember; } export type ExponentiationOperator = SyntaxKind.AsteriskAsteriskToken; export type MultiplicativeOperator = SyntaxKind.AsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken; @@ -962,30 +1054,33 @@ declare namespace ts { export type BitwiseOperatorOrHigher = EqualityOperatorOrHigher | BitwiseOperator; export type LogicalOperator = SyntaxKind.AmpersandAmpersandToken | SyntaxKind.BarBarToken; export type LogicalOperatorOrHigher = BitwiseOperatorOrHigher | LogicalOperator; - export type CompoundAssignmentOperator = SyntaxKind.PlusEqualsToken | SyntaxKind.MinusEqualsToken | SyntaxKind.AsteriskAsteriskEqualsToken | SyntaxKind.AsteriskEqualsToken | SyntaxKind.SlashEqualsToken | SyntaxKind.PercentEqualsToken | SyntaxKind.AmpersandEqualsToken | SyntaxKind.BarEqualsToken | SyntaxKind.CaretEqualsToken | SyntaxKind.LessThanLessThanEqualsToken | SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken | SyntaxKind.GreaterThanGreaterThanEqualsToken; + export type CompoundAssignmentOperator = SyntaxKind.PlusEqualsToken | SyntaxKind.MinusEqualsToken | SyntaxKind.AsteriskAsteriskEqualsToken | SyntaxKind.AsteriskEqualsToken | SyntaxKind.SlashEqualsToken | SyntaxKind.PercentEqualsToken | SyntaxKind.AmpersandEqualsToken | SyntaxKind.BarEqualsToken | SyntaxKind.CaretEqualsToken | SyntaxKind.LessThanLessThanEqualsToken | SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken | SyntaxKind.GreaterThanGreaterThanEqualsToken | SyntaxKind.BarBarEqualsToken | SyntaxKind.AmpersandAmpersandEqualsToken | SyntaxKind.QuestionQuestionEqualsToken; export type AssignmentOperator = SyntaxKind.EqualsToken | CompoundAssignmentOperator; export type AssignmentOperatorOrHigher = SyntaxKind.QuestionQuestionToken | LogicalOperatorOrHigher | AssignmentOperator; export type BinaryOperator = AssignmentOperatorOrHigher | SyntaxKind.CommaToken; + export type LogicalOrCoalescingAssignmentOperator = SyntaxKind.AmpersandAmpersandEqualsToken | SyntaxKind.BarBarEqualsToken | SyntaxKind.QuestionQuestionEqualsToken; export type BinaryOperatorToken = Token; export interface BinaryExpression extends Expression, Declaration { - kind: SyntaxKind.BinaryExpression; - left: Expression; - operatorToken: BinaryOperatorToken; - right: Expression; + readonly kind: SyntaxKind.BinaryExpression; + readonly left: Expression; + readonly operatorToken: BinaryOperatorToken; + readonly right: Expression; } export type AssignmentOperatorToken = Token; export interface AssignmentExpression extends BinaryExpression { - left: LeftHandSideExpression; - operatorToken: TOperator; + readonly left: LeftHandSideExpression; + readonly operatorToken: TOperator; } export interface ObjectDestructuringAssignment extends AssignmentExpression { - left: ObjectLiteralExpression; + readonly left: ObjectLiteralExpression; } export interface ArrayDestructuringAssignment extends AssignmentExpression { - left: ArrayLiteralExpression; + readonly left: ArrayLiteralExpression; } export type DestructuringAssignment = ObjectDestructuringAssignment | ArrayDestructuringAssignment; - export type BindingOrAssignmentElement = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment | OmittedExpression | SpreadElement | ArrayLiteralExpression | ObjectLiteralExpression | AssignmentExpression | Identifier | PropertyAccessExpression | ElementAccessExpression; + export type BindingOrAssignmentElement = VariableDeclaration | ParameterDeclaration | ObjectBindingOrAssignmentElement | ArrayBindingOrAssignmentElement; + export type ObjectBindingOrAssignmentElement = BindingElement | PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment; + export type ArrayBindingOrAssignmentElement = BindingElement | OmittedExpression | SpreadElement | ArrayLiteralExpression | ObjectLiteralExpression | AssignmentExpression | Identifier | PropertyAccessExpression | ElementAccessExpression; export type BindingOrAssignmentElementRestIndicator = DotDotDotToken | SpreadElement | SpreadAssignment; export type BindingOrAssignmentElementTarget = BindingOrAssignmentPattern | Identifier | PropertyAccessExpression | ElementAccessExpression | OmittedExpression; export type ObjectBindingOrAssignmentPattern = ObjectBindingPattern | ObjectLiteralExpression; @@ -993,25 +1088,25 @@ declare namespace ts { export type AssignmentPattern = ObjectLiteralExpression | ArrayLiteralExpression; export type BindingOrAssignmentPattern = ObjectBindingOrAssignmentPattern | ArrayBindingOrAssignmentPattern; export interface ConditionalExpression extends Expression { - kind: SyntaxKind.ConditionalExpression; - condition: Expression; - questionToken: QuestionToken; - whenTrue: Expression; - colonToken: ColonToken; - whenFalse: Expression; + readonly kind: SyntaxKind.ConditionalExpression; + readonly condition: Expression; + readonly questionToken: QuestionToken; + readonly whenTrue: Expression; + readonly colonToken: ColonToken; + readonly whenFalse: Expression; } export type FunctionBody = Block; export type ConciseBody = FunctionBody | Expression; export interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclarationBase, JSDocContainer { - kind: SyntaxKind.FunctionExpression; - name?: Identifier; - body: FunctionBody; + readonly kind: SyntaxKind.FunctionExpression; + readonly name?: Identifier; + readonly body: FunctionBody; } export interface ArrowFunction extends Expression, FunctionLikeDeclarationBase, JSDocContainer { - kind: SyntaxKind.ArrowFunction; - equalsGreaterThanToken: EqualsGreaterThanToken; - body: ConciseBody; - name: never; + readonly kind: SyntaxKind.ArrowFunction; + readonly equalsGreaterThanToken: EqualsGreaterThanToken; + readonly body: ConciseBody; + readonly name: never; } export interface LiteralLikeNode extends Node { text: string; @@ -1025,10 +1120,10 @@ declare namespace ts { _literalExpressionBrand: any; } export interface RegularExpressionLiteral extends LiteralExpression { - kind: SyntaxKind.RegularExpressionLiteral; + readonly kind: SyntaxKind.RegularExpressionLiteral; } export interface NoSubstitutionTemplateLiteral extends LiteralExpression, TemplateLiteralLikeNode, Declaration { - kind: SyntaxKind.NoSubstitutionTemplateLiteral; + readonly kind: SyntaxKind.NoSubstitutionTemplateLiteral; } export enum TokenFlags { None = 0, @@ -1039,47 +1134,50 @@ declare namespace ts { OctalSpecifier = 256, } export interface NumericLiteral extends LiteralExpression, Declaration { - kind: SyntaxKind.NumericLiteral; + readonly kind: SyntaxKind.NumericLiteral; } export interface BigIntLiteral extends LiteralExpression { - kind: SyntaxKind.BigIntLiteral; + readonly kind: SyntaxKind.BigIntLiteral; } + export type LiteralToken = NumericLiteral | BigIntLiteral | StringLiteral | JsxText | RegularExpressionLiteral | NoSubstitutionTemplateLiteral; export interface TemplateHead extends TemplateLiteralLikeNode { - kind: SyntaxKind.TemplateHead; - parent: TemplateExpression; + readonly kind: SyntaxKind.TemplateHead; + readonly parent: TemplateExpression; } export interface TemplateMiddle extends TemplateLiteralLikeNode { - kind: SyntaxKind.TemplateMiddle; - parent: TemplateSpan; + readonly kind: SyntaxKind.TemplateMiddle; + readonly parent: TemplateSpan; } export interface TemplateTail extends TemplateLiteralLikeNode { - kind: SyntaxKind.TemplateTail; - parent: TemplateSpan; + readonly kind: SyntaxKind.TemplateTail; + readonly parent: TemplateSpan; + } + export type PseudoLiteralToken = TemplateHead | TemplateMiddle | TemplateTail; + export type TemplateLiteralToken = NoSubstitutionTemplateLiteral | PseudoLiteralToken; + export interface TemplateExpression extends PrimaryExpression { + readonly kind: SyntaxKind.TemplateExpression; + readonly head: TemplateHead; + readonly templateSpans: NodeArray; } export type TemplateLiteral = TemplateExpression | NoSubstitutionTemplateLiteral; - export interface TemplateExpression extends PrimaryExpression { - kind: SyntaxKind.TemplateExpression; - head: TemplateHead; - templateSpans: NodeArray; - } export interface TemplateSpan extends Node { - kind: SyntaxKind.TemplateSpan; - parent: TemplateExpression; - expression: Expression; - literal: TemplateMiddle | TemplateTail; + readonly kind: SyntaxKind.TemplateSpan; + readonly parent: TemplateExpression; + readonly expression: Expression; + readonly literal: TemplateMiddle | TemplateTail; } export interface ParenthesizedExpression extends PrimaryExpression, JSDocContainer { - kind: SyntaxKind.ParenthesizedExpression; - expression: Expression; + readonly kind: SyntaxKind.ParenthesizedExpression; + readonly expression: Expression; } export interface ArrayLiteralExpression extends PrimaryExpression { - kind: SyntaxKind.ArrayLiteralExpression; - elements: NodeArray; + readonly kind: SyntaxKind.ArrayLiteralExpression; + readonly elements: NodeArray; } export interface SpreadElement extends Expression { - kind: SyntaxKind.SpreadElement; - parent: ArrayLiteralExpression | CallExpression | NewExpression; - expression: Expression; + readonly kind: SyntaxKind.SpreadElement; + readonly parent: ArrayLiteralExpression | CallExpression | NewExpression; + readonly expression: Expression; } /** * This interface is a base interface for ObjectLiteralExpression and JSXAttributes to extend from. JSXAttributes is similar to @@ -1088,388 +1186,389 @@ declare namespace ts { * ObjectLiteralElement (e.g. PropertyAssignment, ShorthandPropertyAssignment etc.) */ export interface ObjectLiteralExpressionBase extends PrimaryExpression, Declaration { - properties: NodeArray; + readonly properties: NodeArray; } export interface ObjectLiteralExpression extends ObjectLiteralExpressionBase { - kind: SyntaxKind.ObjectLiteralExpression; + readonly kind: SyntaxKind.ObjectLiteralExpression; } export type EntityNameExpression = Identifier | PropertyAccessEntityNameExpression; export type EntityNameOrEntityNameExpression = EntityName | EntityNameExpression; + export type AccessExpression = PropertyAccessExpression | ElementAccessExpression; export interface PropertyAccessExpression extends MemberExpression, NamedDeclaration { - kind: SyntaxKind.PropertyAccessExpression; - expression: LeftHandSideExpression; - questionDotToken?: QuestionDotToken; - name: Identifier | PrivateIdentifier; + readonly kind: SyntaxKind.PropertyAccessExpression; + readonly expression: LeftHandSideExpression; + readonly questionDotToken?: QuestionDotToken; + readonly name: Identifier | PrivateIdentifier; } export interface PropertyAccessChain extends PropertyAccessExpression { _optionalChainBrand: any; - name: Identifier; + readonly name: Identifier | PrivateIdentifier; } export interface SuperPropertyAccessExpression extends PropertyAccessExpression { - expression: SuperExpression; + readonly expression: SuperExpression; } /** Brand for a PropertyAccessExpression which, like a QualifiedName, consists of a sequence of identifiers separated by dots. */ export interface PropertyAccessEntityNameExpression extends PropertyAccessExpression { _propertyAccessExpressionLikeQualifiedNameBrand?: any; - expression: EntityNameExpression; - name: Identifier; + readonly expression: EntityNameExpression; + readonly name: Identifier; } export interface ElementAccessExpression extends MemberExpression { - kind: SyntaxKind.ElementAccessExpression; - expression: LeftHandSideExpression; - questionDotToken?: QuestionDotToken; - argumentExpression: Expression; + readonly kind: SyntaxKind.ElementAccessExpression; + readonly expression: LeftHandSideExpression; + readonly questionDotToken?: QuestionDotToken; + readonly argumentExpression: Expression; } export interface ElementAccessChain extends ElementAccessExpression { _optionalChainBrand: any; } export interface SuperElementAccessExpression extends ElementAccessExpression { - expression: SuperExpression; + readonly expression: SuperExpression; } export type SuperProperty = SuperPropertyAccessExpression | SuperElementAccessExpression; export interface CallExpression extends LeftHandSideExpression, Declaration { - kind: SyntaxKind.CallExpression; - expression: LeftHandSideExpression; - questionDotToken?: QuestionDotToken; - typeArguments?: NodeArray; - arguments: NodeArray; + readonly kind: SyntaxKind.CallExpression; + readonly expression: LeftHandSideExpression; + readonly questionDotToken?: QuestionDotToken; + readonly typeArguments?: NodeArray; + readonly arguments: NodeArray; } export interface CallChain extends CallExpression { _optionalChainBrand: any; } export type OptionalChain = PropertyAccessChain | ElementAccessChain | CallChain | NonNullChain; export interface SuperCall extends CallExpression { - expression: SuperExpression; + readonly expression: SuperExpression; } export interface ImportCall extends CallExpression { - expression: ImportExpression; + readonly expression: ImportExpression; } export interface ExpressionWithTypeArguments extends NodeWithTypeArguments { - kind: SyntaxKind.ExpressionWithTypeArguments; - parent: HeritageClause | JSDocAugmentsTag | JSDocImplementsTag; - expression: LeftHandSideExpression; + readonly kind: SyntaxKind.ExpressionWithTypeArguments; + readonly parent: HeritageClause | JSDocAugmentsTag | JSDocImplementsTag; + readonly expression: LeftHandSideExpression; } export interface NewExpression extends PrimaryExpression, Declaration { - kind: SyntaxKind.NewExpression; - expression: LeftHandSideExpression; - typeArguments?: NodeArray; - arguments?: NodeArray; + readonly kind: SyntaxKind.NewExpression; + readonly expression: LeftHandSideExpression; + readonly typeArguments?: NodeArray; + readonly arguments?: NodeArray; } export interface TaggedTemplateExpression extends MemberExpression { - kind: SyntaxKind.TaggedTemplateExpression; - tag: LeftHandSideExpression; - typeArguments?: NodeArray; - template: TemplateLiteral; + readonly kind: SyntaxKind.TaggedTemplateExpression; + readonly tag: LeftHandSideExpression; + readonly typeArguments?: NodeArray; + readonly template: TemplateLiteral; } export type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator | JsxOpeningLikeElement; export interface AsExpression extends Expression { - kind: SyntaxKind.AsExpression; - expression: Expression; - type: TypeNode; + readonly kind: SyntaxKind.AsExpression; + readonly expression: Expression; + readonly type: TypeNode; } export interface TypeAssertion extends UnaryExpression { - kind: SyntaxKind.TypeAssertionExpression; - type: TypeNode; - expression: UnaryExpression; + readonly kind: SyntaxKind.TypeAssertionExpression; + readonly type: TypeNode; + readonly expression: UnaryExpression; } export type AssertionExpression = TypeAssertion | AsExpression; export interface NonNullExpression extends LeftHandSideExpression { - kind: SyntaxKind.NonNullExpression; - expression: Expression; + readonly kind: SyntaxKind.NonNullExpression; + readonly expression: Expression; } export interface NonNullChain extends NonNullExpression { _optionalChainBrand: any; } export interface MetaProperty extends PrimaryExpression { - kind: SyntaxKind.MetaProperty; - keywordToken: SyntaxKind.NewKeyword | SyntaxKind.ImportKeyword; - name: Identifier; + readonly kind: SyntaxKind.MetaProperty; + readonly keywordToken: SyntaxKind.NewKeyword | SyntaxKind.ImportKeyword; + readonly name: Identifier; } export interface JsxElement extends PrimaryExpression { - kind: SyntaxKind.JsxElement; - openingElement: JsxOpeningElement; - children: NodeArray; - closingElement: JsxClosingElement; + readonly kind: SyntaxKind.JsxElement; + readonly openingElement: JsxOpeningElement; + readonly children: NodeArray; + readonly closingElement: JsxClosingElement; } export type JsxOpeningLikeElement = JsxSelfClosingElement | JsxOpeningElement; export type JsxAttributeLike = JsxAttribute | JsxSpreadAttribute; export type JsxTagNameExpression = Identifier | ThisExpression | JsxTagNamePropertyAccess; export interface JsxTagNamePropertyAccess extends PropertyAccessExpression { - expression: JsxTagNameExpression; + readonly expression: JsxTagNameExpression; } export interface JsxAttributes extends ObjectLiteralExpressionBase { - kind: SyntaxKind.JsxAttributes; - parent: JsxOpeningLikeElement; + readonly kind: SyntaxKind.JsxAttributes; + readonly parent: JsxOpeningLikeElement; } export interface JsxOpeningElement extends Expression { - kind: SyntaxKind.JsxOpeningElement; - parent: JsxElement; - tagName: JsxTagNameExpression; - typeArguments?: NodeArray; - attributes: JsxAttributes; + readonly kind: SyntaxKind.JsxOpeningElement; + readonly parent: JsxElement; + readonly tagName: JsxTagNameExpression; + readonly typeArguments?: NodeArray; + readonly attributes: JsxAttributes; } export interface JsxSelfClosingElement extends PrimaryExpression { - kind: SyntaxKind.JsxSelfClosingElement; - tagName: JsxTagNameExpression; - typeArguments?: NodeArray; - attributes: JsxAttributes; + readonly kind: SyntaxKind.JsxSelfClosingElement; + readonly tagName: JsxTagNameExpression; + readonly typeArguments?: NodeArray; + readonly attributes: JsxAttributes; } export interface JsxFragment extends PrimaryExpression { - kind: SyntaxKind.JsxFragment; - openingFragment: JsxOpeningFragment; - children: NodeArray; - closingFragment: JsxClosingFragment; + readonly kind: SyntaxKind.JsxFragment; + readonly openingFragment: JsxOpeningFragment; + readonly children: NodeArray; + readonly closingFragment: JsxClosingFragment; } export interface JsxOpeningFragment extends Expression { - kind: SyntaxKind.JsxOpeningFragment; - parent: JsxFragment; + readonly kind: SyntaxKind.JsxOpeningFragment; + readonly parent: JsxFragment; } export interface JsxClosingFragment extends Expression { - kind: SyntaxKind.JsxClosingFragment; - parent: JsxFragment; + readonly kind: SyntaxKind.JsxClosingFragment; + readonly parent: JsxFragment; } export interface JsxAttribute extends ObjectLiteralElement { - kind: SyntaxKind.JsxAttribute; - parent: JsxAttributes; - name: Identifier; - initializer?: StringLiteral | JsxExpression; + readonly kind: SyntaxKind.JsxAttribute; + readonly parent: JsxAttributes; + readonly name: Identifier; + readonly initializer?: StringLiteral | JsxExpression; } export interface JsxSpreadAttribute extends ObjectLiteralElement { - kind: SyntaxKind.JsxSpreadAttribute; - parent: JsxAttributes; - expression: Expression; + readonly kind: SyntaxKind.JsxSpreadAttribute; + readonly parent: JsxAttributes; + readonly expression: Expression; } export interface JsxClosingElement extends Node { - kind: SyntaxKind.JsxClosingElement; - parent: JsxElement; - tagName: JsxTagNameExpression; + readonly kind: SyntaxKind.JsxClosingElement; + readonly parent: JsxElement; + readonly tagName: JsxTagNameExpression; } export interface JsxExpression extends Expression { - kind: SyntaxKind.JsxExpression; - parent: JsxElement | JsxAttributeLike; - dotDotDotToken?: Token; - expression?: Expression; + readonly kind: SyntaxKind.JsxExpression; + readonly parent: JsxElement | JsxAttributeLike; + readonly dotDotDotToken?: Token; + readonly expression?: Expression; } export interface JsxText extends LiteralLikeNode { - kind: SyntaxKind.JsxText; - containsOnlyTriviaWhiteSpaces: boolean; - parent: JsxElement; + readonly kind: SyntaxKind.JsxText; + readonly parent: JsxElement; + readonly containsOnlyTriviaWhiteSpaces: boolean; } export type JsxChild = JsxText | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment; export interface Statement extends Node { _statementBrand: any; } export interface NotEmittedStatement extends Statement { - kind: SyntaxKind.NotEmittedStatement; + readonly kind: SyntaxKind.NotEmittedStatement; } /** * A list of comma-separated expressions. This node is only created by transformations. */ export interface CommaListExpression extends Expression { - kind: SyntaxKind.CommaListExpression; - elements: NodeArray; + readonly kind: SyntaxKind.CommaListExpression; + readonly elements: NodeArray; } export interface EmptyStatement extends Statement { - kind: SyntaxKind.EmptyStatement; + readonly kind: SyntaxKind.EmptyStatement; } export interface DebuggerStatement extends Statement { - kind: SyntaxKind.DebuggerStatement; + readonly kind: SyntaxKind.DebuggerStatement; } export interface MissingDeclaration extends DeclarationStatement { - kind: SyntaxKind.MissingDeclaration; - name?: Identifier; + readonly kind: SyntaxKind.MissingDeclaration; + readonly name?: Identifier; } export type BlockLike = SourceFile | Block | ModuleBlock | CaseOrDefaultClause; export interface Block extends Statement { - kind: SyntaxKind.Block; - statements: NodeArray; + readonly kind: SyntaxKind.Block; + readonly statements: NodeArray; } export interface VariableStatement extends Statement, JSDocContainer { - kind: SyntaxKind.VariableStatement; - declarationList: VariableDeclarationList; + readonly kind: SyntaxKind.VariableStatement; + readonly declarationList: VariableDeclarationList; } export interface ExpressionStatement extends Statement, JSDocContainer { - kind: SyntaxKind.ExpressionStatement; - expression: Expression; + readonly kind: SyntaxKind.ExpressionStatement; + readonly expression: Expression; } export interface IfStatement extends Statement { - kind: SyntaxKind.IfStatement; - expression: Expression; - thenStatement: Statement; - elseStatement?: Statement; + readonly kind: SyntaxKind.IfStatement; + readonly expression: Expression; + readonly thenStatement: Statement; + readonly elseStatement?: Statement; } export interface IterationStatement extends Statement { - statement: Statement; + readonly statement: Statement; } export interface DoStatement extends IterationStatement { - kind: SyntaxKind.DoStatement; - expression: Expression; + readonly kind: SyntaxKind.DoStatement; + readonly expression: Expression; } export interface WhileStatement extends IterationStatement { - kind: SyntaxKind.WhileStatement; - expression: Expression; + readonly kind: SyntaxKind.WhileStatement; + readonly expression: Expression; } export type ForInitializer = VariableDeclarationList | Expression; export interface ForStatement extends IterationStatement { - kind: SyntaxKind.ForStatement; - initializer?: ForInitializer; - condition?: Expression; - incrementor?: Expression; + readonly kind: SyntaxKind.ForStatement; + readonly initializer?: ForInitializer; + readonly condition?: Expression; + readonly incrementor?: Expression; } export type ForInOrOfStatement = ForInStatement | ForOfStatement; export interface ForInStatement extends IterationStatement { - kind: SyntaxKind.ForInStatement; - initializer: ForInitializer; - expression: Expression; + readonly kind: SyntaxKind.ForInStatement; + readonly initializer: ForInitializer; + readonly expression: Expression; } export interface ForOfStatement extends IterationStatement { - kind: SyntaxKind.ForOfStatement; - awaitModifier?: AwaitKeywordToken; - initializer: ForInitializer; - expression: Expression; + readonly kind: SyntaxKind.ForOfStatement; + readonly awaitModifier?: AwaitKeywordToken; + readonly initializer: ForInitializer; + readonly expression: Expression; } export interface BreakStatement extends Statement { - kind: SyntaxKind.BreakStatement; - label?: Identifier; + readonly kind: SyntaxKind.BreakStatement; + readonly label?: Identifier; } export interface ContinueStatement extends Statement { - kind: SyntaxKind.ContinueStatement; - label?: Identifier; + readonly kind: SyntaxKind.ContinueStatement; + readonly label?: Identifier; } export type BreakOrContinueStatement = BreakStatement | ContinueStatement; export interface ReturnStatement extends Statement { - kind: SyntaxKind.ReturnStatement; - expression?: Expression; + readonly kind: SyntaxKind.ReturnStatement; + readonly expression?: Expression; } export interface WithStatement extends Statement { - kind: SyntaxKind.WithStatement; - expression: Expression; - statement: Statement; + readonly kind: SyntaxKind.WithStatement; + readonly expression: Expression; + readonly statement: Statement; } export interface SwitchStatement extends Statement { - kind: SyntaxKind.SwitchStatement; - expression: Expression; - caseBlock: CaseBlock; + readonly kind: SyntaxKind.SwitchStatement; + readonly expression: Expression; + readonly caseBlock: CaseBlock; possiblyExhaustive?: boolean; } export interface CaseBlock extends Node { - kind: SyntaxKind.CaseBlock; - parent: SwitchStatement; - clauses: NodeArray; + readonly kind: SyntaxKind.CaseBlock; + readonly parent: SwitchStatement; + readonly clauses: NodeArray; } export interface CaseClause extends Node { - kind: SyntaxKind.CaseClause; - parent: CaseBlock; - expression: Expression; - statements: NodeArray; + readonly kind: SyntaxKind.CaseClause; + readonly parent: CaseBlock; + readonly expression: Expression; + readonly statements: NodeArray; } export interface DefaultClause extends Node { - kind: SyntaxKind.DefaultClause; - parent: CaseBlock; - statements: NodeArray; + readonly kind: SyntaxKind.DefaultClause; + readonly parent: CaseBlock; + readonly statements: NodeArray; } export type CaseOrDefaultClause = CaseClause | DefaultClause; export interface LabeledStatement extends Statement, JSDocContainer { - kind: SyntaxKind.LabeledStatement; - label: Identifier; - statement: Statement; + readonly kind: SyntaxKind.LabeledStatement; + readonly label: Identifier; + readonly statement: Statement; } export interface ThrowStatement extends Statement { - kind: SyntaxKind.ThrowStatement; - expression?: Expression; + readonly kind: SyntaxKind.ThrowStatement; + readonly expression: Expression; } export interface TryStatement extends Statement { - kind: SyntaxKind.TryStatement; - tryBlock: Block; - catchClause?: CatchClause; - finallyBlock?: Block; + readonly kind: SyntaxKind.TryStatement; + readonly tryBlock: Block; + readonly catchClause?: CatchClause; + readonly finallyBlock?: Block; } export interface CatchClause extends Node { - kind: SyntaxKind.CatchClause; - parent: TryStatement; - variableDeclaration?: VariableDeclaration; - block: Block; + readonly kind: SyntaxKind.CatchClause; + readonly parent: TryStatement; + readonly variableDeclaration?: VariableDeclaration; + readonly block: Block; } export type ObjectTypeDeclaration = ClassLikeDeclaration | InterfaceDeclaration | TypeLiteralNode; export type DeclarationWithTypeParameters = DeclarationWithTypeParameterChildren | JSDocTypedefTag | JSDocCallbackTag | JSDocSignature; export type DeclarationWithTypeParameterChildren = SignatureDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | JSDocTemplateTag; export interface ClassLikeDeclarationBase extends NamedDeclaration, JSDocContainer { - kind: SyntaxKind.ClassDeclaration | SyntaxKind.ClassExpression; - name?: Identifier; - typeParameters?: NodeArray; - heritageClauses?: NodeArray; - members: NodeArray; + readonly kind: SyntaxKind.ClassDeclaration | SyntaxKind.ClassExpression; + readonly name?: Identifier; + readonly typeParameters?: NodeArray; + readonly heritageClauses?: NodeArray; + readonly members: NodeArray; } export interface ClassDeclaration extends ClassLikeDeclarationBase, DeclarationStatement { - kind: SyntaxKind.ClassDeclaration; + readonly kind: SyntaxKind.ClassDeclaration; /** May be undefined in `export default class { ... }`. */ - name?: Identifier; + readonly name?: Identifier; } export interface ClassExpression extends ClassLikeDeclarationBase, PrimaryExpression { - kind: SyntaxKind.ClassExpression; + readonly kind: SyntaxKind.ClassExpression; } export type ClassLikeDeclaration = ClassDeclaration | ClassExpression; export interface ClassElement extends NamedDeclaration { _classElementBrand: any; - name?: PropertyName; + readonly name?: PropertyName; } export interface TypeElement extends NamedDeclaration { _typeElementBrand: any; - name?: PropertyName; - questionToken?: QuestionToken; + readonly name?: PropertyName; + readonly questionToken?: QuestionToken; } export interface InterfaceDeclaration extends DeclarationStatement, JSDocContainer { - kind: SyntaxKind.InterfaceDeclaration; - name: Identifier; - typeParameters?: NodeArray; - heritageClauses?: NodeArray; - members: NodeArray; + readonly kind: SyntaxKind.InterfaceDeclaration; + readonly name: Identifier; + readonly typeParameters?: NodeArray; + readonly heritageClauses?: NodeArray; + readonly members: NodeArray; } export interface HeritageClause extends Node { - kind: SyntaxKind.HeritageClause; - parent: InterfaceDeclaration | ClassLikeDeclaration; - token: SyntaxKind.ExtendsKeyword | SyntaxKind.ImplementsKeyword; - types: NodeArray; + readonly kind: SyntaxKind.HeritageClause; + readonly parent: InterfaceDeclaration | ClassLikeDeclaration; + readonly token: SyntaxKind.ExtendsKeyword | SyntaxKind.ImplementsKeyword; + readonly types: NodeArray; } export interface TypeAliasDeclaration extends DeclarationStatement, JSDocContainer { - kind: SyntaxKind.TypeAliasDeclaration; - name: Identifier; - typeParameters?: NodeArray; - type: TypeNode; + readonly kind: SyntaxKind.TypeAliasDeclaration; + readonly name: Identifier; + readonly typeParameters?: NodeArray; + readonly type: TypeNode; } export interface EnumMember extends NamedDeclaration, JSDocContainer { - kind: SyntaxKind.EnumMember; - parent: EnumDeclaration; - name: PropertyName; - initializer?: Expression; + readonly kind: SyntaxKind.EnumMember; + readonly parent: EnumDeclaration; + readonly name: PropertyName; + readonly initializer?: Expression; } export interface EnumDeclaration extends DeclarationStatement, JSDocContainer { - kind: SyntaxKind.EnumDeclaration; - name: Identifier; - members: NodeArray; + readonly kind: SyntaxKind.EnumDeclaration; + readonly name: Identifier; + readonly members: NodeArray; } export type ModuleName = Identifier | StringLiteral; export type ModuleBody = NamespaceBody | JSDocNamespaceBody; export interface ModuleDeclaration extends DeclarationStatement, JSDocContainer { - kind: SyntaxKind.ModuleDeclaration; - parent: ModuleBody | SourceFile; - name: ModuleName; - body?: ModuleBody | JSDocNamespaceDeclaration; + readonly kind: SyntaxKind.ModuleDeclaration; + readonly parent: ModuleBody | SourceFile; + readonly name: ModuleName; + readonly body?: ModuleBody | JSDocNamespaceDeclaration; } export type NamespaceBody = ModuleBlock | NamespaceDeclaration; export interface NamespaceDeclaration extends ModuleDeclaration { - name: Identifier; - body: NamespaceBody; + readonly name: Identifier; + readonly body: NamespaceBody; } export type JSDocNamespaceBody = Identifier | JSDocNamespaceDeclaration; export interface JSDocNamespaceDeclaration extends ModuleDeclaration { - name: Identifier; - body?: JSDocNamespaceBody; + readonly name: Identifier; + readonly body?: JSDocNamespaceBody; } export interface ModuleBlock extends Node, Statement { - kind: SyntaxKind.ModuleBlock; - parent: ModuleDeclaration; - statements: NodeArray; + readonly kind: SyntaxKind.ModuleBlock; + readonly parent: ModuleDeclaration; + readonly statements: NodeArray; } export type ModuleReference = EntityName | ExternalModuleReference; /** @@ -1478,77 +1577,77 @@ declare namespace ts { * - import x = M.x; */ export interface ImportEqualsDeclaration extends DeclarationStatement, JSDocContainer { - kind: SyntaxKind.ImportEqualsDeclaration; - parent: SourceFile | ModuleBlock; - name: Identifier; - moduleReference: ModuleReference; + readonly kind: SyntaxKind.ImportEqualsDeclaration; + readonly parent: SourceFile | ModuleBlock; + readonly name: Identifier; + readonly moduleReference: ModuleReference; } export interface ExternalModuleReference extends Node { - kind: SyntaxKind.ExternalModuleReference; - parent: ImportEqualsDeclaration; - expression: Expression; + readonly kind: SyntaxKind.ExternalModuleReference; + readonly parent: ImportEqualsDeclaration; + readonly expression: Expression; } - export interface ImportDeclaration extends Statement { - kind: SyntaxKind.ImportDeclaration; - parent: SourceFile | ModuleBlock; - importClause?: ImportClause; + export interface ImportDeclaration extends Statement, JSDocContainer { + readonly kind: SyntaxKind.ImportDeclaration; + readonly parent: SourceFile | ModuleBlock; + readonly importClause?: ImportClause; /** If this is not a StringLiteral it will be a grammar error. */ - moduleSpecifier: Expression; + readonly moduleSpecifier: Expression; } export type NamedImportBindings = NamespaceImport | NamedImports; export type NamedExportBindings = NamespaceExport | NamedExports; export interface ImportClause extends NamedDeclaration { - kind: SyntaxKind.ImportClause; - parent: ImportDeclaration; - isTypeOnly: boolean; - name?: Identifier; - namedBindings?: NamedImportBindings; + readonly kind: SyntaxKind.ImportClause; + readonly parent: ImportDeclaration; + readonly isTypeOnly: boolean; + readonly name?: Identifier; + readonly namedBindings?: NamedImportBindings; } export interface NamespaceImport extends NamedDeclaration { - kind: SyntaxKind.NamespaceImport; - parent: ImportClause; - name: Identifier; + readonly kind: SyntaxKind.NamespaceImport; + readonly parent: ImportClause; + readonly name: Identifier; } export interface NamespaceExport extends NamedDeclaration { - kind: SyntaxKind.NamespaceExport; - parent: ExportDeclaration; - name: Identifier; + readonly kind: SyntaxKind.NamespaceExport; + readonly parent: ExportDeclaration; + readonly name: Identifier; } - export interface NamespaceExportDeclaration extends DeclarationStatement { - kind: SyntaxKind.NamespaceExportDeclaration; - name: Identifier; + export interface NamespaceExportDeclaration extends DeclarationStatement, JSDocContainer { + readonly kind: SyntaxKind.NamespaceExportDeclaration; + readonly name: Identifier; } export interface ExportDeclaration extends DeclarationStatement, JSDocContainer { - kind: SyntaxKind.ExportDeclaration; - parent: SourceFile | ModuleBlock; - isTypeOnly: boolean; + readonly kind: SyntaxKind.ExportDeclaration; + readonly parent: SourceFile | ModuleBlock; + readonly isTypeOnly: boolean; /** Will not be assigned in the case of `export * from "foo";` */ - exportClause?: NamedExportBindings; + readonly exportClause?: NamedExportBindings; /** If this is not a StringLiteral it will be a grammar error. */ - moduleSpecifier?: Expression; + readonly moduleSpecifier?: Expression; } export interface NamedImports extends Node { - kind: SyntaxKind.NamedImports; - parent: ImportClause; - elements: NodeArray; + readonly kind: SyntaxKind.NamedImports; + readonly parent: ImportClause; + readonly elements: NodeArray; } export interface NamedExports extends Node { - kind: SyntaxKind.NamedExports; - parent: ExportDeclaration; - elements: NodeArray; + readonly kind: SyntaxKind.NamedExports; + readonly parent: ExportDeclaration; + readonly elements: NodeArray; } export type NamedImportsOrExports = NamedImports | NamedExports; export interface ImportSpecifier extends NamedDeclaration { - kind: SyntaxKind.ImportSpecifier; - parent: NamedImports; - propertyName?: Identifier; - name: Identifier; + readonly kind: SyntaxKind.ImportSpecifier; + readonly parent: NamedImports; + readonly propertyName?: Identifier; + readonly name: Identifier; } export interface ExportSpecifier extends NamedDeclaration { - kind: SyntaxKind.ExportSpecifier; - parent: NamedExports; - propertyName?: Identifier; - name: Identifier; + readonly kind: SyntaxKind.ExportSpecifier; + readonly parent: NamedExports; + readonly propertyName?: Identifier; + readonly name: Identifier; } export type ImportOrExportSpecifier = ImportSpecifier | ExportSpecifier; export type TypeOnlyCompatibleAliasDeclaration = ImportClause | NamespaceImport | ImportOrExportSpecifier; @@ -1556,11 +1655,11 @@ declare namespace ts { * This is either an `export =` or an `export default` declaration. * Unless `isExportEquals` is set, this node was parsed as an `export default`. */ - export interface ExportAssignment extends DeclarationStatement { - kind: SyntaxKind.ExportAssignment; - parent: SourceFile; - isExportEquals?: boolean; - expression: Expression; + export interface ExportAssignment extends DeclarationStatement, JSDocContainer { + readonly kind: SyntaxKind.ExportAssignment; + readonly parent: SourceFile; + readonly isExportEquals?: boolean; + readonly expression: Expression; } export interface FileReference extends TextRange { fileName: string; @@ -1577,153 +1676,157 @@ declare namespace ts { text: string; pos: -1; end: -1; + hasLeadingNewline?: boolean; } export interface JSDocTypeExpression extends TypeNode { - kind: SyntaxKind.JSDocTypeExpression; - type: TypeNode; + readonly kind: SyntaxKind.JSDocTypeExpression; + readonly type: TypeNode; } export interface JSDocType extends TypeNode { _jsDocTypeBrand: any; } export interface JSDocAllType extends JSDocType { - kind: SyntaxKind.JSDocAllType; + readonly kind: SyntaxKind.JSDocAllType; } export interface JSDocUnknownType extends JSDocType { - kind: SyntaxKind.JSDocUnknownType; + readonly kind: SyntaxKind.JSDocUnknownType; } export interface JSDocNonNullableType extends JSDocType { - kind: SyntaxKind.JSDocNonNullableType; - type: TypeNode; + readonly kind: SyntaxKind.JSDocNonNullableType; + readonly type: TypeNode; } export interface JSDocNullableType extends JSDocType { - kind: SyntaxKind.JSDocNullableType; - type: TypeNode; + readonly kind: SyntaxKind.JSDocNullableType; + readonly type: TypeNode; } export interface JSDocOptionalType extends JSDocType { - kind: SyntaxKind.JSDocOptionalType; - type: TypeNode; + readonly kind: SyntaxKind.JSDocOptionalType; + readonly type: TypeNode; } export interface JSDocFunctionType extends JSDocType, SignatureDeclarationBase { - kind: SyntaxKind.JSDocFunctionType; + readonly kind: SyntaxKind.JSDocFunctionType; } export interface JSDocVariadicType extends JSDocType { - kind: SyntaxKind.JSDocVariadicType; - type: TypeNode; + readonly kind: SyntaxKind.JSDocVariadicType; + readonly type: TypeNode; } export interface JSDocNamepathType extends JSDocType { - kind: SyntaxKind.JSDocNamepathType; - type: TypeNode; + readonly kind: SyntaxKind.JSDocNamepathType; + readonly type: TypeNode; } export type JSDocTypeReferencingNode = JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType; export interface JSDoc extends Node { - kind: SyntaxKind.JSDocComment; - parent: HasJSDoc; - tags?: NodeArray; - comment?: string; + readonly kind: SyntaxKind.JSDocComment; + readonly parent: HasJSDoc; + readonly tags?: NodeArray; + readonly comment?: string; } export interface JSDocTag extends Node { - parent: JSDoc | JSDocTypeLiteral; - tagName: Identifier; - comment?: string; + readonly parent: JSDoc | JSDocTypeLiteral; + readonly tagName: Identifier; + readonly comment?: string; } export interface JSDocUnknownTag extends JSDocTag { - kind: SyntaxKind.JSDocTag; + readonly kind: SyntaxKind.JSDocTag; } /** * Note that `@extends` is a synonym of `@augments`. * Both tags are represented by this interface. */ export interface JSDocAugmentsTag extends JSDocTag { - kind: SyntaxKind.JSDocAugmentsTag; - class: ExpressionWithTypeArguments & { - expression: Identifier | PropertyAccessEntityNameExpression; + readonly kind: SyntaxKind.JSDocAugmentsTag; + readonly class: ExpressionWithTypeArguments & { + readonly expression: Identifier | PropertyAccessEntityNameExpression; }; } export interface JSDocImplementsTag extends JSDocTag { - kind: SyntaxKind.JSDocImplementsTag; - class: ExpressionWithTypeArguments & { - expression: Identifier | PropertyAccessEntityNameExpression; + readonly kind: SyntaxKind.JSDocImplementsTag; + readonly class: ExpressionWithTypeArguments & { + readonly expression: Identifier | PropertyAccessEntityNameExpression; }; } export interface JSDocAuthorTag extends JSDocTag { - kind: SyntaxKind.JSDocAuthorTag; + readonly kind: SyntaxKind.JSDocAuthorTag; + } + export interface JSDocDeprecatedTag extends JSDocTag { + kind: SyntaxKind.JSDocDeprecatedTag; } export interface JSDocClassTag extends JSDocTag { - kind: SyntaxKind.JSDocClassTag; + readonly kind: SyntaxKind.JSDocClassTag; } export interface JSDocPublicTag extends JSDocTag { - kind: SyntaxKind.JSDocPublicTag; + readonly kind: SyntaxKind.JSDocPublicTag; } export interface JSDocPrivateTag extends JSDocTag { - kind: SyntaxKind.JSDocPrivateTag; + readonly kind: SyntaxKind.JSDocPrivateTag; } export interface JSDocProtectedTag extends JSDocTag { - kind: SyntaxKind.JSDocProtectedTag; + readonly kind: SyntaxKind.JSDocProtectedTag; } export interface JSDocReadonlyTag extends JSDocTag { - kind: SyntaxKind.JSDocReadonlyTag; + readonly kind: SyntaxKind.JSDocReadonlyTag; } export interface JSDocEnumTag extends JSDocTag, Declaration { - parent: JSDoc; - kind: SyntaxKind.JSDocEnumTag; - typeExpression?: JSDocTypeExpression; + readonly kind: SyntaxKind.JSDocEnumTag; + readonly parent: JSDoc; + readonly typeExpression: JSDocTypeExpression; } export interface JSDocThisTag extends JSDocTag { - kind: SyntaxKind.JSDocThisTag; - typeExpression?: JSDocTypeExpression; + readonly kind: SyntaxKind.JSDocThisTag; + readonly typeExpression: JSDocTypeExpression; } export interface JSDocTemplateTag extends JSDocTag { - kind: SyntaxKind.JSDocTemplateTag; - constraint: JSDocTypeExpression | undefined; - typeParameters: NodeArray; + readonly kind: SyntaxKind.JSDocTemplateTag; + readonly constraint: JSDocTypeExpression | undefined; + readonly typeParameters: NodeArray; } export interface JSDocReturnTag extends JSDocTag { - kind: SyntaxKind.JSDocReturnTag; - typeExpression?: JSDocTypeExpression; + readonly kind: SyntaxKind.JSDocReturnTag; + readonly typeExpression?: JSDocTypeExpression; } export interface JSDocTypeTag extends JSDocTag { - kind: SyntaxKind.JSDocTypeTag; - typeExpression: JSDocTypeExpression; + readonly kind: SyntaxKind.JSDocTypeTag; + readonly typeExpression: JSDocTypeExpression; } export interface JSDocTypedefTag extends JSDocTag, NamedDeclaration { - parent: JSDoc; - kind: SyntaxKind.JSDocTypedefTag; - fullName?: JSDocNamespaceDeclaration | Identifier; - name?: Identifier; - typeExpression?: JSDocTypeExpression | JSDocTypeLiteral; + readonly kind: SyntaxKind.JSDocTypedefTag; + readonly parent: JSDoc; + readonly fullName?: JSDocNamespaceDeclaration | Identifier; + readonly name?: Identifier; + readonly typeExpression?: JSDocTypeExpression | JSDocTypeLiteral; } export interface JSDocCallbackTag extends JSDocTag, NamedDeclaration { - parent: JSDoc; - kind: SyntaxKind.JSDocCallbackTag; - fullName?: JSDocNamespaceDeclaration | Identifier; - name?: Identifier; - typeExpression: JSDocSignature; + readonly kind: SyntaxKind.JSDocCallbackTag; + readonly parent: JSDoc; + readonly fullName?: JSDocNamespaceDeclaration | Identifier; + readonly name?: Identifier; + readonly typeExpression: JSDocSignature; } export interface JSDocSignature extends JSDocType, Declaration { - kind: SyntaxKind.JSDocSignature; - typeParameters?: readonly JSDocTemplateTag[]; - parameters: readonly JSDocParameterTag[]; - type: JSDocReturnTag | undefined; + readonly kind: SyntaxKind.JSDocSignature; + readonly typeParameters?: readonly JSDocTemplateTag[]; + readonly parameters: readonly JSDocParameterTag[]; + readonly type: JSDocReturnTag | undefined; } export interface JSDocPropertyLikeTag extends JSDocTag, Declaration { - parent: JSDoc; - name: EntityName; - typeExpression?: JSDocTypeExpression; + readonly parent: JSDoc; + readonly name: EntityName; + readonly typeExpression?: JSDocTypeExpression; /** Whether the property name came before the type -- non-standard for JSDoc, but Typescript-like */ - isNameFirst: boolean; - isBracketed: boolean; + readonly isNameFirst: boolean; + readonly isBracketed: boolean; } export interface JSDocPropertyTag extends JSDocPropertyLikeTag { - kind: SyntaxKind.JSDocPropertyTag; + readonly kind: SyntaxKind.JSDocPropertyTag; } export interface JSDocParameterTag extends JSDocPropertyLikeTag { - kind: SyntaxKind.JSDocParameterTag; + readonly kind: SyntaxKind.JSDocParameterTag; } export interface JSDocTypeLiteral extends JSDocType { - kind: SyntaxKind.JSDocTypeLiteral; - jsDocPropertyTags?: readonly JSDocPropertyLikeTag[]; + readonly kind: SyntaxKind.JSDocTypeLiteral; + readonly jsDocPropertyTags?: readonly JSDocPropertyLikeTag[]; /** If true, then this type literal represents an *array* of its type. */ - isArrayType?: boolean; + readonly isArrayType: boolean; } export enum FlowFlags { Unreachable = 1, @@ -1742,21 +1845,11 @@ declare namespace ts { Label = 12, Condition = 96 } - export type FlowNode = AfterFinallyFlow | PreFinallyFlow | FlowStart | FlowLabel | FlowAssignment | FlowCall | FlowCondition | FlowSwitchClause | FlowArrayMutation; + export type FlowNode = FlowStart | FlowLabel | FlowAssignment | FlowCall | FlowCondition | FlowSwitchClause | FlowArrayMutation | FlowCall | FlowReduceLabel; export interface FlowNodeBase { flags: FlowFlags; id?: number; } - export interface FlowLock { - locked?: boolean; - } - export interface AfterFinallyFlow extends FlowNodeBase, FlowLock { - antecedent: FlowNode; - } - export interface PreFinallyFlow extends FlowNodeBase { - antecedent: FlowNode; - lock: FlowLock; - } export interface FlowStart extends FlowNodeBase { node?: FunctionExpression | ArrowFunction | MethodDeclaration; } @@ -1800,9 +1893,9 @@ declare namespace ts { name?: string; } export interface SourceFile extends Declaration { - kind: SyntaxKind.SourceFile; - statements: NodeArray; - endOfFileToken: Token; + readonly kind: SyntaxKind.SourceFile; + readonly statements: NodeArray; + readonly endOfFileToken: Token; fileName: string; text: string; amdDependencies: readonly AmdDependency[]; @@ -1824,12 +1917,12 @@ declare namespace ts { languageVersion: ScriptTarget; } export interface Bundle extends Node { - kind: SyntaxKind.Bundle; - prepends: readonly (InputFiles | UnparsedSource)[]; - sourceFiles: readonly SourceFile[]; + readonly kind: SyntaxKind.Bundle; + readonly prepends: readonly (InputFiles | UnparsedSource)[]; + readonly sourceFiles: readonly SourceFile[]; } export interface InputFiles extends Node { - kind: SyntaxKind.InputFiles; + readonly kind: SyntaxKind.InputFiles; javascriptPath?: string; javascriptText: string; javascriptMapPath?: string; @@ -1840,10 +1933,10 @@ declare namespace ts { declarationMapText?: string; } export interface UnparsedSource extends Node { - kind: SyntaxKind.UnparsedSource; + readonly kind: SyntaxKind.UnparsedSource; fileName: string; text: string; - prologues: readonly UnparsedPrologue[]; + readonly prologues: readonly UnparsedPrologue[]; helpers: readonly UnscopedEmitHelper[] | undefined; referencedFiles: readonly FileReference[]; typeReferenceDirectives: readonly string[] | undefined; @@ -1851,48 +1944,49 @@ declare namespace ts { hasNoDefaultLib?: boolean; sourceMapPath?: string; sourceMapText?: string; - syntheticReferences?: readonly UnparsedSyntheticReference[]; - texts: readonly UnparsedSourceText[]; + readonly syntheticReferences?: readonly UnparsedSyntheticReference[]; + readonly texts: readonly UnparsedSourceText[]; } export type UnparsedSourceText = UnparsedPrepend | UnparsedTextLike; export type UnparsedNode = UnparsedPrologue | UnparsedSourceText | UnparsedSyntheticReference; export interface UnparsedSection extends Node { - kind: SyntaxKind; - data?: string; - parent: UnparsedSource; + readonly kind: SyntaxKind; + readonly parent: UnparsedSource; + readonly data?: string; } export interface UnparsedPrologue extends UnparsedSection { - kind: SyntaxKind.UnparsedPrologue; - data: string; - parent: UnparsedSource; + readonly kind: SyntaxKind.UnparsedPrologue; + readonly parent: UnparsedSource; + readonly data: string; } export interface UnparsedPrepend extends UnparsedSection { - kind: SyntaxKind.UnparsedPrepend; - data: string; - parent: UnparsedSource; - texts: readonly UnparsedTextLike[]; + readonly kind: SyntaxKind.UnparsedPrepend; + readonly parent: UnparsedSource; + readonly data: string; + readonly texts: readonly UnparsedTextLike[]; } export interface UnparsedTextLike extends UnparsedSection { - kind: SyntaxKind.UnparsedText | SyntaxKind.UnparsedInternalText; - parent: UnparsedSource; + readonly kind: SyntaxKind.UnparsedText | SyntaxKind.UnparsedInternalText; + readonly parent: UnparsedSource; } export interface UnparsedSyntheticReference extends UnparsedSection { - kind: SyntaxKind.UnparsedSyntheticReference; - parent: UnparsedSource; + readonly kind: SyntaxKind.UnparsedSyntheticReference; + readonly parent: UnparsedSource; } export interface JsonSourceFile extends SourceFile { - statements: NodeArray; + readonly statements: NodeArray; } export interface TsConfigSourceFile extends JsonSourceFile { extendedSourceFiles?: string[]; } export interface JsonMinusNumericLiteral extends PrefixUnaryExpression { - kind: SyntaxKind.PrefixUnaryExpression; - operator: SyntaxKind.MinusToken; - operand: NumericLiteral; + readonly kind: SyntaxKind.PrefixUnaryExpression; + readonly operator: SyntaxKind.MinusToken; + readonly operand: NumericLiteral; } + export type JsonObjectExpression = ObjectLiteralExpression | ArrayLiteralExpression | JsonMinusNumericLiteral | NumericLiteral | StringLiteral | BooleanLiteral | NullLiteral; export interface JsonObjectExpressionStatement extends ExpressionStatement { - expression: ObjectLiteralExpression | ArrayLiteralExpression | JsonMinusNumericLiteral | NumericLiteral | StringLiteral | BooleanLiteral | NullLiteral; + readonly expression: JsonObjectExpression; } export interface ScriptReferenceHost { getCompilerOptions(): CompilerOptions; @@ -2040,23 +2134,23 @@ declare namespace ts { getNonNullableType(type: Type): Type; getTypeArguments(type: TypeReference): readonly Type[]; /** Note that the resulting nodes cannot be checked. */ - typeToTypeNode(type: Type, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): TypeNode | undefined; + typeToTypeNode(type: Type, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): TypeNode | undefined; /** Note that the resulting nodes cannot be checked. */ - signatureToSignatureDeclaration(signature: Signature, kind: SyntaxKind, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): (SignatureDeclaration & { + signatureToSignatureDeclaration(signature: Signature, kind: SyntaxKind, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): SignatureDeclaration & { typeArguments?: NodeArray; - }) | undefined; + } | undefined; /** Note that the resulting nodes cannot be checked. */ - indexInfoToIndexSignatureDeclaration(indexInfo: IndexInfo, kind: IndexKind, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): IndexSignatureDeclaration | undefined; + indexInfoToIndexSignatureDeclaration(indexInfo: IndexInfo, kind: IndexKind, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): IndexSignatureDeclaration | undefined; /** Note that the resulting nodes cannot be checked. */ - symbolToEntityName(symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): EntityName | undefined; + symbolToEntityName(symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): EntityName | undefined; /** Note that the resulting nodes cannot be checked. */ - symbolToExpression(symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): Expression | undefined; + symbolToExpression(symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): Expression | undefined; /** Note that the resulting nodes cannot be checked. */ - symbolToTypeParameterDeclarations(symbol: Symbol, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): NodeArray | undefined; + symbolToTypeParameterDeclarations(symbol: Symbol, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): NodeArray | undefined; /** Note that the resulting nodes cannot be checked. */ - symbolToParameterDeclaration(symbol: Symbol, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): ParameterDeclaration | undefined; + symbolToParameterDeclaration(symbol: Symbol, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): ParameterDeclaration | undefined; /** Note that the resulting nodes cannot be checked. */ - typeParameterToDeclaration(parameter: TypeParameter, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): TypeParameterDeclaration | undefined; + typeParameterToDeclaration(parameter: TypeParameter, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): TypeParameterDeclaration | undefined; getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[]; getSymbolAtLocation(node: Node): Symbol | undefined; getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[]; @@ -2136,6 +2230,7 @@ declare namespace ts { UseAliasDefinedOutsideCurrentScope = 16384, UseSingleQuotesForStringLiteralType = 268435456, NoTypeReduction = 536870912, + NoUndefinedOptionalParameterType = 1073741824, AllowThisInObjectLiteral = 32768, AllowQualifedNameInPlaceOfIdentifier = 65536, AllowAnonymousIdentifier = 131072, @@ -2320,20 +2415,10 @@ declare namespace ts { __escapedIdentifier: void; }) | InternalSymbolName; /** ReadonlyMap where keys are `__String`s. */ - export interface ReadonlyUnderscoreEscapedMap { - get(key: __String): T | undefined; - has(key: __String): boolean; - forEach(action: (value: T, key: __String) => void): void; - readonly size: number; - keys(): Iterator<__String>; - values(): Iterator; - entries(): Iterator<[__String, T]>; + export interface ReadonlyUnderscoreEscapedMap extends ReadonlyESMap<__String, T> { } /** Map where keys are `__String`s. */ - export interface UnderscoreEscapedMap extends ReadonlyUnderscoreEscapedMap { - set(key: __String, value: T): this; - delete(key: __String): boolean; - clear(): void; + export interface UnderscoreEscapedMap extends ESMap<__String, T>, ReadonlyUnderscoreEscapedMap { } /** SymbolTable based on ES6 Map interface. */ export type SymbolTable = UnderscoreEscapedMap; @@ -2384,7 +2469,6 @@ declare namespace ts { Instantiable = 63176704, StructuredOrInstantiable = 66846720, Narrowable = 133970943, - NotUnionOrUnit = 67637251, } export type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression; export interface Type { @@ -2471,11 +2555,21 @@ declare namespace ts { } export interface GenericType extends InterfaceType, TypeReference { } + export enum ElementFlags { + Required = 1, + Optional = 2, + Rest = 4, + Variadic = 8, + Variable = 12 + } export interface TupleType extends GenericType { + elementFlags: readonly ElementFlags[]; minLength: number; + fixedLength: number; hasRestElement: boolean; + combinedFlags: ElementFlags; readonly: boolean; - associatedNames?: __String[]; + labeledElementDeclarations?: readonly (NamedTupleMember | ParameterDeclaration)[]; } export interface TupleTypeReference extends TypeReference { target: TupleType; @@ -2551,16 +2645,17 @@ declare namespace ts { } export enum InferencePriority { NakedTypeVariable = 1, - HomomorphicMappedType = 2, - PartialHomomorphicMappedType = 4, - MappedTypeConstraint = 8, - ContravariantConditional = 16, - ReturnType = 32, - LiteralKeyof = 64, - NoConstraints = 128, - AlwaysStrict = 256, - MaxValue = 512, - PriorityImpliesCombination = 104, + SpeculativeTuple = 2, + HomomorphicMappedType = 4, + PartialHomomorphicMappedType = 8, + MappedTypeConstraint = 16, + ContravariantConditional = 32, + ReturnType = 64, + LiteralKeyof = 128, + NoConstraints = 256, + AlwaysStrict = 512, + MaxValue = 1024, + PriorityImpliesCombination = 208, Circularity = -1 } /** @deprecated Use FileExtensionInfo instead. */ @@ -2576,6 +2671,7 @@ declare namespace ts { code: number; message: string; reportsUnnecessary?: {}; + reportsDeprecated?: {}; } /** * A linked list of formatted diagnostic messages to be used as part of a multiline message. @@ -2592,6 +2688,7 @@ declare namespace ts { export interface Diagnostic extends DiagnosticRelatedInformation { /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */ reportsUnnecessary?: {}; + reportsDeprecated?: {}; source?: string; relatedInformation?: DiagnosticRelatedInformation[]; } @@ -2666,6 +2763,7 @@ declare namespace ts { disableSizeLimit?: boolean; disableSourceOfProjectReferenceRedirect?: boolean; disableSolutionSearching?: boolean; + disableReferencedProjectLoad?: boolean; downlevelIteration?: boolean; emitBOM?: boolean; emitDecoratorMetadata?: boolean; @@ -2709,6 +2807,7 @@ declare namespace ts { project?: string; reactNamespace?: string; jsxFactory?: string; + jsxFragmentFactory?: string; composite?: boolean; incremental?: boolean; tsBuildInfoFile?: string; @@ -3006,7 +3105,437 @@ declare namespace ts { EmbeddedStatement = 5, JsxAttributeValue = 6 } - export interface TransformationContext { + export enum OuterExpressionKinds { + Parentheses = 1, + TypeAssertions = 2, + NonNullAssertions = 4, + PartiallyEmittedExpressions = 8, + Assertions = 6, + All = 15 + } + export type TypeOfTag = "undefined" | "number" | "bigint" | "boolean" | "string" | "symbol" | "object" | "function"; + export interface NodeFactory { + createNodeArray(elements?: readonly T[], hasTrailingComma?: boolean): NodeArray; + createNumericLiteral(value: string | number, numericLiteralFlags?: TokenFlags): NumericLiteral; + createBigIntLiteral(value: string | PseudoBigInt): BigIntLiteral; + createStringLiteral(text: string, isSingleQuote?: boolean): StringLiteral; + createStringLiteralFromNode(sourceNode: PropertyNameLiteral, isSingleQuote?: boolean): StringLiteral; + createRegularExpressionLiteral(text: string): RegularExpressionLiteral; + createIdentifier(text: string): Identifier; + /** Create a unique temporary variable. */ + createTempVariable(recordTempVariable: ((node: Identifier) => void) | undefined): Identifier; + /** Create a unique temporary variable for use in a loop. */ + createLoopVariable(): Identifier; + /** Create a unique name based on the supplied text. */ + createUniqueName(text: string, flags?: GeneratedIdentifierFlags): Identifier; + /** Create a unique name generated for a node. */ + getGeneratedNameForNode(node: Node | undefined): Identifier; + createPrivateIdentifier(text: string): PrivateIdentifier; + createToken(token: SyntaxKind.SuperKeyword): SuperExpression; + createToken(token: SyntaxKind.ThisKeyword): ThisExpression; + createToken(token: SyntaxKind.NullKeyword): NullLiteral; + createToken(token: SyntaxKind.TrueKeyword): TrueLiteral; + createToken(token: SyntaxKind.FalseKeyword): FalseLiteral; + createToken(token: TKind): PunctuationToken; + createToken(token: TKind): KeywordTypeNode; + createToken(token: TKind): ModifierToken; + createToken(token: TKind): KeywordToken; + createToken(token: TKind): Token; + createSuper(): SuperExpression; + createThis(): ThisExpression; + createNull(): NullLiteral; + createTrue(): TrueLiteral; + createFalse(): FalseLiteral; + createModifier(kind: T): ModifierToken; + createModifiersFromModifierFlags(flags: ModifierFlags): Modifier[]; + createQualifiedName(left: EntityName, right: string | Identifier): QualifiedName; + updateQualifiedName(node: QualifiedName, left: EntityName, right: Identifier): QualifiedName; + createComputedPropertyName(expression: Expression): ComputedPropertyName; + updateComputedPropertyName(node: ComputedPropertyName, expression: Expression): ComputedPropertyName; + createTypeParameterDeclaration(name: string | Identifier, constraint?: TypeNode, defaultType?: TypeNode): TypeParameterDeclaration; + updateTypeParameterDeclaration(node: TypeParameterDeclaration, name: Identifier, constraint: TypeNode | undefined, defaultType: TypeNode | undefined): TypeParameterDeclaration; + createParameterDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, dotDotDotToken: DotDotDotToken | undefined, name: string | BindingName, questionToken?: QuestionToken, type?: TypeNode, initializer?: Expression): ParameterDeclaration; + updateParameterDeclaration(node: ParameterDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, dotDotDotToken: DotDotDotToken | undefined, name: string | BindingName, questionToken: QuestionToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): ParameterDeclaration; + createDecorator(expression: Expression): Decorator; + updateDecorator(node: Decorator, expression: Expression): Decorator; + createPropertySignature(modifiers: readonly Modifier[] | undefined, name: PropertyName | string, questionToken: QuestionToken | undefined, type: TypeNode | undefined): PropertySignature; + updatePropertySignature(node: PropertySignature, modifiers: readonly Modifier[] | undefined, name: PropertyName, questionToken: QuestionToken | undefined, type: TypeNode | undefined): PropertySignature; + createPropertyDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | PropertyName, questionOrExclamationToken: QuestionToken | ExclamationToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): PropertyDeclaration; + updatePropertyDeclaration(node: PropertyDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | PropertyName, questionOrExclamationToken: QuestionToken | ExclamationToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): PropertyDeclaration; + createMethodSignature(modifiers: readonly Modifier[] | undefined, name: string | PropertyName, questionToken: QuestionToken | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined): MethodSignature; + updateMethodSignature(node: MethodSignature, modifiers: readonly Modifier[] | undefined, name: PropertyName, questionToken: QuestionToken | undefined, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode | undefined): MethodSignature; + createMethodDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: string | PropertyName, questionToken: QuestionToken | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined): MethodDeclaration; + updateMethodDeclaration(node: MethodDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: PropertyName, questionToken: QuestionToken | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined): MethodDeclaration; + createConstructorDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], body: Block | undefined): ConstructorDeclaration; + updateConstructorDeclaration(node: ConstructorDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], body: Block | undefined): ConstructorDeclaration; + createGetAccessorDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | PropertyName, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined): GetAccessorDeclaration; + updateGetAccessorDeclaration(node: GetAccessorDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: PropertyName, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined): GetAccessorDeclaration; + createSetAccessorDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | PropertyName, parameters: readonly ParameterDeclaration[], body: Block | undefined): SetAccessorDeclaration; + updateSetAccessorDeclaration(node: SetAccessorDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: PropertyName, parameters: readonly ParameterDeclaration[], body: Block | undefined): SetAccessorDeclaration; + createCallSignature(typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined): CallSignatureDeclaration; + updateCallSignature(node: CallSignatureDeclaration, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode | undefined): CallSignatureDeclaration; + createConstructSignature(typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined): ConstructSignatureDeclaration; + updateConstructSignature(node: ConstructSignatureDeclaration, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode | undefined): ConstructSignatureDeclaration; + createIndexSignature(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode): IndexSignatureDeclaration; + updateIndexSignature(node: IndexSignatureDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode): IndexSignatureDeclaration; + createKeywordTypeNode(kind: TKind): KeywordTypeNode; + createTypePredicateNode(assertsModifier: AssertsKeyword | undefined, parameterName: Identifier | ThisTypeNode | string, type: TypeNode | undefined): TypePredicateNode; + updateTypePredicateNode(node: TypePredicateNode, assertsModifier: AssertsKeyword | undefined, parameterName: Identifier | ThisTypeNode, type: TypeNode | undefined): TypePredicateNode; + createTypeReferenceNode(typeName: string | EntityName, typeArguments?: readonly TypeNode[]): TypeReferenceNode; + updateTypeReferenceNode(node: TypeReferenceNode, typeName: EntityName, typeArguments: NodeArray | undefined): TypeReferenceNode; + createFunctionTypeNode(typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode): FunctionTypeNode; + updateFunctionTypeNode(node: FunctionTypeNode, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode): FunctionTypeNode; + createConstructorTypeNode(typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode): ConstructorTypeNode; + updateConstructorTypeNode(node: ConstructorTypeNode, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode): ConstructorTypeNode; + createTypeQueryNode(exprName: EntityName): TypeQueryNode; + updateTypeQueryNode(node: TypeQueryNode, exprName: EntityName): TypeQueryNode; + createTypeLiteralNode(members: readonly TypeElement[] | undefined): TypeLiteralNode; + updateTypeLiteralNode(node: TypeLiteralNode, members: NodeArray): TypeLiteralNode; + createArrayTypeNode(elementType: TypeNode): ArrayTypeNode; + updateArrayTypeNode(node: ArrayTypeNode, elementType: TypeNode): ArrayTypeNode; + createTupleTypeNode(elements: readonly (TypeNode | NamedTupleMember)[]): TupleTypeNode; + updateTupleTypeNode(node: TupleTypeNode, elements: readonly (TypeNode | NamedTupleMember)[]): TupleTypeNode; + createNamedTupleMember(dotDotDotToken: DotDotDotToken | undefined, name: Identifier, questionToken: QuestionToken | undefined, type: TypeNode): NamedTupleMember; + updateNamedTupleMember(node: NamedTupleMember, dotDotDotToken: DotDotDotToken | undefined, name: Identifier, questionToken: QuestionToken | undefined, type: TypeNode): NamedTupleMember; + createOptionalTypeNode(type: TypeNode): OptionalTypeNode; + updateOptionalTypeNode(node: OptionalTypeNode, type: TypeNode): OptionalTypeNode; + createRestTypeNode(type: TypeNode): RestTypeNode; + updateRestTypeNode(node: RestTypeNode, type: TypeNode): RestTypeNode; + createUnionTypeNode(types: readonly TypeNode[]): UnionTypeNode; + updateUnionTypeNode(node: UnionTypeNode, types: NodeArray): UnionTypeNode; + createIntersectionTypeNode(types: readonly TypeNode[]): IntersectionTypeNode; + updateIntersectionTypeNode(node: IntersectionTypeNode, types: NodeArray): IntersectionTypeNode; + createConditionalTypeNode(checkType: TypeNode, extendsType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode; + updateConditionalTypeNode(node: ConditionalTypeNode, checkType: TypeNode, extendsType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode; + createInferTypeNode(typeParameter: TypeParameterDeclaration): InferTypeNode; + updateInferTypeNode(node: InferTypeNode, typeParameter: TypeParameterDeclaration): InferTypeNode; + createImportTypeNode(argument: TypeNode, qualifier?: EntityName, typeArguments?: readonly TypeNode[], isTypeOf?: boolean): ImportTypeNode; + updateImportTypeNode(node: ImportTypeNode, argument: TypeNode, qualifier: EntityName | undefined, typeArguments: readonly TypeNode[] | undefined, isTypeOf?: boolean): ImportTypeNode; + createParenthesizedType(type: TypeNode): ParenthesizedTypeNode; + updateParenthesizedType(node: ParenthesizedTypeNode, type: TypeNode): ParenthesizedTypeNode; + createThisTypeNode(): ThisTypeNode; + createTypeOperatorNode(operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.ReadonlyKeyword, type: TypeNode): TypeOperatorNode; + updateTypeOperatorNode(node: TypeOperatorNode, type: TypeNode): TypeOperatorNode; + createIndexedAccessTypeNode(objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode; + updateIndexedAccessTypeNode(node: IndexedAccessTypeNode, objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode; + createMappedTypeNode(readonlyToken: ReadonlyKeyword | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined): MappedTypeNode; + updateMappedTypeNode(node: MappedTypeNode, readonlyToken: ReadonlyKeyword | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined): MappedTypeNode; + createLiteralTypeNode(literal: LiteralTypeNode["literal"]): LiteralTypeNode; + updateLiteralTypeNode(node: LiteralTypeNode, literal: LiteralTypeNode["literal"]): LiteralTypeNode; + createObjectBindingPattern(elements: readonly BindingElement[]): ObjectBindingPattern; + updateObjectBindingPattern(node: ObjectBindingPattern, elements: readonly BindingElement[]): ObjectBindingPattern; + createArrayBindingPattern(elements: readonly ArrayBindingElement[]): ArrayBindingPattern; + updateArrayBindingPattern(node: ArrayBindingPattern, elements: readonly ArrayBindingElement[]): ArrayBindingPattern; + createBindingElement(dotDotDotToken: DotDotDotToken | undefined, propertyName: string | PropertyName | undefined, name: string | BindingName, initializer?: Expression): BindingElement; + updateBindingElement(node: BindingElement, dotDotDotToken: DotDotDotToken | undefined, propertyName: PropertyName | undefined, name: BindingName, initializer: Expression | undefined): BindingElement; + createArrayLiteralExpression(elements?: readonly Expression[], multiLine?: boolean): ArrayLiteralExpression; + updateArrayLiteralExpression(node: ArrayLiteralExpression, elements: readonly Expression[]): ArrayLiteralExpression; + createObjectLiteralExpression(properties?: readonly ObjectLiteralElementLike[], multiLine?: boolean): ObjectLiteralExpression; + updateObjectLiteralExpression(node: ObjectLiteralExpression, properties: readonly ObjectLiteralElementLike[]): ObjectLiteralExpression; + createPropertyAccessExpression(expression: Expression, name: string | Identifier | PrivateIdentifier): PropertyAccessExpression; + updatePropertyAccessExpression(node: PropertyAccessExpression, expression: Expression, name: Identifier | PrivateIdentifier): PropertyAccessExpression; + createPropertyAccessChain(expression: Expression, questionDotToken: QuestionDotToken | undefined, name: string | Identifier | PrivateIdentifier): PropertyAccessChain; + updatePropertyAccessChain(node: PropertyAccessChain, expression: Expression, questionDotToken: QuestionDotToken | undefined, name: Identifier | PrivateIdentifier): PropertyAccessChain; + createElementAccessExpression(expression: Expression, index: number | Expression): ElementAccessExpression; + updateElementAccessExpression(node: ElementAccessExpression, expression: Expression, argumentExpression: Expression): ElementAccessExpression; + createElementAccessChain(expression: Expression, questionDotToken: QuestionDotToken | undefined, index: number | Expression): ElementAccessChain; + updateElementAccessChain(node: ElementAccessChain, expression: Expression, questionDotToken: QuestionDotToken | undefined, argumentExpression: Expression): ElementAccessChain; + createCallExpression(expression: Expression, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[] | undefined): CallExpression; + updateCallExpression(node: CallExpression, expression: Expression, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[]): CallExpression; + createCallChain(expression: Expression, questionDotToken: QuestionDotToken | undefined, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[] | undefined): CallChain; + updateCallChain(node: CallChain, expression: Expression, questionDotToken: QuestionDotToken | undefined, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[]): CallChain; + createNewExpression(expression: Expression, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[] | undefined): NewExpression; + updateNewExpression(node: NewExpression, expression: Expression, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[] | undefined): NewExpression; + createTaggedTemplateExpression(tag: Expression, typeArguments: readonly TypeNode[] | undefined, template: TemplateLiteral): TaggedTemplateExpression; + updateTaggedTemplateExpression(node: TaggedTemplateExpression, tag: Expression, typeArguments: readonly TypeNode[] | undefined, template: TemplateLiteral): TaggedTemplateExpression; + createTypeAssertion(type: TypeNode, expression: Expression): TypeAssertion; + updateTypeAssertion(node: TypeAssertion, type: TypeNode, expression: Expression): TypeAssertion; + createParenthesizedExpression(expression: Expression): ParenthesizedExpression; + updateParenthesizedExpression(node: ParenthesizedExpression, expression: Expression): ParenthesizedExpression; + createFunctionExpression(modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: string | Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[] | undefined, type: TypeNode | undefined, body: Block): FunctionExpression; + updateFunctionExpression(node: FunctionExpression, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block): FunctionExpression; + createArrowFunction(modifiers: readonly Modifier[] | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, equalsGreaterThanToken: EqualsGreaterThanToken | undefined, body: ConciseBody): ArrowFunction; + updateArrowFunction(node: ArrowFunction, modifiers: readonly Modifier[] | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, equalsGreaterThanToken: EqualsGreaterThanToken, body: ConciseBody): ArrowFunction; + createDeleteExpression(expression: Expression): DeleteExpression; + updateDeleteExpression(node: DeleteExpression, expression: Expression): DeleteExpression; + createTypeOfExpression(expression: Expression): TypeOfExpression; + updateTypeOfExpression(node: TypeOfExpression, expression: Expression): TypeOfExpression; + createVoidExpression(expression: Expression): VoidExpression; + updateVoidExpression(node: VoidExpression, expression: Expression): VoidExpression; + createAwaitExpression(expression: Expression): AwaitExpression; + updateAwaitExpression(node: AwaitExpression, expression: Expression): AwaitExpression; + createPrefixUnaryExpression(operator: PrefixUnaryOperator, operand: Expression): PrefixUnaryExpression; + updatePrefixUnaryExpression(node: PrefixUnaryExpression, operand: Expression): PrefixUnaryExpression; + createPostfixUnaryExpression(operand: Expression, operator: PostfixUnaryOperator): PostfixUnaryExpression; + updatePostfixUnaryExpression(node: PostfixUnaryExpression, operand: Expression): PostfixUnaryExpression; + createBinaryExpression(left: Expression, operator: BinaryOperator | BinaryOperatorToken, right: Expression): BinaryExpression; + updateBinaryExpression(node: BinaryExpression, left: Expression, operator: BinaryOperator | BinaryOperatorToken, right: Expression): BinaryExpression; + createConditionalExpression(condition: Expression, questionToken: QuestionToken | undefined, whenTrue: Expression, colonToken: ColonToken | undefined, whenFalse: Expression): ConditionalExpression; + updateConditionalExpression(node: ConditionalExpression, condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression): ConditionalExpression; + createTemplateExpression(head: TemplateHead, templateSpans: readonly TemplateSpan[]): TemplateExpression; + updateTemplateExpression(node: TemplateExpression, head: TemplateHead, templateSpans: readonly TemplateSpan[]): TemplateExpression; + createTemplateHead(text: string, rawText?: string, templateFlags?: TokenFlags): TemplateHead; + createTemplateHead(text: string | undefined, rawText: string, templateFlags?: TokenFlags): TemplateHead; + createTemplateMiddle(text: string, rawText?: string, templateFlags?: TokenFlags): TemplateMiddle; + createTemplateMiddle(text: string | undefined, rawText: string, templateFlags?: TokenFlags): TemplateMiddle; + createTemplateTail(text: string, rawText?: string, templateFlags?: TokenFlags): TemplateTail; + createTemplateTail(text: string | undefined, rawText: string, templateFlags?: TokenFlags): TemplateTail; + createNoSubstitutionTemplateLiteral(text: string, rawText?: string): NoSubstitutionTemplateLiteral; + createNoSubstitutionTemplateLiteral(text: string | undefined, rawText: string): NoSubstitutionTemplateLiteral; + createYieldExpression(asteriskToken: AsteriskToken, expression: Expression): YieldExpression; + createYieldExpression(asteriskToken: undefined, expression: Expression | undefined): YieldExpression; + updateYieldExpression(node: YieldExpression, asteriskToken: AsteriskToken | undefined, expression: Expression | undefined): YieldExpression; + createSpreadElement(expression: Expression): SpreadElement; + updateSpreadElement(node: SpreadElement, expression: Expression): SpreadElement; + createClassExpression(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly ClassElement[]): ClassExpression; + updateClassExpression(node: ClassExpression, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly ClassElement[]): ClassExpression; + createOmittedExpression(): OmittedExpression; + createExpressionWithTypeArguments(expression: Expression, typeArguments: readonly TypeNode[] | undefined): ExpressionWithTypeArguments; + updateExpressionWithTypeArguments(node: ExpressionWithTypeArguments, expression: Expression, typeArguments: readonly TypeNode[] | undefined): ExpressionWithTypeArguments; + createAsExpression(expression: Expression, type: TypeNode): AsExpression; + updateAsExpression(node: AsExpression, expression: Expression, type: TypeNode): AsExpression; + createNonNullExpression(expression: Expression): NonNullExpression; + updateNonNullExpression(node: NonNullExpression, expression: Expression): NonNullExpression; + createNonNullChain(expression: Expression): NonNullChain; + updateNonNullChain(node: NonNullChain, expression: Expression): NonNullChain; + createMetaProperty(keywordToken: MetaProperty["keywordToken"], name: Identifier): MetaProperty; + updateMetaProperty(node: MetaProperty, name: Identifier): MetaProperty; + createTemplateSpan(expression: Expression, literal: TemplateMiddle | TemplateTail): TemplateSpan; + updateTemplateSpan(node: TemplateSpan, expression: Expression, literal: TemplateMiddle | TemplateTail): TemplateSpan; + createSemicolonClassElement(): SemicolonClassElement; + createBlock(statements: readonly Statement[], multiLine?: boolean): Block; + updateBlock(node: Block, statements: readonly Statement[]): Block; + createVariableStatement(modifiers: readonly Modifier[] | undefined, declarationList: VariableDeclarationList | readonly VariableDeclaration[]): VariableStatement; + updateVariableStatement(node: VariableStatement, modifiers: readonly Modifier[] | undefined, declarationList: VariableDeclarationList): VariableStatement; + createEmptyStatement(): EmptyStatement; + createExpressionStatement(expression: Expression): ExpressionStatement; + updateExpressionStatement(node: ExpressionStatement, expression: Expression): ExpressionStatement; + createIfStatement(expression: Expression, thenStatement: Statement, elseStatement?: Statement): IfStatement; + updateIfStatement(node: IfStatement, expression: Expression, thenStatement: Statement, elseStatement: Statement | undefined): IfStatement; + createDoStatement(statement: Statement, expression: Expression): DoStatement; + updateDoStatement(node: DoStatement, statement: Statement, expression: Expression): DoStatement; + createWhileStatement(expression: Expression, statement: Statement): WhileStatement; + updateWhileStatement(node: WhileStatement, expression: Expression, statement: Statement): WhileStatement; + createForStatement(initializer: ForInitializer | undefined, condition: Expression | undefined, incrementor: Expression | undefined, statement: Statement): ForStatement; + updateForStatement(node: ForStatement, initializer: ForInitializer | undefined, condition: Expression | undefined, incrementor: Expression | undefined, statement: Statement): ForStatement; + createForInStatement(initializer: ForInitializer, expression: Expression, statement: Statement): ForInStatement; + updateForInStatement(node: ForInStatement, initializer: ForInitializer, expression: Expression, statement: Statement): ForInStatement; + createForOfStatement(awaitModifier: AwaitKeyword | undefined, initializer: ForInitializer, expression: Expression, statement: Statement): ForOfStatement; + updateForOfStatement(node: ForOfStatement, awaitModifier: AwaitKeyword | undefined, initializer: ForInitializer, expression: Expression, statement: Statement): ForOfStatement; + createContinueStatement(label?: string | Identifier): ContinueStatement; + updateContinueStatement(node: ContinueStatement, label: Identifier | undefined): ContinueStatement; + createBreakStatement(label?: string | Identifier): BreakStatement; + updateBreakStatement(node: BreakStatement, label: Identifier | undefined): BreakStatement; + createReturnStatement(expression?: Expression): ReturnStatement; + updateReturnStatement(node: ReturnStatement, expression: Expression | undefined): ReturnStatement; + createWithStatement(expression: Expression, statement: Statement): WithStatement; + updateWithStatement(node: WithStatement, expression: Expression, statement: Statement): WithStatement; + createSwitchStatement(expression: Expression, caseBlock: CaseBlock): SwitchStatement; + updateSwitchStatement(node: SwitchStatement, expression: Expression, caseBlock: CaseBlock): SwitchStatement; + createLabeledStatement(label: string | Identifier, statement: Statement): LabeledStatement; + updateLabeledStatement(node: LabeledStatement, label: Identifier, statement: Statement): LabeledStatement; + createThrowStatement(expression: Expression): ThrowStatement; + updateThrowStatement(node: ThrowStatement, expression: Expression): ThrowStatement; + createTryStatement(tryBlock: Block, catchClause: CatchClause | undefined, finallyBlock: Block | undefined): TryStatement; + updateTryStatement(node: TryStatement, tryBlock: Block, catchClause: CatchClause | undefined, finallyBlock: Block | undefined): TryStatement; + createDebuggerStatement(): DebuggerStatement; + createVariableDeclaration(name: string | BindingName, exclamationToken?: ExclamationToken, type?: TypeNode, initializer?: Expression): VariableDeclaration; + updateVariableDeclaration(node: VariableDeclaration, name: BindingName, exclamationToken: ExclamationToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): VariableDeclaration; + createVariableDeclarationList(declarations: readonly VariableDeclaration[], flags?: NodeFlags): VariableDeclarationList; + updateVariableDeclarationList(node: VariableDeclarationList, declarations: readonly VariableDeclaration[]): VariableDeclarationList; + createFunctionDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: string | Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined): FunctionDeclaration; + updateFunctionDeclaration(node: FunctionDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined): FunctionDeclaration; + createClassDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly ClassElement[]): ClassDeclaration; + updateClassDeclaration(node: ClassDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly ClassElement[]): ClassDeclaration; + createInterfaceDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly TypeElement[]): InterfaceDeclaration; + updateInterfaceDeclaration(node: InterfaceDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly TypeElement[]): InterfaceDeclaration; + createTypeAliasDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier, typeParameters: readonly TypeParameterDeclaration[] | undefined, type: TypeNode): TypeAliasDeclaration; + updateTypeAliasDeclaration(node: TypeAliasDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier, typeParameters: readonly TypeParameterDeclaration[] | undefined, type: TypeNode): TypeAliasDeclaration; + createEnumDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier, members: readonly EnumMember[]): EnumDeclaration; + updateEnumDeclaration(node: EnumDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier, members: readonly EnumMember[]): EnumDeclaration; + createModuleDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: ModuleName, body: ModuleBody | undefined, flags?: NodeFlags): ModuleDeclaration; + updateModuleDeclaration(node: ModuleDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: ModuleName, body: ModuleBody | undefined): ModuleDeclaration; + createModuleBlock(statements: readonly Statement[]): ModuleBlock; + updateModuleBlock(node: ModuleBlock, statements: readonly Statement[]): ModuleBlock; + createCaseBlock(clauses: readonly CaseOrDefaultClause[]): CaseBlock; + updateCaseBlock(node: CaseBlock, clauses: readonly CaseOrDefaultClause[]): CaseBlock; + createNamespaceExportDeclaration(name: string | Identifier): NamespaceExportDeclaration; + updateNamespaceExportDeclaration(node: NamespaceExportDeclaration, name: Identifier): NamespaceExportDeclaration; + createImportEqualsDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier, moduleReference: ModuleReference): ImportEqualsDeclaration; + updateImportEqualsDeclaration(node: ImportEqualsDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier, moduleReference: ModuleReference): ImportEqualsDeclaration; + createImportDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, importClause: ImportClause | undefined, moduleSpecifier: Expression): ImportDeclaration; + updateImportDeclaration(node: ImportDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, importClause: ImportClause | undefined, moduleSpecifier: Expression): ImportDeclaration; + createImportClause(isTypeOnly: boolean, name: Identifier | undefined, namedBindings: NamedImportBindings | undefined): ImportClause; + updateImportClause(node: ImportClause, isTypeOnly: boolean, name: Identifier | undefined, namedBindings: NamedImportBindings | undefined): ImportClause; + createNamespaceImport(name: Identifier): NamespaceImport; + updateNamespaceImport(node: NamespaceImport, name: Identifier): NamespaceImport; + createNamespaceExport(name: Identifier): NamespaceExport; + updateNamespaceExport(node: NamespaceExport, name: Identifier): NamespaceExport; + createNamedImports(elements: readonly ImportSpecifier[]): NamedImports; + updateNamedImports(node: NamedImports, elements: readonly ImportSpecifier[]): NamedImports; + createImportSpecifier(propertyName: Identifier | undefined, name: Identifier): ImportSpecifier; + updateImportSpecifier(node: ImportSpecifier, propertyName: Identifier | undefined, name: Identifier): ImportSpecifier; + createExportAssignment(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, isExportEquals: boolean | undefined, expression: Expression): ExportAssignment; + updateExportAssignment(node: ExportAssignment, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, expression: Expression): ExportAssignment; + createExportDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, isTypeOnly: boolean, exportClause: NamedExportBindings | undefined, moduleSpecifier?: Expression): ExportDeclaration; + updateExportDeclaration(node: ExportDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, isTypeOnly: boolean, exportClause: NamedExportBindings | undefined, moduleSpecifier: Expression | undefined): ExportDeclaration; + createNamedExports(elements: readonly ExportSpecifier[]): NamedExports; + updateNamedExports(node: NamedExports, elements: readonly ExportSpecifier[]): NamedExports; + createExportSpecifier(propertyName: string | Identifier | undefined, name: string | Identifier): ExportSpecifier; + updateExportSpecifier(node: ExportSpecifier, propertyName: Identifier | undefined, name: Identifier): ExportSpecifier; + createExternalModuleReference(expression: Expression): ExternalModuleReference; + updateExternalModuleReference(node: ExternalModuleReference, expression: Expression): ExternalModuleReference; + createJSDocAllType(): JSDocAllType; + createJSDocUnknownType(): JSDocUnknownType; + createJSDocNonNullableType(type: TypeNode): JSDocNonNullableType; + updateJSDocNonNullableType(node: JSDocNonNullableType, type: TypeNode): JSDocNonNullableType; + createJSDocNullableType(type: TypeNode): JSDocNullableType; + updateJSDocNullableType(node: JSDocNullableType, type: TypeNode): JSDocNullableType; + createJSDocOptionalType(type: TypeNode): JSDocOptionalType; + updateJSDocOptionalType(node: JSDocOptionalType, type: TypeNode): JSDocOptionalType; + createJSDocFunctionType(parameters: readonly ParameterDeclaration[], type: TypeNode | undefined): JSDocFunctionType; + updateJSDocFunctionType(node: JSDocFunctionType, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined): JSDocFunctionType; + createJSDocVariadicType(type: TypeNode): JSDocVariadicType; + updateJSDocVariadicType(node: JSDocVariadicType, type: TypeNode): JSDocVariadicType; + createJSDocNamepathType(type: TypeNode): JSDocNamepathType; + updateJSDocNamepathType(node: JSDocNamepathType, type: TypeNode): JSDocNamepathType; + createJSDocTypeExpression(type: TypeNode): JSDocTypeExpression; + updateJSDocTypeExpression(node: JSDocTypeExpression, type: TypeNode): JSDocTypeExpression; + createJSDocTypeLiteral(jsDocPropertyTags?: readonly JSDocPropertyLikeTag[], isArrayType?: boolean): JSDocTypeLiteral; + updateJSDocTypeLiteral(node: JSDocTypeLiteral, jsDocPropertyTags: readonly JSDocPropertyLikeTag[] | undefined, isArrayType: boolean | undefined): JSDocTypeLiteral; + createJSDocSignature(typeParameters: readonly JSDocTemplateTag[] | undefined, parameters: readonly JSDocParameterTag[], type?: JSDocReturnTag): JSDocSignature; + updateJSDocSignature(node: JSDocSignature, typeParameters: readonly JSDocTemplateTag[] | undefined, parameters: readonly JSDocParameterTag[], type: JSDocReturnTag | undefined): JSDocSignature; + createJSDocTemplateTag(tagName: Identifier | undefined, constraint: JSDocTypeExpression | undefined, typeParameters: readonly TypeParameterDeclaration[], comment?: string): JSDocTemplateTag; + updateJSDocTemplateTag(node: JSDocTemplateTag, tagName: Identifier | undefined, constraint: JSDocTypeExpression | undefined, typeParameters: readonly TypeParameterDeclaration[], comment: string | undefined): JSDocTemplateTag; + createJSDocTypedefTag(tagName: Identifier | undefined, typeExpression?: JSDocTypeExpression | JSDocTypeLiteral, fullName?: Identifier | JSDocNamespaceDeclaration, comment?: string): JSDocTypedefTag; + updateJSDocTypedefTag(node: JSDocTypedefTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression | JSDocTypeLiteral | undefined, fullName: Identifier | JSDocNamespaceDeclaration | undefined, comment: string | undefined): JSDocTypedefTag; + createJSDocParameterTag(tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression?: JSDocTypeExpression, isNameFirst?: boolean, comment?: string): JSDocParameterTag; + updateJSDocParameterTag(node: JSDocParameterTag, tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression: JSDocTypeExpression | undefined, isNameFirst: boolean, comment: string | undefined): JSDocParameterTag; + createJSDocPropertyTag(tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression?: JSDocTypeExpression, isNameFirst?: boolean, comment?: string): JSDocPropertyTag; + updateJSDocPropertyTag(node: JSDocPropertyTag, tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression: JSDocTypeExpression | undefined, isNameFirst: boolean, comment: string | undefined): JSDocPropertyTag; + createJSDocTypeTag(tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string): JSDocTypeTag; + updateJSDocTypeTag(node: JSDocTypeTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment: string | undefined): JSDocTypeTag; + createJSDocReturnTag(tagName: Identifier | undefined, typeExpression?: JSDocTypeExpression, comment?: string): JSDocReturnTag; + updateJSDocReturnTag(node: JSDocReturnTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression | undefined, comment: string | undefined): JSDocReturnTag; + createJSDocThisTag(tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string): JSDocThisTag; + updateJSDocThisTag(node: JSDocThisTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression | undefined, comment: string | undefined): JSDocThisTag; + createJSDocEnumTag(tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string): JSDocEnumTag; + updateJSDocEnumTag(node: JSDocEnumTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment: string | undefined): JSDocEnumTag; + createJSDocCallbackTag(tagName: Identifier | undefined, typeExpression: JSDocSignature, fullName?: Identifier | JSDocNamespaceDeclaration, comment?: string): JSDocCallbackTag; + updateJSDocCallbackTag(node: JSDocCallbackTag, tagName: Identifier | undefined, typeExpression: JSDocSignature, fullName: Identifier | JSDocNamespaceDeclaration | undefined, comment: string | undefined): JSDocCallbackTag; + createJSDocAugmentsTag(tagName: Identifier | undefined, className: JSDocAugmentsTag["class"], comment?: string): JSDocAugmentsTag; + updateJSDocAugmentsTag(node: JSDocAugmentsTag, tagName: Identifier | undefined, className: JSDocAugmentsTag["class"], comment: string | undefined): JSDocAugmentsTag; + createJSDocImplementsTag(tagName: Identifier | undefined, className: JSDocImplementsTag["class"], comment?: string): JSDocImplementsTag; + updateJSDocImplementsTag(node: JSDocImplementsTag, tagName: Identifier | undefined, className: JSDocImplementsTag["class"], comment: string | undefined): JSDocImplementsTag; + createJSDocAuthorTag(tagName: Identifier | undefined, comment?: string): JSDocAuthorTag; + updateJSDocAuthorTag(node: JSDocAuthorTag, tagName: Identifier | undefined, comment: string | undefined): JSDocAuthorTag; + createJSDocClassTag(tagName: Identifier | undefined, comment?: string): JSDocClassTag; + updateJSDocClassTag(node: JSDocClassTag, tagName: Identifier | undefined, comment: string | undefined): JSDocClassTag; + createJSDocPublicTag(tagName: Identifier | undefined, comment?: string): JSDocPublicTag; + updateJSDocPublicTag(node: JSDocPublicTag, tagName: Identifier | undefined, comment: string | undefined): JSDocPublicTag; + createJSDocPrivateTag(tagName: Identifier | undefined, comment?: string): JSDocPrivateTag; + updateJSDocPrivateTag(node: JSDocPrivateTag, tagName: Identifier | undefined, comment: string | undefined): JSDocPrivateTag; + createJSDocProtectedTag(tagName: Identifier | undefined, comment?: string): JSDocProtectedTag; + updateJSDocProtectedTag(node: JSDocProtectedTag, tagName: Identifier | undefined, comment: string | undefined): JSDocProtectedTag; + createJSDocReadonlyTag(tagName: Identifier | undefined, comment?: string): JSDocReadonlyTag; + updateJSDocReadonlyTag(node: JSDocReadonlyTag, tagName: Identifier | undefined, comment: string | undefined): JSDocReadonlyTag; + createJSDocUnknownTag(tagName: Identifier, comment?: string): JSDocUnknownTag; + updateJSDocUnknownTag(node: JSDocUnknownTag, tagName: Identifier, comment: string | undefined): JSDocUnknownTag; + createJSDocDeprecatedTag(tagName: Identifier, comment?: string): JSDocDeprecatedTag; + updateJSDocDeprecatedTag(node: JSDocDeprecatedTag, tagName: Identifier, comment?: string): JSDocDeprecatedTag; + createJSDocComment(comment?: string | undefined, tags?: readonly JSDocTag[] | undefined): JSDoc; + updateJSDocComment(node: JSDoc, comment: string | undefined, tags: readonly JSDocTag[] | undefined): JSDoc; + createJsxElement(openingElement: JsxOpeningElement, children: readonly JsxChild[], closingElement: JsxClosingElement): JsxElement; + updateJsxElement(node: JsxElement, openingElement: JsxOpeningElement, children: readonly JsxChild[], closingElement: JsxClosingElement): JsxElement; + createJsxSelfClosingElement(tagName: JsxTagNameExpression, typeArguments: readonly TypeNode[] | undefined, attributes: JsxAttributes): JsxSelfClosingElement; + updateJsxSelfClosingElement(node: JsxSelfClosingElement, tagName: JsxTagNameExpression, typeArguments: readonly TypeNode[] | undefined, attributes: JsxAttributes): JsxSelfClosingElement; + createJsxOpeningElement(tagName: JsxTagNameExpression, typeArguments: readonly TypeNode[] | undefined, attributes: JsxAttributes): JsxOpeningElement; + updateJsxOpeningElement(node: JsxOpeningElement, tagName: JsxTagNameExpression, typeArguments: readonly TypeNode[] | undefined, attributes: JsxAttributes): JsxOpeningElement; + createJsxClosingElement(tagName: JsxTagNameExpression): JsxClosingElement; + updateJsxClosingElement(node: JsxClosingElement, tagName: JsxTagNameExpression): JsxClosingElement; + createJsxFragment(openingFragment: JsxOpeningFragment, children: readonly JsxChild[], closingFragment: JsxClosingFragment): JsxFragment; + createJsxText(text: string, containsOnlyTriviaWhiteSpaces?: boolean): JsxText; + updateJsxText(node: JsxText, text: string, containsOnlyTriviaWhiteSpaces?: boolean): JsxText; + createJsxOpeningFragment(): JsxOpeningFragment; + createJsxJsxClosingFragment(): JsxClosingFragment; + updateJsxFragment(node: JsxFragment, openingFragment: JsxOpeningFragment, children: readonly JsxChild[], closingFragment: JsxClosingFragment): JsxFragment; + createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression | undefined): JsxAttribute; + updateJsxAttribute(node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression | undefined): JsxAttribute; + createJsxAttributes(properties: readonly JsxAttributeLike[]): JsxAttributes; + updateJsxAttributes(node: JsxAttributes, properties: readonly JsxAttributeLike[]): JsxAttributes; + createJsxSpreadAttribute(expression: Expression): JsxSpreadAttribute; + updateJsxSpreadAttribute(node: JsxSpreadAttribute, expression: Expression): JsxSpreadAttribute; + createJsxExpression(dotDotDotToken: DotDotDotToken | undefined, expression: Expression | undefined): JsxExpression; + updateJsxExpression(node: JsxExpression, expression: Expression | undefined): JsxExpression; + createCaseClause(expression: Expression, statements: readonly Statement[]): CaseClause; + updateCaseClause(node: CaseClause, expression: Expression, statements: readonly Statement[]): CaseClause; + createDefaultClause(statements: readonly Statement[]): DefaultClause; + updateDefaultClause(node: DefaultClause, statements: readonly Statement[]): DefaultClause; + createHeritageClause(token: HeritageClause["token"], types: readonly ExpressionWithTypeArguments[]): HeritageClause; + updateHeritageClause(node: HeritageClause, types: readonly ExpressionWithTypeArguments[]): HeritageClause; + createCatchClause(variableDeclaration: string | VariableDeclaration | undefined, block: Block): CatchClause; + updateCatchClause(node: CatchClause, variableDeclaration: VariableDeclaration | undefined, block: Block): CatchClause; + createPropertyAssignment(name: string | PropertyName, initializer: Expression): PropertyAssignment; + updatePropertyAssignment(node: PropertyAssignment, name: PropertyName, initializer: Expression): PropertyAssignment; + createShorthandPropertyAssignment(name: string | Identifier, objectAssignmentInitializer?: Expression): ShorthandPropertyAssignment; + updateShorthandPropertyAssignment(node: ShorthandPropertyAssignment, name: Identifier, objectAssignmentInitializer: Expression | undefined): ShorthandPropertyAssignment; + createSpreadAssignment(expression: Expression): SpreadAssignment; + updateSpreadAssignment(node: SpreadAssignment, expression: Expression): SpreadAssignment; + createEnumMember(name: string | PropertyName, initializer?: Expression): EnumMember; + updateEnumMember(node: EnumMember, name: PropertyName, initializer: Expression | undefined): EnumMember; + createSourceFile(statements: readonly Statement[], endOfFileToken: EndOfFileToken, flags: NodeFlags): SourceFile; + updateSourceFile(node: SourceFile, statements: readonly Statement[], isDeclarationFile?: boolean, referencedFiles?: readonly FileReference[], typeReferences?: readonly FileReference[], hasNoDefaultLib?: boolean, libReferences?: readonly FileReference[]): SourceFile; + createNotEmittedStatement(original: Node): NotEmittedStatement; + createPartiallyEmittedExpression(expression: Expression, original?: Node): PartiallyEmittedExpression; + updatePartiallyEmittedExpression(node: PartiallyEmittedExpression, expression: Expression): PartiallyEmittedExpression; + createCommaListExpression(elements: readonly Expression[]): CommaListExpression; + updateCommaListExpression(node: CommaListExpression, elements: readonly Expression[]): CommaListExpression; + createBundle(sourceFiles: readonly SourceFile[], prepends?: readonly (UnparsedSource | InputFiles)[]): Bundle; + updateBundle(node: Bundle, sourceFiles: readonly SourceFile[], prepends?: readonly (UnparsedSource | InputFiles)[]): Bundle; + createComma(left: Expression, right: Expression): BinaryExpression; + createAssignment(left: ObjectLiteralExpression | ArrayLiteralExpression, right: Expression): DestructuringAssignment; + createAssignment(left: Expression, right: Expression): AssignmentExpression; + createLogicalOr(left: Expression, right: Expression): BinaryExpression; + createLogicalAnd(left: Expression, right: Expression): BinaryExpression; + createBitwiseOr(left: Expression, right: Expression): BinaryExpression; + createBitwiseXor(left: Expression, right: Expression): BinaryExpression; + createBitwiseAnd(left: Expression, right: Expression): BinaryExpression; + createStrictEquality(left: Expression, right: Expression): BinaryExpression; + createStrictInequality(left: Expression, right: Expression): BinaryExpression; + createEquality(left: Expression, right: Expression): BinaryExpression; + createInequality(left: Expression, right: Expression): BinaryExpression; + createLessThan(left: Expression, right: Expression): BinaryExpression; + createLessThanEquals(left: Expression, right: Expression): BinaryExpression; + createGreaterThan(left: Expression, right: Expression): BinaryExpression; + createGreaterThanEquals(left: Expression, right: Expression): BinaryExpression; + createLeftShift(left: Expression, right: Expression): BinaryExpression; + createRightShift(left: Expression, right: Expression): BinaryExpression; + createUnsignedRightShift(left: Expression, right: Expression): BinaryExpression; + createAdd(left: Expression, right: Expression): BinaryExpression; + createSubtract(left: Expression, right: Expression): BinaryExpression; + createMultiply(left: Expression, right: Expression): BinaryExpression; + createDivide(left: Expression, right: Expression): BinaryExpression; + createModulo(left: Expression, right: Expression): BinaryExpression; + createExponent(left: Expression, right: Expression): BinaryExpression; + createPrefixPlus(operand: Expression): PrefixUnaryExpression; + createPrefixMinus(operand: Expression): PrefixUnaryExpression; + createPrefixIncrement(operand: Expression): PrefixUnaryExpression; + createPrefixDecrement(operand: Expression): PrefixUnaryExpression; + createBitwiseNot(operand: Expression): PrefixUnaryExpression; + createLogicalNot(operand: Expression): PrefixUnaryExpression; + createPostfixIncrement(operand: Expression): PostfixUnaryExpression; + createPostfixDecrement(operand: Expression): PostfixUnaryExpression; + createImmediatelyInvokedFunctionExpression(statements: readonly Statement[]): CallExpression; + createImmediatelyInvokedFunctionExpression(statements: readonly Statement[], param: ParameterDeclaration, paramValue: Expression): CallExpression; + createImmediatelyInvokedArrowFunction(statements: readonly Statement[]): CallExpression; + createImmediatelyInvokedArrowFunction(statements: readonly Statement[], param: ParameterDeclaration, paramValue: Expression): CallExpression; + createVoidZero(): VoidExpression; + createExportDefault(expression: Expression): ExportAssignment; + createExternalModuleExport(exportName: Identifier): ExportDeclaration; + restoreOuterExpressions(outerExpression: Expression | undefined, innerExpression: Expression, kinds?: OuterExpressionKinds): Expression; + } + export interface CoreTransformationContext { + readonly factory: NodeFactory; /** Gets the compiler options supplied to the transformer. */ getCompilerOptions(): CompilerOptions; /** Starts a new lexical environment. */ @@ -3021,6 +3550,8 @@ declare namespace ts { hoistFunctionDeclaration(node: FunctionDeclaration): void; /** Hoists a variable declaration to the containing scope. */ hoistVariableDeclaration(node: Identifier): void; + } + export interface TransformationContext extends CoreTransformationContext { /** Records a request for a non-scoped emit helper in the current context. */ requestEmitHelper(helper: EmitHelper): void; /** Gets and resets the requested non-scoped emit helpers. */ @@ -3100,6 +3631,14 @@ declare namespace ts { * A function that accepts and possibly transforms a node. */ export type Visitor = (node: Node) => VisitResult; + export interface NodeVisitor { + (nodes: T, visitor: Visitor | undefined, test?: (node: Node) => boolean, lift?: (node: NodeArray) => T): T; + (nodes: T | undefined, visitor: Visitor | undefined, test?: (node: Node) => boolean, lift?: (node: NodeArray) => T): T | undefined; + } + export interface NodesVisitor { + (nodes: NodeArray, visitor: Visitor | undefined, test?: (node: Node) => boolean, start?: number, count?: number): NodeArray; + (nodes: NodeArray | undefined, visitor: Visitor | undefined, test?: (node: Node) => boolean, start?: number, count?: number): NodeArray | undefined; + } export type VisitResult = T | T[] | undefined; export interface Printer { /** @@ -3196,6 +3735,7 @@ declare namespace ts { newLength: number; } export interface SyntaxList extends Node { + kind: SyntaxKind.SyntaxList; _children: Node[]; } export enum ListFormat { @@ -3232,7 +3772,8 @@ declare namespace ts { HeritageClauses = 512, SingleLineTypeLiteralMembers = 768, MultiLineTypeLiteralMembers = 32897, - TupleTypeElements = 528, + SingleLineTupleTypeElements = 528, + MultiLineTupleTypeElements = 657, UnionTypeConstituents = 516, IntersectionTypeConstituents = 520, ObjectBindingPatternElements = 525136, @@ -3277,6 +3818,8 @@ declare namespace ts { readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js"; readonly allowTextChangesInNewFiles?: boolean; readonly providePrefixAndSuffixTextForRename?: boolean; + readonly includePackageJsonAutoImports?: "auto" | "on" | "off"; + readonly provideRefactorNotApplicableReason?: boolean; } /** Represents a bigint literal value without requiring bigint support */ export interface PseudoBigInt { @@ -3360,6 +3903,7 @@ declare namespace ts { isUnterminated(): boolean; reScanGreaterToken(): SyntaxKind; reScanSlashToken(): SyntaxKind; + reScanAsteriskEqualsToken(): SyntaxKind; reScanTemplateToken(isTaggedTemplate: boolean): SyntaxKind; reScanTemplateHeadOrNoSubstitutionTemplate(): SyntaxKind; scanJsxIdentifier(): SyntaxKind; @@ -3470,7 +4014,7 @@ declare namespace ts { * @param node The original node. * @returns The original parse tree node if found; otherwise, undefined. */ - function getParseTreeNode(node: Node): Node; + function getParseTreeNode(node: Node | undefined): Node | undefined; /** * Gets the original parse tree node for a node. * @@ -3478,7 +4022,7 @@ declare namespace ts { * @param nodeTest A callback used to ensure the correct type of parse tree node is returned. * @returns The original parse tree node if found; otherwise, undefined. */ - function getParseTreeNode(node: Node | undefined, nodeTest?: (node: Node) => node is T): T | undefined; + function getParseTreeNode(node: T | undefined, nodeTest?: (node: Node) => node is T): T | undefined; /** Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' */ function escapeLeadingUnderscores(identifier: string): __String; /** @@ -3537,6 +4081,8 @@ declare namespace ts { function getJSDocProtectedTag(node: Node): JSDocProtectedTag | undefined; /** Gets the JSDoc protected tag for the node if present */ function getJSDocReadonlyTag(node: Node): JSDocReadonlyTag | undefined; + /** Gets the JSDoc deprecated tag for the node if present */ + function getJSDocDeprecatedTag(node: Node): JSDocDeprecatedTag | undefined; /** Gets the JSDoc enum tag for the node if present */ function getJSDocEnumTag(node: Node): JSDocEnumTag | undefined; /** Gets the JSDoc this tag for the node if present */ @@ -3578,193 +4124,21 @@ declare namespace ts { */ function getEffectiveTypeParameterDeclarations(node: DeclarationWithTypeParameters): readonly TypeParameterDeclaration[]; function getEffectiveConstraintOfTypeParameter(node: TypeParameterDeclaration): TypeNode | undefined; - function isNumericLiteral(node: Node): node is NumericLiteral; - function isBigIntLiteral(node: Node): node is BigIntLiteral; - function isStringLiteral(node: Node): node is StringLiteral; - function isJsxText(node: Node): node is JsxText; - function isRegularExpressionLiteral(node: Node): node is RegularExpressionLiteral; - function isNoSubstitutionTemplateLiteral(node: Node): node is NoSubstitutionTemplateLiteral; - function isTemplateHead(node: Node): node is TemplateHead; - function isTemplateMiddle(node: Node): node is TemplateMiddle; - function isTemplateTail(node: Node): node is TemplateTail; - function isIdentifier(node: Node): node is Identifier; - function isQualifiedName(node: Node): node is QualifiedName; - function isComputedPropertyName(node: Node): node is ComputedPropertyName; - function isPrivateIdentifier(node: Node): node is PrivateIdentifier; function isIdentifierOrPrivateIdentifier(node: Node): node is Identifier | PrivateIdentifier; - function isTypeParameterDeclaration(node: Node): node is TypeParameterDeclaration; - function isParameter(node: Node): node is ParameterDeclaration; - function isDecorator(node: Node): node is Decorator; - function isPropertySignature(node: Node): node is PropertySignature; - function isPropertyDeclaration(node: Node): node is PropertyDeclaration; - function isMethodSignature(node: Node): node is MethodSignature; - function isMethodDeclaration(node: Node): node is MethodDeclaration; - function isConstructorDeclaration(node: Node): node is ConstructorDeclaration; - function isGetAccessorDeclaration(node: Node): node is GetAccessorDeclaration; - function isSetAccessorDeclaration(node: Node): node is SetAccessorDeclaration; - function isCallSignatureDeclaration(node: Node): node is CallSignatureDeclaration; - function isConstructSignatureDeclaration(node: Node): node is ConstructSignatureDeclaration; - function isIndexSignatureDeclaration(node: Node): node is IndexSignatureDeclaration; - function isTypePredicateNode(node: Node): node is TypePredicateNode; - function isTypeReferenceNode(node: Node): node is TypeReferenceNode; - function isFunctionTypeNode(node: Node): node is FunctionTypeNode; - function isConstructorTypeNode(node: Node): node is ConstructorTypeNode; - function isTypeQueryNode(node: Node): node is TypeQueryNode; - function isTypeLiteralNode(node: Node): node is TypeLiteralNode; - function isArrayTypeNode(node: Node): node is ArrayTypeNode; - function isTupleTypeNode(node: Node): node is TupleTypeNode; - function isUnionTypeNode(node: Node): node is UnionTypeNode; - function isIntersectionTypeNode(node: Node): node is IntersectionTypeNode; - function isConditionalTypeNode(node: Node): node is ConditionalTypeNode; - function isInferTypeNode(node: Node): node is InferTypeNode; - function isParenthesizedTypeNode(node: Node): node is ParenthesizedTypeNode; - function isThisTypeNode(node: Node): node is ThisTypeNode; - function isTypeOperatorNode(node: Node): node is TypeOperatorNode; - function isIndexedAccessTypeNode(node: Node): node is IndexedAccessTypeNode; - function isMappedTypeNode(node: Node): node is MappedTypeNode; - function isLiteralTypeNode(node: Node): node is LiteralTypeNode; - function isImportTypeNode(node: Node): node is ImportTypeNode; - function isObjectBindingPattern(node: Node): node is ObjectBindingPattern; - function isArrayBindingPattern(node: Node): node is ArrayBindingPattern; - function isBindingElement(node: Node): node is BindingElement; - function isArrayLiteralExpression(node: Node): node is ArrayLiteralExpression; - function isObjectLiteralExpression(node: Node): node is ObjectLiteralExpression; - function isPropertyAccessExpression(node: Node): node is PropertyAccessExpression; function isPropertyAccessChain(node: Node): node is PropertyAccessChain; - function isElementAccessExpression(node: Node): node is ElementAccessExpression; function isElementAccessChain(node: Node): node is ElementAccessChain; - function isCallExpression(node: Node): node is CallExpression; function isCallChain(node: Node): node is CallChain; function isOptionalChain(node: Node): node is PropertyAccessChain | ElementAccessChain | CallChain | NonNullChain; function isNullishCoalesce(node: Node): boolean; - function isNewExpression(node: Node): node is NewExpression; - function isTaggedTemplateExpression(node: Node): node is TaggedTemplateExpression; - function isTypeAssertion(node: Node): node is TypeAssertion; function isConstTypeReference(node: Node): boolean; - function isParenthesizedExpression(node: Node): node is ParenthesizedExpression; function skipPartiallyEmittedExpressions(node: Expression): Expression; function skipPartiallyEmittedExpressions(node: Node): Node; - function isFunctionExpression(node: Node): node is FunctionExpression; - function isArrowFunction(node: Node): node is ArrowFunction; - function isDeleteExpression(node: Node): node is DeleteExpression; - function isTypeOfExpression(node: Node): node is TypeOfExpression; - function isVoidExpression(node: Node): node is VoidExpression; - function isAwaitExpression(node: Node): node is AwaitExpression; - function isPrefixUnaryExpression(node: Node): node is PrefixUnaryExpression; - function isPostfixUnaryExpression(node: Node): node is PostfixUnaryExpression; - function isBinaryExpression(node: Node): node is BinaryExpression; - function isConditionalExpression(node: Node): node is ConditionalExpression; - function isTemplateExpression(node: Node): node is TemplateExpression; - function isYieldExpression(node: Node): node is YieldExpression; - function isSpreadElement(node: Node): node is SpreadElement; - function isClassExpression(node: Node): node is ClassExpression; - function isOmittedExpression(node: Node): node is OmittedExpression; - function isExpressionWithTypeArguments(node: Node): node is ExpressionWithTypeArguments; - function isAsExpression(node: Node): node is AsExpression; - function isNonNullExpression(node: Node): node is NonNullExpression; function isNonNullChain(node: Node): node is NonNullChain; - function isMetaProperty(node: Node): node is MetaProperty; - function isTemplateSpan(node: Node): node is TemplateSpan; - function isSemicolonClassElement(node: Node): node is SemicolonClassElement; - function isBlock(node: Node): node is Block; - function isVariableStatement(node: Node): node is VariableStatement; - function isEmptyStatement(node: Node): node is EmptyStatement; - function isExpressionStatement(node: Node): node is ExpressionStatement; - function isIfStatement(node: Node): node is IfStatement; - function isDoStatement(node: Node): node is DoStatement; - function isWhileStatement(node: Node): node is WhileStatement; - function isForStatement(node: Node): node is ForStatement; - function isForInStatement(node: Node): node is ForInStatement; - function isForOfStatement(node: Node): node is ForOfStatement; - function isContinueStatement(node: Node): node is ContinueStatement; - function isBreakStatement(node: Node): node is BreakStatement; function isBreakOrContinueStatement(node: Node): node is BreakOrContinueStatement; - function isReturnStatement(node: Node): node is ReturnStatement; - function isWithStatement(node: Node): node is WithStatement; - function isSwitchStatement(node: Node): node is SwitchStatement; - function isLabeledStatement(node: Node): node is LabeledStatement; - function isThrowStatement(node: Node): node is ThrowStatement; - function isTryStatement(node: Node): node is TryStatement; - function isDebuggerStatement(node: Node): node is DebuggerStatement; - function isVariableDeclaration(node: Node): node is VariableDeclaration; - function isVariableDeclarationList(node: Node): node is VariableDeclarationList; - function isFunctionDeclaration(node: Node): node is FunctionDeclaration; - function isClassDeclaration(node: Node): node is ClassDeclaration; - function isInterfaceDeclaration(node: Node): node is InterfaceDeclaration; - function isTypeAliasDeclaration(node: Node): node is TypeAliasDeclaration; - function isEnumDeclaration(node: Node): node is EnumDeclaration; - function isModuleDeclaration(node: Node): node is ModuleDeclaration; - function isModuleBlock(node: Node): node is ModuleBlock; - function isCaseBlock(node: Node): node is CaseBlock; - function isNamespaceExportDeclaration(node: Node): node is NamespaceExportDeclaration; - function isImportEqualsDeclaration(node: Node): node is ImportEqualsDeclaration; - function isImportDeclaration(node: Node): node is ImportDeclaration; - function isImportClause(node: Node): node is ImportClause; - function isNamespaceImport(node: Node): node is NamespaceImport; - function isNamespaceExport(node: Node): node is NamespaceExport; function isNamedExportBindings(node: Node): node is NamedExportBindings; - function isNamedImports(node: Node): node is NamedImports; - function isImportSpecifier(node: Node): node is ImportSpecifier; - function isExportAssignment(node: Node): node is ExportAssignment; - function isExportDeclaration(node: Node): node is ExportDeclaration; - function isNamedExports(node: Node): node is NamedExports; - function isExportSpecifier(node: Node): node is ExportSpecifier; - function isMissingDeclaration(node: Node): node is MissingDeclaration; - function isExternalModuleReference(node: Node): node is ExternalModuleReference; - function isJsxElement(node: Node): node is JsxElement; - function isJsxSelfClosingElement(node: Node): node is JsxSelfClosingElement; - function isJsxOpeningElement(node: Node): node is JsxOpeningElement; - function isJsxClosingElement(node: Node): node is JsxClosingElement; - function isJsxFragment(node: Node): node is JsxFragment; - function isJsxOpeningFragment(node: Node): node is JsxOpeningFragment; - function isJsxClosingFragment(node: Node): node is JsxClosingFragment; - function isJsxAttribute(node: Node): node is JsxAttribute; - function isJsxAttributes(node: Node): node is JsxAttributes; - function isJsxSpreadAttribute(node: Node): node is JsxSpreadAttribute; - function isJsxExpression(node: Node): node is JsxExpression; - function isCaseClause(node: Node): node is CaseClause; - function isDefaultClause(node: Node): node is DefaultClause; - function isHeritageClause(node: Node): node is HeritageClause; - function isCatchClause(node: Node): node is CatchClause; - function isPropertyAssignment(node: Node): node is PropertyAssignment; - function isShorthandPropertyAssignment(node: Node): node is ShorthandPropertyAssignment; - function isSpreadAssignment(node: Node): node is SpreadAssignment; - function isEnumMember(node: Node): node is EnumMember; - function isSourceFile(node: Node): node is SourceFile; - function isBundle(node: Node): node is Bundle; - function isUnparsedSource(node: Node): node is UnparsedSource; - function isUnparsedPrepend(node: Node): node is UnparsedPrepend; function isUnparsedTextLike(node: Node): node is UnparsedTextLike; function isUnparsedNode(node: Node): node is UnparsedNode; - function isJSDocTypeExpression(node: Node): node is JSDocTypeExpression; - function isJSDocAllType(node: Node): node is JSDocAllType; - function isJSDocUnknownType(node: Node): node is JSDocUnknownType; - function isJSDocNullableType(node: Node): node is JSDocNullableType; - function isJSDocNonNullableType(node: Node): node is JSDocNonNullableType; - function isJSDocOptionalType(node: Node): node is JSDocOptionalType; - function isJSDocFunctionType(node: Node): node is JSDocFunctionType; - function isJSDocVariadicType(node: Node): node is JSDocVariadicType; - function isJSDoc(node: Node): node is JSDoc; - function isJSDocAuthorTag(node: Node): node is JSDocAuthorTag; - function isJSDocAugmentsTag(node: Node): node is JSDocAugmentsTag; - function isJSDocImplementsTag(node: Node): node is JSDocImplementsTag; - function isJSDocClassTag(node: Node): node is JSDocClassTag; - function isJSDocPublicTag(node: Node): node is JSDocPublicTag; - function isJSDocPrivateTag(node: Node): node is JSDocPrivateTag; - function isJSDocProtectedTag(node: Node): node is JSDocProtectedTag; - function isJSDocReadonlyTag(node: Node): node is JSDocReadonlyTag; - function isJSDocEnumTag(node: Node): node is JSDocEnumTag; - function isJSDocThisTag(node: Node): node is JSDocThisTag; - function isJSDocParameterTag(node: Node): node is JSDocParameterTag; - function isJSDocReturnTag(node: Node): node is JSDocReturnTag; - function isJSDocTypeTag(node: Node): node is JSDocTypeTag; - function isJSDocTemplateTag(node: Node): node is JSDocTemplateTag; - function isJSDocTypedefTag(node: Node): node is JSDocTypedefTag; - function isJSDocPropertyTag(node: Node): node is JSDocPropertyTag; function isJSDocPropertyLikeTag(node: Node): node is JSDocPropertyLikeTag; - function isJSDocTypeLiteral(node: Node): node is JSDocTypeLiteral; - function isJSDocCallbackTag(node: Node): node is JSDocCallbackTag; - function isJSDocSignature(node: Node): node is JSDocSignature; /** * True if node is of some token syntax kind. * For example, this is true for an IfKeyword but not for an IfStatement. @@ -3772,7 +4146,6 @@ declare namespace ts { */ function isToken(n: Node): boolean; function isLiteralExpression(node: Node): node is LiteralExpression; - type TemplateLiteralToken = NoSubstitutionTemplateLiteral | TemplateHead | TemplateMiddle | TemplateTail; function isTemplateLiteralToken(node: Node): node is TemplateLiteralToken; function isTemplateMiddleOrTemplateTail(node: Node): node is TemplateMiddle | TemplateTail; function isImportOrExportSpecifier(node: Node): node is ImportSpecifier | ExportSpecifier; @@ -3815,7 +4188,277 @@ declare namespace ts { function isStringLiteralLike(node: Node): node is StringLiteralLike; } declare namespace ts { - export function createNode(kind: SyntaxKind, pos?: number, end?: number): Node; + const factory: NodeFactory; + function createUnparsedSourceFile(text: string): UnparsedSource; + function createUnparsedSourceFile(inputFile: InputFiles, type: "js" | "dts", stripInternal?: boolean): UnparsedSource; + function createUnparsedSourceFile(text: string, mapPath: string | undefined, map: string | undefined): UnparsedSource; + function createInputFiles(javascriptText: string, declarationText: string): InputFiles; + function createInputFiles(readFileText: (path: string) => string | undefined, javascriptPath: string, javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined, buildInfoPath: string | undefined): InputFiles; + function createInputFiles(javascriptText: string, declarationText: string, javascriptMapPath: string | undefined, javascriptMapText: string | undefined, declarationMapPath: string | undefined, declarationMapText: string | undefined): InputFiles; + /** + * Create an external source map source file reference + */ + function createSourceMapSource(fileName: string, text: string, skipTrivia?: (pos: number) => number): SourceMapSource; + function setOriginalNode(node: T, original: Node | undefined): T; +} +declare namespace ts { + /** + * Clears any `EmitNode` entries from parse-tree nodes. + * @param sourceFile A source file. + */ + function disposeEmitNodes(sourceFile: SourceFile | undefined): void; + /** + * Sets flags that control emit behavior of a node. + */ + function setEmitFlags(node: T, emitFlags: EmitFlags): T; + /** + * Gets a custom text range to use when emitting source maps. + */ + function getSourceMapRange(node: Node): SourceMapRange; + /** + * Sets a custom text range to use when emitting source maps. + */ + function setSourceMapRange(node: T, range: SourceMapRange | undefined): T; + /** + * Gets the TextRange to use for source maps for a token of a node. + */ + function getTokenSourceMapRange(node: Node, token: SyntaxKind): SourceMapRange | undefined; + /** + * Sets the TextRange to use for source maps for a token of a node. + */ + function setTokenSourceMapRange(node: T, token: SyntaxKind, range: SourceMapRange | undefined): T; + /** + * Gets a custom text range to use when emitting comments. + */ + function getCommentRange(node: Node): TextRange; + /** + * Sets a custom text range to use when emitting comments. + */ + function setCommentRange(node: T, range: TextRange): T; + function getSyntheticLeadingComments(node: Node): SynthesizedComment[] | undefined; + function setSyntheticLeadingComments(node: T, comments: SynthesizedComment[] | undefined): T; + function addSyntheticLeadingComment(node: T, kind: SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia, text: string, hasTrailingNewLine?: boolean): T; + function getSyntheticTrailingComments(node: Node): SynthesizedComment[] | undefined; + function setSyntheticTrailingComments(node: T, comments: SynthesizedComment[] | undefined): T; + function addSyntheticTrailingComment(node: T, kind: SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia, text: string, hasTrailingNewLine?: boolean): T; + function moveSyntheticComments(node: T, original: Node): T; + /** + * Gets the constant value to emit for an expression representing an enum. + */ + function getConstantValue(node: AccessExpression): string | number | undefined; + /** + * Sets the constant value to emit for an expression. + */ + function setConstantValue(node: AccessExpression, value: string | number): AccessExpression; + /** + * Adds an EmitHelper to a node. + */ + function addEmitHelper(node: T, helper: EmitHelper): T; + /** + * Add EmitHelpers to a node. + */ + function addEmitHelpers(node: T, helpers: EmitHelper[] | undefined): T; + /** + * Removes an EmitHelper from a node. + */ + function removeEmitHelper(node: Node, helper: EmitHelper): boolean; + /** + * Gets the EmitHelpers of a node. + */ + function getEmitHelpers(node: Node): EmitHelper[] | undefined; + /** + * Moves matching emit helpers from a source node to a target node. + */ + function moveEmitHelpers(source: Node, target: Node, predicate: (helper: EmitHelper) => boolean): void; +} +declare namespace ts { + function isNumericLiteral(node: Node): node is NumericLiteral; + function isBigIntLiteral(node: Node): node is BigIntLiteral; + function isStringLiteral(node: Node): node is StringLiteral; + function isJsxText(node: Node): node is JsxText; + function isRegularExpressionLiteral(node: Node): node is RegularExpressionLiteral; + function isNoSubstitutionTemplateLiteral(node: Node): node is NoSubstitutionTemplateLiteral; + function isTemplateHead(node: Node): node is TemplateHead; + function isTemplateMiddle(node: Node): node is TemplateMiddle; + function isTemplateTail(node: Node): node is TemplateTail; + function isIdentifier(node: Node): node is Identifier; + function isQualifiedName(node: Node): node is QualifiedName; + function isComputedPropertyName(node: Node): node is ComputedPropertyName; + function isPrivateIdentifier(node: Node): node is PrivateIdentifier; + function isTypeParameterDeclaration(node: Node): node is TypeParameterDeclaration; + function isParameter(node: Node): node is ParameterDeclaration; + function isDecorator(node: Node): node is Decorator; + function isPropertySignature(node: Node): node is PropertySignature; + function isPropertyDeclaration(node: Node): node is PropertyDeclaration; + function isMethodSignature(node: Node): node is MethodSignature; + function isMethodDeclaration(node: Node): node is MethodDeclaration; + function isConstructorDeclaration(node: Node): node is ConstructorDeclaration; + function isGetAccessorDeclaration(node: Node): node is GetAccessorDeclaration; + function isSetAccessorDeclaration(node: Node): node is SetAccessorDeclaration; + function isCallSignatureDeclaration(node: Node): node is CallSignatureDeclaration; + function isConstructSignatureDeclaration(node: Node): node is ConstructSignatureDeclaration; + function isIndexSignatureDeclaration(node: Node): node is IndexSignatureDeclaration; + function isTypePredicateNode(node: Node): node is TypePredicateNode; + function isTypeReferenceNode(node: Node): node is TypeReferenceNode; + function isFunctionTypeNode(node: Node): node is FunctionTypeNode; + function isConstructorTypeNode(node: Node): node is ConstructorTypeNode; + function isTypeQueryNode(node: Node): node is TypeQueryNode; + function isTypeLiteralNode(node: Node): node is TypeLiteralNode; + function isArrayTypeNode(node: Node): node is ArrayTypeNode; + function isTupleTypeNode(node: Node): node is TupleTypeNode; + function isNamedTupleMember(node: Node): node is NamedTupleMember; + function isOptionalTypeNode(node: Node): node is OptionalTypeNode; + function isRestTypeNode(node: Node): node is RestTypeNode; + function isUnionTypeNode(node: Node): node is UnionTypeNode; + function isIntersectionTypeNode(node: Node): node is IntersectionTypeNode; + function isConditionalTypeNode(node: Node): node is ConditionalTypeNode; + function isInferTypeNode(node: Node): node is InferTypeNode; + function isParenthesizedTypeNode(node: Node): node is ParenthesizedTypeNode; + function isThisTypeNode(node: Node): node is ThisTypeNode; + function isTypeOperatorNode(node: Node): node is TypeOperatorNode; + function isIndexedAccessTypeNode(node: Node): node is IndexedAccessTypeNode; + function isMappedTypeNode(node: Node): node is MappedTypeNode; + function isLiteralTypeNode(node: Node): node is LiteralTypeNode; + function isImportTypeNode(node: Node): node is ImportTypeNode; + function isObjectBindingPattern(node: Node): node is ObjectBindingPattern; + function isArrayBindingPattern(node: Node): node is ArrayBindingPattern; + function isBindingElement(node: Node): node is BindingElement; + function isArrayLiteralExpression(node: Node): node is ArrayLiteralExpression; + function isObjectLiteralExpression(node: Node): node is ObjectLiteralExpression; + function isPropertyAccessExpression(node: Node): node is PropertyAccessExpression; + function isElementAccessExpression(node: Node): node is ElementAccessExpression; + function isCallExpression(node: Node): node is CallExpression; + function isNewExpression(node: Node): node is NewExpression; + function isTaggedTemplateExpression(node: Node): node is TaggedTemplateExpression; + function isTypeAssertionExpression(node: Node): node is TypeAssertion; + function isParenthesizedExpression(node: Node): node is ParenthesizedExpression; + function isFunctionExpression(node: Node): node is FunctionExpression; + function isArrowFunction(node: Node): node is ArrowFunction; + function isDeleteExpression(node: Node): node is DeleteExpression; + function isTypeOfExpression(node: Node): node is TypeOfExpression; + function isVoidExpression(node: Node): node is VoidExpression; + function isAwaitExpression(node: Node): node is AwaitExpression; + function isPrefixUnaryExpression(node: Node): node is PrefixUnaryExpression; + function isPostfixUnaryExpression(node: Node): node is PostfixUnaryExpression; + function isBinaryExpression(node: Node): node is BinaryExpression; + function isConditionalExpression(node: Node): node is ConditionalExpression; + function isTemplateExpression(node: Node): node is TemplateExpression; + function isYieldExpression(node: Node): node is YieldExpression; + function isSpreadElement(node: Node): node is SpreadElement; + function isClassExpression(node: Node): node is ClassExpression; + function isOmittedExpression(node: Node): node is OmittedExpression; + function isExpressionWithTypeArguments(node: Node): node is ExpressionWithTypeArguments; + function isAsExpression(node: Node): node is AsExpression; + function isNonNullExpression(node: Node): node is NonNullExpression; + function isMetaProperty(node: Node): node is MetaProperty; + function isSyntheticExpression(node: Node): node is SyntheticExpression; + function isPartiallyEmittedExpression(node: Node): node is PartiallyEmittedExpression; + function isCommaListExpression(node: Node): node is CommaListExpression; + function isTemplateSpan(node: Node): node is TemplateSpan; + function isSemicolonClassElement(node: Node): node is SemicolonClassElement; + function isBlock(node: Node): node is Block; + function isVariableStatement(node: Node): node is VariableStatement; + function isEmptyStatement(node: Node): node is EmptyStatement; + function isExpressionStatement(node: Node): node is ExpressionStatement; + function isIfStatement(node: Node): node is IfStatement; + function isDoStatement(node: Node): node is DoStatement; + function isWhileStatement(node: Node): node is WhileStatement; + function isForStatement(node: Node): node is ForStatement; + function isForInStatement(node: Node): node is ForInStatement; + function isForOfStatement(node: Node): node is ForOfStatement; + function isContinueStatement(node: Node): node is ContinueStatement; + function isBreakStatement(node: Node): node is BreakStatement; + function isReturnStatement(node: Node): node is ReturnStatement; + function isWithStatement(node: Node): node is WithStatement; + function isSwitchStatement(node: Node): node is SwitchStatement; + function isLabeledStatement(node: Node): node is LabeledStatement; + function isThrowStatement(node: Node): node is ThrowStatement; + function isTryStatement(node: Node): node is TryStatement; + function isDebuggerStatement(node: Node): node is DebuggerStatement; + function isVariableDeclaration(node: Node): node is VariableDeclaration; + function isVariableDeclarationList(node: Node): node is VariableDeclarationList; + function isFunctionDeclaration(node: Node): node is FunctionDeclaration; + function isClassDeclaration(node: Node): node is ClassDeclaration; + function isInterfaceDeclaration(node: Node): node is InterfaceDeclaration; + function isTypeAliasDeclaration(node: Node): node is TypeAliasDeclaration; + function isEnumDeclaration(node: Node): node is EnumDeclaration; + function isModuleDeclaration(node: Node): node is ModuleDeclaration; + function isModuleBlock(node: Node): node is ModuleBlock; + function isCaseBlock(node: Node): node is CaseBlock; + function isNamespaceExportDeclaration(node: Node): node is NamespaceExportDeclaration; + function isImportEqualsDeclaration(node: Node): node is ImportEqualsDeclaration; + function isImportDeclaration(node: Node): node is ImportDeclaration; + function isImportClause(node: Node): node is ImportClause; + function isNamespaceImport(node: Node): node is NamespaceImport; + function isNamespaceExport(node: Node): node is NamespaceExport; + function isNamedImports(node: Node): node is NamedImports; + function isImportSpecifier(node: Node): node is ImportSpecifier; + function isExportAssignment(node: Node): node is ExportAssignment; + function isExportDeclaration(node: Node): node is ExportDeclaration; + function isNamedExports(node: Node): node is NamedExports; + function isExportSpecifier(node: Node): node is ExportSpecifier; + function isMissingDeclaration(node: Node): node is MissingDeclaration; + function isNotEmittedStatement(node: Node): node is NotEmittedStatement; + function isExternalModuleReference(node: Node): node is ExternalModuleReference; + function isJsxElement(node: Node): node is JsxElement; + function isJsxSelfClosingElement(node: Node): node is JsxSelfClosingElement; + function isJsxOpeningElement(node: Node): node is JsxOpeningElement; + function isJsxClosingElement(node: Node): node is JsxClosingElement; + function isJsxFragment(node: Node): node is JsxFragment; + function isJsxOpeningFragment(node: Node): node is JsxOpeningFragment; + function isJsxClosingFragment(node: Node): node is JsxClosingFragment; + function isJsxAttribute(node: Node): node is JsxAttribute; + function isJsxAttributes(node: Node): node is JsxAttributes; + function isJsxSpreadAttribute(node: Node): node is JsxSpreadAttribute; + function isJsxExpression(node: Node): node is JsxExpression; + function isCaseClause(node: Node): node is CaseClause; + function isDefaultClause(node: Node): node is DefaultClause; + function isHeritageClause(node: Node): node is HeritageClause; + function isCatchClause(node: Node): node is CatchClause; + function isPropertyAssignment(node: Node): node is PropertyAssignment; + function isShorthandPropertyAssignment(node: Node): node is ShorthandPropertyAssignment; + function isSpreadAssignment(node: Node): node is SpreadAssignment; + function isEnumMember(node: Node): node is EnumMember; + function isUnparsedPrepend(node: Node): node is UnparsedPrepend; + function isSourceFile(node: Node): node is SourceFile; + function isBundle(node: Node): node is Bundle; + function isUnparsedSource(node: Node): node is UnparsedSource; + function isJSDocTypeExpression(node: Node): node is JSDocTypeExpression; + function isJSDocAllType(node: Node): node is JSDocAllType; + function isJSDocUnknownType(node: Node): node is JSDocUnknownType; + function isJSDocNullableType(node: Node): node is JSDocNullableType; + function isJSDocNonNullableType(node: Node): node is JSDocNonNullableType; + function isJSDocOptionalType(node: Node): node is JSDocOptionalType; + function isJSDocFunctionType(node: Node): node is JSDocFunctionType; + function isJSDocVariadicType(node: Node): node is JSDocVariadicType; + function isJSDocNamepathType(node: Node): node is JSDocNamepathType; + function isJSDoc(node: Node): node is JSDoc; + function isJSDocTypeLiteral(node: Node): node is JSDocTypeLiteral; + function isJSDocSignature(node: Node): node is JSDocSignature; + function isJSDocAugmentsTag(node: Node): node is JSDocAugmentsTag; + function isJSDocAuthorTag(node: Node): node is JSDocAuthorTag; + function isJSDocClassTag(node: Node): node is JSDocClassTag; + function isJSDocCallbackTag(node: Node): node is JSDocCallbackTag; + function isJSDocPublicTag(node: Node): node is JSDocPublicTag; + function isJSDocPrivateTag(node: Node): node is JSDocPrivateTag; + function isJSDocProtectedTag(node: Node): node is JSDocProtectedTag; + function isJSDocReadonlyTag(node: Node): node is JSDocReadonlyTag; + function isJSDocDeprecatedTag(node: Node): node is JSDocDeprecatedTag; + function isJSDocEnumTag(node: Node): node is JSDocEnumTag; + function isJSDocParameterTag(node: Node): node is JSDocParameterTag; + function isJSDocReturnTag(node: Node): node is JSDocReturnTag; + function isJSDocThisTag(node: Node): node is JSDocThisTag; + function isJSDocTypeTag(node: Node): node is JSDocTypeTag; + function isJSDocTemplateTag(node: Node): node is JSDocTemplateTag; + function isJSDocTypedefTag(node: Node): node is JSDocTypedefTag; + function isJSDocUnknownTag(node: Node): node is JSDocUnknownTag; + function isJSDocPropertyTag(node: Node): node is JSDocPropertyTag; + function isJSDocImplementsTag(node: Node): node is JSDocImplementsTag; +} +declare namespace ts { + function setTextRange(range: T, location: TextRange | undefined): T; +} +declare namespace ts { /** * Invokes a callback for each child of the given node. The 'cbNode' callback is invoked for all child nodes * stored in properties. If a 'cbNodes' callback is specified, it is invoked for embedded arrays; otherwise, @@ -3971,447 +4614,6 @@ declare namespace ts { function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations; function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: NonRelativeModuleNameResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations; } -declare namespace ts { - function createNodeArray(elements?: readonly T[], hasTrailingComma?: boolean): NodeArray; - /** If a node is passed, creates a string literal whose source text is read from a source node during emit. */ - function createLiteral(value: string | StringLiteral | NoSubstitutionTemplateLiteral | NumericLiteral | Identifier): StringLiteral; - function createLiteral(value: number | PseudoBigInt): NumericLiteral; - function createLiteral(value: boolean): BooleanLiteral; - function createLiteral(value: string | number | PseudoBigInt | boolean): PrimaryExpression; - function createNumericLiteral(value: string, numericLiteralFlags?: TokenFlags): NumericLiteral; - function createBigIntLiteral(value: string): BigIntLiteral; - function createStringLiteral(text: string): StringLiteral; - function createRegularExpressionLiteral(text: string): RegularExpressionLiteral; - function createIdentifier(text: string): Identifier; - function updateIdentifier(node: Identifier): Identifier; - /** Create a unique temporary variable. */ - function createTempVariable(recordTempVariable: ((node: Identifier) => void) | undefined): Identifier; - /** Create a unique temporary variable for use in a loop. */ - function createLoopVariable(): Identifier; - /** Create a unique name based on the supplied text. */ - function createUniqueName(text: string): Identifier; - /** Create a unique name based on the supplied text. */ - function createOptimisticUniqueName(text: string): Identifier; - /** Create a unique name based on the supplied text. This does not consider names injected by the transformer. */ - function createFileLevelUniqueName(text: string): Identifier; - /** Create a unique name generated for a node. */ - function getGeneratedNameForNode(node: Node | undefined): Identifier; - function createPrivateIdentifier(text: string): PrivateIdentifier; - function createToken(token: TKind): Token; - function createSuper(): SuperExpression; - function createThis(): ThisExpression & Token; - function createNull(): NullLiteral & Token; - function createTrue(): BooleanLiteral & Token; - function createFalse(): BooleanLiteral & Token; - function createModifier(kind: T): Token; - function createModifiersFromModifierFlags(flags: ModifierFlags): Modifier[]; - function createQualifiedName(left: EntityName, right: string | Identifier): QualifiedName; - function updateQualifiedName(node: QualifiedName, left: EntityName, right: Identifier): QualifiedName; - function createComputedPropertyName(expression: Expression): ComputedPropertyName; - function updateComputedPropertyName(node: ComputedPropertyName, expression: Expression): ComputedPropertyName; - function createTypeParameterDeclaration(name: string | Identifier, constraint?: TypeNode, defaultType?: TypeNode): TypeParameterDeclaration; - function updateTypeParameterDeclaration(node: TypeParameterDeclaration, name: Identifier, constraint: TypeNode | undefined, defaultType: TypeNode | undefined): TypeParameterDeclaration; - function createParameter(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, dotDotDotToken: DotDotDotToken | undefined, name: string | BindingName, questionToken?: QuestionToken, type?: TypeNode, initializer?: Expression): ParameterDeclaration; - function updateParameter(node: ParameterDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, dotDotDotToken: DotDotDotToken | undefined, name: string | BindingName, questionToken: QuestionToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): ParameterDeclaration; - function createDecorator(expression: Expression): Decorator; - function updateDecorator(node: Decorator, expression: Expression): Decorator; - function createPropertySignature(modifiers: readonly Modifier[] | undefined, name: PropertyName | string, questionToken: QuestionToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): PropertySignature; - function updatePropertySignature(node: PropertySignature, modifiers: readonly Modifier[] | undefined, name: PropertyName, questionToken: QuestionToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): PropertySignature; - function createProperty(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | PropertyName, questionOrExclamationToken: QuestionToken | ExclamationToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): PropertyDeclaration; - function updateProperty(node: PropertyDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | PropertyName, questionOrExclamationToken: QuestionToken | ExclamationToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): PropertyDeclaration; - function createMethodSignature(typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, name: string | PropertyName, questionToken: QuestionToken | undefined): MethodSignature; - function updateMethodSignature(node: MethodSignature, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode | undefined, name: PropertyName, questionToken: QuestionToken | undefined): MethodSignature; - function createMethod(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: string | PropertyName, questionToken: QuestionToken | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined): MethodDeclaration; - function updateMethod(node: MethodDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: PropertyName, questionToken: QuestionToken | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined): MethodDeclaration; - function createConstructor(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], body: Block | undefined): ConstructorDeclaration; - function updateConstructor(node: ConstructorDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], body: Block | undefined): ConstructorDeclaration; - function createGetAccessor(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | PropertyName, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined): GetAccessorDeclaration; - function updateGetAccessor(node: GetAccessorDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: PropertyName, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined): GetAccessorDeclaration; - function createSetAccessor(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | PropertyName, parameters: readonly ParameterDeclaration[], body: Block | undefined): SetAccessorDeclaration; - function updateSetAccessor(node: SetAccessorDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: PropertyName, parameters: readonly ParameterDeclaration[], body: Block | undefined): SetAccessorDeclaration; - function createCallSignature(typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined): CallSignatureDeclaration; - function updateCallSignature(node: CallSignatureDeclaration, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode | undefined): CallSignatureDeclaration; - function createConstructSignature(typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined): ConstructSignatureDeclaration; - function updateConstructSignature(node: ConstructSignatureDeclaration, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode | undefined): ConstructSignatureDeclaration; - function createIndexSignature(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode): IndexSignatureDeclaration; - function updateIndexSignature(node: IndexSignatureDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode): IndexSignatureDeclaration; - function createKeywordTypeNode(kind: KeywordTypeNode["kind"]): KeywordTypeNode; - function createTypePredicateNode(parameterName: Identifier | ThisTypeNode | string, type: TypeNode): TypePredicateNode; - function createTypePredicateNodeWithModifier(assertsModifier: AssertsToken | undefined, parameterName: Identifier | ThisTypeNode | string, type: TypeNode | undefined): TypePredicateNode; - function updateTypePredicateNode(node: TypePredicateNode, parameterName: Identifier | ThisTypeNode, type: TypeNode): TypePredicateNode; - function updateTypePredicateNodeWithModifier(node: TypePredicateNode, assertsModifier: AssertsToken | undefined, parameterName: Identifier | ThisTypeNode, type: TypeNode | undefined): TypePredicateNode; - function createTypeReferenceNode(typeName: string | EntityName, typeArguments: readonly TypeNode[] | undefined): TypeReferenceNode; - function updateTypeReferenceNode(node: TypeReferenceNode, typeName: EntityName, typeArguments: NodeArray | undefined): TypeReferenceNode; - function createFunctionTypeNode(typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined): FunctionTypeNode; - function updateFunctionTypeNode(node: FunctionTypeNode, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode | undefined): FunctionTypeNode; - function createConstructorTypeNode(typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined): ConstructorTypeNode; - function updateConstructorTypeNode(node: ConstructorTypeNode, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode | undefined): ConstructorTypeNode; - function createTypeQueryNode(exprName: EntityName): TypeQueryNode; - function updateTypeQueryNode(node: TypeQueryNode, exprName: EntityName): TypeQueryNode; - function createTypeLiteralNode(members: readonly TypeElement[] | undefined): TypeLiteralNode; - function updateTypeLiteralNode(node: TypeLiteralNode, members: NodeArray): TypeLiteralNode; - function createArrayTypeNode(elementType: TypeNode): ArrayTypeNode; - function updateArrayTypeNode(node: ArrayTypeNode, elementType: TypeNode): ArrayTypeNode; - function createTupleTypeNode(elementTypes: readonly TypeNode[]): TupleTypeNode; - function updateTupleTypeNode(node: TupleTypeNode, elementTypes: readonly TypeNode[]): TupleTypeNode; - function createOptionalTypeNode(type: TypeNode): OptionalTypeNode; - function updateOptionalTypeNode(node: OptionalTypeNode, type: TypeNode): OptionalTypeNode; - function createRestTypeNode(type: TypeNode): RestTypeNode; - function updateRestTypeNode(node: RestTypeNode, type: TypeNode): RestTypeNode; - function createUnionTypeNode(types: readonly TypeNode[]): UnionTypeNode; - function updateUnionTypeNode(node: UnionTypeNode, types: NodeArray): UnionTypeNode; - function createIntersectionTypeNode(types: readonly TypeNode[]): IntersectionTypeNode; - function updateIntersectionTypeNode(node: IntersectionTypeNode, types: NodeArray): IntersectionTypeNode; - function createUnionOrIntersectionTypeNode(kind: SyntaxKind.UnionType | SyntaxKind.IntersectionType, types: readonly TypeNode[]): UnionOrIntersectionTypeNode; - function createConditionalTypeNode(checkType: TypeNode, extendsType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode; - function updateConditionalTypeNode(node: ConditionalTypeNode, checkType: TypeNode, extendsType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode; - function createInferTypeNode(typeParameter: TypeParameterDeclaration): InferTypeNode; - function updateInferTypeNode(node: InferTypeNode, typeParameter: TypeParameterDeclaration): InferTypeNode; - function createImportTypeNode(argument: TypeNode, qualifier?: EntityName, typeArguments?: readonly TypeNode[], isTypeOf?: boolean): ImportTypeNode; - function updateImportTypeNode(node: ImportTypeNode, argument: TypeNode, qualifier?: EntityName, typeArguments?: readonly TypeNode[], isTypeOf?: boolean): ImportTypeNode; - function createParenthesizedType(type: TypeNode): ParenthesizedTypeNode; - function updateParenthesizedType(node: ParenthesizedTypeNode, type: TypeNode): ParenthesizedTypeNode; - function createThisTypeNode(): ThisTypeNode; - function createTypeOperatorNode(type: TypeNode): TypeOperatorNode; - function createTypeOperatorNode(operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.ReadonlyKeyword, type: TypeNode): TypeOperatorNode; - function updateTypeOperatorNode(node: TypeOperatorNode, type: TypeNode): TypeOperatorNode; - function createIndexedAccessTypeNode(objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode; - function updateIndexedAccessTypeNode(node: IndexedAccessTypeNode, objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode; - function createMappedTypeNode(readonlyToken: ReadonlyToken | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined): MappedTypeNode; - function updateMappedTypeNode(node: MappedTypeNode, readonlyToken: ReadonlyToken | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined): MappedTypeNode; - function createLiteralTypeNode(literal: LiteralTypeNode["literal"]): LiteralTypeNode; - function updateLiteralTypeNode(node: LiteralTypeNode, literal: LiteralTypeNode["literal"]): LiteralTypeNode; - function createObjectBindingPattern(elements: readonly BindingElement[]): ObjectBindingPattern; - function updateObjectBindingPattern(node: ObjectBindingPattern, elements: readonly BindingElement[]): ObjectBindingPattern; - function createArrayBindingPattern(elements: readonly ArrayBindingElement[]): ArrayBindingPattern; - function updateArrayBindingPattern(node: ArrayBindingPattern, elements: readonly ArrayBindingElement[]): ArrayBindingPattern; - function createBindingElement(dotDotDotToken: DotDotDotToken | undefined, propertyName: string | PropertyName | undefined, name: string | BindingName, initializer?: Expression): BindingElement; - function updateBindingElement(node: BindingElement, dotDotDotToken: DotDotDotToken | undefined, propertyName: PropertyName | undefined, name: BindingName, initializer: Expression | undefined): BindingElement; - function createArrayLiteral(elements?: readonly Expression[], multiLine?: boolean): ArrayLiteralExpression; - function updateArrayLiteral(node: ArrayLiteralExpression, elements: readonly Expression[]): ArrayLiteralExpression; - function createObjectLiteral(properties?: readonly ObjectLiteralElementLike[], multiLine?: boolean): ObjectLiteralExpression; - function updateObjectLiteral(node: ObjectLiteralExpression, properties: readonly ObjectLiteralElementLike[]): ObjectLiteralExpression; - function createPropertyAccess(expression: Expression, name: string | Identifier | PrivateIdentifier): PropertyAccessExpression; - function updatePropertyAccess(node: PropertyAccessExpression, expression: Expression, name: Identifier | PrivateIdentifier): PropertyAccessExpression; - function createPropertyAccessChain(expression: Expression, questionDotToken: QuestionDotToken | undefined, name: string | Identifier): PropertyAccessChain; - function updatePropertyAccessChain(node: PropertyAccessChain, expression: Expression, questionDotToken: QuestionDotToken | undefined, name: Identifier): PropertyAccessChain; - function createElementAccess(expression: Expression, index: number | Expression): ElementAccessExpression; - function updateElementAccess(node: ElementAccessExpression, expression: Expression, argumentExpression: Expression): ElementAccessExpression; - function createElementAccessChain(expression: Expression, questionDotToken: QuestionDotToken | undefined, index: number | Expression): ElementAccessChain; - function updateElementAccessChain(node: ElementAccessChain, expression: Expression, questionDotToken: QuestionDotToken | undefined, argumentExpression: Expression): ElementAccessChain; - function createCall(expression: Expression, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[] | undefined): CallExpression; - function updateCall(node: CallExpression, expression: Expression, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[]): CallExpression; - function createCallChain(expression: Expression, questionDotToken: QuestionDotToken | undefined, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[] | undefined): CallChain; - function updateCallChain(node: CallChain, expression: Expression, questionDotToken: QuestionDotToken | undefined, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[]): CallChain; - function createNew(expression: Expression, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[] | undefined): NewExpression; - function updateNew(node: NewExpression, expression: Expression, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[] | undefined): NewExpression; - /** @deprecated */ function createTaggedTemplate(tag: Expression, template: TemplateLiteral): TaggedTemplateExpression; - function createTaggedTemplate(tag: Expression, typeArguments: readonly TypeNode[] | undefined, template: TemplateLiteral): TaggedTemplateExpression; - /** @deprecated */ function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral): TaggedTemplateExpression; - function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, typeArguments: readonly TypeNode[] | undefined, template: TemplateLiteral): TaggedTemplateExpression; - function createTypeAssertion(type: TypeNode, expression: Expression): TypeAssertion; - function updateTypeAssertion(node: TypeAssertion, type: TypeNode, expression: Expression): TypeAssertion; - function createParen(expression: Expression): ParenthesizedExpression; - function updateParen(node: ParenthesizedExpression, expression: Expression): ParenthesizedExpression; - function createFunctionExpression(modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: string | Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[] | undefined, type: TypeNode | undefined, body: Block): FunctionExpression; - function updateFunctionExpression(node: FunctionExpression, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block): FunctionExpression; - function createArrowFunction(modifiers: readonly Modifier[] | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, equalsGreaterThanToken: EqualsGreaterThanToken | undefined, body: ConciseBody): ArrowFunction; - function updateArrowFunction(node: ArrowFunction, modifiers: readonly Modifier[] | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, equalsGreaterThanToken: Token, body: ConciseBody): ArrowFunction; - function createDelete(expression: Expression): DeleteExpression; - function updateDelete(node: DeleteExpression, expression: Expression): DeleteExpression; - function createTypeOf(expression: Expression): TypeOfExpression; - function updateTypeOf(node: TypeOfExpression, expression: Expression): TypeOfExpression; - function createVoid(expression: Expression): VoidExpression; - function updateVoid(node: VoidExpression, expression: Expression): VoidExpression; - function createAwait(expression: Expression): AwaitExpression; - function updateAwait(node: AwaitExpression, expression: Expression): AwaitExpression; - function createPrefix(operator: PrefixUnaryOperator, operand: Expression): PrefixUnaryExpression; - function updatePrefix(node: PrefixUnaryExpression, operand: Expression): PrefixUnaryExpression; - function createPostfix(operand: Expression, operator: PostfixUnaryOperator): PostfixUnaryExpression; - function updatePostfix(node: PostfixUnaryExpression, operand: Expression): PostfixUnaryExpression; - function createBinary(left: Expression, operator: BinaryOperator | BinaryOperatorToken, right: Expression): BinaryExpression; - function updateBinary(node: BinaryExpression, left: Expression, right: Expression, operator?: BinaryOperator | BinaryOperatorToken): BinaryExpression; - /** @deprecated */ function createConditional(condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression; - function createConditional(condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression): ConditionalExpression; - function updateConditional(node: ConditionalExpression, condition: Expression, questionToken: Token, whenTrue: Expression, colonToken: Token, whenFalse: Expression): ConditionalExpression; - function createTemplateExpression(head: TemplateHead, templateSpans: readonly TemplateSpan[]): TemplateExpression; - function updateTemplateExpression(node: TemplateExpression, head: TemplateHead, templateSpans: readonly TemplateSpan[]): TemplateExpression; - function createTemplateHead(text: string, rawText?: string): TemplateHead; - function createTemplateMiddle(text: string, rawText?: string): TemplateMiddle; - function createTemplateTail(text: string, rawText?: string): TemplateTail; - function createNoSubstitutionTemplateLiteral(text: string, rawText?: string): NoSubstitutionTemplateLiteral; - function createYield(expression?: Expression): YieldExpression; - function createYield(asteriskToken: AsteriskToken | undefined, expression: Expression): YieldExpression; - function updateYield(node: YieldExpression, asteriskToken: AsteriskToken | undefined, expression: Expression): YieldExpression; - function createSpread(expression: Expression): SpreadElement; - function updateSpread(node: SpreadElement, expression: Expression): SpreadElement; - function createClassExpression(modifiers: readonly Modifier[] | undefined, name: string | Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly ClassElement[]): ClassExpression; - function updateClassExpression(node: ClassExpression, modifiers: readonly Modifier[] | undefined, name: Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly ClassElement[]): ClassExpression; - function createOmittedExpression(): OmittedExpression; - function createExpressionWithTypeArguments(typeArguments: readonly TypeNode[] | undefined, expression: Expression): ExpressionWithTypeArguments; - function updateExpressionWithTypeArguments(node: ExpressionWithTypeArguments, typeArguments: readonly TypeNode[] | undefined, expression: Expression): ExpressionWithTypeArguments; - function createAsExpression(expression: Expression, type: TypeNode): AsExpression; - function updateAsExpression(node: AsExpression, expression: Expression, type: TypeNode): AsExpression; - function createNonNullExpression(expression: Expression): NonNullExpression; - function updateNonNullExpression(node: NonNullExpression, expression: Expression): NonNullExpression; - function createNonNullChain(expression: Expression): NonNullChain; - function updateNonNullChain(node: NonNullChain, expression: Expression): NonNullChain; - function createMetaProperty(keywordToken: MetaProperty["keywordToken"], name: Identifier): MetaProperty; - function updateMetaProperty(node: MetaProperty, name: Identifier): MetaProperty; - function createTemplateSpan(expression: Expression, literal: TemplateMiddle | TemplateTail): TemplateSpan; - function updateTemplateSpan(node: TemplateSpan, expression: Expression, literal: TemplateMiddle | TemplateTail): TemplateSpan; - function createSemicolonClassElement(): SemicolonClassElement; - function createBlock(statements: readonly Statement[], multiLine?: boolean): Block; - function updateBlock(node: Block, statements: readonly Statement[]): Block; - function createVariableStatement(modifiers: readonly Modifier[] | undefined, declarationList: VariableDeclarationList | readonly VariableDeclaration[]): VariableStatement; - function updateVariableStatement(node: VariableStatement, modifiers: readonly Modifier[] | undefined, declarationList: VariableDeclarationList): VariableStatement; - function createEmptyStatement(): EmptyStatement; - function createExpressionStatement(expression: Expression): ExpressionStatement; - function updateExpressionStatement(node: ExpressionStatement, expression: Expression): ExpressionStatement; - /** @deprecated Use `createExpressionStatement` instead. */ - const createStatement: typeof createExpressionStatement; - /** @deprecated Use `updateExpressionStatement` instead. */ - const updateStatement: typeof updateExpressionStatement; - function createIf(expression: Expression, thenStatement: Statement, elseStatement?: Statement): IfStatement; - function updateIf(node: IfStatement, expression: Expression, thenStatement: Statement, elseStatement: Statement | undefined): IfStatement; - function createDo(statement: Statement, expression: Expression): DoStatement; - function updateDo(node: DoStatement, statement: Statement, expression: Expression): DoStatement; - function createWhile(expression: Expression, statement: Statement): WhileStatement; - function updateWhile(node: WhileStatement, expression: Expression, statement: Statement): WhileStatement; - function createFor(initializer: ForInitializer | undefined, condition: Expression | undefined, incrementor: Expression | undefined, statement: Statement): ForStatement; - function updateFor(node: ForStatement, initializer: ForInitializer | undefined, condition: Expression | undefined, incrementor: Expression | undefined, statement: Statement): ForStatement; - function createForIn(initializer: ForInitializer, expression: Expression, statement: Statement): ForInStatement; - function updateForIn(node: ForInStatement, initializer: ForInitializer, expression: Expression, statement: Statement): ForInStatement; - function createForOf(awaitModifier: AwaitKeywordToken | undefined, initializer: ForInitializer, expression: Expression, statement: Statement): ForOfStatement; - function updateForOf(node: ForOfStatement, awaitModifier: AwaitKeywordToken | undefined, initializer: ForInitializer, expression: Expression, statement: Statement): ForOfStatement; - function createContinue(label?: string | Identifier): ContinueStatement; - function updateContinue(node: ContinueStatement, label: Identifier | undefined): ContinueStatement; - function createBreak(label?: string | Identifier): BreakStatement; - function updateBreak(node: BreakStatement, label: Identifier | undefined): BreakStatement; - function createReturn(expression?: Expression): ReturnStatement; - function updateReturn(node: ReturnStatement, expression: Expression | undefined): ReturnStatement; - function createWith(expression: Expression, statement: Statement): WithStatement; - function updateWith(node: WithStatement, expression: Expression, statement: Statement): WithStatement; - function createSwitch(expression: Expression, caseBlock: CaseBlock): SwitchStatement; - function updateSwitch(node: SwitchStatement, expression: Expression, caseBlock: CaseBlock): SwitchStatement; - function createLabel(label: string | Identifier, statement: Statement): LabeledStatement; - function updateLabel(node: LabeledStatement, label: Identifier, statement: Statement): LabeledStatement; - function createThrow(expression: Expression): ThrowStatement; - function updateThrow(node: ThrowStatement, expression: Expression): ThrowStatement; - function createTry(tryBlock: Block, catchClause: CatchClause | undefined, finallyBlock: Block | undefined): TryStatement; - function updateTry(node: TryStatement, tryBlock: Block, catchClause: CatchClause | undefined, finallyBlock: Block | undefined): TryStatement; - function createDebuggerStatement(): DebuggerStatement; - function createVariableDeclaration(name: string | BindingName, type?: TypeNode, initializer?: Expression): VariableDeclaration; - function updateVariableDeclaration(node: VariableDeclaration, name: BindingName, type: TypeNode | undefined, initializer: Expression | undefined): VariableDeclaration; - function createVariableDeclarationList(declarations: readonly VariableDeclaration[], flags?: NodeFlags): VariableDeclarationList; - function updateVariableDeclarationList(node: VariableDeclarationList, declarations: readonly VariableDeclaration[]): VariableDeclarationList; - function createFunctionDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: string | Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined): FunctionDeclaration; - function updateFunctionDeclaration(node: FunctionDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined): FunctionDeclaration; - function createClassDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly ClassElement[]): ClassDeclaration; - function updateClassDeclaration(node: ClassDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly ClassElement[]): ClassDeclaration; - function createInterfaceDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly TypeElement[]): InterfaceDeclaration; - function updateInterfaceDeclaration(node: InterfaceDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly TypeElement[]): InterfaceDeclaration; - function createTypeAliasDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier, typeParameters: readonly TypeParameterDeclaration[] | undefined, type: TypeNode): TypeAliasDeclaration; - function updateTypeAliasDeclaration(node: TypeAliasDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier, typeParameters: readonly TypeParameterDeclaration[] | undefined, type: TypeNode): TypeAliasDeclaration; - function createEnumDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier, members: readonly EnumMember[]): EnumDeclaration; - function updateEnumDeclaration(node: EnumDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier, members: readonly EnumMember[]): EnumDeclaration; - function createModuleDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: ModuleName, body: ModuleBody | undefined, flags?: NodeFlags): ModuleDeclaration; - function updateModuleDeclaration(node: ModuleDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: ModuleName, body: ModuleBody | undefined): ModuleDeclaration; - function createModuleBlock(statements: readonly Statement[]): ModuleBlock; - function updateModuleBlock(node: ModuleBlock, statements: readonly Statement[]): ModuleBlock; - function createCaseBlock(clauses: readonly CaseOrDefaultClause[]): CaseBlock; - function updateCaseBlock(node: CaseBlock, clauses: readonly CaseOrDefaultClause[]): CaseBlock; - function createNamespaceExportDeclaration(name: string | Identifier): NamespaceExportDeclaration; - function updateNamespaceExportDeclaration(node: NamespaceExportDeclaration, name: Identifier): NamespaceExportDeclaration; - function createImportEqualsDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier, moduleReference: ModuleReference): ImportEqualsDeclaration; - function updateImportEqualsDeclaration(node: ImportEqualsDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier, moduleReference: ModuleReference): ImportEqualsDeclaration; - function createImportDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, importClause: ImportClause | undefined, moduleSpecifier: Expression): ImportDeclaration; - function updateImportDeclaration(node: ImportDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, importClause: ImportClause | undefined, moduleSpecifier: Expression): ImportDeclaration; - function createImportClause(name: Identifier | undefined, namedBindings: NamedImportBindings | undefined, isTypeOnly?: boolean): ImportClause; - function updateImportClause(node: ImportClause, name: Identifier | undefined, namedBindings: NamedImportBindings | undefined, isTypeOnly: boolean): ImportClause; - function createNamespaceImport(name: Identifier): NamespaceImport; - function createNamespaceExport(name: Identifier): NamespaceExport; - function updateNamespaceImport(node: NamespaceImport, name: Identifier): NamespaceImport; - function updateNamespaceExport(node: NamespaceExport, name: Identifier): NamespaceExport; - function createNamedImports(elements: readonly ImportSpecifier[]): NamedImports; - function updateNamedImports(node: NamedImports, elements: readonly ImportSpecifier[]): NamedImports; - function createImportSpecifier(propertyName: Identifier | undefined, name: Identifier): ImportSpecifier; - function updateImportSpecifier(node: ImportSpecifier, propertyName: Identifier | undefined, name: Identifier): ImportSpecifier; - function createExportAssignment(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, isExportEquals: boolean | undefined, expression: Expression): ExportAssignment; - function updateExportAssignment(node: ExportAssignment, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, expression: Expression): ExportAssignment; - function createExportDeclaration(decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, exportClause: NamedExportBindings | undefined, moduleSpecifier?: Expression, isTypeOnly?: boolean): ExportDeclaration; - function updateExportDeclaration(node: ExportDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, exportClause: NamedExportBindings | undefined, moduleSpecifier: Expression | undefined, isTypeOnly: boolean): ExportDeclaration; - function createNamedExports(elements: readonly ExportSpecifier[]): NamedExports; - function updateNamedExports(node: NamedExports, elements: readonly ExportSpecifier[]): NamedExports; - function createExportSpecifier(propertyName: string | Identifier | undefined, name: string | Identifier): ExportSpecifier; - function updateExportSpecifier(node: ExportSpecifier, propertyName: Identifier | undefined, name: Identifier): ExportSpecifier; - function createExternalModuleReference(expression: Expression): ExternalModuleReference; - function updateExternalModuleReference(node: ExternalModuleReference, expression: Expression): ExternalModuleReference; - function createJsxElement(openingElement: JsxOpeningElement, children: readonly JsxChild[], closingElement: JsxClosingElement): JsxElement; - function updateJsxElement(node: JsxElement, openingElement: JsxOpeningElement, children: readonly JsxChild[], closingElement: JsxClosingElement): JsxElement; - function createJsxSelfClosingElement(tagName: JsxTagNameExpression, typeArguments: readonly TypeNode[] | undefined, attributes: JsxAttributes): JsxSelfClosingElement; - function updateJsxSelfClosingElement(node: JsxSelfClosingElement, tagName: JsxTagNameExpression, typeArguments: readonly TypeNode[] | undefined, attributes: JsxAttributes): JsxSelfClosingElement; - function createJsxOpeningElement(tagName: JsxTagNameExpression, typeArguments: readonly TypeNode[] | undefined, attributes: JsxAttributes): JsxOpeningElement; - function updateJsxOpeningElement(node: JsxOpeningElement, tagName: JsxTagNameExpression, typeArguments: readonly TypeNode[] | undefined, attributes: JsxAttributes): JsxOpeningElement; - function createJsxClosingElement(tagName: JsxTagNameExpression): JsxClosingElement; - function updateJsxClosingElement(node: JsxClosingElement, tagName: JsxTagNameExpression): JsxClosingElement; - function createJsxFragment(openingFragment: JsxOpeningFragment, children: readonly JsxChild[], closingFragment: JsxClosingFragment): JsxFragment; - function createJsxText(text: string, containsOnlyTriviaWhiteSpaces?: boolean): JsxText; - function updateJsxText(node: JsxText, text: string, containsOnlyTriviaWhiteSpaces?: boolean): JsxText; - function createJsxOpeningFragment(): JsxOpeningFragment; - function createJsxJsxClosingFragment(): JsxClosingFragment; - function updateJsxFragment(node: JsxFragment, openingFragment: JsxOpeningFragment, children: readonly JsxChild[], closingFragment: JsxClosingFragment): JsxFragment; - function createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression): JsxAttribute; - function updateJsxAttribute(node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression): JsxAttribute; - function createJsxAttributes(properties: readonly JsxAttributeLike[]): JsxAttributes; - function updateJsxAttributes(node: JsxAttributes, properties: readonly JsxAttributeLike[]): JsxAttributes; - function createJsxSpreadAttribute(expression: Expression): JsxSpreadAttribute; - function updateJsxSpreadAttribute(node: JsxSpreadAttribute, expression: Expression): JsxSpreadAttribute; - function createJsxExpression(dotDotDotToken: DotDotDotToken | undefined, expression: Expression | undefined): JsxExpression; - function updateJsxExpression(node: JsxExpression, expression: Expression | undefined): JsxExpression; - function createCaseClause(expression: Expression, statements: readonly Statement[]): CaseClause; - function updateCaseClause(node: CaseClause, expression: Expression, statements: readonly Statement[]): CaseClause; - function createDefaultClause(statements: readonly Statement[]): DefaultClause; - function updateDefaultClause(node: DefaultClause, statements: readonly Statement[]): DefaultClause; - function createHeritageClause(token: HeritageClause["token"], types: readonly ExpressionWithTypeArguments[]): HeritageClause; - function updateHeritageClause(node: HeritageClause, types: readonly ExpressionWithTypeArguments[]): HeritageClause; - function createCatchClause(variableDeclaration: string | VariableDeclaration | undefined, block: Block): CatchClause; - function updateCatchClause(node: CatchClause, variableDeclaration: VariableDeclaration | undefined, block: Block): CatchClause; - function createPropertyAssignment(name: string | PropertyName, initializer: Expression): PropertyAssignment; - function updatePropertyAssignment(node: PropertyAssignment, name: PropertyName, initializer: Expression): PropertyAssignment; - function createShorthandPropertyAssignment(name: string | Identifier, objectAssignmentInitializer?: Expression): ShorthandPropertyAssignment; - function updateShorthandPropertyAssignment(node: ShorthandPropertyAssignment, name: Identifier, objectAssignmentInitializer: Expression | undefined): ShorthandPropertyAssignment; - function createSpreadAssignment(expression: Expression): SpreadAssignment; - function updateSpreadAssignment(node: SpreadAssignment, expression: Expression): SpreadAssignment; - function createEnumMember(name: string | PropertyName, initializer?: Expression): EnumMember; - function updateEnumMember(node: EnumMember, name: PropertyName, initializer: Expression | undefined): EnumMember; - function updateSourceFileNode(node: SourceFile, statements: readonly Statement[], isDeclarationFile?: boolean, referencedFiles?: SourceFile["referencedFiles"], typeReferences?: SourceFile["typeReferenceDirectives"], hasNoDefaultLib?: boolean, libReferences?: SourceFile["libReferenceDirectives"]): SourceFile; - /** - * Creates a shallow, memberwise clone of a node for mutation. - */ - function getMutableClone(node: T): T; - /** - * Creates a synthetic statement to act as a placeholder for a not-emitted statement in - * order to preserve comments. - * - * @param original The original statement. - */ - function createNotEmittedStatement(original: Node): NotEmittedStatement; - /** - * Creates a synthetic expression to act as a placeholder for a not-emitted expression in - * order to preserve comments or sourcemap positions. - * - * @param expression The inner expression to emit. - * @param original The original outer expression. - * @param location The location for the expression. Defaults to the positions from "original" if provided. - */ - function createPartiallyEmittedExpression(expression: Expression, original?: Node): PartiallyEmittedExpression; - function updatePartiallyEmittedExpression(node: PartiallyEmittedExpression, expression: Expression): PartiallyEmittedExpression; - function createCommaList(elements: readonly Expression[]): CommaListExpression; - function updateCommaList(node: CommaListExpression, elements: readonly Expression[]): CommaListExpression; - function createBundle(sourceFiles: readonly SourceFile[], prepends?: readonly (UnparsedSource | InputFiles)[]): Bundle; - function createUnparsedSourceFile(text: string): UnparsedSource; - function createUnparsedSourceFile(inputFile: InputFiles, type: "js" | "dts", stripInternal?: boolean): UnparsedSource; - function createUnparsedSourceFile(text: string, mapPath: string | undefined, map: string | undefined): UnparsedSource; - function createInputFiles(javascriptText: string, declarationText: string): InputFiles; - function createInputFiles(readFileText: (path: string) => string | undefined, javascriptPath: string, javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined, buildInfoPath: string | undefined): InputFiles; - function createInputFiles(javascriptText: string, declarationText: string, javascriptMapPath: string | undefined, javascriptMapText: string | undefined, declarationMapPath: string | undefined, declarationMapText: string | undefined): InputFiles; - function updateBundle(node: Bundle, sourceFiles: readonly SourceFile[], prepends?: readonly (UnparsedSource | InputFiles)[]): Bundle; - function createImmediatelyInvokedFunctionExpression(statements: readonly Statement[]): CallExpression; - function createImmediatelyInvokedFunctionExpression(statements: readonly Statement[], param: ParameterDeclaration, paramValue: Expression): CallExpression; - function createImmediatelyInvokedArrowFunction(statements: readonly Statement[]): CallExpression; - function createImmediatelyInvokedArrowFunction(statements: readonly Statement[], param: ParameterDeclaration, paramValue: Expression): CallExpression; - function createComma(left: Expression, right: Expression): Expression; - function createLessThan(left: Expression, right: Expression): Expression; - function createAssignment(left: ObjectLiteralExpression | ArrayLiteralExpression, right: Expression): DestructuringAssignment; - function createAssignment(left: Expression, right: Expression): BinaryExpression; - function createStrictEquality(left: Expression, right: Expression): BinaryExpression; - function createStrictInequality(left: Expression, right: Expression): BinaryExpression; - function createAdd(left: Expression, right: Expression): BinaryExpression; - function createSubtract(left: Expression, right: Expression): BinaryExpression; - function createPostfixIncrement(operand: Expression): PostfixUnaryExpression; - function createLogicalAnd(left: Expression, right: Expression): BinaryExpression; - function createLogicalOr(left: Expression, right: Expression): BinaryExpression; - function createNullishCoalesce(left: Expression, right: Expression): BinaryExpression; - function createLogicalNot(operand: Expression): PrefixUnaryExpression; - function createVoidZero(): VoidExpression; - function createExportDefault(expression: Expression): ExportAssignment; - function createExternalModuleExport(exportName: Identifier): ExportDeclaration; - /** - * Clears any EmitNode entries from parse-tree nodes. - * @param sourceFile A source file. - */ - function disposeEmitNodes(sourceFile: SourceFile): void; - function setTextRange(range: T, location: TextRange | undefined): T; - /** - * Sets flags that control emit behavior of a node. - */ - function setEmitFlags(node: T, emitFlags: EmitFlags): T; - /** - * Gets a custom text range to use when emitting source maps. - */ - function getSourceMapRange(node: Node): SourceMapRange; - /** - * Sets a custom text range to use when emitting source maps. - */ - function setSourceMapRange(node: T, range: SourceMapRange | undefined): T; - /** - * Create an external source map source file reference - */ - function createSourceMapSource(fileName: string, text: string, skipTrivia?: (pos: number) => number): SourceMapSource; - /** - * Gets the TextRange to use for source maps for a token of a node. - */ - function getTokenSourceMapRange(node: Node, token: SyntaxKind): SourceMapRange | undefined; - /** - * Sets the TextRange to use for source maps for a token of a node. - */ - function setTokenSourceMapRange(node: T, token: SyntaxKind, range: SourceMapRange | undefined): T; - /** - * Gets a custom text range to use when emitting comments. - */ - function getCommentRange(node: Node): TextRange; - /** - * Sets a custom text range to use when emitting comments. - */ - function setCommentRange(node: T, range: TextRange): T; - function getSyntheticLeadingComments(node: Node): SynthesizedComment[] | undefined; - function setSyntheticLeadingComments(node: T, comments: SynthesizedComment[] | undefined): T; - function addSyntheticLeadingComment(node: T, kind: SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia, text: string, hasTrailingNewLine?: boolean): T; - function getSyntheticTrailingComments(node: Node): SynthesizedComment[] | undefined; - function setSyntheticTrailingComments(node: T, comments: SynthesizedComment[] | undefined): T; - function addSyntheticTrailingComment(node: T, kind: SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia, text: string, hasTrailingNewLine?: boolean): T; - function moveSyntheticComments(node: T, original: Node): T; - /** - * Gets the constant value to emit for an expression. - */ - function getConstantValue(node: PropertyAccessExpression | ElementAccessExpression): string | number | undefined; - /** - * Sets the constant value to emit for an expression. - */ - function setConstantValue(node: PropertyAccessExpression | ElementAccessExpression, value: string | number): PropertyAccessExpression | ElementAccessExpression; - /** - * Adds an EmitHelper to a node. - */ - function addEmitHelper(node: T, helper: EmitHelper): T; - /** - * Add EmitHelpers to a node. - */ - function addEmitHelpers(node: T, helpers: EmitHelper[] | undefined): T; - /** - * Removes an EmitHelper from a node. - */ - function removeEmitHelper(node: Node, helper: EmitHelper): boolean; - /** - * Gets the EmitHelpers of a node. - */ - function getEmitHelpers(node: Node): EmitHelper[] | undefined; - /** - * Moves matching emit helpers from a source node to a target node. - */ - function moveEmitHelpers(source: Node, target: Node, predicate: (helper: EmitHelper) => boolean): void; - function setOriginalNode(node: T, original: Node | undefined): T; -} declare namespace ts { /** * Visits a Node using the supplied visitor, possibly returning a new Node in its place. @@ -4421,7 +4623,7 @@ declare namespace ts { * @param test A callback to execute to verify the Node is valid. * @param lift An optional callback to execute to lift a NodeArray into a valid Node. */ - function visitNode(node: T | undefined, visitor: Visitor | undefined, test?: (node: Node) => boolean, lift?: (node: NodeArray) => T): T; + function visitNode(node: T, visitor: Visitor | undefined, test?: (node: Node) => boolean, lift?: (node: NodeArray) => T): T; /** * Visits a Node using the supplied visitor, possibly returning a new Node in its place. * @@ -4440,7 +4642,7 @@ declare namespace ts { * @param start An optional value indicating the starting offset at which to start visiting. * @param count An optional value indicating the maximum number of nodes to visit. */ - function visitNodes(nodes: NodeArray | undefined, visitor: Visitor, test?: (node: Node) => boolean, start?: number, count?: number): NodeArray; + function visitNodes(nodes: NodeArray, visitor: Visitor | undefined, test?: (node: Node) => boolean, start?: number, count?: number): NodeArray; /** * Visits a NodeArray using the supplied visitor, possibly returning a new NodeArray in its place. * @@ -4450,18 +4652,18 @@ declare namespace ts { * @param start An optional value indicating the starting offset at which to start visiting. * @param count An optional value indicating the maximum number of nodes to visit. */ - function visitNodes(nodes: NodeArray | undefined, visitor: Visitor, test?: (node: Node) => boolean, start?: number, count?: number): NodeArray | undefined; + function visitNodes(nodes: NodeArray | undefined, visitor: Visitor | undefined, test?: (node: Node) => boolean, start?: number, count?: number): NodeArray | undefined; /** * Starts a new lexical environment and visits a statement list, ending the lexical environment * and merging hoisted declarations upon completion. */ - function visitLexicalEnvironment(statements: NodeArray, visitor: Visitor, context: TransformationContext, start?: number, ensureUseStrict?: boolean): NodeArray; + function visitLexicalEnvironment(statements: NodeArray, visitor: Visitor, context: TransformationContext, start?: number, ensureUseStrict?: boolean, nodesVisitor?: NodesVisitor): NodeArray; /** * Starts a new lexical environment and visits a parameter list, suspending the lexical * environment upon completion. */ - function visitParameterList(nodes: NodeArray, visitor: Visitor, context: TransformationContext, nodesVisitor?: (nodes: NodeArray, visitor: Visitor, test?: (node: Node) => boolean, start?: number, count?: number) => NodeArray): NodeArray; - function visitParameterList(nodes: NodeArray | undefined, visitor: Visitor, context: TransformationContext, nodesVisitor?: (nodes: NodeArray | undefined, visitor: Visitor, test?: (node: Node) => boolean, start?: number, count?: number) => NodeArray | undefined): NodeArray | undefined; + function visitParameterList(nodes: NodeArray, visitor: Visitor, context: TransformationContext, nodesVisitor?: NodesVisitor): NodeArray; + function visitParameterList(nodes: NodeArray | undefined, visitor: Visitor, context: TransformationContext, nodesVisitor?: NodesVisitor): NodeArray | undefined; /** * Resumes a suspended lexical environment and visits a function body, ending the lexical * environment and merging hoisted declarations upon completion. @@ -4960,6 +5162,7 @@ declare namespace ts.server { interface InitializationFailedResponse extends TypingInstallerResponse { readonly kind: EventInitializationFailed; readonly message: string; + readonly stack?: string; } interface ProjectResponse extends TypingInstallerResponse { readonly projectName: string; @@ -5108,6 +5311,15 @@ declare namespace ts { fileName: Path; packageName: string; } + interface PerformanceEvent { + kind: "UpdateGraph" | "CreatePackageJsonAutoImportProvider"; + durationMs: number; + } + enum LanguageServiceMode { + Semantic = 0, + PartialSemantic = 1, + Syntactic = 2 + } interface LanguageServiceHost extends GetEffectiveTypeRootsHost { getCompilationSettings(): CompilerOptions; getNewLine?(): string; @@ -5277,12 +5489,16 @@ declare namespace ts { applyCodeActionCommand(fileName: string, action: CodeActionCommand[]): Promise; /** @deprecated `fileName` will be ignored */ applyCodeActionCommand(fileName: string, action: CodeActionCommand | CodeActionCommand[]): Promise; - getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined): ApplicableRefactorInfo[]; + getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason): ApplicableRefactorInfo[]; getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined): RefactorEditInfo | undefined; organizeImports(scope: OrganizeImportsScope, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): readonly FileTextChanges[]; getEditsForFileRename(oldFilePath: string, newFilePath: string, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): readonly FileTextChanges[]; getEmitOutput(fileName: string, emitOnlyDtsFiles?: boolean, forceDtsEmit?: boolean): EmitOutput; getProgram(): Program | undefined; + toggleLineComment(fileName: string, textRange: TextRange): TextChange[]; + toggleMultilineComment(fileName: string, textRange: TextRange): TextChange[]; + commentSelection(fileName: string, textRange: TextRange): TextChange[]; + uncommentSelection(fileName: string, textRange: TextRange): TextChange[]; dispose(): void; } interface JsxClosingTagInfo { @@ -5392,9 +5608,11 @@ declare namespace ts { interface CallHierarchyItem { name: string; kind: ScriptElementKind; + kindModifiers?: string; file: string; span: TextSpan; selectionSpan: TextSpan; + containerName?: string; } interface CallHierarchyIncomingCall { from: CallHierarchyItem; @@ -5488,6 +5706,11 @@ declare namespace ts { * so this description should make sense by itself if the parent is inlineable=true */ description: string; + /** + * A message to show to the user if the refactoring cannot be applied in + * the current context. + */ + notApplicableReason?: string; } /** * A set of edits to make in response to a refactor action, plus an optional @@ -5499,6 +5722,7 @@ declare namespace ts { renameLocation?: number; commands?: CodeActionCommand[]; } + type RefactorTriggerReason = "implicit" | "invoked"; interface TextInsertion { newText: string; /** The position in newText the caret should point to after the insertion. */ @@ -5764,6 +5988,7 @@ declare namespace ts { source?: string; isRecommended?: true; isFromUncheckedFile?: true; + isPackageJsonImport?: true; } interface CompletionEntryDetails { name: string; @@ -5939,6 +6164,7 @@ declare namespace ts { staticModifier = "static", abstractModifier = "abstract", optionalModifier = "optional", + deprecatedModifier = "deprecated", dtsModifier = ".d.ts", tsModifier = ".ts", tsxModifier = ".tsx", @@ -6105,7 +6331,7 @@ declare namespace ts { function getSupportedCodeFixes(): string[]; function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean, scriptKind?: ScriptKind): SourceFile; function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange | undefined, aggressiveChecks?: boolean): SourceFile; - function createLanguageService(host: LanguageServiceHost, documentRegistry?: DocumentRegistry, syntaxOnly?: boolean): LanguageService; + function createLanguageService(host: LanguageServiceHost, documentRegistry?: DocumentRegistry, syntaxOnlyOrLanguageServiceMode?: boolean | LanguageServiceMode): LanguageService; /** * Get the path of the default library files (lib.d.ts) as distributed with the typescript * node package. @@ -6122,5 +6348,771 @@ declare namespace ts { */ function transform(source: T | T[], transformers: TransformerFactory[], compilerOptions?: CompilerOptions): TransformationResult; } +declare namespace ts { + /** @deprecated Use `factory.createNodeArray` or the factory supplied by your transformation context instead. */ + const createNodeArray: (elements?: readonly T[] | undefined, hasTrailingComma?: boolean | undefined) => NodeArray; + /** @deprecated Use `factory.createNumericLiteral` or the factory supplied by your transformation context instead. */ + const createNumericLiteral: (value: string | number, numericLiteralFlags?: TokenFlags | undefined) => NumericLiteral; + /** @deprecated Use `factory.createBigIntLiteral` or the factory supplied by your transformation context instead. */ + const createBigIntLiteral: (value: string | PseudoBigInt) => BigIntLiteral; + /** @deprecated Use `factory.createStringLiteral` or the factory supplied by your transformation context instead. */ + const createStringLiteral: { + (text: string, isSingleQuote?: boolean | undefined): StringLiteral; + (text: string, isSingleQuote?: boolean | undefined, hasExtendedUnicodeEscape?: boolean | undefined): StringLiteral; + }; + /** @deprecated Use `factory.createStringLiteralFromNode` or the factory supplied by your transformation context instead. */ + const createStringLiteralFromNode: (sourceNode: Identifier | StringLiteral | NoSubstitutionTemplateLiteral | NumericLiteral, isSingleQuote?: boolean | undefined) => StringLiteral; + /** @deprecated Use `factory.createRegularExpressionLiteral` or the factory supplied by your transformation context instead. */ + const createRegularExpressionLiteral: (text: string) => RegularExpressionLiteral; + /** @deprecated Use `factory.createLoopVariable` or the factory supplied by your transformation context instead. */ + const createLoopVariable: () => Identifier; + /** @deprecated Use `factory.createUniqueName` or the factory supplied by your transformation context instead. */ + const createUniqueName: (text: string, flags?: GeneratedIdentifierFlags | undefined) => Identifier; + /** @deprecated Use `factory.createPrivateIdentifier` or the factory supplied by your transformation context instead. */ + const createPrivateIdentifier: (text: string) => PrivateIdentifier; + /** @deprecated Use `factory.createSuper` or the factory supplied by your transformation context instead. */ + const createSuper: () => SuperExpression; + /** @deprecated Use `factory.createThis` or the factory supplied by your transformation context instead. */ + const createThis: () => ThisExpression; + /** @deprecated Use `factory.createNull` or the factory supplied by your transformation context instead. */ + const createNull: () => NullLiteral; + /** @deprecated Use `factory.createTrue` or the factory supplied by your transformation context instead. */ + const createTrue: () => TrueLiteral; + /** @deprecated Use `factory.createFalse` or the factory supplied by your transformation context instead. */ + const createFalse: () => FalseLiteral; + /** @deprecated Use `factory.createModifier` or the factory supplied by your transformation context instead. */ + const createModifier: (kind: T) => ModifierToken; + /** @deprecated Use `factory.createModifiersFromModifierFlags` or the factory supplied by your transformation context instead. */ + const createModifiersFromModifierFlags: (flags: ModifierFlags) => Modifier[]; + /** @deprecated Use `factory.createQualifiedName` or the factory supplied by your transformation context instead. */ + const createQualifiedName: (left: EntityName, right: string | Identifier) => QualifiedName; + /** @deprecated Use `factory.updateQualifiedName` or the factory supplied by your transformation context instead. */ + const updateQualifiedName: (node: QualifiedName, left: EntityName, right: Identifier) => QualifiedName; + /** @deprecated Use `factory.createComputedPropertyName` or the factory supplied by your transformation context instead. */ + const createComputedPropertyName: (expression: Expression) => ComputedPropertyName; + /** @deprecated Use `factory.updateComputedPropertyName` or the factory supplied by your transformation context instead. */ + const updateComputedPropertyName: (node: ComputedPropertyName, expression: Expression) => ComputedPropertyName; + /** @deprecated Use `factory.createTypeParameterDeclaration` or the factory supplied by your transformation context instead. */ + const createTypeParameterDeclaration: (name: string | Identifier, constraint?: TypeNode | undefined, defaultType?: TypeNode | undefined) => TypeParameterDeclaration; + /** @deprecated Use `factory.updateTypeParameterDeclaration` or the factory supplied by your transformation context instead. */ + const updateTypeParameterDeclaration: (node: TypeParameterDeclaration, name: Identifier, constraint: TypeNode | undefined, defaultType: TypeNode | undefined) => TypeParameterDeclaration; + /** @deprecated Use `factory.createParameterDeclaration` or the factory supplied by your transformation context instead. */ + const createParameter: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, dotDotDotToken: DotDotDotToken | undefined, name: string | Identifier | ObjectBindingPattern | ArrayBindingPattern, questionToken?: QuestionToken | undefined, type?: TypeNode | undefined, initializer?: Expression | undefined) => ParameterDeclaration; + /** @deprecated Use `factory.updateParameterDeclaration` or the factory supplied by your transformation context instead. */ + const updateParameter: (node: ParameterDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, dotDotDotToken: DotDotDotToken | undefined, name: string | Identifier | ObjectBindingPattern | ArrayBindingPattern, questionToken: QuestionToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined) => ParameterDeclaration; + /** @deprecated Use `factory.createDecorator` or the factory supplied by your transformation context instead. */ + const createDecorator: (expression: Expression) => Decorator; + /** @deprecated Use `factory.updateDecorator` or the factory supplied by your transformation context instead. */ + const updateDecorator: (node: Decorator, expression: Expression) => Decorator; + /** @deprecated Use `factory.createPropertyDeclaration` or the factory supplied by your transformation context instead. */ + const createProperty: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier | StringLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier, questionOrExclamationToken: QuestionToken | ExclamationToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined) => PropertyDeclaration; + /** @deprecated Use `factory.updatePropertyDeclaration` or the factory supplied by your transformation context instead. */ + const updateProperty: (node: PropertyDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier | StringLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier, questionOrExclamationToken: QuestionToken | ExclamationToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined) => PropertyDeclaration; + /** @deprecated Use `factory.createMethodDeclaration` or the factory supplied by your transformation context instead. */ + const createMethod: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: string | Identifier | StringLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier, questionToken: QuestionToken | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined) => MethodDeclaration; + /** @deprecated Use `factory.updateMethodDeclaration` or the factory supplied by your transformation context instead. */ + const updateMethod: (node: MethodDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: PropertyName, questionToken: QuestionToken | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined) => MethodDeclaration; + /** @deprecated Use `factory.createConstructorDeclaration` or the factory supplied by your transformation context instead. */ + const createConstructor: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], body: Block | undefined) => ConstructorDeclaration; + /** @deprecated Use `factory.updateConstructorDeclaration` or the factory supplied by your transformation context instead. */ + const updateConstructor: (node: ConstructorDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], body: Block | undefined) => ConstructorDeclaration; + /** @deprecated Use `factory.createGetAccessorDeclaration` or the factory supplied by your transformation context instead. */ + const createGetAccessor: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier | StringLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined) => GetAccessorDeclaration; + /** @deprecated Use `factory.updateGetAccessorDeclaration` or the factory supplied by your transformation context instead. */ + const updateGetAccessor: (node: GetAccessorDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: PropertyName, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined) => GetAccessorDeclaration; + /** @deprecated Use `factory.createSetAccessorDeclaration` or the factory supplied by your transformation context instead. */ + const createSetAccessor: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier | StringLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier, parameters: readonly ParameterDeclaration[], body: Block | undefined) => SetAccessorDeclaration; + /** @deprecated Use `factory.updateSetAccessorDeclaration` or the factory supplied by your transformation context instead. */ + const updateSetAccessor: (node: SetAccessorDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: PropertyName, parameters: readonly ParameterDeclaration[], body: Block | undefined) => SetAccessorDeclaration; + /** @deprecated Use `factory.createCallSignature` or the factory supplied by your transformation context instead. */ + const createCallSignature: (typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined) => CallSignatureDeclaration; + /** @deprecated Use `factory.updateCallSignature` or the factory supplied by your transformation context instead. */ + const updateCallSignature: (node: CallSignatureDeclaration, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode | undefined) => CallSignatureDeclaration; + /** @deprecated Use `factory.createConstructSignature` or the factory supplied by your transformation context instead. */ + const createConstructSignature: (typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined) => ConstructSignatureDeclaration; + /** @deprecated Use `factory.updateConstructSignature` or the factory supplied by your transformation context instead. */ + const updateConstructSignature: (node: ConstructSignatureDeclaration, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode | undefined) => ConstructSignatureDeclaration; + /** @deprecated Use `factory.updateIndexSignature` or the factory supplied by your transformation context instead. */ + const updateIndexSignature: (node: IndexSignatureDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode) => IndexSignatureDeclaration; + /** @deprecated Use `factory.createKeywordTypeNode` or the factory supplied by your transformation context instead. */ + const createKeywordTypeNode: (kind: TKind) => KeywordTypeNode; + /** @deprecated Use `factory.createTypePredicateNode` or the factory supplied by your transformation context instead. */ + const createTypePredicateNodeWithModifier: (assertsModifier: AssertsKeyword | undefined, parameterName: string | Identifier | ThisTypeNode, type: TypeNode | undefined) => TypePredicateNode; + /** @deprecated Use `factory.updateTypePredicateNode` or the factory supplied by your transformation context instead. */ + const updateTypePredicateNodeWithModifier: (node: TypePredicateNode, assertsModifier: AssertsKeyword | undefined, parameterName: Identifier | ThisTypeNode, type: TypeNode | undefined) => TypePredicateNode; + /** @deprecated Use `factory.createTypeReferenceNode` or the factory supplied by your transformation context instead. */ + const createTypeReferenceNode: (typeName: string | Identifier | QualifiedName, typeArguments?: readonly TypeNode[] | undefined) => TypeReferenceNode; + /** @deprecated Use `factory.updateTypeReferenceNode` or the factory supplied by your transformation context instead. */ + const updateTypeReferenceNode: (node: TypeReferenceNode, typeName: EntityName, typeArguments: NodeArray | undefined) => TypeReferenceNode; + /** @deprecated Use `factory.createFunctionTypeNode` or the factory supplied by your transformation context instead. */ + const createFunctionTypeNode: (typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode) => FunctionTypeNode; + /** @deprecated Use `factory.updateFunctionTypeNode` or the factory supplied by your transformation context instead. */ + const updateFunctionTypeNode: (node: FunctionTypeNode, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode) => FunctionTypeNode; + /** @deprecated Use `factory.createConstructorTypeNode` or the factory supplied by your transformation context instead. */ + const createConstructorTypeNode: (typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode) => ConstructorTypeNode; + /** @deprecated Use `factory.updateConstructorTypeNode` or the factory supplied by your transformation context instead. */ + const updateConstructorTypeNode: (node: ConstructorTypeNode, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode) => ConstructorTypeNode; + /** @deprecated Use `factory.createTypeQueryNode` or the factory supplied by your transformation context instead. */ + const createTypeQueryNode: (exprName: EntityName) => TypeQueryNode; + /** @deprecated Use `factory.updateTypeQueryNode` or the factory supplied by your transformation context instead. */ + const updateTypeQueryNode: (node: TypeQueryNode, exprName: EntityName) => TypeQueryNode; + /** @deprecated Use `factory.createTypeLiteralNode` or the factory supplied by your transformation context instead. */ + const createTypeLiteralNode: (members: readonly TypeElement[] | undefined) => TypeLiteralNode; + /** @deprecated Use `factory.updateTypeLiteralNode` or the factory supplied by your transformation context instead. */ + const updateTypeLiteralNode: (node: TypeLiteralNode, members: NodeArray) => TypeLiteralNode; + /** @deprecated Use `factory.createArrayTypeNode` or the factory supplied by your transformation context instead. */ + const createArrayTypeNode: (elementType: TypeNode) => ArrayTypeNode; + /** @deprecated Use `factory.updateArrayTypeNode` or the factory supplied by your transformation context instead. */ + const updateArrayTypeNode: (node: ArrayTypeNode, elementType: TypeNode) => ArrayTypeNode; + /** @deprecated Use `factory.createTupleTypeNode` or the factory supplied by your transformation context instead. */ + const createTupleTypeNode: (elements: readonly (TypeNode | NamedTupleMember)[]) => TupleTypeNode; + /** @deprecated Use `factory.updateTupleTypeNode` or the factory supplied by your transformation context instead. */ + const updateTupleTypeNode: (node: TupleTypeNode, elements: readonly (TypeNode | NamedTupleMember)[]) => TupleTypeNode; + /** @deprecated Use `factory.createOptionalTypeNode` or the factory supplied by your transformation context instead. */ + const createOptionalTypeNode: (type: TypeNode) => OptionalTypeNode; + /** @deprecated Use `factory.updateOptionalTypeNode` or the factory supplied by your transformation context instead. */ + const updateOptionalTypeNode: (node: OptionalTypeNode, type: TypeNode) => OptionalTypeNode; + /** @deprecated Use `factory.createRestTypeNode` or the factory supplied by your transformation context instead. */ + const createRestTypeNode: (type: TypeNode) => RestTypeNode; + /** @deprecated Use `factory.updateRestTypeNode` or the factory supplied by your transformation context instead. */ + const updateRestTypeNode: (node: RestTypeNode, type: TypeNode) => RestTypeNode; + /** @deprecated Use `factory.createUnionTypeNode` or the factory supplied by your transformation context instead. */ + const createUnionTypeNode: (types: readonly TypeNode[]) => UnionTypeNode; + /** @deprecated Use `factory.updateUnionTypeNode` or the factory supplied by your transformation context instead. */ + const updateUnionTypeNode: (node: UnionTypeNode, types: NodeArray) => UnionTypeNode; + /** @deprecated Use `factory.createIntersectionTypeNode` or the factory supplied by your transformation context instead. */ + const createIntersectionTypeNode: (types: readonly TypeNode[]) => IntersectionTypeNode; + /** @deprecated Use `factory.updateIntersectionTypeNode` or the factory supplied by your transformation context instead. */ + const updateIntersectionTypeNode: (node: IntersectionTypeNode, types: NodeArray) => IntersectionTypeNode; + /** @deprecated Use `factory.createConditionalTypeNode` or the factory supplied by your transformation context instead. */ + const createConditionalTypeNode: (checkType: TypeNode, extendsType: TypeNode, trueType: TypeNode, falseType: TypeNode) => ConditionalTypeNode; + /** @deprecated Use `factory.updateConditionalTypeNode` or the factory supplied by your transformation context instead. */ + const updateConditionalTypeNode: (node: ConditionalTypeNode, checkType: TypeNode, extendsType: TypeNode, trueType: TypeNode, falseType: TypeNode) => ConditionalTypeNode; + /** @deprecated Use `factory.createInferTypeNode` or the factory supplied by your transformation context instead. */ + const createInferTypeNode: (typeParameter: TypeParameterDeclaration) => InferTypeNode; + /** @deprecated Use `factory.updateInferTypeNode` or the factory supplied by your transformation context instead. */ + const updateInferTypeNode: (node: InferTypeNode, typeParameter: TypeParameterDeclaration) => InferTypeNode; + /** @deprecated Use `factory.createImportTypeNode` or the factory supplied by your transformation context instead. */ + const createImportTypeNode: (argument: TypeNode, qualifier?: Identifier | QualifiedName | undefined, typeArguments?: readonly TypeNode[] | undefined, isTypeOf?: boolean | undefined) => ImportTypeNode; + /** @deprecated Use `factory.updateImportTypeNode` or the factory supplied by your transformation context instead. */ + const updateImportTypeNode: (node: ImportTypeNode, argument: TypeNode, qualifier: Identifier | QualifiedName | undefined, typeArguments: readonly TypeNode[] | undefined, isTypeOf?: boolean | undefined) => ImportTypeNode; + /** @deprecated Use `factory.createParenthesizedType` or the factory supplied by your transformation context instead. */ + const createParenthesizedType: (type: TypeNode) => ParenthesizedTypeNode; + /** @deprecated Use `factory.updateParenthesizedType` or the factory supplied by your transformation context instead. */ + const updateParenthesizedType: (node: ParenthesizedTypeNode, type: TypeNode) => ParenthesizedTypeNode; + /** @deprecated Use `factory.createThisTypeNode` or the factory supplied by your transformation context instead. */ + const createThisTypeNode: () => ThisTypeNode; + /** @deprecated Use `factory.updateTypeOperatorNode` or the factory supplied by your transformation context instead. */ + const updateTypeOperatorNode: (node: TypeOperatorNode, type: TypeNode) => TypeOperatorNode; + /** @deprecated Use `factory.createIndexedAccessTypeNode` or the factory supplied by your transformation context instead. */ + const createIndexedAccessTypeNode: (objectType: TypeNode, indexType: TypeNode) => IndexedAccessTypeNode; + /** @deprecated Use `factory.updateIndexedAccessTypeNode` or the factory supplied by your transformation context instead. */ + const updateIndexedAccessTypeNode: (node: IndexedAccessTypeNode, objectType: TypeNode, indexType: TypeNode) => IndexedAccessTypeNode; + /** @deprecated Use `factory.createMappedTypeNode` or the factory supplied by your transformation context instead. */ + const createMappedTypeNode: (readonlyToken: ReadonlyKeyword | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined) => MappedTypeNode; + /** @deprecated Use `factory.updateMappedTypeNode` or the factory supplied by your transformation context instead. */ + const updateMappedTypeNode: (node: MappedTypeNode, readonlyToken: ReadonlyKeyword | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined) => MappedTypeNode; + /** @deprecated Use `factory.createLiteralTypeNode` or the factory supplied by your transformation context instead. */ + const createLiteralTypeNode: (literal: LiteralExpression | TrueLiteral | FalseLiteral | PrefixUnaryExpression | NullLiteral) => LiteralTypeNode; + /** @deprecated Use `factory.updateLiteralTypeNode` or the factory supplied by your transformation context instead. */ + const updateLiteralTypeNode: (node: LiteralTypeNode, literal: LiteralExpression | TrueLiteral | FalseLiteral | PrefixUnaryExpression | NullLiteral) => LiteralTypeNode; + /** @deprecated Use `factory.createObjectBindingPattern` or the factory supplied by your transformation context instead. */ + const createObjectBindingPattern: (elements: readonly BindingElement[]) => ObjectBindingPattern; + /** @deprecated Use `factory.updateObjectBindingPattern` or the factory supplied by your transformation context instead. */ + const updateObjectBindingPattern: (node: ObjectBindingPattern, elements: readonly BindingElement[]) => ObjectBindingPattern; + /** @deprecated Use `factory.createArrayBindingPattern` or the factory supplied by your transformation context instead. */ + const createArrayBindingPattern: (elements: readonly ArrayBindingElement[]) => ArrayBindingPattern; + /** @deprecated Use `factory.updateArrayBindingPattern` or the factory supplied by your transformation context instead. */ + const updateArrayBindingPattern: (node: ArrayBindingPattern, elements: readonly ArrayBindingElement[]) => ArrayBindingPattern; + /** @deprecated Use `factory.createBindingElement` or the factory supplied by your transformation context instead. */ + const createBindingElement: (dotDotDotToken: DotDotDotToken | undefined, propertyName: string | Identifier | StringLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier | undefined, name: string | Identifier | ObjectBindingPattern | ArrayBindingPattern, initializer?: Expression | undefined) => BindingElement; + /** @deprecated Use `factory.updateBindingElement` or the factory supplied by your transformation context instead. */ + const updateBindingElement: (node: BindingElement, dotDotDotToken: DotDotDotToken | undefined, propertyName: Identifier | StringLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier | undefined, name: BindingName, initializer: Expression | undefined) => BindingElement; + /** @deprecated Use `factory.createArrayLiteral` or the factory supplied by your transformation context instead. */ + const createArrayLiteral: (elements?: readonly Expression[] | undefined, multiLine?: boolean | undefined) => ArrayLiteralExpression; + /** @deprecated Use `factory.updateArrayLiteral` or the factory supplied by your transformation context instead. */ + const updateArrayLiteral: (node: ArrayLiteralExpression, elements: readonly Expression[]) => ArrayLiteralExpression; + /** @deprecated Use `factory.createObjectLiteral` or the factory supplied by your transformation context instead. */ + const createObjectLiteral: (properties?: readonly ObjectLiteralElementLike[] | undefined, multiLine?: boolean | undefined) => ObjectLiteralExpression; + /** @deprecated Use `factory.updateObjectLiteral` or the factory supplied by your transformation context instead. */ + const updateObjectLiteral: (node: ObjectLiteralExpression, properties: readonly ObjectLiteralElementLike[]) => ObjectLiteralExpression; + /** @deprecated Use `factory.createPropertyAccess` or the factory supplied by your transformation context instead. */ + const createPropertyAccess: (expression: Expression, name: string | Identifier | PrivateIdentifier) => PropertyAccessExpression; + /** @deprecated Use `factory.updatePropertyAccess` or the factory supplied by your transformation context instead. */ + const updatePropertyAccess: (node: PropertyAccessExpression, expression: Expression, name: Identifier | PrivateIdentifier) => PropertyAccessExpression; + /** @deprecated Use `factory.createPropertyAccessChain` or the factory supplied by your transformation context instead. */ + const createPropertyAccessChain: (expression: Expression, questionDotToken: QuestionDotToken | undefined, name: string | Identifier | PrivateIdentifier) => PropertyAccessChain; + /** @deprecated Use `factory.updatePropertyAccessChain` or the factory supplied by your transformation context instead. */ + const updatePropertyAccessChain: (node: PropertyAccessChain, expression: Expression, questionDotToken: QuestionDotToken | undefined, name: Identifier | PrivateIdentifier) => PropertyAccessChain; + /** @deprecated Use `factory.createElementAccess` or the factory supplied by your transformation context instead. */ + const createElementAccess: (expression: Expression, index: number | Expression) => ElementAccessExpression; + /** @deprecated Use `factory.updateElementAccess` or the factory supplied by your transformation context instead. */ + const updateElementAccess: (node: ElementAccessExpression, expression: Expression, argumentExpression: Expression) => ElementAccessExpression; + /** @deprecated Use `factory.createElementAccessChain` or the factory supplied by your transformation context instead. */ + const createElementAccessChain: (expression: Expression, questionDotToken: QuestionDotToken | undefined, index: number | Expression) => ElementAccessChain; + /** @deprecated Use `factory.updateElementAccessChain` or the factory supplied by your transformation context instead. */ + const updateElementAccessChain: (node: ElementAccessChain, expression: Expression, questionDotToken: QuestionDotToken | undefined, argumentExpression: Expression) => ElementAccessChain; + /** @deprecated Use `factory.createCall` or the factory supplied by your transformation context instead. */ + const createCall: (expression: Expression, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[] | undefined) => CallExpression; + /** @deprecated Use `factory.updateCall` or the factory supplied by your transformation context instead. */ + const updateCall: (node: CallExpression, expression: Expression, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[]) => CallExpression; + /** @deprecated Use `factory.createCallChain` or the factory supplied by your transformation context instead. */ + const createCallChain: (expression: Expression, questionDotToken: QuestionDotToken | undefined, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[] | undefined) => CallChain; + /** @deprecated Use `factory.updateCallChain` or the factory supplied by your transformation context instead. */ + const updateCallChain: (node: CallChain, expression: Expression, questionDotToken: QuestionDotToken | undefined, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[]) => CallChain; + /** @deprecated Use `factory.createNew` or the factory supplied by your transformation context instead. */ + const createNew: (expression: Expression, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[] | undefined) => NewExpression; + /** @deprecated Use `factory.updateNew` or the factory supplied by your transformation context instead. */ + const updateNew: (node: NewExpression, expression: Expression, typeArguments: readonly TypeNode[] | undefined, argumentsArray: readonly Expression[] | undefined) => NewExpression; + /** @deprecated Use `factory.createTypeAssertion` or the factory supplied by your transformation context instead. */ + const createTypeAssertion: (type: TypeNode, expression: Expression) => TypeAssertion; + /** @deprecated Use `factory.updateTypeAssertion` or the factory supplied by your transformation context instead. */ + const updateTypeAssertion: (node: TypeAssertion, type: TypeNode, expression: Expression) => TypeAssertion; + /** @deprecated Use `factory.createParen` or the factory supplied by your transformation context instead. */ + const createParen: (expression: Expression) => ParenthesizedExpression; + /** @deprecated Use `factory.updateParen` or the factory supplied by your transformation context instead. */ + const updateParen: (node: ParenthesizedExpression, expression: Expression) => ParenthesizedExpression; + /** @deprecated Use `factory.createFunctionExpression` or the factory supplied by your transformation context instead. */ + const createFunctionExpression: (modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: string | Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[] | undefined, type: TypeNode | undefined, body: Block) => FunctionExpression; + /** @deprecated Use `factory.updateFunctionExpression` or the factory supplied by your transformation context instead. */ + const updateFunctionExpression: (node: FunctionExpression, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block) => FunctionExpression; + /** @deprecated Use `factory.createDelete` or the factory supplied by your transformation context instead. */ + const createDelete: (expression: Expression) => DeleteExpression; + /** @deprecated Use `factory.updateDelete` or the factory supplied by your transformation context instead. */ + const updateDelete: (node: DeleteExpression, expression: Expression) => DeleteExpression; + /** @deprecated Use `factory.createTypeOf` or the factory supplied by your transformation context instead. */ + const createTypeOf: (expression: Expression) => TypeOfExpression; + /** @deprecated Use `factory.updateTypeOf` or the factory supplied by your transformation context instead. */ + const updateTypeOf: (node: TypeOfExpression, expression: Expression) => TypeOfExpression; + /** @deprecated Use `factory.createVoid` or the factory supplied by your transformation context instead. */ + const createVoid: (expression: Expression) => VoidExpression; + /** @deprecated Use `factory.updateVoid` or the factory supplied by your transformation context instead. */ + const updateVoid: (node: VoidExpression, expression: Expression) => VoidExpression; + /** @deprecated Use `factory.createAwait` or the factory supplied by your transformation context instead. */ + const createAwait: (expression: Expression) => AwaitExpression; + /** @deprecated Use `factory.updateAwait` or the factory supplied by your transformation context instead. */ + const updateAwait: (node: AwaitExpression, expression: Expression) => AwaitExpression; + /** @deprecated Use `factory.createPrefix` or the factory supplied by your transformation context instead. */ + const createPrefix: (operator: PrefixUnaryOperator, operand: Expression) => PrefixUnaryExpression; + /** @deprecated Use `factory.updatePrefix` or the factory supplied by your transformation context instead. */ + const updatePrefix: (node: PrefixUnaryExpression, operand: Expression) => PrefixUnaryExpression; + /** @deprecated Use `factory.createPostfix` or the factory supplied by your transformation context instead. */ + const createPostfix: (operand: Expression, operator: PostfixUnaryOperator) => PostfixUnaryExpression; + /** @deprecated Use `factory.updatePostfix` or the factory supplied by your transformation context instead. */ + const updatePostfix: (node: PostfixUnaryExpression, operand: Expression) => PostfixUnaryExpression; + /** @deprecated Use `factory.createBinary` or the factory supplied by your transformation context instead. */ + const createBinary: (left: Expression, operator: SyntaxKind.CommaToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.LessThanEqualsToken | SyntaxKind.GreaterThanEqualsToken | SyntaxKind.EqualsEqualsToken | SyntaxKind.ExclamationEqualsToken | SyntaxKind.EqualsEqualsEqualsToken | SyntaxKind.ExclamationEqualsEqualsToken | SyntaxKind.PlusToken | SyntaxKind.MinusToken | SyntaxKind.AsteriskToken | SyntaxKind.AsteriskAsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken | SyntaxKind.LessThanLessThanToken | SyntaxKind.GreaterThanGreaterThanToken | SyntaxKind.GreaterThanGreaterThanGreaterThanToken | SyntaxKind.AmpersandToken | SyntaxKind.BarToken | SyntaxKind.CaretToken | SyntaxKind.AmpersandAmpersandToken | SyntaxKind.BarBarToken | SyntaxKind.QuestionQuestionToken | SyntaxKind.EqualsToken | SyntaxKind.PlusEqualsToken | SyntaxKind.MinusEqualsToken | SyntaxKind.AsteriskEqualsToken | SyntaxKind.AsteriskAsteriskEqualsToken | SyntaxKind.SlashEqualsToken | SyntaxKind.PercentEqualsToken | SyntaxKind.LessThanLessThanEqualsToken | SyntaxKind.GreaterThanGreaterThanEqualsToken | SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken | SyntaxKind.AmpersandEqualsToken | SyntaxKind.BarEqualsToken | SyntaxKind.BarBarEqualsToken | SyntaxKind.AmpersandAmpersandEqualsToken | SyntaxKind.QuestionQuestionEqualsToken | SyntaxKind.CaretEqualsToken | SyntaxKind.InKeyword | SyntaxKind.InstanceOfKeyword | BinaryOperatorToken, right: Expression) => BinaryExpression; + /** @deprecated Use `factory.updateConditional` or the factory supplied by your transformation context instead. */ + const updateConditional: (node: ConditionalExpression, condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression) => ConditionalExpression; + /** @deprecated Use `factory.createTemplateExpression` or the factory supplied by your transformation context instead. */ + const createTemplateExpression: (head: TemplateHead, templateSpans: readonly TemplateSpan[]) => TemplateExpression; + /** @deprecated Use `factory.updateTemplateExpression` or the factory supplied by your transformation context instead. */ + const updateTemplateExpression: (node: TemplateExpression, head: TemplateHead, templateSpans: readonly TemplateSpan[]) => TemplateExpression; + /** @deprecated Use `factory.createTemplateHead` or the factory supplied by your transformation context instead. */ + const createTemplateHead: { + (text: string, rawText?: string | undefined, templateFlags?: TokenFlags | undefined): TemplateHead; + (text: string | undefined, rawText: string, templateFlags?: TokenFlags | undefined): TemplateHead; + }; + /** @deprecated Use `factory.createTemplateMiddle` or the factory supplied by your transformation context instead. */ + const createTemplateMiddle: { + (text: string, rawText?: string | undefined, templateFlags?: TokenFlags | undefined): TemplateMiddle; + (text: string | undefined, rawText: string, templateFlags?: TokenFlags | undefined): TemplateMiddle; + }; + /** @deprecated Use `factory.createTemplateTail` or the factory supplied by your transformation context instead. */ + const createTemplateTail: { + (text: string, rawText?: string | undefined, templateFlags?: TokenFlags | undefined): TemplateTail; + (text: string | undefined, rawText: string, templateFlags?: TokenFlags | undefined): TemplateTail; + }; + /** @deprecated Use `factory.createNoSubstitutionTemplateLiteral` or the factory supplied by your transformation context instead. */ + const createNoSubstitutionTemplateLiteral: { + (text: string, rawText?: string | undefined): NoSubstitutionTemplateLiteral; + (text: string | undefined, rawText: string): NoSubstitutionTemplateLiteral; + }; + /** @deprecated Use `factory.updateYield` or the factory supplied by your transformation context instead. */ + const updateYield: (node: YieldExpression, asteriskToken: AsteriskToken | undefined, expression: Expression | undefined) => YieldExpression; + /** @deprecated Use `factory.createSpread` or the factory supplied by your transformation context instead. */ + const createSpread: (expression: Expression) => SpreadElement; + /** @deprecated Use `factory.updateSpread` or the factory supplied by your transformation context instead. */ + const updateSpread: (node: SpreadElement, expression: Expression) => SpreadElement; + /** @deprecated Use `factory.createOmittedExpression` or the factory supplied by your transformation context instead. */ + const createOmittedExpression: () => OmittedExpression; + /** @deprecated Use `factory.createAsExpression` or the factory supplied by your transformation context instead. */ + const createAsExpression: (expression: Expression, type: TypeNode) => AsExpression; + /** @deprecated Use `factory.updateAsExpression` or the factory supplied by your transformation context instead. */ + const updateAsExpression: (node: AsExpression, expression: Expression, type: TypeNode) => AsExpression; + /** @deprecated Use `factory.createNonNullExpression` or the factory supplied by your transformation context instead. */ + const createNonNullExpression: (expression: Expression) => NonNullExpression; + /** @deprecated Use `factory.updateNonNullExpression` or the factory supplied by your transformation context instead. */ + const updateNonNullExpression: (node: NonNullExpression, expression: Expression) => NonNullExpression; + /** @deprecated Use `factory.createNonNullChain` or the factory supplied by your transformation context instead. */ + const createNonNullChain: (expression: Expression) => NonNullChain; + /** @deprecated Use `factory.updateNonNullChain` or the factory supplied by your transformation context instead. */ + const updateNonNullChain: (node: NonNullChain, expression: Expression) => NonNullChain; + /** @deprecated Use `factory.createMetaProperty` or the factory supplied by your transformation context instead. */ + const createMetaProperty: (keywordToken: SyntaxKind.ImportKeyword | SyntaxKind.NewKeyword, name: Identifier) => MetaProperty; + /** @deprecated Use `factory.updateMetaProperty` or the factory supplied by your transformation context instead. */ + const updateMetaProperty: (node: MetaProperty, name: Identifier) => MetaProperty; + /** @deprecated Use `factory.createTemplateSpan` or the factory supplied by your transformation context instead. */ + const createTemplateSpan: (expression: Expression, literal: TemplateMiddle | TemplateTail) => TemplateSpan; + /** @deprecated Use `factory.updateTemplateSpan` or the factory supplied by your transformation context instead. */ + const updateTemplateSpan: (node: TemplateSpan, expression: Expression, literal: TemplateMiddle | TemplateTail) => TemplateSpan; + /** @deprecated Use `factory.createSemicolonClassElement` or the factory supplied by your transformation context instead. */ + const createSemicolonClassElement: () => SemicolonClassElement; + /** @deprecated Use `factory.createBlock` or the factory supplied by your transformation context instead. */ + const createBlock: (statements: readonly Statement[], multiLine?: boolean | undefined) => Block; + /** @deprecated Use `factory.updateBlock` or the factory supplied by your transformation context instead. */ + const updateBlock: (node: Block, statements: readonly Statement[]) => Block; + /** @deprecated Use `factory.createVariableStatement` or the factory supplied by your transformation context instead. */ + const createVariableStatement: (modifiers: readonly Modifier[] | undefined, declarationList: VariableDeclarationList | readonly VariableDeclaration[]) => VariableStatement; + /** @deprecated Use `factory.updateVariableStatement` or the factory supplied by your transformation context instead. */ + const updateVariableStatement: (node: VariableStatement, modifiers: readonly Modifier[] | undefined, declarationList: VariableDeclarationList) => VariableStatement; + /** @deprecated Use `factory.createEmptyStatement` or the factory supplied by your transformation context instead. */ + const createEmptyStatement: () => EmptyStatement; + /** @deprecated Use `factory.createExpressionStatement` or the factory supplied by your transformation context instead. */ + const createExpressionStatement: (expression: Expression) => ExpressionStatement; + /** @deprecated Use `factory.updateExpressionStatement` or the factory supplied by your transformation context instead. */ + const updateExpressionStatement: (node: ExpressionStatement, expression: Expression) => ExpressionStatement; + /** @deprecated Use `factory.createExpressionStatement` or the factory supplied by your transformation context instead. */ + const createStatement: (expression: Expression) => ExpressionStatement; + /** @deprecated Use `factory.updateExpressionStatement` or the factory supplied by your transformation context instead. */ + const updateStatement: (node: ExpressionStatement, expression: Expression) => ExpressionStatement; + /** @deprecated Use `factory.createIf` or the factory supplied by your transformation context instead. */ + const createIf: (expression: Expression, thenStatement: Statement, elseStatement?: Statement | undefined) => IfStatement; + /** @deprecated Use `factory.updateIf` or the factory supplied by your transformation context instead. */ + const updateIf: (node: IfStatement, expression: Expression, thenStatement: Statement, elseStatement: Statement | undefined) => IfStatement; + /** @deprecated Use `factory.createDo` or the factory supplied by your transformation context instead. */ + const createDo: (statement: Statement, expression: Expression) => DoStatement; + /** @deprecated Use `factory.updateDo` or the factory supplied by your transformation context instead. */ + const updateDo: (node: DoStatement, statement: Statement, expression: Expression) => DoStatement; + /** @deprecated Use `factory.createWhile` or the factory supplied by your transformation context instead. */ + const createWhile: (expression: Expression, statement: Statement) => WhileStatement; + /** @deprecated Use `factory.updateWhile` or the factory supplied by your transformation context instead. */ + const updateWhile: (node: WhileStatement, expression: Expression, statement: Statement) => WhileStatement; + /** @deprecated Use `factory.createFor` or the factory supplied by your transformation context instead. */ + const createFor: (initializer: Expression | VariableDeclarationList | undefined, condition: Expression | undefined, incrementor: Expression | undefined, statement: Statement) => ForStatement; + /** @deprecated Use `factory.updateFor` or the factory supplied by your transformation context instead. */ + const updateFor: (node: ForStatement, initializer: Expression | VariableDeclarationList | undefined, condition: Expression | undefined, incrementor: Expression | undefined, statement: Statement) => ForStatement; + /** @deprecated Use `factory.createForIn` or the factory supplied by your transformation context instead. */ + const createForIn: (initializer: ForInitializer, expression: Expression, statement: Statement) => ForInStatement; + /** @deprecated Use `factory.updateForIn` or the factory supplied by your transformation context instead. */ + const updateForIn: (node: ForInStatement, initializer: ForInitializer, expression: Expression, statement: Statement) => ForInStatement; + /** @deprecated Use `factory.createForOf` or the factory supplied by your transformation context instead. */ + const createForOf: (awaitModifier: AwaitKeyword | undefined, initializer: ForInitializer, expression: Expression, statement: Statement) => ForOfStatement; + /** @deprecated Use `factory.updateForOf` or the factory supplied by your transformation context instead. */ + const updateForOf: (node: ForOfStatement, awaitModifier: AwaitKeyword | undefined, initializer: ForInitializer, expression: Expression, statement: Statement) => ForOfStatement; + /** @deprecated Use `factory.createContinue` or the factory supplied by your transformation context instead. */ + const createContinue: (label?: string | Identifier | undefined) => ContinueStatement; + /** @deprecated Use `factory.updateContinue` or the factory supplied by your transformation context instead. */ + const updateContinue: (node: ContinueStatement, label: Identifier | undefined) => ContinueStatement; + /** @deprecated Use `factory.createBreak` or the factory supplied by your transformation context instead. */ + const createBreak: (label?: string | Identifier | undefined) => BreakStatement; + /** @deprecated Use `factory.updateBreak` or the factory supplied by your transformation context instead. */ + const updateBreak: (node: BreakStatement, label: Identifier | undefined) => BreakStatement; + /** @deprecated Use `factory.createReturn` or the factory supplied by your transformation context instead. */ + const createReturn: (expression?: Expression | undefined) => ReturnStatement; + /** @deprecated Use `factory.updateReturn` or the factory supplied by your transformation context instead. */ + const updateReturn: (node: ReturnStatement, expression: Expression | undefined) => ReturnStatement; + /** @deprecated Use `factory.createWith` or the factory supplied by your transformation context instead. */ + const createWith: (expression: Expression, statement: Statement) => WithStatement; + /** @deprecated Use `factory.updateWith` or the factory supplied by your transformation context instead. */ + const updateWith: (node: WithStatement, expression: Expression, statement: Statement) => WithStatement; + /** @deprecated Use `factory.createSwitch` or the factory supplied by your transformation context instead. */ + const createSwitch: (expression: Expression, caseBlock: CaseBlock) => SwitchStatement; + /** @deprecated Use `factory.updateSwitch` or the factory supplied by your transformation context instead. */ + const updateSwitch: (node: SwitchStatement, expression: Expression, caseBlock: CaseBlock) => SwitchStatement; + /** @deprecated Use `factory.createLabel` or the factory supplied by your transformation context instead. */ + const createLabel: (label: string | Identifier, statement: Statement) => LabeledStatement; + /** @deprecated Use `factory.updateLabel` or the factory supplied by your transformation context instead. */ + const updateLabel: (node: LabeledStatement, label: Identifier, statement: Statement) => LabeledStatement; + /** @deprecated Use `factory.createThrow` or the factory supplied by your transformation context instead. */ + const createThrow: (expression: Expression) => ThrowStatement; + /** @deprecated Use `factory.updateThrow` or the factory supplied by your transformation context instead. */ + const updateThrow: (node: ThrowStatement, expression: Expression) => ThrowStatement; + /** @deprecated Use `factory.createTry` or the factory supplied by your transformation context instead. */ + const createTry: (tryBlock: Block, catchClause: CatchClause | undefined, finallyBlock: Block | undefined) => TryStatement; + /** @deprecated Use `factory.updateTry` or the factory supplied by your transformation context instead. */ + const updateTry: (node: TryStatement, tryBlock: Block, catchClause: CatchClause | undefined, finallyBlock: Block | undefined) => TryStatement; + /** @deprecated Use `factory.createDebuggerStatement` or the factory supplied by your transformation context instead. */ + const createDebuggerStatement: () => DebuggerStatement; + /** @deprecated Use `factory.createVariableDeclarationList` or the factory supplied by your transformation context instead. */ + const createVariableDeclarationList: (declarations: readonly VariableDeclaration[], flags?: NodeFlags | undefined) => VariableDeclarationList; + /** @deprecated Use `factory.updateVariableDeclarationList` or the factory supplied by your transformation context instead. */ + const updateVariableDeclarationList: (node: VariableDeclarationList, declarations: readonly VariableDeclaration[]) => VariableDeclarationList; + /** @deprecated Use `factory.createFunctionDeclaration` or the factory supplied by your transformation context instead. */ + const createFunctionDeclaration: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: string | Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined) => FunctionDeclaration; + /** @deprecated Use `factory.updateFunctionDeclaration` or the factory supplied by your transformation context instead. */ + const updateFunctionDeclaration: (node: FunctionDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, asteriskToken: AsteriskToken | undefined, name: Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: Block | undefined) => FunctionDeclaration; + /** @deprecated Use `factory.createClassDeclaration` or the factory supplied by your transformation context instead. */ + const createClassDeclaration: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly ClassElement[]) => ClassDeclaration; + /** @deprecated Use `factory.updateClassDeclaration` or the factory supplied by your transformation context instead. */ + const updateClassDeclaration: (node: ClassDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly ClassElement[]) => ClassDeclaration; + /** @deprecated Use `factory.createInterfaceDeclaration` or the factory supplied by your transformation context instead. */ + const createInterfaceDeclaration: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly TypeElement[]) => InterfaceDeclaration; + /** @deprecated Use `factory.updateInterfaceDeclaration` or the factory supplied by your transformation context instead. */ + const updateInterfaceDeclaration: (node: InterfaceDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly TypeElement[]) => InterfaceDeclaration; + /** @deprecated Use `factory.createTypeAliasDeclaration` or the factory supplied by your transformation context instead. */ + const createTypeAliasDeclaration: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier, typeParameters: readonly TypeParameterDeclaration[] | undefined, type: TypeNode) => TypeAliasDeclaration; + /** @deprecated Use `factory.updateTypeAliasDeclaration` or the factory supplied by your transformation context instead. */ + const updateTypeAliasDeclaration: (node: TypeAliasDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier, typeParameters: readonly TypeParameterDeclaration[] | undefined, type: TypeNode) => TypeAliasDeclaration; + /** @deprecated Use `factory.createEnumDeclaration` or the factory supplied by your transformation context instead. */ + const createEnumDeclaration: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier, members: readonly EnumMember[]) => EnumDeclaration; + /** @deprecated Use `factory.updateEnumDeclaration` or the factory supplied by your transformation context instead. */ + const updateEnumDeclaration: (node: EnumDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier, members: readonly EnumMember[]) => EnumDeclaration; + /** @deprecated Use `factory.createModuleDeclaration` or the factory supplied by your transformation context instead. */ + const createModuleDeclaration: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: ModuleName, body: Identifier | ModuleBlock | NamespaceDeclaration | JSDocNamespaceDeclaration | undefined, flags?: NodeFlags | undefined) => ModuleDeclaration; + /** @deprecated Use `factory.updateModuleDeclaration` or the factory supplied by your transformation context instead. */ + const updateModuleDeclaration: (node: ModuleDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: ModuleName, body: Identifier | ModuleBlock | NamespaceDeclaration | JSDocNamespaceDeclaration | undefined) => ModuleDeclaration; + /** @deprecated Use `factory.createModuleBlock` or the factory supplied by your transformation context instead. */ + const createModuleBlock: (statements: readonly Statement[]) => ModuleBlock; + /** @deprecated Use `factory.updateModuleBlock` or the factory supplied by your transformation context instead. */ + const updateModuleBlock: (node: ModuleBlock, statements: readonly Statement[]) => ModuleBlock; + /** @deprecated Use `factory.createCaseBlock` or the factory supplied by your transformation context instead. */ + const createCaseBlock: (clauses: readonly CaseOrDefaultClause[]) => CaseBlock; + /** @deprecated Use `factory.updateCaseBlock` or the factory supplied by your transformation context instead. */ + const updateCaseBlock: (node: CaseBlock, clauses: readonly CaseOrDefaultClause[]) => CaseBlock; + /** @deprecated Use `factory.createNamespaceExportDeclaration` or the factory supplied by your transformation context instead. */ + const createNamespaceExportDeclaration: (name: string | Identifier) => NamespaceExportDeclaration; + /** @deprecated Use `factory.updateNamespaceExportDeclaration` or the factory supplied by your transformation context instead. */ + const updateNamespaceExportDeclaration: (node: NamespaceExportDeclaration, name: Identifier) => NamespaceExportDeclaration; + /** @deprecated Use `factory.createImportEqualsDeclaration` or the factory supplied by your transformation context instead. */ + const createImportEqualsDeclaration: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: string | Identifier, moduleReference: ModuleReference) => ImportEqualsDeclaration; + /** @deprecated Use `factory.updateImportEqualsDeclaration` or the factory supplied by your transformation context instead. */ + const updateImportEqualsDeclaration: (node: ImportEqualsDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, name: Identifier, moduleReference: ModuleReference) => ImportEqualsDeclaration; + /** @deprecated Use `factory.createImportDeclaration` or the factory supplied by your transformation context instead. */ + const createImportDeclaration: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, importClause: ImportClause | undefined, moduleSpecifier: Expression) => ImportDeclaration; + /** @deprecated Use `factory.updateImportDeclaration` or the factory supplied by your transformation context instead. */ + const updateImportDeclaration: (node: ImportDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, importClause: ImportClause | undefined, moduleSpecifier: Expression) => ImportDeclaration; + /** @deprecated Use `factory.createNamespaceImport` or the factory supplied by your transformation context instead. */ + const createNamespaceImport: (name: Identifier) => NamespaceImport; + /** @deprecated Use `factory.updateNamespaceImport` or the factory supplied by your transformation context instead. */ + const updateNamespaceImport: (node: NamespaceImport, name: Identifier) => NamespaceImport; + /** @deprecated Use `factory.createNamedImports` or the factory supplied by your transformation context instead. */ + const createNamedImports: (elements: readonly ImportSpecifier[]) => NamedImports; + /** @deprecated Use `factory.updateNamedImports` or the factory supplied by your transformation context instead. */ + const updateNamedImports: (node: NamedImports, elements: readonly ImportSpecifier[]) => NamedImports; + /** @deprecated Use `factory.createImportSpecifier` or the factory supplied by your transformation context instead. */ + const createImportSpecifier: (propertyName: Identifier | undefined, name: Identifier) => ImportSpecifier; + /** @deprecated Use `factory.updateImportSpecifier` or the factory supplied by your transformation context instead. */ + const updateImportSpecifier: (node: ImportSpecifier, propertyName: Identifier | undefined, name: Identifier) => ImportSpecifier; + /** @deprecated Use `factory.createExportAssignment` or the factory supplied by your transformation context instead. */ + const createExportAssignment: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, isExportEquals: boolean | undefined, expression: Expression) => ExportAssignment; + /** @deprecated Use `factory.updateExportAssignment` or the factory supplied by your transformation context instead. */ + const updateExportAssignment: (node: ExportAssignment, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, expression: Expression) => ExportAssignment; + /** @deprecated Use `factory.createNamedExports` or the factory supplied by your transformation context instead. */ + const createNamedExports: (elements: readonly ExportSpecifier[]) => NamedExports; + /** @deprecated Use `factory.updateNamedExports` or the factory supplied by your transformation context instead. */ + const updateNamedExports: (node: NamedExports, elements: readonly ExportSpecifier[]) => NamedExports; + /** @deprecated Use `factory.createExportSpecifier` or the factory supplied by your transformation context instead. */ + const createExportSpecifier: (propertyName: string | Identifier | undefined, name: string | Identifier) => ExportSpecifier; + /** @deprecated Use `factory.updateExportSpecifier` or the factory supplied by your transformation context instead. */ + const updateExportSpecifier: (node: ExportSpecifier, propertyName: Identifier | undefined, name: Identifier) => ExportSpecifier; + /** @deprecated Use `factory.createExternalModuleReference` or the factory supplied by your transformation context instead. */ + const createExternalModuleReference: (expression: Expression) => ExternalModuleReference; + /** @deprecated Use `factory.updateExternalModuleReference` or the factory supplied by your transformation context instead. */ + const updateExternalModuleReference: (node: ExternalModuleReference, expression: Expression) => ExternalModuleReference; + /** @deprecated Use `factory.createJSDocTypeExpression` or the factory supplied by your transformation context instead. */ + const createJSDocTypeExpression: (type: TypeNode) => JSDocTypeExpression; + /** @deprecated Use `factory.createJSDocTypeTag` or the factory supplied by your transformation context instead. */ + const createJSDocTypeTag: (tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string | undefined) => JSDocTypeTag; + /** @deprecated Use `factory.createJSDocReturnTag` or the factory supplied by your transformation context instead. */ + const createJSDocReturnTag: (tagName: Identifier | undefined, typeExpression?: JSDocTypeExpression | undefined, comment?: string | undefined) => JSDocReturnTag; + /** @deprecated Use `factory.createJSDocThisTag` or the factory supplied by your transformation context instead. */ + const createJSDocThisTag: (tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string | undefined) => JSDocThisTag; + /** @deprecated Use `factory.createJSDocComment` or the factory supplied by your transformation context instead. */ + const createJSDocComment: (comment?: string | undefined, tags?: readonly JSDocTag[] | undefined) => JSDoc; + /** @deprecated Use `factory.createJSDocParameterTag` or the factory supplied by your transformation context instead. */ + const createJSDocParameterTag: (tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression?: JSDocTypeExpression | undefined, isNameFirst?: boolean | undefined, comment?: string | undefined) => JSDocParameterTag; + /** @deprecated Use `factory.createJSDocClassTag` or the factory supplied by your transformation context instead. */ + const createJSDocClassTag: (tagName: Identifier | undefined, comment?: string | undefined) => JSDocClassTag; + /** @deprecated Use `factory.createJSDocAugmentsTag` or the factory supplied by your transformation context instead. */ + const createJSDocAugmentsTag: (tagName: Identifier | undefined, className: ExpressionWithTypeArguments & { + readonly expression: Identifier | PropertyAccessEntityNameExpression; + }, comment?: string | undefined) => JSDocAugmentsTag; + /** @deprecated Use `factory.createJSDocEnumTag` or the factory supplied by your transformation context instead. */ + const createJSDocEnumTag: (tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string | undefined) => JSDocEnumTag; + /** @deprecated Use `factory.createJSDocTemplateTag` or the factory supplied by your transformation context instead. */ + const createJSDocTemplateTag: (tagName: Identifier | undefined, constraint: JSDocTypeExpression | undefined, typeParameters: readonly TypeParameterDeclaration[], comment?: string | undefined) => JSDocTemplateTag; + /** @deprecated Use `factory.createJSDocTypedefTag` or the factory supplied by your transformation context instead. */ + const createJSDocTypedefTag: (tagName: Identifier | undefined, typeExpression?: JSDocTypeLiteral | JSDocTypeExpression | undefined, fullName?: Identifier | JSDocNamespaceDeclaration | undefined, comment?: string | undefined) => JSDocTypedefTag; + /** @deprecated Use `factory.createJSDocCallbackTag` or the factory supplied by your transformation context instead. */ + const createJSDocCallbackTag: (tagName: Identifier | undefined, typeExpression: JSDocSignature, fullName?: Identifier | JSDocNamespaceDeclaration | undefined, comment?: string | undefined) => JSDocCallbackTag; + /** @deprecated Use `factory.createJSDocSignature` or the factory supplied by your transformation context instead. */ + const createJSDocSignature: (typeParameters: readonly JSDocTemplateTag[] | undefined, parameters: readonly JSDocParameterTag[], type?: JSDocReturnTag | undefined) => JSDocSignature; + /** @deprecated Use `factory.createJSDocPropertyTag` or the factory supplied by your transformation context instead. */ + const createJSDocPropertyTag: (tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression?: JSDocTypeExpression | undefined, isNameFirst?: boolean | undefined, comment?: string | undefined) => JSDocPropertyTag; + /** @deprecated Use `factory.createJSDocTypeLiteral` or the factory supplied by your transformation context instead. */ + const createJSDocTypeLiteral: (jsDocPropertyTags?: readonly JSDocPropertyLikeTag[] | undefined, isArrayType?: boolean | undefined) => JSDocTypeLiteral; + /** @deprecated Use `factory.createJSDocImplementsTag` or the factory supplied by your transformation context instead. */ + const createJSDocImplementsTag: (tagName: Identifier | undefined, className: ExpressionWithTypeArguments & { + readonly expression: Identifier | PropertyAccessEntityNameExpression; + }, comment?: string | undefined) => JSDocImplementsTag; + /** @deprecated Use `factory.createJSDocAuthorTag` or the factory supplied by your transformation context instead. */ + const createJSDocAuthorTag: (tagName: Identifier | undefined, comment?: string | undefined) => JSDocAuthorTag; + /** @deprecated Use `factory.createJSDocPublicTag` or the factory supplied by your transformation context instead. */ + const createJSDocPublicTag: (tagName: Identifier | undefined, comment?: string | undefined) => JSDocPublicTag; + /** @deprecated Use `factory.createJSDocPrivateTag` or the factory supplied by your transformation context instead. */ + const createJSDocPrivateTag: (tagName: Identifier | undefined, comment?: string | undefined) => JSDocPrivateTag; + /** @deprecated Use `factory.createJSDocProtectedTag` or the factory supplied by your transformation context instead. */ + const createJSDocProtectedTag: (tagName: Identifier | undefined, comment?: string | undefined) => JSDocProtectedTag; + /** @deprecated Use `factory.createJSDocReadonlyTag` or the factory supplied by your transformation context instead. */ + const createJSDocReadonlyTag: (tagName: Identifier | undefined, comment?: string | undefined) => JSDocReadonlyTag; + /** @deprecated Use `factory.createJSDocUnknownTag` or the factory supplied by your transformation context instead. */ + const createJSDocTag: (tagName: Identifier, comment?: string | undefined) => JSDocUnknownTag; + /** @deprecated Use `factory.createJsxElement` or the factory supplied by your transformation context instead. */ + const createJsxElement: (openingElement: JsxOpeningElement, children: readonly JsxChild[], closingElement: JsxClosingElement) => JsxElement; + /** @deprecated Use `factory.updateJsxElement` or the factory supplied by your transformation context instead. */ + const updateJsxElement: (node: JsxElement, openingElement: JsxOpeningElement, children: readonly JsxChild[], closingElement: JsxClosingElement) => JsxElement; + /** @deprecated Use `factory.createJsxSelfClosingElement` or the factory supplied by your transformation context instead. */ + const createJsxSelfClosingElement: (tagName: JsxTagNameExpression, typeArguments: readonly TypeNode[] | undefined, attributes: JsxAttributes) => JsxSelfClosingElement; + /** @deprecated Use `factory.updateJsxSelfClosingElement` or the factory supplied by your transformation context instead. */ + const updateJsxSelfClosingElement: (node: JsxSelfClosingElement, tagName: JsxTagNameExpression, typeArguments: readonly TypeNode[] | undefined, attributes: JsxAttributes) => JsxSelfClosingElement; + /** @deprecated Use `factory.createJsxOpeningElement` or the factory supplied by your transformation context instead. */ + const createJsxOpeningElement: (tagName: JsxTagNameExpression, typeArguments: readonly TypeNode[] | undefined, attributes: JsxAttributes) => JsxOpeningElement; + /** @deprecated Use `factory.updateJsxOpeningElement` or the factory supplied by your transformation context instead. */ + const updateJsxOpeningElement: (node: JsxOpeningElement, tagName: JsxTagNameExpression, typeArguments: readonly TypeNode[] | undefined, attributes: JsxAttributes) => JsxOpeningElement; + /** @deprecated Use `factory.createJsxClosingElement` or the factory supplied by your transformation context instead. */ + const createJsxClosingElement: (tagName: JsxTagNameExpression) => JsxClosingElement; + /** @deprecated Use `factory.updateJsxClosingElement` or the factory supplied by your transformation context instead. */ + const updateJsxClosingElement: (node: JsxClosingElement, tagName: JsxTagNameExpression) => JsxClosingElement; + /** @deprecated Use `factory.createJsxFragment` or the factory supplied by your transformation context instead. */ + const createJsxFragment: (openingFragment: JsxOpeningFragment, children: readonly JsxChild[], closingFragment: JsxClosingFragment) => JsxFragment; + /** @deprecated Use `factory.createJsxText` or the factory supplied by your transformation context instead. */ + const createJsxText: (text: string, containsOnlyTriviaWhiteSpaces?: boolean | undefined) => JsxText; + /** @deprecated Use `factory.updateJsxText` or the factory supplied by your transformation context instead. */ + const updateJsxText: (node: JsxText, text: string, containsOnlyTriviaWhiteSpaces?: boolean | undefined) => JsxText; + /** @deprecated Use `factory.createJsxOpeningFragment` or the factory supplied by your transformation context instead. */ + const createJsxOpeningFragment: () => JsxOpeningFragment; + /** @deprecated Use `factory.createJsxJsxClosingFragment` or the factory supplied by your transformation context instead. */ + const createJsxJsxClosingFragment: () => JsxClosingFragment; + /** @deprecated Use `factory.updateJsxFragment` or the factory supplied by your transformation context instead. */ + const updateJsxFragment: (node: JsxFragment, openingFragment: JsxOpeningFragment, children: readonly JsxChild[], closingFragment: JsxClosingFragment) => JsxFragment; + /** @deprecated Use `factory.createJsxAttribute` or the factory supplied by your transformation context instead. */ + const createJsxAttribute: (name: Identifier, initializer: StringLiteral | JsxExpression | undefined) => JsxAttribute; + /** @deprecated Use `factory.updateJsxAttribute` or the factory supplied by your transformation context instead. */ + const updateJsxAttribute: (node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression | undefined) => JsxAttribute; + /** @deprecated Use `factory.createJsxAttributes` or the factory supplied by your transformation context instead. */ + const createJsxAttributes: (properties: readonly JsxAttributeLike[]) => JsxAttributes; + /** @deprecated Use `factory.updateJsxAttributes` or the factory supplied by your transformation context instead. */ + const updateJsxAttributes: (node: JsxAttributes, properties: readonly JsxAttributeLike[]) => JsxAttributes; + /** @deprecated Use `factory.createJsxSpreadAttribute` or the factory supplied by your transformation context instead. */ + const createJsxSpreadAttribute: (expression: Expression) => JsxSpreadAttribute; + /** @deprecated Use `factory.updateJsxSpreadAttribute` or the factory supplied by your transformation context instead. */ + const updateJsxSpreadAttribute: (node: JsxSpreadAttribute, expression: Expression) => JsxSpreadAttribute; + /** @deprecated Use `factory.createJsxExpression` or the factory supplied by your transformation context instead. */ + const createJsxExpression: (dotDotDotToken: DotDotDotToken | undefined, expression: Expression | undefined) => JsxExpression; + /** @deprecated Use `factory.updateJsxExpression` or the factory supplied by your transformation context instead. */ + const updateJsxExpression: (node: JsxExpression, expression: Expression | undefined) => JsxExpression; + /** @deprecated Use `factory.createCaseClause` or the factory supplied by your transformation context instead. */ + const createCaseClause: (expression: Expression, statements: readonly Statement[]) => CaseClause; + /** @deprecated Use `factory.updateCaseClause` or the factory supplied by your transformation context instead. */ + const updateCaseClause: (node: CaseClause, expression: Expression, statements: readonly Statement[]) => CaseClause; + /** @deprecated Use `factory.createDefaultClause` or the factory supplied by your transformation context instead. */ + const createDefaultClause: (statements: readonly Statement[]) => DefaultClause; + /** @deprecated Use `factory.updateDefaultClause` or the factory supplied by your transformation context instead. */ + const updateDefaultClause: (node: DefaultClause, statements: readonly Statement[]) => DefaultClause; + /** @deprecated Use `factory.createHeritageClause` or the factory supplied by your transformation context instead. */ + const createHeritageClause: (token: SyntaxKind.ExtendsKeyword | SyntaxKind.ImplementsKeyword, types: readonly ExpressionWithTypeArguments[]) => HeritageClause; + /** @deprecated Use `factory.updateHeritageClause` or the factory supplied by your transformation context instead. */ + const updateHeritageClause: (node: HeritageClause, types: readonly ExpressionWithTypeArguments[]) => HeritageClause; + /** @deprecated Use `factory.createCatchClause` or the factory supplied by your transformation context instead. */ + const createCatchClause: (variableDeclaration: string | VariableDeclaration | undefined, block: Block) => CatchClause; + /** @deprecated Use `factory.updateCatchClause` or the factory supplied by your transformation context instead. */ + const updateCatchClause: (node: CatchClause, variableDeclaration: VariableDeclaration | undefined, block: Block) => CatchClause; + /** @deprecated Use `factory.createPropertyAssignment` or the factory supplied by your transformation context instead. */ + const createPropertyAssignment: (name: string | Identifier | StringLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier, initializer: Expression) => PropertyAssignment; + /** @deprecated Use `factory.updatePropertyAssignment` or the factory supplied by your transformation context instead. */ + const updatePropertyAssignment: (node: PropertyAssignment, name: PropertyName, initializer: Expression) => PropertyAssignment; + /** @deprecated Use `factory.createShorthandPropertyAssignment` or the factory supplied by your transformation context instead. */ + const createShorthandPropertyAssignment: (name: string | Identifier, objectAssignmentInitializer?: Expression | undefined) => ShorthandPropertyAssignment; + /** @deprecated Use `factory.updateShorthandPropertyAssignment` or the factory supplied by your transformation context instead. */ + const updateShorthandPropertyAssignment: (node: ShorthandPropertyAssignment, name: Identifier, objectAssignmentInitializer: Expression | undefined) => ShorthandPropertyAssignment; + /** @deprecated Use `factory.createSpreadAssignment` or the factory supplied by your transformation context instead. */ + const createSpreadAssignment: (expression: Expression) => SpreadAssignment; + /** @deprecated Use `factory.updateSpreadAssignment` or the factory supplied by your transformation context instead. */ + const updateSpreadAssignment: (node: SpreadAssignment, expression: Expression) => SpreadAssignment; + /** @deprecated Use `factory.createEnumMember` or the factory supplied by your transformation context instead. */ + const createEnumMember: (name: string | Identifier | StringLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier, initializer?: Expression | undefined) => EnumMember; + /** @deprecated Use `factory.updateEnumMember` or the factory supplied by your transformation context instead. */ + const updateEnumMember: (node: EnumMember, name: PropertyName, initializer: Expression | undefined) => EnumMember; + /** @deprecated Use `factory.updateSourceFile` or the factory supplied by your transformation context instead. */ + const updateSourceFileNode: (node: SourceFile, statements: readonly Statement[], isDeclarationFile?: boolean | undefined, referencedFiles?: readonly FileReference[] | undefined, typeReferences?: readonly FileReference[] | undefined, hasNoDefaultLib?: boolean | undefined, libReferences?: readonly FileReference[] | undefined) => SourceFile; + /** @deprecated Use `factory.createNotEmittedStatement` or the factory supplied by your transformation context instead. */ + const createNotEmittedStatement: (original: Node) => NotEmittedStatement; + /** @deprecated Use `factory.createPartiallyEmittedExpression` or the factory supplied by your transformation context instead. */ + const createPartiallyEmittedExpression: (expression: Expression, original?: Node | undefined) => PartiallyEmittedExpression; + /** @deprecated Use `factory.updatePartiallyEmittedExpression` or the factory supplied by your transformation context instead. */ + const updatePartiallyEmittedExpression: (node: PartiallyEmittedExpression, expression: Expression) => PartiallyEmittedExpression; + /** @deprecated Use `factory.createCommaList` or the factory supplied by your transformation context instead. */ + const createCommaList: (elements: readonly Expression[]) => CommaListExpression; + /** @deprecated Use `factory.updateCommaList` or the factory supplied by your transformation context instead. */ + const updateCommaList: (node: CommaListExpression, elements: readonly Expression[]) => CommaListExpression; + /** @deprecated Use `factory.createBundle` or the factory supplied by your transformation context instead. */ + const createBundle: (sourceFiles: readonly SourceFile[], prepends?: readonly (UnparsedSource | InputFiles)[] | undefined) => Bundle; + /** @deprecated Use `factory.updateBundle` or the factory supplied by your transformation context instead. */ + const updateBundle: (node: Bundle, sourceFiles: readonly SourceFile[], prepends?: readonly (UnparsedSource | InputFiles)[] | undefined) => Bundle; + /** @deprecated Use `factory.createImmediatelyInvokedFunctionExpression` or the factory supplied by your transformation context instead. */ + const createImmediatelyInvokedFunctionExpression: { + (statements: readonly Statement[]): CallExpression; + (statements: readonly Statement[], param: ParameterDeclaration, paramValue: Expression): CallExpression; + }; + /** @deprecated Use `factory.createImmediatelyInvokedArrowFunction` or the factory supplied by your transformation context instead. */ + const createImmediatelyInvokedArrowFunction: { + (statements: readonly Statement[]): CallExpression; + (statements: readonly Statement[], param: ParameterDeclaration, paramValue: Expression): CallExpression; + }; + /** @deprecated Use `factory.createVoidZero` or the factory supplied by your transformation context instead. */ + const createVoidZero: () => VoidExpression; + /** @deprecated Use `factory.createExportDefault` or the factory supplied by your transformation context instead. */ + const createExportDefault: (expression: Expression) => ExportAssignment; + /** @deprecated Use `factory.createExternalModuleExport` or the factory supplied by your transformation context instead. */ + const createExternalModuleExport: (exportName: Identifier) => ExportDeclaration; + /** @deprecated Use `factory.createNamespaceExport` or the factory supplied by your transformation context instead. */ + const createNamespaceExport: (name: Identifier) => NamespaceExport; + /** @deprecated Use `factory.updateNamespaceExport` or the factory supplied by your transformation context instead. */ + const updateNamespaceExport: (node: NamespaceExport, name: Identifier) => NamespaceExport; + /** @deprecated Use `factory.createToken` or the factory supplied by your transformation context instead. */ + const createToken: (kind: TKind) => Token; + /** @deprecated Use `factory.createIdentifier` or the factory supplied by your transformation context instead. */ + const createIdentifier: (text: string) => Identifier; + /** @deprecated Use `factory.createTempVariable` or the factory supplied by your transformation context instead. */ + const createTempVariable: (recordTempVariable: ((node: Identifier) => void) | undefined) => Identifier; + /** @deprecated Use `factory.getGeneratedNameForNode` or the factory supplied by your transformation context instead. */ + const getGeneratedNameForNode: (node: Node | undefined) => Identifier; + /** @deprecated Use `factory.createUniqueName(text, GeneratedIdentifierFlags.Optimistic)` or the factory supplied by your transformation context instead. */ + const createOptimisticUniqueName: (text: string) => Identifier; + /** @deprecated Use `factory.createUniqueName(text, GeneratedIdentifierFlags.Optimistic | GeneratedIdentifierFlags.FileLevel)` or the factory supplied by your transformation context instead. */ + const createFileLevelUniqueName: (text: string) => Identifier; + /** @deprecated Use `factory.createIndexSignature` or the factory supplied by your transformation context instead. */ + const createIndexSignature: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode) => IndexSignatureDeclaration; + /** @deprecated Use `factory.createTypePredicateNode` or the factory supplied by your transformation context instead. */ + const createTypePredicateNode: (parameterName: Identifier | ThisTypeNode | string, type: TypeNode) => TypePredicateNode; + /** @deprecated Use `factory.updateTypePredicateNode` or the factory supplied by your transformation context instead. */ + const updateTypePredicateNode: (node: TypePredicateNode, parameterName: Identifier | ThisTypeNode, type: TypeNode) => TypePredicateNode; + /** @deprecated Use `factory.createStringLiteral`, `factory.createStringLiteralFromNode`, `factory.createNumericLiteral`, `factory.createBigIntLiteral`, `factory.createTrue`, `factory.createFalse`, or the factory supplied by your transformation context instead. */ + const createLiteral: { + (value: string | StringLiteral | NoSubstitutionTemplateLiteral | NumericLiteral | Identifier): StringLiteral; + (value: number | PseudoBigInt): NumericLiteral; + (value: boolean): BooleanLiteral; + (value: string | number | PseudoBigInt | boolean): PrimaryExpression; + }; + /** @deprecated Use `factory.createMethodSignature` or the factory supplied by your transformation context instead. */ + const createMethodSignature: (typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, name: string | PropertyName, questionToken: QuestionToken | undefined) => MethodSignature; + /** @deprecated Use `factory.updateMethodSignature` or the factory supplied by your transformation context instead. */ + const updateMethodSignature: (node: MethodSignature, typeParameters: NodeArray | undefined, parameters: NodeArray, type: TypeNode | undefined, name: PropertyName, questionToken: QuestionToken | undefined) => MethodSignature; + /** @deprecated Use `factory.createTypeOperatorNode` or the factory supplied by your transformation context instead. */ + const createTypeOperatorNode: { + (type: TypeNode): TypeOperatorNode; + (operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.ReadonlyKeyword, type: TypeNode): TypeOperatorNode; + }; + /** @deprecated Use `factory.createTaggedTemplate` or the factory supplied by your transformation context instead. */ + const createTaggedTemplate: { + (tag: Expression, template: TemplateLiteral): TaggedTemplateExpression; + (tag: Expression, typeArguments: readonly TypeNode[] | undefined, template: TemplateLiteral): TaggedTemplateExpression; + }; + /** @deprecated Use `factory.updateTaggedTemplate` or the factory supplied by your transformation context instead. */ + const updateTaggedTemplate: { + (node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral): TaggedTemplateExpression; + (node: TaggedTemplateExpression, tag: Expression, typeArguments: readonly TypeNode[] | undefined, template: TemplateLiteral): TaggedTemplateExpression; + }; + /** @deprecated Use `factory.updateBinary` or the factory supplied by your transformation context instead. */ + const updateBinary: (node: BinaryExpression, left: Expression, right: Expression, operator?: BinaryOperator | BinaryOperatorToken) => BinaryExpression; + /** @deprecated Use `factory.createConditional` or the factory supplied by your transformation context instead. */ + const createConditional: { + (condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression; + (condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression): ConditionalExpression; + }; + /** @deprecated Use `factory.createYield` or the factory supplied by your transformation context instead. */ + const createYield: { + (expression?: Expression | undefined): YieldExpression; + (asteriskToken: AsteriskToken | undefined, expression: Expression): YieldExpression; + }; + /** @deprecated Use `factory.createClassExpression` or the factory supplied by your transformation context instead. */ + const createClassExpression: (modifiers: readonly Modifier[] | undefined, name: string | Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly ClassElement[]) => ClassExpression; + /** @deprecated Use `factory.updateClassExpression` or the factory supplied by your transformation context instead. */ + const updateClassExpression: (node: ClassExpression, modifiers: readonly Modifier[] | undefined, name: Identifier | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, heritageClauses: readonly HeritageClause[] | undefined, members: readonly ClassElement[]) => ClassExpression; + /** @deprecated Use `factory.createPropertySignature` or the factory supplied by your transformation context instead. */ + const createPropertySignature: (modifiers: readonly Modifier[] | undefined, name: PropertyName | string, questionToken: QuestionToken | undefined, type: TypeNode | undefined, initializer?: Expression | undefined) => PropertySignature; + /** @deprecated Use `factory.updatePropertySignature` or the factory supplied by your transformation context instead. */ + const updatePropertySignature: (node: PropertySignature, modifiers: readonly Modifier[] | undefined, name: PropertyName, questionToken: QuestionToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined) => PropertySignature; + /** @deprecated Use `factory.createExpressionWithTypeArguments` or the factory supplied by your transformation context instead. */ + const createExpressionWithTypeArguments: (typeArguments: readonly TypeNode[] | undefined, expression: Expression) => ExpressionWithTypeArguments; + /** @deprecated Use `factory.updateExpressionWithTypeArguments` or the factory supplied by your transformation context instead. */ + const updateExpressionWithTypeArguments: (node: ExpressionWithTypeArguments, typeArguments: readonly TypeNode[] | undefined, expression: Expression) => ExpressionWithTypeArguments; + /** @deprecated Use `factory.createArrowFunction` or the factory supplied by your transformation context instead. */ + const createArrowFunction: { + (modifiers: readonly Modifier[] | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, equalsGreaterThanToken: EqualsGreaterThanToken | undefined, body: ConciseBody): ArrowFunction; + (modifiers: readonly Modifier[] | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: ConciseBody): ArrowFunction; + }; + /** @deprecated Use `factory.updateArrowFunction` or the factory supplied by your transformation context instead. */ + const updateArrowFunction: { + (node: ArrowFunction, modifiers: readonly Modifier[] | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, equalsGreaterThanToken: EqualsGreaterThanToken, body: ConciseBody): ArrowFunction; + (node: ArrowFunction, modifiers: readonly Modifier[] | undefined, typeParameters: readonly TypeParameterDeclaration[] | undefined, parameters: readonly ParameterDeclaration[], type: TypeNode | undefined, body: ConciseBody): ArrowFunction; + }; + /** @deprecated Use `factory.createVariableDeclaration` or the factory supplied by your transformation context instead. */ + const createVariableDeclaration: { + (name: string | BindingName, type?: TypeNode | undefined, initializer?: Expression | undefined): VariableDeclaration; + (name: string | BindingName, exclamationToken: ExclamationToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): VariableDeclaration; + }; + /** @deprecated Use `factory.updateVariableDeclaration` or the factory supplied by your transformation context instead. */ + const updateVariableDeclaration: { + (node: VariableDeclaration, name: BindingName, type: TypeNode | undefined, initializer: Expression | undefined): VariableDeclaration; + (node: VariableDeclaration, name: BindingName, exclamationToken: ExclamationToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): VariableDeclaration; + }; + /** @deprecated Use `factory.createImportClause` or the factory supplied by your transformation context instead. */ + const createImportClause: (name: Identifier | undefined, namedBindings: NamedImportBindings | undefined, isTypeOnly?: any) => ImportClause; + /** @deprecated Use `factory.updateImportClause` or the factory supplied by your transformation context instead. */ + const updateImportClause: (node: ImportClause, name: Identifier | undefined, namedBindings: NamedImportBindings | undefined, isTypeOnly: boolean) => ImportClause; + /** @deprecated Use `factory.createExportDeclaration` or the factory supplied by your transformation context instead. */ + const createExportDeclaration: (decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, exportClause: NamedExportBindings | undefined, moduleSpecifier?: Expression | undefined, isTypeOnly?: any) => ExportDeclaration; + /** @deprecated Use `factory.updateExportDeclaration` or the factory supplied by your transformation context instead. */ + const updateExportDeclaration: (node: ExportDeclaration, decorators: readonly Decorator[] | undefined, modifiers: readonly Modifier[] | undefined, exportClause: NamedExportBindings | undefined, moduleSpecifier: Expression | undefined, isTypeOnly: boolean) => ExportDeclaration; + /** @deprecated Use `factory.createJSDocParameterTag` or the factory supplied by your transformation context instead. */ + const createJSDocParamTag: (name: EntityName, isBracketed: boolean, typeExpression?: JSDocTypeExpression | undefined, comment?: string | undefined) => JSDocParameterTag; + /** @deprecated Use `factory.createComma` or the factory supplied by your transformation context instead. */ + const createComma: (left: Expression, right: Expression) => Expression; + /** @deprecated Use `factory.createLessThan` or the factory supplied by your transformation context instead. */ + const createLessThan: (left: Expression, right: Expression) => Expression; + /** @deprecated Use `factory.createAssignment` or the factory supplied by your transformation context instead. */ + const createAssignment: (left: Expression, right: Expression) => BinaryExpression; + /** @deprecated Use `factory.createStrictEquality` or the factory supplied by your transformation context instead. */ + const createStrictEquality: (left: Expression, right: Expression) => BinaryExpression; + /** @deprecated Use `factory.createStrictInequality` or the factory supplied by your transformation context instead. */ + const createStrictInequality: (left: Expression, right: Expression) => BinaryExpression; + /** @deprecated Use `factory.createAdd` or the factory supplied by your transformation context instead. */ + const createAdd: (left: Expression, right: Expression) => BinaryExpression; + /** @deprecated Use `factory.createSubtract` or the factory supplied by your transformation context instead. */ + const createSubtract: (left: Expression, right: Expression) => BinaryExpression; + /** @deprecated Use `factory.createLogicalAnd` or the factory supplied by your transformation context instead. */ + const createLogicalAnd: (left: Expression, right: Expression) => BinaryExpression; + /** @deprecated Use `factory.createLogicalOr` or the factory supplied by your transformation context instead. */ + const createLogicalOr: (left: Expression, right: Expression) => BinaryExpression; + /** @deprecated Use `factory.createPostfixIncrement` or the factory supplied by your transformation context instead. */ + const createPostfixIncrement: (operand: Expression) => PostfixUnaryExpression; + /** @deprecated Use `factory.createLogicalNot` or the factory supplied by your transformation context instead. */ + const createLogicalNot: (operand: Expression) => PrefixUnaryExpression; + /** @deprecated Use an appropriate `factory` method instead. */ + const createNode: (kind: SyntaxKind, pos?: any, end?: any) => Node; + /** + * Creates a shallow, memberwise clone of a node ~for mutation~ with its `pos`, `end`, and `parent` set. + * + * NOTE: It is unsafe to change any properties of a `Node` that relate to its AST children, as those changes won't be + * captured with respect to transformations. + * + * @deprecated Use `factory.cloneNode` instead and use `setCommentRange` or `setSourceMapRange` and avoid setting `parent`. + */ + const getMutableClone: (node: T) => T; + /** @deprecated Use `isTypeAssertionExpression` instead. */ + const isTypeAssertion: (node: Node) => node is TypeAssertion; + /** + * @deprecated Use `ts.ReadonlyESMap` instead. + */ + interface ReadonlyMap extends ReadonlyESMap { + } + /** + * @deprecated Use `ts.ESMap` instead. + */ + interface Map extends ESMap { + } +} export = ts; \ No newline at end of file diff --git a/cli/op_fetch_asset.rs b/cli/op_fetch_asset.rs index 0ebd84c430..cca085db78 100644 --- a/cli/op_fetch_asset.rs +++ b/cli/op_fetch_asset.rs @@ -62,18 +62,15 @@ fn get_asset(name: &str) -> Option<&'static str> { "lib.es2019.string.d.ts" => inc!("lib.es2019.string.d.ts"), "lib.es2019.symbol.d.ts" => inc!("lib.es2019.symbol.d.ts"), "lib.es2020.bigint.d.ts" => inc!("lib.es2020.bigint.d.ts"), + "lib.es2020.intl.d.ts" => inc!("lib.es2020.intl.d.ts"), "lib.es2020.promise.d.ts" => inc!("lib.es2020.promise.d.ts"), "lib.es2020.string.d.ts" => inc!("lib.es2020.string.d.ts"), "lib.es2020.symbol.wellknown.d.ts" => { inc!("lib.es2020.symbol.wellknown.d.ts") } - "lib.esnext.array.d.ts" => inc!("lib.esnext.array.d.ts"), - "lib.esnext.asynciterable.d.ts" => inc!("lib.esnext.asynciterable.d.ts"), - "lib.esnext.bigint.d.ts" => inc!("lib.esnext.bigint.d.ts"), "lib.esnext.intl.d.ts" => inc!("lib.esnext.intl.d.ts"), "lib.esnext.promise.d.ts" => inc!("lib.esnext.promise.d.ts"), "lib.esnext.string.d.ts" => inc!("lib.esnext.string.d.ts"), - "lib.esnext.symbol.d.ts" => inc!("lib.esnext.symbol.d.ts"), "lib.scripthost.d.ts" => inc!("lib.scripthost.d.ts"), "lib.webworker.d.ts" => inc!("lib.webworker.d.ts"), "lib.webworker.importscripts.d.ts" => { diff --git a/cli/tests/complex_permissions_test.ts b/cli/tests/complex_permissions_test.ts index f4b8e6c730..d7737fa2d3 100644 --- a/cli/tests/complex_permissions_test.ts +++ b/cli/tests/complex_permissions_test.ts @@ -1,6 +1,7 @@ // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. const name = Deno.args[0]; -const test: { [key: string]: Function } = { +// eslint-disable-next-line @typescript-eslint/no-explicit-any +const test: { [key: string]: (...args: any[]) => void | Promise } = { read(files: string[]): void { files.forEach((file) => Deno.readFileSync(file)); }, diff --git a/cli/tests/error_014_catch_dynamic_import_error.js.out b/cli/tests/error_014_catch_dynamic_import_error.js.out index 1a2ab2fd87..5249425b3e 100644 --- a/cli/tests/error_014_catch_dynamic_import_error.js.out +++ b/cli/tests/error_014_catch_dynamic_import_error.js.out @@ -6,7 +6,7 @@ TypeError: relative import path "does not exist either" not prefixed with / or . Caught error thrown by dynamically imported module. Error: An error - at file:///[WILDCARD]tests/subdir/throws.js:5:7 + at file:///[WILDCARD]tests/subdir/throws.js:6:7 Caught error thrown indirectly by dynamically imported module. Error: An error - at file:///[WILDCARD]tests/subdir/throws.js:5:7 + at file:///[WILDCARD]tests/subdir/throws.js:6:7 diff --git a/cli/tests/esm_imports_b.js b/cli/tests/esm_imports_b.js index 321dfc05af..240a323829 100644 --- a/cli/tests/esm_imports_b.js +++ b/cli/tests/esm_imports_b.js @@ -1,3 +1,4 @@ +/* eslint-disable */ export function retb() { return "b"; } diff --git a/cli/tests/hash.ts b/cli/tests/hash.ts index 9c230dcfce..74438bd77e 100644 --- a/cli/tests/hash.ts +++ b/cli/tests/hash.ts @@ -1,4 +1,4 @@ -/* eslint-disable @typescript-eslint/camelcase, @typescript-eslint/no-explicit-any */ +/* eslint-disable @typescript-eslint/no-explicit-any */ const { args } = Deno; import { createHash, SupportedAlgorithm } from "../../std/hash/mod.ts"; diff --git a/cli/tests/performance_stats.out b/cli/tests/performance_stats.out index c623d81da0..dd1dbe32e2 100644 --- a/cli/tests/performance_stats.out +++ b/cli/tests/performance_stats.out @@ -1,5 +1,5 @@ [WILDCARD] -Files: 44 +Files: 45 Nodes: [WILDCARD] Identifiers: [WILDCARD] Symbols: [WILDCARD] diff --git a/cli/tests/permission_test.ts b/cli/tests/permission_test.ts index 399c757d36..5050efde87 100644 --- a/cli/tests/permission_test.ts +++ b/cli/tests/permission_test.ts @@ -1,6 +1,7 @@ // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. const name = Deno.args[0]; -const test: { [key: string]: Function } = { +// eslint-disable-next-line @typescript-eslint/no-explicit-any +const test: { [key: string]: (...args: any[]) => void | Promise } = { readRequired(): Promise { Deno.readFileSync("README.md"); return Promise.resolve(); diff --git a/cli/tests/subdir/throws.js b/cli/tests/subdir/throws.js index b77e7104fe..91ce4628ed 100644 --- a/cli/tests/subdir/throws.js +++ b/cli/tests/subdir/throws.js @@ -1,3 +1,4 @@ +/* eslint-disable */ export function boo() { console.log("Boo!"); } diff --git a/cli/tests/unit/blob_test.ts b/cli/tests/unit/blob_test.ts index 494c2ac756..7ef9b01255 100644 --- a/cli/tests/unit/blob_test.ts +++ b/cli/tests/unit/blob_test.ts @@ -46,11 +46,12 @@ unitTest(function blobShouldNotThrowError(): void { let hasThrown = false; try { - const options1: object = { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const options1: any = { ending: "utf8", hasOwnProperty: "hasOwnProperty", }; - const options2: object = Object.create(null); + const options2 = Object.create(null); new Blob(["Hello World"], options1); new Blob(["Hello World"], options2); } catch { @@ -61,9 +62,9 @@ unitTest(function blobShouldNotThrowError(): void { }); unitTest(function nativeEndLine(): void { - const options: object = { + const options = { ending: "native", - }; + } as const; const blob = new Blob(["Hello\nWorld"], options); assertEquals(blob.size, Deno.build.os === "windows" ? 12 : 11); diff --git a/cli/tests/unit/error_stack_test.ts b/cli/tests/unit/error_stack_test.ts index cd21d471cb..50cc2493b7 100644 --- a/cli/tests/unit/error_stack_test.ts +++ b/cli/tests/unit/error_stack_test.ts @@ -7,6 +7,7 @@ const { setPrepareStackTrace } = Deno[Deno.internal]; interface CallSite { getThis(): unknown; getTypeName(): string | null; + // eslint-disable-next-line @typescript-eslint/ban-types getFunction(): Function | null; getFunctionName(): string | null; getMethodName(): string | null; @@ -35,6 +36,7 @@ function getMockCallSite( getTypeName(): string { return ""; }, + // eslint-disable-next-line @typescript-eslint/ban-types getFunction(): Function { return (): void => {}; }, diff --git a/cli/tests/unit/globals_test.ts b/cli/tests/unit/globals_test.ts index 116df16987..dabe3c08e1 100644 --- a/cli/tests/unit/globals_test.ts +++ b/cli/tests/unit/globals_test.ts @@ -72,7 +72,8 @@ unitTest(function DenoNamespaceImmutable(): void { } assert(denoCopy === Deno); try { - delete window.Deno; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + delete (window as any).Deno; } catch { // pass } @@ -87,7 +88,8 @@ unitTest(function DenoNamespaceImmutable(): void { } assert(readFile === Deno.readFile); try { - delete window.Deno.readFile; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + delete (window as any).Deno.readFile; } catch { // pass } diff --git a/cli/tests/unit/timers_test.ts b/cli/tests/unit/timers_test.ts index b7f6dd520c..30da0dfe93 100644 --- a/cli/tests/unit/timers_test.ts +++ b/cli/tests/unit/timers_test.ts @@ -7,16 +7,19 @@ import { assertNotEquals, } from "./test_util.ts"; +// eslint-disable-next-line @typescript-eslint/no-explicit-any +type AnyRecord = Record; + function deferred(): { - promise: Promise<{}>; - resolve: (value?: {} | PromiseLike<{}>) => void; + promise: Promise; + resolve: (value?: AnyRecord | PromiseLike) => void; // eslint-disable-next-line @typescript-eslint/no-explicit-any reject: (reason?: any) => void; } { - let resolve: (value?: {} | PromiseLike<{}>) => void; + let resolve: (value?: AnyRecord | PromiseLike) => void; // eslint-disable-next-line @typescript-eslint/no-explicit-any let reject: ((reason?: any) => void) | undefined = undefined; - const promise = new Promise<{}>((res, rej): void => { + const promise = new Promise((res, rej): void => { resolve = res; reject = rej; }); diff --git a/cli/tsc/00_typescript.js b/cli/tsc/00_typescript.js index cb5199f3bc..70d7dd8323 100644 --- a/cli/tsc/00_typescript.js +++ b/cli/tsc/00_typescript.js @@ -32,6 +32,10 @@ var __assign = (this && this.__assign) || function () { }; return __assign.apply(this, arguments); }; +var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) { + if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; } + return cooked; +}; var __generator = (this && this.__generator) || function (thisArg, body) { var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; @@ -59,10 +63,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) { if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; } }; -var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) { - if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; } - return cooked; -}; var __rest = (this && this.__rest) || function (s, e) { var t = {}; for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) @@ -78,7 +78,7 @@ var __extends = (this && this.__extends) || (function () { var extendStatics = function (d, b) { extendStatics = Object.setPrototypeOf || ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; }; return extendStatics(d, b); }; return function (d, b) { @@ -90,178 +90,205 @@ var __extends = (this && this.__extends) || (function () { /* @internal */ var ts; (function (ts) { - function createMapShim() { - /** Create a MapLike with good performance. */ - function createDictionaryObject() { - var map = Object.create(/*prototype*/ null); // eslint-disable-line no-null/no-null - // Using 'delete' on an object causes V8 to put the object in dictionary mode. - // This disables creation of hidden classes, which are expensive when an object is - // constantly changing shape. - map.__ = undefined; - delete map.__; - return map; - } - var MapIterator = /** @class */ (function () { - function MapIterator(currentEntry, selector) { - this.currentEntry = currentEntry; - this.selector = selector; - } - MapIterator.prototype.next = function () { - // Navigate to the next entry. - while (this.currentEntry) { - var skipNext = !!this.currentEntry.skipNext; - this.currentEntry = this.currentEntry.nextEntry; - if (!skipNext) { - break; - } - } - if (this.currentEntry) { - return { value: this.selector(this.currentEntry.key, this.currentEntry.value), done: false }; - } - else { - return { value: undefined, done: true }; - } - }; - return MapIterator; - }()); - return /** @class */ (function () { - function class_1() { - this.data = createDictionaryObject(); - this.size = 0; - // Create a first (stub) map entry that will not contain a key - // and value but serves as starting point for iterators. - this.firstEntry = {}; - // When the map is empty, the last entry is the same as the - // first one. - this.lastEntry = this.firstEntry; - } - class_1.prototype.get = function (key) { - var entry = this.data[key]; - return entry && entry.value; - }; - class_1.prototype.set = function (key, value) { - if (!this.has(key)) { - this.size++; - // Create a new entry that will be appended at the - // end of the linked list. - var newEntry = { - key: key, - value: value - }; - this.data[key] = newEntry; - // Adjust the references. - var previousLastEntry = this.lastEntry; - previousLastEntry.nextEntry = newEntry; - newEntry.previousEntry = previousLastEntry; - this.lastEntry = newEntry; - } - else { - this.data[key].value = value; - } - return this; - }; - class_1.prototype.has = function (key) { - // eslint-disable-next-line no-in-operator - return key in this.data; - }; - class_1.prototype.delete = function (key) { - if (this.has(key)) { - this.size--; - var entry = this.data[key]; - delete this.data[key]; - // Adjust the linked list references of the neighbor entries. - var previousEntry = entry.previousEntry; - previousEntry.nextEntry = entry.nextEntry; - if (entry.nextEntry) { - entry.nextEntry.previousEntry = previousEntry; - } - // When the deleted entry was the last one, we need to - // adjust the lastEntry reference. - if (this.lastEntry === entry) { - this.lastEntry = previousEntry; - } - // Adjust the forward reference of the deleted entry - // in case an iterator still references it. This allows us - // to throw away the entry, but when an active iterator - // (which points to the current entry) continues, it will - // navigate to the entry that originally came before the - // current one and skip it. - entry.previousEntry = undefined; - entry.nextEntry = previousEntry; - entry.skipNext = true; - return true; - } - return false; - }; - class_1.prototype.clear = function () { - this.data = createDictionaryObject(); - this.size = 0; - // Reset the linked list. Note that we must adjust the forward - // references of the deleted entries to ensure iterators stuck - // in the middle of the list don't continue with deleted entries, - // but can continue with new entries added after the clear() - // operation. - var firstEntry = this.firstEntry; - var currentEntry = firstEntry.nextEntry; - while (currentEntry) { - var nextEntry = currentEntry.nextEntry; - currentEntry.previousEntry = undefined; - currentEntry.nextEntry = firstEntry; - currentEntry.skipNext = true; - currentEntry = nextEntry; - } - firstEntry.nextEntry = undefined; - this.lastEntry = firstEntry; - }; - class_1.prototype.keys = function () { - return new MapIterator(this.firstEntry, function (key) { return key; }); - }; - class_1.prototype.values = function () { - return new MapIterator(this.firstEntry, function (_key, value) { return value; }); - }; - class_1.prototype.entries = function () { - return new MapIterator(this.firstEntry, function (key, value) { return [key, value]; }); - }; - class_1.prototype.forEach = function (action) { - var iterator = this.entries(); - while (true) { - var iterResult = iterator.next(); - if (iterResult.done) { - break; - } - var _a = iterResult.value, key = _a[0], value = _a[1]; - action(value, key); - } - }; - return class_1; - }()); + function createMapData() { + var sentinel = {}; + sentinel.prev = sentinel; + return { head: sentinel, tail: sentinel, size: 0 }; } - ts.createMapShim = createMapShim; + function createMapEntry(key, value) { + return { key: key, value: value, next: undefined, prev: undefined }; + } + function sameValueZero(x, y) { + // Treats -0 === 0 and NaN === NaN + return x === y || x !== x && y !== y; + } + function getPrev(entry) { + var prev = entry.prev; + // Entries without a 'prev' have been removed from the map. + // An entry whose 'prev' points to itself is the head of the list and is invalid here. + if (!prev || prev === entry) + throw new Error("Illegal state"); + return prev; + } + function getNext(entry) { + while (entry) { + // Entries without a 'prev' have been removed from the map. Their 'next' + // pointer should point to the previous entry prior to deletion and + // that entry should be skipped to resume iteration. + var skipNext = !entry.prev; + entry = entry.next; + if (skipNext) { + continue; + } + return entry; + } + } + function getEntry(data, key) { + // We walk backwards from 'tail' to prioritize recently added entries. + // We skip 'head' because it is an empty entry used to track iteration start. + for (var entry = data.tail; entry !== data.head; entry = getPrev(entry)) { + if (sameValueZero(entry.key, key)) { + return entry; + } + } + } + function addOrUpdateEntry(data, key, value) { + var existing = getEntry(data, key); + if (existing) { + existing.value = value; + return; + } + var entry = createMapEntry(key, value); + entry.prev = data.tail; + data.tail.next = entry; + data.tail = entry; + data.size++; + return entry; + } + function deleteEntry(data, key) { + // We walk backwards from 'tail' to prioritize recently added entries. + // We skip 'head' because it is an empty entry used to track iteration start. + for (var entry = data.tail; entry !== data.head; entry = getPrev(entry)) { + // all entries in the map should have a 'prev' pointer. + if (entry.prev === undefined) + throw new Error("Illegal state"); + if (sameValueZero(entry.key, key)) { + if (entry.next) { + entry.next.prev = entry.prev; + } + else { + // an entry in the map without a 'next' pointer must be the 'tail'. + if (data.tail !== entry) + throw new Error("Illegal state"); + data.tail = entry.prev; + } + entry.prev.next = entry.next; + entry.next = entry.prev; + entry.prev = undefined; + data.size--; + return entry; + } + } + } + function clearEntries(data) { + var node = data.tail; + while (node !== data.head) { + var prev = getPrev(node); + node.next = data.head; + node.prev = undefined; + node = prev; + } + data.head.next = undefined; + data.tail = data.head; + data.size = 0; + } + function forEachEntry(data, action) { + var entry = data.head; + while (entry) { + entry = getNext(entry); + if (entry) { + action(entry.value, entry.key); + } + } + } + function forEachIteration(iterator, action) { + if (iterator) { + for (var step = iterator.next(); !step.done; step = iterator.next()) { + action(step.value); + } + } + } + function createIteratorData(data, selector) { + return { current: data.head, selector: selector }; + } + function iteratorNext(data) { + // Navigate to the next entry. + data.current = getNext(data.current); + if (data.current) { + return { value: data.selector(data.current.key, data.current.value), done: false }; + } + else { + return { value: undefined, done: true }; + } + } + /* @internal */ + var ShimCollections; + (function (ShimCollections) { + function createMapShim(getIterator) { + var MapIterator = /** @class */ (function () { + function MapIterator(data, selector) { + this._data = createIteratorData(data, selector); + } + MapIterator.prototype.next = function () { return iteratorNext(this._data); }; + return MapIterator; + }()); + return /** @class */ (function () { + function Map(iterable) { + var _this = this; + this._mapData = createMapData(); + forEachIteration(getIterator(iterable), function (_a) { + var key = _a[0], value = _a[1]; + return _this.set(key, value); + }); + } + Object.defineProperty(Map.prototype, "size", { + get: function () { return this._mapData.size; }, + enumerable: false, + configurable: true + }); + Map.prototype.get = function (key) { var _a; return (_a = getEntry(this._mapData, key)) === null || _a === void 0 ? void 0 : _a.value; }; + Map.prototype.set = function (key, value) { return addOrUpdateEntry(this._mapData, key, value), this; }; + Map.prototype.has = function (key) { return !!getEntry(this._mapData, key); }; + Map.prototype.delete = function (key) { return !!deleteEntry(this._mapData, key); }; + Map.prototype.clear = function () { clearEntries(this._mapData); }; + Map.prototype.keys = function () { return new MapIterator(this._mapData, function (key, _value) { return key; }); }; + Map.prototype.values = function () { return new MapIterator(this._mapData, function (_key, value) { return value; }); }; + Map.prototype.entries = function () { return new MapIterator(this._mapData, function (key, value) { return [key, value]; }); }; + Map.prototype.forEach = function (action) { forEachEntry(this._mapData, action); }; + return Map; + }()); + } + ShimCollections.createMapShim = createMapShim; + function createSetShim(getIterator) { + var SetIterator = /** @class */ (function () { + function SetIterator(data, selector) { + this._data = createIteratorData(data, selector); + } + SetIterator.prototype.next = function () { return iteratorNext(this._data); }; + return SetIterator; + }()); + return /** @class */ (function () { + function Set(iterable) { + var _this = this; + this._mapData = createMapData(); + forEachIteration(getIterator(iterable), function (value) { return _this.add(value); }); + } + Object.defineProperty(Set.prototype, "size", { + get: function () { return this._mapData.size; }, + enumerable: false, + configurable: true + }); + Set.prototype.add = function (value) { return addOrUpdateEntry(this._mapData, value, value), this; }; + Set.prototype.has = function (value) { return !!getEntry(this._mapData, value); }; + Set.prototype.delete = function (value) { return !!deleteEntry(this._mapData, value); }; + Set.prototype.clear = function () { clearEntries(this._mapData); }; + Set.prototype.keys = function () { return new SetIterator(this._mapData, function (key, _value) { return key; }); }; + Set.prototype.values = function () { return new SetIterator(this._mapData, function (_key, value) { return value; }); }; + Set.prototype.entries = function () { return new SetIterator(this._mapData, function (key, value) { return [key, value]; }); }; + Set.prototype.forEach = function (action) { forEachEntry(this._mapData, action); }; + return Set; + }()); + } + ShimCollections.createSetShim = createSetShim; + })(ShimCollections = ts.ShimCollections || (ts.ShimCollections = {})); })(ts || (ts = {})); var ts; (function (ts) { // WARNING: The script `configurePrerelease.ts` uses a regexp to parse out these values. // If changing the text in this section, be sure to test `configurePrerelease` too. - ts.versionMajorMinor = "3.9"; + ts.versionMajorMinor = "4.0"; /** The version of the TypeScript compiler release */ - ts.version = "3.9.7"; - /** - * Returns the native Map implementation if it is available and compatible (i.e. supports iteration). - */ - /* @internal */ - function tryGetNativeMap() { - // eslint-disable-next-line no-in-operator - return typeof Map !== "undefined" && "entries" in Map.prototype ? Map : undefined; - } - ts.tryGetNativeMap = tryGetNativeMap; - /* @internal */ - ts.Map = tryGetNativeMap() || (function () { - // NOTE: createMapShim will be defined for typescriptServices.js but not for tsc.js, so we must test for it. - if (typeof ts.createMapShim === "function") { - return ts.createMapShim(); - } - throw new Error("TypeScript requires an environment that provides a compatible native Map implementation."); - })(); + ts.version = "4.0.2"; /* @internal */ var Comparison; (function (Comparison) { @@ -269,27 +296,65 @@ var ts; Comparison[Comparison["EqualTo"] = 0] = "EqualTo"; Comparison[Comparison["GreaterThan"] = 1] = "GreaterThan"; })(Comparison = ts.Comparison || (ts.Comparison = {})); + /* @internal */ + var NativeCollections; + (function (NativeCollections) { + /** + * Returns the native Map implementation if it is available and compatible (i.e. supports iteration). + */ + function tryGetNativeMap() { + // Internet Explorer's Map doesn't support iteration, so don't use it. + // eslint-disable-next-line no-in-operator + return typeof Map !== "undefined" && "entries" in Map.prototype && new Map([[0, 0]]).size === 1 ? Map : undefined; + } + NativeCollections.tryGetNativeMap = tryGetNativeMap; + /** + * Returns the native Set implementation if it is available and compatible (i.e. supports iteration). + */ + function tryGetNativeSet() { + // Internet Explorer's Set doesn't support iteration, so don't use it. + // eslint-disable-next-line no-in-operator + return typeof Set !== "undefined" && "entries" in Set.prototype && new Set([0]).size === 1 ? Set : undefined; + } + NativeCollections.tryGetNativeSet = tryGetNativeSet; + })(NativeCollections = ts.NativeCollections || (ts.NativeCollections = {})); })(ts || (ts = {})); /* @internal */ var ts; (function (ts) { + function getCollectionImplementation(name, nativeFactory, shimFactory) { + var _a; + // NOTE: ts.ShimCollections will be defined for typescriptServices.js but not for tsc.js, so we must test for it. + var constructor = (_a = ts.NativeCollections[nativeFactory]()) !== null && _a !== void 0 ? _a : ts.ShimCollections === null || ts.ShimCollections === void 0 ? void 0 : ts.ShimCollections[shimFactory](getIterator); + if (constructor) + return constructor; + throw new Error("TypeScript requires an environment that provides a compatible native " + name + " implementation."); + } + ts.Map = getCollectionImplementation("Map", "tryGetNativeMap", "createMapShim"); + ts.Set = getCollectionImplementation("Set", "tryGetNativeSet", "createSetShim"); + function getIterator(iterable) { + if (iterable) { + if (isArray(iterable)) + return arrayIterator(iterable); + if (iterable instanceof ts.Map) + return iterable.entries(); + if (iterable instanceof ts.Set) + return iterable.values(); + throw new Error("Iteration not supported."); + } + } + ts.getIterator = getIterator; ts.emptyArray = []; - /** Create a new map. */ + ts.emptyMap = new ts.Map(); + ts.emptySet = new ts.Set(); function createMap() { return new ts.Map(); } ts.createMap = createMap; - /** Create a new map from an array of entries. */ - function createMapFromEntries(entries) { - var map = createMap(); - for (var _i = 0, entries_1 = entries; _i < entries_1.length; _i++) { - var _a = entries_1[_i], key = _a[0], value = _a[1]; - map.set(key, value); - } - return map; - } - ts.createMapFromEntries = createMapFromEntries; - /** Create a new map from a template object is provided, the map will copy entries from it. */ + /** + * Create a new map from a template object is provided, the map will copy entries from it. + * @deprecated Use `new Map(getEntries(template))` instead. + */ function createMapFromTemplate(template) { var map = new ts.Map(); // Copies keys/values from template. Note that for..in will not throw if @@ -365,6 +430,16 @@ var ts; } } ts.firstDefinedIterator = firstDefinedIterator; + function reduceLeftIterator(iterator, f, initial) { + var result = initial; + if (iterator) { + for (var step = iterator.next(), pos = 0; !step.done; step = iterator.next(), pos++) { + result = f(result, step.value, pos); + } + } + return result; + } + ts.reduceLeftIterator = reduceLeftIterator; function zipWith(arrayA, arrayB, callback) { var result = []; ts.Debug.assertEqual(arrayA.length, arrayB.length); @@ -390,13 +465,30 @@ var ts; ts.zipToIterator = zipToIterator; function zipToMap(keys, values) { ts.Debug.assert(keys.length === values.length); - var map = createMap(); + var map = new ts.Map(); for (var i = 0; i < keys.length; ++i) { map.set(keys[i], values[i]); } return map; } ts.zipToMap = zipToMap; + /** + * Creates a new array with `element` interspersed in between each element of `input` + * if there is more than 1 value in `input`. Otherwise, returns the existing array. + */ + function intersperse(input, element) { + if (input.length <= 1) { + return input; + } + var result = []; + for (var i = 0, n = input.length; i < n; i++) { + if (i) + result.push(element); + result.push(input[i]); + } + return result; + } + ts.intersperse = intersperse; /** * Iterates through `array` by index and performs the callback on each element of array until the callback * returns a falsey value, then returns false. @@ -735,18 +827,53 @@ var ts; }; } ts.mapDefinedIterator = mapDefinedIterator; - function mapDefinedMap(map, mapValue, mapKey) { - if (mapKey === void 0) { mapKey = identity; } - var result = createMap(); + function mapDefinedEntries(map, f) { + if (!map) { + return undefined; + } + var result = new ts.Map(); map.forEach(function (value, key) { - var mapped = mapValue(value, key); - if (mapped !== undefined) { - result.set(mapKey(key), mapped); + var entry = f(key, value); + if (entry !== undefined) { + var newKey = entry[0], newValue = entry[1]; + if (newKey !== undefined && newValue !== undefined) { + result.set(newKey, newValue); + } } }); return result; } - ts.mapDefinedMap = mapDefinedMap; + ts.mapDefinedEntries = mapDefinedEntries; + function mapDefinedValues(set, f) { + if (set) { + var result_1 = new ts.Set(); + set.forEach(function (value) { + var newValue = f(value); + if (newValue !== undefined) { + result_1.add(newValue); + } + }); + return result_1; + } + } + ts.mapDefinedValues = mapDefinedValues; + function getOrUpdate(map, key, callback) { + if (map.has(key)) { + return map.get(key); + } + var value = callback(); + map.set(key, value); + return value; + } + ts.getOrUpdate = getOrUpdate; + function tryAddToSet(set, value) { + if (!set.has(value)) { + set.add(value); + return true; + } + return false; + } + ts.tryAddToSet = tryAddToSet; ts.emptyIterator = { next: function () { return ({ value: undefined, done: true }); } }; function singleIterator(value) { var done = false; @@ -798,7 +925,7 @@ var ts; if (!map) { return undefined; } - var result = createMap(); + var result = new ts.Map(); map.forEach(function (value, key) { var _a = f(key, value), newKey = _a[0], newValue = _a[1]; result.set(newKey, newValue); @@ -936,6 +1063,20 @@ var ts; return deduplicateSorted(sort(array, comparer), equalityComparer || comparer || compareStringsCaseSensitive); } ts.sortAndDeduplicate = sortAndDeduplicate; + function arrayIsSorted(array, comparer) { + if (array.length < 2) + return true; + var prevElement = array[0]; + for (var _i = 0, _a = array.slice(1); _i < _a.length; _i++) { + var element = _a[_i]; + if (comparer(prevElement, element) === 1 /* GreaterThan */) { + return false; + } + prevElement = element; + } + return true; + } + ts.arrayIsSorted = arrayIsSorted; function arrayIsEqualTo(array1, array2, equalityComparer) { if (equalityComparer === void 0) { equalityComparer = equateValues; } if (!array1 || !array2) { @@ -1335,6 +1476,27 @@ var ts; return values; } ts.getOwnValues = getOwnValues; + var _entries = Object.entries ? Object.entries : function (obj) { + var keys = getOwnKeys(obj); + var result = Array(keys.length); + for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) { + var key = keys_1[_i]; + result.push([key, obj[key]]); + } + return result; + }; + function getEntries(obj) { + return obj ? _entries(obj) : []; + } + ts.getEntries = getEntries; + function arrayOf(count, f) { + var result = new Array(count); + for (var i = 0; i < count; i++) { + result[i] = f(i); + } + return result; + } + ts.arrayOf = arrayOf; function arrayFrom(iterator, map) { var result = []; for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) { @@ -1392,7 +1554,7 @@ var ts; ts.equalOwnProperties = equalOwnProperties; function arrayToMap(array, makeKey, makeValue) { if (makeValue === void 0) { makeValue = identity; } - var result = createMap(); + var result = new ts.Map(); for (var _i = 0, array_6 = array; _i < array_6.length; _i++) { var value = array_6[_i]; var key = makeKey(value); @@ -1469,14 +1631,8 @@ var ts; return fn ? fn.bind(obj) : undefined; } ts.maybeBind = maybeBind; - function mapMap(map, f) { - var result = createMap(); - map.forEach(function (t, key) { return result.set.apply(result, (f(t, key))); }); - return result; - } - ts.mapMap = mapMap; function createMultiMap() { - var map = createMap(); + var map = new ts.Map(); map.add = multiMapAdd; map.remove = multiMapRemove; return map; @@ -1611,6 +1767,20 @@ var ts; }; } ts.memoize = memoize; + /** A version of `memoize` that supports a single primitive argument */ + function memoizeOne(callback) { + var map = new ts.Map(); + return function (arg) { + var key = typeof arg + ":" + arg; + var value = map.get(key); + if (value === undefined && !map.has(key)) { + value = callback(arg); + map.set(key, value); + } + return value; + }; + } + ts.memoizeOne = memoizeOne; function compose(a, b, c, d, e) { if (!!e) { var args_2 = []; @@ -1708,7 +1878,7 @@ var ts; * Case-insensitive comparisons compare both strings one code-point at a time using the integer * value of each code-point after applying `toUpperCase` to each string. We always map both * strings to their upper-case form as some unicode characters do not properly round-trip to - * lowercase (such as `ẞ` (German sharp capital s)). + * lowercase (such as `ẞ` (German sharp capital s)). */ function compareStringsCaseInsensitive(a, b) { if (a === b) @@ -1780,7 +1950,7 @@ var ts; // // For case insensitive comparisons we always map both strings to their // upper-case form as some unicode characters do not properly round-trip to - // lowercase (such as `ẞ` (German sharp capital s)). + // lowercase (such as `ẞ` (German sharp capital s)). return function (a, b) { return compareWithCallback(a, b, compareDictionaryOrder); }; function compareDictionaryOrder(a, b) { return compareStrings(a.toUpperCase(), b.toUpperCase()) || compareStrings(a, b); @@ -2121,6 +2291,7 @@ var ts; var oldIndex = 0; var newLen = newItems.length; var oldLen = oldItems.length; + var hasChanges = false; while (newIndex < newLen && oldIndex < oldLen) { var newItem = newItems[newIndex]; var oldItem = oldItems[oldIndex]; @@ -2128,10 +2299,12 @@ var ts; if (compareResult === -1 /* LessThan */) { inserted(newItem); newIndex++; + hasChanges = true; } else if (compareResult === 1 /* GreaterThan */) { deleted(oldItem); oldIndex++; + hasChanges = true; } else { unchanged(oldItem, newItem); @@ -2141,10 +2314,13 @@ var ts; } while (newIndex < newLen) { inserted(newItems[newIndex++]); + hasChanges = true; } while (oldIndex < oldLen) { deleted(oldItems[oldIndex++]); + hasChanges = true; } + return hasChanges; } ts.enumerateInsertsAndDeletes = enumerateInsertsAndDeletes; function fill(length, cb) { @@ -2198,11 +2374,56 @@ var ts; /* @internal */ var ts; (function (ts) { + var LogLevel; + (function (LogLevel) { + LogLevel[LogLevel["Off"] = 0] = "Off"; + LogLevel[LogLevel["Error"] = 1] = "Error"; + LogLevel[LogLevel["Warning"] = 2] = "Warning"; + LogLevel[LogLevel["Info"] = 3] = "Info"; + LogLevel[LogLevel["Verbose"] = 4] = "Verbose"; + })(LogLevel = ts.LogLevel || (ts.LogLevel = {})); var Debug; (function (Debug) { + var typeScriptVersion; + /* eslint-disable prefer-const */ var currentAssertionLevel = 0 /* None */; - // eslint-disable-next-line prefer-const + Debug.currentLogLevel = LogLevel.Warning; Debug.isDebugging = false; + function getTypeScriptVersion() { + return typeScriptVersion !== null && typeScriptVersion !== void 0 ? typeScriptVersion : (typeScriptVersion = new ts.Version(ts.version)); + } + Debug.getTypeScriptVersion = getTypeScriptVersion; + function shouldLog(level) { + return Debug.currentLogLevel <= level; + } + Debug.shouldLog = shouldLog; + function logMessage(level, s) { + if (Debug.loggingHost && shouldLog(level)) { + Debug.loggingHost.log(level, s); + } + } + function log(s) { + logMessage(LogLevel.Info, s); + } + Debug.log = log; + (function (log_1) { + function error(s) { + logMessage(LogLevel.Error, s); + } + log_1.error = error; + function warn(s) { + logMessage(LogLevel.Warning, s); + } + log_1.warn = warn; + function log(s) { + logMessage(LogLevel.Info, s); + } + log_1.log = log; + function trace(s) { + logMessage(LogLevel.Verbose, s); + } + log_1.trace = trace; + })(log = Debug.log || (Debug.log = {})); var assertionCache = {}; function getAssertionLevel() { return currentAssertionLevel; @@ -2518,7 +2739,7 @@ var ts; Object.defineProperties(ctor.prototype, { __debugKind: { get: function () { return formatSyntaxKind(this.kind); } }, __debugNodeFlags: { get: function () { return formatNodeFlags(this.flags); } }, - __debugModifierFlags: { get: function () { return formatModifierFlags(ts.getModifierFlagsNoCache(this)); } }, + __debugModifierFlags: { get: function () { return formatModifierFlags(ts.getEffectiveModifierFlagsNoCache(this)); } }, __debugTransformFlags: { get: function () { return formatTransformFlags(this.transformFlags); } }, __debugIsParseTreeNode: { get: function () { return ts.isParseTreeNode(this); } }, __debugEmitFlags: { get: function () { return formatEmitFlags(ts.getEmitFlags(this)); } }, @@ -2551,6 +2772,53 @@ var ts; isDebugInfoEnabled = true; } Debug.enableDebugInfo = enableDebugInfo; + function formatDeprecationMessage(name, error, errorAfter, since, message) { + var deprecationMessage = error ? "DeprecationError: " : "DeprecationWarning: "; + deprecationMessage += "'" + name + "' "; + deprecationMessage += since ? "has been deprecated since v" + since : "is deprecated"; + deprecationMessage += error ? " and can no longer be used." : errorAfter ? " and will no longer be usable after v" + errorAfter + "." : "."; + deprecationMessage += message ? " " + ts.formatStringFromArgs(message, [name], 0) : ""; + return deprecationMessage; + } + function createErrorDeprecation(name, errorAfter, since, message) { + var deprecationMessage = formatDeprecationMessage(name, /*error*/ true, errorAfter, since, message); + return function () { + throw new TypeError(deprecationMessage); + }; + } + function createWarningDeprecation(name, errorAfter, since, message) { + var hasWrittenDeprecation = false; + return function () { + if (!hasWrittenDeprecation) { + log.warn(formatDeprecationMessage(name, /*error*/ false, errorAfter, since, message)); + hasWrittenDeprecation = true; + } + }; + } + function createDeprecation(name, options) { + var _a, _b; + if (options === void 0) { options = {}; } + var version = typeof options.typeScriptVersion === "string" ? new ts.Version(options.typeScriptVersion) : (_a = options.typeScriptVersion) !== null && _a !== void 0 ? _a : getTypeScriptVersion(); + var errorAfter = typeof options.errorAfter === "string" ? new ts.Version(options.errorAfter) : options.errorAfter; + var warnAfter = typeof options.warnAfter === "string" ? new ts.Version(options.warnAfter) : options.warnAfter; + var since = typeof options.since === "string" ? new ts.Version(options.since) : (_b = options.since) !== null && _b !== void 0 ? _b : warnAfter; + var error = options.error || errorAfter && version.compareTo(errorAfter) <= 0; + var warn = !warnAfter || version.compareTo(warnAfter) >= 0; + return error ? createErrorDeprecation(name, errorAfter, since, options.message) : + warn ? createWarningDeprecation(name, errorAfter, since, options.message) : + ts.noop; + } + function wrapFunction(deprecation, func) { + return function () { + deprecation(); + return func.apply(this, arguments); + }; + } + function deprecate(func, options) { + var deprecation = createDeprecation(getFunctionName(func), options); + return wrapFunction(deprecation, func); + } + Debug.deprecate = deprecate; })(Debug = ts.Debug || (ts.Debug = {})); })(ts || (ts = {})); /*@internal*/ @@ -2660,9 +2928,9 @@ var ts; performance.forEachMeasure = forEachMeasure; /** Enables (and resets) performance measurements for the compiler. */ function enable() { - counts = ts.createMap(); - marks = ts.createMap(); - measures = ts.createMap(); + counts = new ts.Map(); + marks = new ts.Map(); + measures = new ts.Map(); enabled = true; profilerStart = ts.timestamp(); } @@ -3163,308 +3431,313 @@ var ts; SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 71] = "GreaterThanGreaterThanGreaterThanEqualsToken"; SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 72] = "AmpersandEqualsToken"; SyntaxKind[SyntaxKind["BarEqualsToken"] = 73] = "BarEqualsToken"; - SyntaxKind[SyntaxKind["CaretEqualsToken"] = 74] = "CaretEqualsToken"; + SyntaxKind[SyntaxKind["BarBarEqualsToken"] = 74] = "BarBarEqualsToken"; + SyntaxKind[SyntaxKind["AmpersandAmpersandEqualsToken"] = 75] = "AmpersandAmpersandEqualsToken"; + SyntaxKind[SyntaxKind["QuestionQuestionEqualsToken"] = 76] = "QuestionQuestionEqualsToken"; + SyntaxKind[SyntaxKind["CaretEqualsToken"] = 77] = "CaretEqualsToken"; // Identifiers and PrivateIdentifiers - SyntaxKind[SyntaxKind["Identifier"] = 75] = "Identifier"; - SyntaxKind[SyntaxKind["PrivateIdentifier"] = 76] = "PrivateIdentifier"; + SyntaxKind[SyntaxKind["Identifier"] = 78] = "Identifier"; + SyntaxKind[SyntaxKind["PrivateIdentifier"] = 79] = "PrivateIdentifier"; // Reserved words - SyntaxKind[SyntaxKind["BreakKeyword"] = 77] = "BreakKeyword"; - SyntaxKind[SyntaxKind["CaseKeyword"] = 78] = "CaseKeyword"; - SyntaxKind[SyntaxKind["CatchKeyword"] = 79] = "CatchKeyword"; - SyntaxKind[SyntaxKind["ClassKeyword"] = 80] = "ClassKeyword"; - SyntaxKind[SyntaxKind["ConstKeyword"] = 81] = "ConstKeyword"; - SyntaxKind[SyntaxKind["ContinueKeyword"] = 82] = "ContinueKeyword"; - SyntaxKind[SyntaxKind["DebuggerKeyword"] = 83] = "DebuggerKeyword"; - SyntaxKind[SyntaxKind["DefaultKeyword"] = 84] = "DefaultKeyword"; - SyntaxKind[SyntaxKind["DeleteKeyword"] = 85] = "DeleteKeyword"; - SyntaxKind[SyntaxKind["DoKeyword"] = 86] = "DoKeyword"; - SyntaxKind[SyntaxKind["ElseKeyword"] = 87] = "ElseKeyword"; - SyntaxKind[SyntaxKind["EnumKeyword"] = 88] = "EnumKeyword"; - SyntaxKind[SyntaxKind["ExportKeyword"] = 89] = "ExportKeyword"; - SyntaxKind[SyntaxKind["ExtendsKeyword"] = 90] = "ExtendsKeyword"; - SyntaxKind[SyntaxKind["FalseKeyword"] = 91] = "FalseKeyword"; - SyntaxKind[SyntaxKind["FinallyKeyword"] = 92] = "FinallyKeyword"; - SyntaxKind[SyntaxKind["ForKeyword"] = 93] = "ForKeyword"; - SyntaxKind[SyntaxKind["FunctionKeyword"] = 94] = "FunctionKeyword"; - SyntaxKind[SyntaxKind["IfKeyword"] = 95] = "IfKeyword"; - SyntaxKind[SyntaxKind["ImportKeyword"] = 96] = "ImportKeyword"; - SyntaxKind[SyntaxKind["InKeyword"] = 97] = "InKeyword"; - SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 98] = "InstanceOfKeyword"; - SyntaxKind[SyntaxKind["NewKeyword"] = 99] = "NewKeyword"; - SyntaxKind[SyntaxKind["NullKeyword"] = 100] = "NullKeyword"; - SyntaxKind[SyntaxKind["ReturnKeyword"] = 101] = "ReturnKeyword"; - SyntaxKind[SyntaxKind["SuperKeyword"] = 102] = "SuperKeyword"; - SyntaxKind[SyntaxKind["SwitchKeyword"] = 103] = "SwitchKeyword"; - SyntaxKind[SyntaxKind["ThisKeyword"] = 104] = "ThisKeyword"; - SyntaxKind[SyntaxKind["ThrowKeyword"] = 105] = "ThrowKeyword"; - SyntaxKind[SyntaxKind["TrueKeyword"] = 106] = "TrueKeyword"; - SyntaxKind[SyntaxKind["TryKeyword"] = 107] = "TryKeyword"; - SyntaxKind[SyntaxKind["TypeOfKeyword"] = 108] = "TypeOfKeyword"; - SyntaxKind[SyntaxKind["VarKeyword"] = 109] = "VarKeyword"; - SyntaxKind[SyntaxKind["VoidKeyword"] = 110] = "VoidKeyword"; - SyntaxKind[SyntaxKind["WhileKeyword"] = 111] = "WhileKeyword"; - SyntaxKind[SyntaxKind["WithKeyword"] = 112] = "WithKeyword"; + SyntaxKind[SyntaxKind["BreakKeyword"] = 80] = "BreakKeyword"; + SyntaxKind[SyntaxKind["CaseKeyword"] = 81] = "CaseKeyword"; + SyntaxKind[SyntaxKind["CatchKeyword"] = 82] = "CatchKeyword"; + SyntaxKind[SyntaxKind["ClassKeyword"] = 83] = "ClassKeyword"; + SyntaxKind[SyntaxKind["ConstKeyword"] = 84] = "ConstKeyword"; + SyntaxKind[SyntaxKind["ContinueKeyword"] = 85] = "ContinueKeyword"; + SyntaxKind[SyntaxKind["DebuggerKeyword"] = 86] = "DebuggerKeyword"; + SyntaxKind[SyntaxKind["DefaultKeyword"] = 87] = "DefaultKeyword"; + SyntaxKind[SyntaxKind["DeleteKeyword"] = 88] = "DeleteKeyword"; + SyntaxKind[SyntaxKind["DoKeyword"] = 89] = "DoKeyword"; + SyntaxKind[SyntaxKind["ElseKeyword"] = 90] = "ElseKeyword"; + SyntaxKind[SyntaxKind["EnumKeyword"] = 91] = "EnumKeyword"; + SyntaxKind[SyntaxKind["ExportKeyword"] = 92] = "ExportKeyword"; + SyntaxKind[SyntaxKind["ExtendsKeyword"] = 93] = "ExtendsKeyword"; + SyntaxKind[SyntaxKind["FalseKeyword"] = 94] = "FalseKeyword"; + SyntaxKind[SyntaxKind["FinallyKeyword"] = 95] = "FinallyKeyword"; + SyntaxKind[SyntaxKind["ForKeyword"] = 96] = "ForKeyword"; + SyntaxKind[SyntaxKind["FunctionKeyword"] = 97] = "FunctionKeyword"; + SyntaxKind[SyntaxKind["IfKeyword"] = 98] = "IfKeyword"; + SyntaxKind[SyntaxKind["ImportKeyword"] = 99] = "ImportKeyword"; + SyntaxKind[SyntaxKind["InKeyword"] = 100] = "InKeyword"; + SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 101] = "InstanceOfKeyword"; + SyntaxKind[SyntaxKind["NewKeyword"] = 102] = "NewKeyword"; + SyntaxKind[SyntaxKind["NullKeyword"] = 103] = "NullKeyword"; + SyntaxKind[SyntaxKind["ReturnKeyword"] = 104] = "ReturnKeyword"; + SyntaxKind[SyntaxKind["SuperKeyword"] = 105] = "SuperKeyword"; + SyntaxKind[SyntaxKind["SwitchKeyword"] = 106] = "SwitchKeyword"; + SyntaxKind[SyntaxKind["ThisKeyword"] = 107] = "ThisKeyword"; + SyntaxKind[SyntaxKind["ThrowKeyword"] = 108] = "ThrowKeyword"; + SyntaxKind[SyntaxKind["TrueKeyword"] = 109] = "TrueKeyword"; + SyntaxKind[SyntaxKind["TryKeyword"] = 110] = "TryKeyword"; + SyntaxKind[SyntaxKind["TypeOfKeyword"] = 111] = "TypeOfKeyword"; + SyntaxKind[SyntaxKind["VarKeyword"] = 112] = "VarKeyword"; + SyntaxKind[SyntaxKind["VoidKeyword"] = 113] = "VoidKeyword"; + SyntaxKind[SyntaxKind["WhileKeyword"] = 114] = "WhileKeyword"; + SyntaxKind[SyntaxKind["WithKeyword"] = 115] = "WithKeyword"; // Strict mode reserved words - SyntaxKind[SyntaxKind["ImplementsKeyword"] = 113] = "ImplementsKeyword"; - SyntaxKind[SyntaxKind["InterfaceKeyword"] = 114] = "InterfaceKeyword"; - SyntaxKind[SyntaxKind["LetKeyword"] = 115] = "LetKeyword"; - SyntaxKind[SyntaxKind["PackageKeyword"] = 116] = "PackageKeyword"; - SyntaxKind[SyntaxKind["PrivateKeyword"] = 117] = "PrivateKeyword"; - SyntaxKind[SyntaxKind["ProtectedKeyword"] = 118] = "ProtectedKeyword"; - SyntaxKind[SyntaxKind["PublicKeyword"] = 119] = "PublicKeyword"; - SyntaxKind[SyntaxKind["StaticKeyword"] = 120] = "StaticKeyword"; - SyntaxKind[SyntaxKind["YieldKeyword"] = 121] = "YieldKeyword"; + SyntaxKind[SyntaxKind["ImplementsKeyword"] = 116] = "ImplementsKeyword"; + SyntaxKind[SyntaxKind["InterfaceKeyword"] = 117] = "InterfaceKeyword"; + SyntaxKind[SyntaxKind["LetKeyword"] = 118] = "LetKeyword"; + SyntaxKind[SyntaxKind["PackageKeyword"] = 119] = "PackageKeyword"; + SyntaxKind[SyntaxKind["PrivateKeyword"] = 120] = "PrivateKeyword"; + SyntaxKind[SyntaxKind["ProtectedKeyword"] = 121] = "ProtectedKeyword"; + SyntaxKind[SyntaxKind["PublicKeyword"] = 122] = "PublicKeyword"; + SyntaxKind[SyntaxKind["StaticKeyword"] = 123] = "StaticKeyword"; + SyntaxKind[SyntaxKind["YieldKeyword"] = 124] = "YieldKeyword"; // Contextual keywords - SyntaxKind[SyntaxKind["AbstractKeyword"] = 122] = "AbstractKeyword"; - SyntaxKind[SyntaxKind["AsKeyword"] = 123] = "AsKeyword"; - SyntaxKind[SyntaxKind["AssertsKeyword"] = 124] = "AssertsKeyword"; - SyntaxKind[SyntaxKind["AnyKeyword"] = 125] = "AnyKeyword"; - SyntaxKind[SyntaxKind["AsyncKeyword"] = 126] = "AsyncKeyword"; - SyntaxKind[SyntaxKind["AwaitKeyword"] = 127] = "AwaitKeyword"; - SyntaxKind[SyntaxKind["BooleanKeyword"] = 128] = "BooleanKeyword"; - SyntaxKind[SyntaxKind["ConstructorKeyword"] = 129] = "ConstructorKeyword"; - SyntaxKind[SyntaxKind["DeclareKeyword"] = 130] = "DeclareKeyword"; - SyntaxKind[SyntaxKind["GetKeyword"] = 131] = "GetKeyword"; - SyntaxKind[SyntaxKind["InferKeyword"] = 132] = "InferKeyword"; - SyntaxKind[SyntaxKind["IsKeyword"] = 133] = "IsKeyword"; - SyntaxKind[SyntaxKind["KeyOfKeyword"] = 134] = "KeyOfKeyword"; - SyntaxKind[SyntaxKind["ModuleKeyword"] = 135] = "ModuleKeyword"; - SyntaxKind[SyntaxKind["NamespaceKeyword"] = 136] = "NamespaceKeyword"; - SyntaxKind[SyntaxKind["NeverKeyword"] = 137] = "NeverKeyword"; - SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 138] = "ReadonlyKeyword"; - SyntaxKind[SyntaxKind["RequireKeyword"] = 139] = "RequireKeyword"; - SyntaxKind[SyntaxKind["NumberKeyword"] = 140] = "NumberKeyword"; - SyntaxKind[SyntaxKind["ObjectKeyword"] = 141] = "ObjectKeyword"; - SyntaxKind[SyntaxKind["SetKeyword"] = 142] = "SetKeyword"; - SyntaxKind[SyntaxKind["StringKeyword"] = 143] = "StringKeyword"; - SyntaxKind[SyntaxKind["SymbolKeyword"] = 144] = "SymbolKeyword"; - SyntaxKind[SyntaxKind["TypeKeyword"] = 145] = "TypeKeyword"; - SyntaxKind[SyntaxKind["UndefinedKeyword"] = 146] = "UndefinedKeyword"; - SyntaxKind[SyntaxKind["UniqueKeyword"] = 147] = "UniqueKeyword"; - SyntaxKind[SyntaxKind["UnknownKeyword"] = 148] = "UnknownKeyword"; - SyntaxKind[SyntaxKind["FromKeyword"] = 149] = "FromKeyword"; - SyntaxKind[SyntaxKind["GlobalKeyword"] = 150] = "GlobalKeyword"; - SyntaxKind[SyntaxKind["BigIntKeyword"] = 151] = "BigIntKeyword"; - SyntaxKind[SyntaxKind["OfKeyword"] = 152] = "OfKeyword"; + SyntaxKind[SyntaxKind["AbstractKeyword"] = 125] = "AbstractKeyword"; + SyntaxKind[SyntaxKind["AsKeyword"] = 126] = "AsKeyword"; + SyntaxKind[SyntaxKind["AssertsKeyword"] = 127] = "AssertsKeyword"; + SyntaxKind[SyntaxKind["AnyKeyword"] = 128] = "AnyKeyword"; + SyntaxKind[SyntaxKind["AsyncKeyword"] = 129] = "AsyncKeyword"; + SyntaxKind[SyntaxKind["AwaitKeyword"] = 130] = "AwaitKeyword"; + SyntaxKind[SyntaxKind["BooleanKeyword"] = 131] = "BooleanKeyword"; + SyntaxKind[SyntaxKind["ConstructorKeyword"] = 132] = "ConstructorKeyword"; + SyntaxKind[SyntaxKind["DeclareKeyword"] = 133] = "DeclareKeyword"; + SyntaxKind[SyntaxKind["GetKeyword"] = 134] = "GetKeyword"; + SyntaxKind[SyntaxKind["InferKeyword"] = 135] = "InferKeyword"; + SyntaxKind[SyntaxKind["IsKeyword"] = 136] = "IsKeyword"; + SyntaxKind[SyntaxKind["KeyOfKeyword"] = 137] = "KeyOfKeyword"; + SyntaxKind[SyntaxKind["ModuleKeyword"] = 138] = "ModuleKeyword"; + SyntaxKind[SyntaxKind["NamespaceKeyword"] = 139] = "NamespaceKeyword"; + SyntaxKind[SyntaxKind["NeverKeyword"] = 140] = "NeverKeyword"; + SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 141] = "ReadonlyKeyword"; + SyntaxKind[SyntaxKind["RequireKeyword"] = 142] = "RequireKeyword"; + SyntaxKind[SyntaxKind["NumberKeyword"] = 143] = "NumberKeyword"; + SyntaxKind[SyntaxKind["ObjectKeyword"] = 144] = "ObjectKeyword"; + SyntaxKind[SyntaxKind["SetKeyword"] = 145] = "SetKeyword"; + SyntaxKind[SyntaxKind["StringKeyword"] = 146] = "StringKeyword"; + SyntaxKind[SyntaxKind["SymbolKeyword"] = 147] = "SymbolKeyword"; + SyntaxKind[SyntaxKind["TypeKeyword"] = 148] = "TypeKeyword"; + SyntaxKind[SyntaxKind["UndefinedKeyword"] = 149] = "UndefinedKeyword"; + SyntaxKind[SyntaxKind["UniqueKeyword"] = 150] = "UniqueKeyword"; + SyntaxKind[SyntaxKind["UnknownKeyword"] = 151] = "UnknownKeyword"; + SyntaxKind[SyntaxKind["FromKeyword"] = 152] = "FromKeyword"; + SyntaxKind[SyntaxKind["GlobalKeyword"] = 153] = "GlobalKeyword"; + SyntaxKind[SyntaxKind["BigIntKeyword"] = 154] = "BigIntKeyword"; + SyntaxKind[SyntaxKind["OfKeyword"] = 155] = "OfKeyword"; // Parse tree nodes // Names - SyntaxKind[SyntaxKind["QualifiedName"] = 153] = "QualifiedName"; - SyntaxKind[SyntaxKind["ComputedPropertyName"] = 154] = "ComputedPropertyName"; + SyntaxKind[SyntaxKind["QualifiedName"] = 156] = "QualifiedName"; + SyntaxKind[SyntaxKind["ComputedPropertyName"] = 157] = "ComputedPropertyName"; // Signature elements - SyntaxKind[SyntaxKind["TypeParameter"] = 155] = "TypeParameter"; - SyntaxKind[SyntaxKind["Parameter"] = 156] = "Parameter"; - SyntaxKind[SyntaxKind["Decorator"] = 157] = "Decorator"; + SyntaxKind[SyntaxKind["TypeParameter"] = 158] = "TypeParameter"; + SyntaxKind[SyntaxKind["Parameter"] = 159] = "Parameter"; + SyntaxKind[SyntaxKind["Decorator"] = 160] = "Decorator"; // TypeMember - SyntaxKind[SyntaxKind["PropertySignature"] = 158] = "PropertySignature"; - SyntaxKind[SyntaxKind["PropertyDeclaration"] = 159] = "PropertyDeclaration"; - SyntaxKind[SyntaxKind["MethodSignature"] = 160] = "MethodSignature"; - SyntaxKind[SyntaxKind["MethodDeclaration"] = 161] = "MethodDeclaration"; - SyntaxKind[SyntaxKind["Constructor"] = 162] = "Constructor"; - SyntaxKind[SyntaxKind["GetAccessor"] = 163] = "GetAccessor"; - SyntaxKind[SyntaxKind["SetAccessor"] = 164] = "SetAccessor"; - SyntaxKind[SyntaxKind["CallSignature"] = 165] = "CallSignature"; - SyntaxKind[SyntaxKind["ConstructSignature"] = 166] = "ConstructSignature"; - SyntaxKind[SyntaxKind["IndexSignature"] = 167] = "IndexSignature"; + SyntaxKind[SyntaxKind["PropertySignature"] = 161] = "PropertySignature"; + SyntaxKind[SyntaxKind["PropertyDeclaration"] = 162] = "PropertyDeclaration"; + SyntaxKind[SyntaxKind["MethodSignature"] = 163] = "MethodSignature"; + SyntaxKind[SyntaxKind["MethodDeclaration"] = 164] = "MethodDeclaration"; + SyntaxKind[SyntaxKind["Constructor"] = 165] = "Constructor"; + SyntaxKind[SyntaxKind["GetAccessor"] = 166] = "GetAccessor"; + SyntaxKind[SyntaxKind["SetAccessor"] = 167] = "SetAccessor"; + SyntaxKind[SyntaxKind["CallSignature"] = 168] = "CallSignature"; + SyntaxKind[SyntaxKind["ConstructSignature"] = 169] = "ConstructSignature"; + SyntaxKind[SyntaxKind["IndexSignature"] = 170] = "IndexSignature"; // Type - SyntaxKind[SyntaxKind["TypePredicate"] = 168] = "TypePredicate"; - SyntaxKind[SyntaxKind["TypeReference"] = 169] = "TypeReference"; - SyntaxKind[SyntaxKind["FunctionType"] = 170] = "FunctionType"; - SyntaxKind[SyntaxKind["ConstructorType"] = 171] = "ConstructorType"; - SyntaxKind[SyntaxKind["TypeQuery"] = 172] = "TypeQuery"; - SyntaxKind[SyntaxKind["TypeLiteral"] = 173] = "TypeLiteral"; - SyntaxKind[SyntaxKind["ArrayType"] = 174] = "ArrayType"; - SyntaxKind[SyntaxKind["TupleType"] = 175] = "TupleType"; - SyntaxKind[SyntaxKind["OptionalType"] = 176] = "OptionalType"; - SyntaxKind[SyntaxKind["RestType"] = 177] = "RestType"; - SyntaxKind[SyntaxKind["UnionType"] = 178] = "UnionType"; - SyntaxKind[SyntaxKind["IntersectionType"] = 179] = "IntersectionType"; - SyntaxKind[SyntaxKind["ConditionalType"] = 180] = "ConditionalType"; - SyntaxKind[SyntaxKind["InferType"] = 181] = "InferType"; - SyntaxKind[SyntaxKind["ParenthesizedType"] = 182] = "ParenthesizedType"; - SyntaxKind[SyntaxKind["ThisType"] = 183] = "ThisType"; - SyntaxKind[SyntaxKind["TypeOperator"] = 184] = "TypeOperator"; - SyntaxKind[SyntaxKind["IndexedAccessType"] = 185] = "IndexedAccessType"; - SyntaxKind[SyntaxKind["MappedType"] = 186] = "MappedType"; - SyntaxKind[SyntaxKind["LiteralType"] = 187] = "LiteralType"; - SyntaxKind[SyntaxKind["ImportType"] = 188] = "ImportType"; + SyntaxKind[SyntaxKind["TypePredicate"] = 171] = "TypePredicate"; + SyntaxKind[SyntaxKind["TypeReference"] = 172] = "TypeReference"; + SyntaxKind[SyntaxKind["FunctionType"] = 173] = "FunctionType"; + SyntaxKind[SyntaxKind["ConstructorType"] = 174] = "ConstructorType"; + SyntaxKind[SyntaxKind["TypeQuery"] = 175] = "TypeQuery"; + SyntaxKind[SyntaxKind["TypeLiteral"] = 176] = "TypeLiteral"; + SyntaxKind[SyntaxKind["ArrayType"] = 177] = "ArrayType"; + SyntaxKind[SyntaxKind["TupleType"] = 178] = "TupleType"; + SyntaxKind[SyntaxKind["OptionalType"] = 179] = "OptionalType"; + SyntaxKind[SyntaxKind["RestType"] = 180] = "RestType"; + SyntaxKind[SyntaxKind["UnionType"] = 181] = "UnionType"; + SyntaxKind[SyntaxKind["IntersectionType"] = 182] = "IntersectionType"; + SyntaxKind[SyntaxKind["ConditionalType"] = 183] = "ConditionalType"; + SyntaxKind[SyntaxKind["InferType"] = 184] = "InferType"; + SyntaxKind[SyntaxKind["ParenthesizedType"] = 185] = "ParenthesizedType"; + SyntaxKind[SyntaxKind["ThisType"] = 186] = "ThisType"; + SyntaxKind[SyntaxKind["TypeOperator"] = 187] = "TypeOperator"; + SyntaxKind[SyntaxKind["IndexedAccessType"] = 188] = "IndexedAccessType"; + SyntaxKind[SyntaxKind["MappedType"] = 189] = "MappedType"; + SyntaxKind[SyntaxKind["LiteralType"] = 190] = "LiteralType"; + SyntaxKind[SyntaxKind["NamedTupleMember"] = 191] = "NamedTupleMember"; + SyntaxKind[SyntaxKind["ImportType"] = 192] = "ImportType"; // Binding patterns - SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 189] = "ObjectBindingPattern"; - SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 190] = "ArrayBindingPattern"; - SyntaxKind[SyntaxKind["BindingElement"] = 191] = "BindingElement"; + SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 193] = "ObjectBindingPattern"; + SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 194] = "ArrayBindingPattern"; + SyntaxKind[SyntaxKind["BindingElement"] = 195] = "BindingElement"; // Expression - SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 192] = "ArrayLiteralExpression"; - SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 193] = "ObjectLiteralExpression"; - SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 194] = "PropertyAccessExpression"; - SyntaxKind[SyntaxKind["ElementAccessExpression"] = 195] = "ElementAccessExpression"; - SyntaxKind[SyntaxKind["CallExpression"] = 196] = "CallExpression"; - SyntaxKind[SyntaxKind["NewExpression"] = 197] = "NewExpression"; - SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 198] = "TaggedTemplateExpression"; - SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 199] = "TypeAssertionExpression"; - SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 200] = "ParenthesizedExpression"; - SyntaxKind[SyntaxKind["FunctionExpression"] = 201] = "FunctionExpression"; - SyntaxKind[SyntaxKind["ArrowFunction"] = 202] = "ArrowFunction"; - SyntaxKind[SyntaxKind["DeleteExpression"] = 203] = "DeleteExpression"; - SyntaxKind[SyntaxKind["TypeOfExpression"] = 204] = "TypeOfExpression"; - SyntaxKind[SyntaxKind["VoidExpression"] = 205] = "VoidExpression"; - SyntaxKind[SyntaxKind["AwaitExpression"] = 206] = "AwaitExpression"; - SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 207] = "PrefixUnaryExpression"; - SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 208] = "PostfixUnaryExpression"; - SyntaxKind[SyntaxKind["BinaryExpression"] = 209] = "BinaryExpression"; - SyntaxKind[SyntaxKind["ConditionalExpression"] = 210] = "ConditionalExpression"; - SyntaxKind[SyntaxKind["TemplateExpression"] = 211] = "TemplateExpression"; - SyntaxKind[SyntaxKind["YieldExpression"] = 212] = "YieldExpression"; - SyntaxKind[SyntaxKind["SpreadElement"] = 213] = "SpreadElement"; - SyntaxKind[SyntaxKind["ClassExpression"] = 214] = "ClassExpression"; - SyntaxKind[SyntaxKind["OmittedExpression"] = 215] = "OmittedExpression"; - SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 216] = "ExpressionWithTypeArguments"; - SyntaxKind[SyntaxKind["AsExpression"] = 217] = "AsExpression"; - SyntaxKind[SyntaxKind["NonNullExpression"] = 218] = "NonNullExpression"; - SyntaxKind[SyntaxKind["MetaProperty"] = 219] = "MetaProperty"; - SyntaxKind[SyntaxKind["SyntheticExpression"] = 220] = "SyntheticExpression"; + SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 196] = "ArrayLiteralExpression"; + SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 197] = "ObjectLiteralExpression"; + SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 198] = "PropertyAccessExpression"; + SyntaxKind[SyntaxKind["ElementAccessExpression"] = 199] = "ElementAccessExpression"; + SyntaxKind[SyntaxKind["CallExpression"] = 200] = "CallExpression"; + SyntaxKind[SyntaxKind["NewExpression"] = 201] = "NewExpression"; + SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 202] = "TaggedTemplateExpression"; + SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 203] = "TypeAssertionExpression"; + SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 204] = "ParenthesizedExpression"; + SyntaxKind[SyntaxKind["FunctionExpression"] = 205] = "FunctionExpression"; + SyntaxKind[SyntaxKind["ArrowFunction"] = 206] = "ArrowFunction"; + SyntaxKind[SyntaxKind["DeleteExpression"] = 207] = "DeleteExpression"; + SyntaxKind[SyntaxKind["TypeOfExpression"] = 208] = "TypeOfExpression"; + SyntaxKind[SyntaxKind["VoidExpression"] = 209] = "VoidExpression"; + SyntaxKind[SyntaxKind["AwaitExpression"] = 210] = "AwaitExpression"; + SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 211] = "PrefixUnaryExpression"; + SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 212] = "PostfixUnaryExpression"; + SyntaxKind[SyntaxKind["BinaryExpression"] = 213] = "BinaryExpression"; + SyntaxKind[SyntaxKind["ConditionalExpression"] = 214] = "ConditionalExpression"; + SyntaxKind[SyntaxKind["TemplateExpression"] = 215] = "TemplateExpression"; + SyntaxKind[SyntaxKind["YieldExpression"] = 216] = "YieldExpression"; + SyntaxKind[SyntaxKind["SpreadElement"] = 217] = "SpreadElement"; + SyntaxKind[SyntaxKind["ClassExpression"] = 218] = "ClassExpression"; + SyntaxKind[SyntaxKind["OmittedExpression"] = 219] = "OmittedExpression"; + SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 220] = "ExpressionWithTypeArguments"; + SyntaxKind[SyntaxKind["AsExpression"] = 221] = "AsExpression"; + SyntaxKind[SyntaxKind["NonNullExpression"] = 222] = "NonNullExpression"; + SyntaxKind[SyntaxKind["MetaProperty"] = 223] = "MetaProperty"; + SyntaxKind[SyntaxKind["SyntheticExpression"] = 224] = "SyntheticExpression"; // Misc - SyntaxKind[SyntaxKind["TemplateSpan"] = 221] = "TemplateSpan"; - SyntaxKind[SyntaxKind["SemicolonClassElement"] = 222] = "SemicolonClassElement"; + SyntaxKind[SyntaxKind["TemplateSpan"] = 225] = "TemplateSpan"; + SyntaxKind[SyntaxKind["SemicolonClassElement"] = 226] = "SemicolonClassElement"; // Element - SyntaxKind[SyntaxKind["Block"] = 223] = "Block"; - SyntaxKind[SyntaxKind["EmptyStatement"] = 224] = "EmptyStatement"; - SyntaxKind[SyntaxKind["VariableStatement"] = 225] = "VariableStatement"; - SyntaxKind[SyntaxKind["ExpressionStatement"] = 226] = "ExpressionStatement"; - SyntaxKind[SyntaxKind["IfStatement"] = 227] = "IfStatement"; - SyntaxKind[SyntaxKind["DoStatement"] = 228] = "DoStatement"; - SyntaxKind[SyntaxKind["WhileStatement"] = 229] = "WhileStatement"; - SyntaxKind[SyntaxKind["ForStatement"] = 230] = "ForStatement"; - SyntaxKind[SyntaxKind["ForInStatement"] = 231] = "ForInStatement"; - SyntaxKind[SyntaxKind["ForOfStatement"] = 232] = "ForOfStatement"; - SyntaxKind[SyntaxKind["ContinueStatement"] = 233] = "ContinueStatement"; - SyntaxKind[SyntaxKind["BreakStatement"] = 234] = "BreakStatement"; - SyntaxKind[SyntaxKind["ReturnStatement"] = 235] = "ReturnStatement"; - SyntaxKind[SyntaxKind["WithStatement"] = 236] = "WithStatement"; - SyntaxKind[SyntaxKind["SwitchStatement"] = 237] = "SwitchStatement"; - SyntaxKind[SyntaxKind["LabeledStatement"] = 238] = "LabeledStatement"; - SyntaxKind[SyntaxKind["ThrowStatement"] = 239] = "ThrowStatement"; - SyntaxKind[SyntaxKind["TryStatement"] = 240] = "TryStatement"; - SyntaxKind[SyntaxKind["DebuggerStatement"] = 241] = "DebuggerStatement"; - SyntaxKind[SyntaxKind["VariableDeclaration"] = 242] = "VariableDeclaration"; - SyntaxKind[SyntaxKind["VariableDeclarationList"] = 243] = "VariableDeclarationList"; - SyntaxKind[SyntaxKind["FunctionDeclaration"] = 244] = "FunctionDeclaration"; - SyntaxKind[SyntaxKind["ClassDeclaration"] = 245] = "ClassDeclaration"; - SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 246] = "InterfaceDeclaration"; - SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 247] = "TypeAliasDeclaration"; - SyntaxKind[SyntaxKind["EnumDeclaration"] = 248] = "EnumDeclaration"; - SyntaxKind[SyntaxKind["ModuleDeclaration"] = 249] = "ModuleDeclaration"; - SyntaxKind[SyntaxKind["ModuleBlock"] = 250] = "ModuleBlock"; - SyntaxKind[SyntaxKind["CaseBlock"] = 251] = "CaseBlock"; - SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 252] = "NamespaceExportDeclaration"; - SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 253] = "ImportEqualsDeclaration"; - SyntaxKind[SyntaxKind["ImportDeclaration"] = 254] = "ImportDeclaration"; - SyntaxKind[SyntaxKind["ImportClause"] = 255] = "ImportClause"; - SyntaxKind[SyntaxKind["NamespaceImport"] = 256] = "NamespaceImport"; - SyntaxKind[SyntaxKind["NamedImports"] = 257] = "NamedImports"; - SyntaxKind[SyntaxKind["ImportSpecifier"] = 258] = "ImportSpecifier"; - SyntaxKind[SyntaxKind["ExportAssignment"] = 259] = "ExportAssignment"; - SyntaxKind[SyntaxKind["ExportDeclaration"] = 260] = "ExportDeclaration"; - SyntaxKind[SyntaxKind["NamedExports"] = 261] = "NamedExports"; - SyntaxKind[SyntaxKind["NamespaceExport"] = 262] = "NamespaceExport"; - SyntaxKind[SyntaxKind["ExportSpecifier"] = 263] = "ExportSpecifier"; - SyntaxKind[SyntaxKind["MissingDeclaration"] = 264] = "MissingDeclaration"; + SyntaxKind[SyntaxKind["Block"] = 227] = "Block"; + SyntaxKind[SyntaxKind["EmptyStatement"] = 228] = "EmptyStatement"; + SyntaxKind[SyntaxKind["VariableStatement"] = 229] = "VariableStatement"; + SyntaxKind[SyntaxKind["ExpressionStatement"] = 230] = "ExpressionStatement"; + SyntaxKind[SyntaxKind["IfStatement"] = 231] = "IfStatement"; + SyntaxKind[SyntaxKind["DoStatement"] = 232] = "DoStatement"; + SyntaxKind[SyntaxKind["WhileStatement"] = 233] = "WhileStatement"; + SyntaxKind[SyntaxKind["ForStatement"] = 234] = "ForStatement"; + SyntaxKind[SyntaxKind["ForInStatement"] = 235] = "ForInStatement"; + SyntaxKind[SyntaxKind["ForOfStatement"] = 236] = "ForOfStatement"; + SyntaxKind[SyntaxKind["ContinueStatement"] = 237] = "ContinueStatement"; + SyntaxKind[SyntaxKind["BreakStatement"] = 238] = "BreakStatement"; + SyntaxKind[SyntaxKind["ReturnStatement"] = 239] = "ReturnStatement"; + SyntaxKind[SyntaxKind["WithStatement"] = 240] = "WithStatement"; + SyntaxKind[SyntaxKind["SwitchStatement"] = 241] = "SwitchStatement"; + SyntaxKind[SyntaxKind["LabeledStatement"] = 242] = "LabeledStatement"; + SyntaxKind[SyntaxKind["ThrowStatement"] = 243] = "ThrowStatement"; + SyntaxKind[SyntaxKind["TryStatement"] = 244] = "TryStatement"; + SyntaxKind[SyntaxKind["DebuggerStatement"] = 245] = "DebuggerStatement"; + SyntaxKind[SyntaxKind["VariableDeclaration"] = 246] = "VariableDeclaration"; + SyntaxKind[SyntaxKind["VariableDeclarationList"] = 247] = "VariableDeclarationList"; + SyntaxKind[SyntaxKind["FunctionDeclaration"] = 248] = "FunctionDeclaration"; + SyntaxKind[SyntaxKind["ClassDeclaration"] = 249] = "ClassDeclaration"; + SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 250] = "InterfaceDeclaration"; + SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 251] = "TypeAliasDeclaration"; + SyntaxKind[SyntaxKind["EnumDeclaration"] = 252] = "EnumDeclaration"; + SyntaxKind[SyntaxKind["ModuleDeclaration"] = 253] = "ModuleDeclaration"; + SyntaxKind[SyntaxKind["ModuleBlock"] = 254] = "ModuleBlock"; + SyntaxKind[SyntaxKind["CaseBlock"] = 255] = "CaseBlock"; + SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 256] = "NamespaceExportDeclaration"; + SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 257] = "ImportEqualsDeclaration"; + SyntaxKind[SyntaxKind["ImportDeclaration"] = 258] = "ImportDeclaration"; + SyntaxKind[SyntaxKind["ImportClause"] = 259] = "ImportClause"; + SyntaxKind[SyntaxKind["NamespaceImport"] = 260] = "NamespaceImport"; + SyntaxKind[SyntaxKind["NamedImports"] = 261] = "NamedImports"; + SyntaxKind[SyntaxKind["ImportSpecifier"] = 262] = "ImportSpecifier"; + SyntaxKind[SyntaxKind["ExportAssignment"] = 263] = "ExportAssignment"; + SyntaxKind[SyntaxKind["ExportDeclaration"] = 264] = "ExportDeclaration"; + SyntaxKind[SyntaxKind["NamedExports"] = 265] = "NamedExports"; + SyntaxKind[SyntaxKind["NamespaceExport"] = 266] = "NamespaceExport"; + SyntaxKind[SyntaxKind["ExportSpecifier"] = 267] = "ExportSpecifier"; + SyntaxKind[SyntaxKind["MissingDeclaration"] = 268] = "MissingDeclaration"; // Module references - SyntaxKind[SyntaxKind["ExternalModuleReference"] = 265] = "ExternalModuleReference"; + SyntaxKind[SyntaxKind["ExternalModuleReference"] = 269] = "ExternalModuleReference"; // JSX - SyntaxKind[SyntaxKind["JsxElement"] = 266] = "JsxElement"; - SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 267] = "JsxSelfClosingElement"; - SyntaxKind[SyntaxKind["JsxOpeningElement"] = 268] = "JsxOpeningElement"; - SyntaxKind[SyntaxKind["JsxClosingElement"] = 269] = "JsxClosingElement"; - SyntaxKind[SyntaxKind["JsxFragment"] = 270] = "JsxFragment"; - SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 271] = "JsxOpeningFragment"; - SyntaxKind[SyntaxKind["JsxClosingFragment"] = 272] = "JsxClosingFragment"; - SyntaxKind[SyntaxKind["JsxAttribute"] = 273] = "JsxAttribute"; - SyntaxKind[SyntaxKind["JsxAttributes"] = 274] = "JsxAttributes"; - SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 275] = "JsxSpreadAttribute"; - SyntaxKind[SyntaxKind["JsxExpression"] = 276] = "JsxExpression"; + SyntaxKind[SyntaxKind["JsxElement"] = 270] = "JsxElement"; + SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 271] = "JsxSelfClosingElement"; + SyntaxKind[SyntaxKind["JsxOpeningElement"] = 272] = "JsxOpeningElement"; + SyntaxKind[SyntaxKind["JsxClosingElement"] = 273] = "JsxClosingElement"; + SyntaxKind[SyntaxKind["JsxFragment"] = 274] = "JsxFragment"; + SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 275] = "JsxOpeningFragment"; + SyntaxKind[SyntaxKind["JsxClosingFragment"] = 276] = "JsxClosingFragment"; + SyntaxKind[SyntaxKind["JsxAttribute"] = 277] = "JsxAttribute"; + SyntaxKind[SyntaxKind["JsxAttributes"] = 278] = "JsxAttributes"; + SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 279] = "JsxSpreadAttribute"; + SyntaxKind[SyntaxKind["JsxExpression"] = 280] = "JsxExpression"; // Clauses - SyntaxKind[SyntaxKind["CaseClause"] = 277] = "CaseClause"; - SyntaxKind[SyntaxKind["DefaultClause"] = 278] = "DefaultClause"; - SyntaxKind[SyntaxKind["HeritageClause"] = 279] = "HeritageClause"; - SyntaxKind[SyntaxKind["CatchClause"] = 280] = "CatchClause"; + SyntaxKind[SyntaxKind["CaseClause"] = 281] = "CaseClause"; + SyntaxKind[SyntaxKind["DefaultClause"] = 282] = "DefaultClause"; + SyntaxKind[SyntaxKind["HeritageClause"] = 283] = "HeritageClause"; + SyntaxKind[SyntaxKind["CatchClause"] = 284] = "CatchClause"; // Property assignments - SyntaxKind[SyntaxKind["PropertyAssignment"] = 281] = "PropertyAssignment"; - SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 282] = "ShorthandPropertyAssignment"; - SyntaxKind[SyntaxKind["SpreadAssignment"] = 283] = "SpreadAssignment"; + SyntaxKind[SyntaxKind["PropertyAssignment"] = 285] = "PropertyAssignment"; + SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 286] = "ShorthandPropertyAssignment"; + SyntaxKind[SyntaxKind["SpreadAssignment"] = 287] = "SpreadAssignment"; // Enum - SyntaxKind[SyntaxKind["EnumMember"] = 284] = "EnumMember"; + SyntaxKind[SyntaxKind["EnumMember"] = 288] = "EnumMember"; // Unparsed - SyntaxKind[SyntaxKind["UnparsedPrologue"] = 285] = "UnparsedPrologue"; - SyntaxKind[SyntaxKind["UnparsedPrepend"] = 286] = "UnparsedPrepend"; - SyntaxKind[SyntaxKind["UnparsedText"] = 287] = "UnparsedText"; - SyntaxKind[SyntaxKind["UnparsedInternalText"] = 288] = "UnparsedInternalText"; - SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 289] = "UnparsedSyntheticReference"; + SyntaxKind[SyntaxKind["UnparsedPrologue"] = 289] = "UnparsedPrologue"; + SyntaxKind[SyntaxKind["UnparsedPrepend"] = 290] = "UnparsedPrepend"; + SyntaxKind[SyntaxKind["UnparsedText"] = 291] = "UnparsedText"; + SyntaxKind[SyntaxKind["UnparsedInternalText"] = 292] = "UnparsedInternalText"; + SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 293] = "UnparsedSyntheticReference"; // Top-level nodes - SyntaxKind[SyntaxKind["SourceFile"] = 290] = "SourceFile"; - SyntaxKind[SyntaxKind["Bundle"] = 291] = "Bundle"; - SyntaxKind[SyntaxKind["UnparsedSource"] = 292] = "UnparsedSource"; - SyntaxKind[SyntaxKind["InputFiles"] = 293] = "InputFiles"; + SyntaxKind[SyntaxKind["SourceFile"] = 294] = "SourceFile"; + SyntaxKind[SyntaxKind["Bundle"] = 295] = "Bundle"; + SyntaxKind[SyntaxKind["UnparsedSource"] = 296] = "UnparsedSource"; + SyntaxKind[SyntaxKind["InputFiles"] = 297] = "InputFiles"; // JSDoc nodes - SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 294] = "JSDocTypeExpression"; + SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 298] = "JSDocTypeExpression"; // The * type - SyntaxKind[SyntaxKind["JSDocAllType"] = 295] = "JSDocAllType"; + SyntaxKind[SyntaxKind["JSDocAllType"] = 299] = "JSDocAllType"; // The ? type - SyntaxKind[SyntaxKind["JSDocUnknownType"] = 296] = "JSDocUnknownType"; - SyntaxKind[SyntaxKind["JSDocNullableType"] = 297] = "JSDocNullableType"; - SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 298] = "JSDocNonNullableType"; - SyntaxKind[SyntaxKind["JSDocOptionalType"] = 299] = "JSDocOptionalType"; - SyntaxKind[SyntaxKind["JSDocFunctionType"] = 300] = "JSDocFunctionType"; - SyntaxKind[SyntaxKind["JSDocVariadicType"] = 301] = "JSDocVariadicType"; + SyntaxKind[SyntaxKind["JSDocUnknownType"] = 300] = "JSDocUnknownType"; + SyntaxKind[SyntaxKind["JSDocNullableType"] = 301] = "JSDocNullableType"; + SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 302] = "JSDocNonNullableType"; + SyntaxKind[SyntaxKind["JSDocOptionalType"] = 303] = "JSDocOptionalType"; + SyntaxKind[SyntaxKind["JSDocFunctionType"] = 304] = "JSDocFunctionType"; + SyntaxKind[SyntaxKind["JSDocVariadicType"] = 305] = "JSDocVariadicType"; // https://jsdoc.app/about-namepaths.html - SyntaxKind[SyntaxKind["JSDocNamepathType"] = 302] = "JSDocNamepathType"; - SyntaxKind[SyntaxKind["JSDocComment"] = 303] = "JSDocComment"; - SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 304] = "JSDocTypeLiteral"; - SyntaxKind[SyntaxKind["JSDocSignature"] = 305] = "JSDocSignature"; - SyntaxKind[SyntaxKind["JSDocTag"] = 306] = "JSDocTag"; - SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 307] = "JSDocAugmentsTag"; - SyntaxKind[SyntaxKind["JSDocImplementsTag"] = 308] = "JSDocImplementsTag"; - SyntaxKind[SyntaxKind["JSDocAuthorTag"] = 309] = "JSDocAuthorTag"; - SyntaxKind[SyntaxKind["JSDocClassTag"] = 310] = "JSDocClassTag"; - SyntaxKind[SyntaxKind["JSDocPublicTag"] = 311] = "JSDocPublicTag"; - SyntaxKind[SyntaxKind["JSDocPrivateTag"] = 312] = "JSDocPrivateTag"; - SyntaxKind[SyntaxKind["JSDocProtectedTag"] = 313] = "JSDocProtectedTag"; - SyntaxKind[SyntaxKind["JSDocReadonlyTag"] = 314] = "JSDocReadonlyTag"; - SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 315] = "JSDocCallbackTag"; - SyntaxKind[SyntaxKind["JSDocEnumTag"] = 316] = "JSDocEnumTag"; - SyntaxKind[SyntaxKind["JSDocParameterTag"] = 317] = "JSDocParameterTag"; - SyntaxKind[SyntaxKind["JSDocReturnTag"] = 318] = "JSDocReturnTag"; - SyntaxKind[SyntaxKind["JSDocThisTag"] = 319] = "JSDocThisTag"; - SyntaxKind[SyntaxKind["JSDocTypeTag"] = 320] = "JSDocTypeTag"; - SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 321] = "JSDocTemplateTag"; - SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 322] = "JSDocTypedefTag"; - SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 323] = "JSDocPropertyTag"; + SyntaxKind[SyntaxKind["JSDocNamepathType"] = 306] = "JSDocNamepathType"; + SyntaxKind[SyntaxKind["JSDocComment"] = 307] = "JSDocComment"; + SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 308] = "JSDocTypeLiteral"; + SyntaxKind[SyntaxKind["JSDocSignature"] = 309] = "JSDocSignature"; + SyntaxKind[SyntaxKind["JSDocTag"] = 310] = "JSDocTag"; + SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 311] = "JSDocAugmentsTag"; + SyntaxKind[SyntaxKind["JSDocImplementsTag"] = 312] = "JSDocImplementsTag"; + SyntaxKind[SyntaxKind["JSDocAuthorTag"] = 313] = "JSDocAuthorTag"; + SyntaxKind[SyntaxKind["JSDocDeprecatedTag"] = 314] = "JSDocDeprecatedTag"; + SyntaxKind[SyntaxKind["JSDocClassTag"] = 315] = "JSDocClassTag"; + SyntaxKind[SyntaxKind["JSDocPublicTag"] = 316] = "JSDocPublicTag"; + SyntaxKind[SyntaxKind["JSDocPrivateTag"] = 317] = "JSDocPrivateTag"; + SyntaxKind[SyntaxKind["JSDocProtectedTag"] = 318] = "JSDocProtectedTag"; + SyntaxKind[SyntaxKind["JSDocReadonlyTag"] = 319] = "JSDocReadonlyTag"; + SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 320] = "JSDocCallbackTag"; + SyntaxKind[SyntaxKind["JSDocEnumTag"] = 321] = "JSDocEnumTag"; + SyntaxKind[SyntaxKind["JSDocParameterTag"] = 322] = "JSDocParameterTag"; + SyntaxKind[SyntaxKind["JSDocReturnTag"] = 323] = "JSDocReturnTag"; + SyntaxKind[SyntaxKind["JSDocThisTag"] = 324] = "JSDocThisTag"; + SyntaxKind[SyntaxKind["JSDocTypeTag"] = 325] = "JSDocTypeTag"; + SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 326] = "JSDocTemplateTag"; + SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 327] = "JSDocTypedefTag"; + SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 328] = "JSDocPropertyTag"; // Synthesized list - SyntaxKind[SyntaxKind["SyntaxList"] = 324] = "SyntaxList"; + SyntaxKind[SyntaxKind["SyntaxList"] = 329] = "SyntaxList"; // Transformation nodes - SyntaxKind[SyntaxKind["NotEmittedStatement"] = 325] = "NotEmittedStatement"; - SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 326] = "PartiallyEmittedExpression"; - SyntaxKind[SyntaxKind["CommaListExpression"] = 327] = "CommaListExpression"; - SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 328] = "MergeDeclarationMarker"; - SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 329] = "EndOfDeclarationMarker"; - SyntaxKind[SyntaxKind["SyntheticReferenceExpression"] = 330] = "SyntheticReferenceExpression"; + SyntaxKind[SyntaxKind["NotEmittedStatement"] = 330] = "NotEmittedStatement"; + SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 331] = "PartiallyEmittedExpression"; + SyntaxKind[SyntaxKind["CommaListExpression"] = 332] = "CommaListExpression"; + SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 333] = "MergeDeclarationMarker"; + SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 334] = "EndOfDeclarationMarker"; + SyntaxKind[SyntaxKind["SyntheticReferenceExpression"] = 335] = "SyntheticReferenceExpression"; // Enum value count - SyntaxKind[SyntaxKind["Count"] = 331] = "Count"; + SyntaxKind[SyntaxKind["Count"] = 336] = "Count"; // Markers SyntaxKind[SyntaxKind["FirstAssignment"] = 62] = "FirstAssignment"; - SyntaxKind[SyntaxKind["LastAssignment"] = 74] = "LastAssignment"; + SyntaxKind[SyntaxKind["LastAssignment"] = 77] = "LastAssignment"; SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 63] = "FirstCompoundAssignment"; - SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 74] = "LastCompoundAssignment"; - SyntaxKind[SyntaxKind["FirstReservedWord"] = 77] = "FirstReservedWord"; - SyntaxKind[SyntaxKind["LastReservedWord"] = 112] = "LastReservedWord"; - SyntaxKind[SyntaxKind["FirstKeyword"] = 77] = "FirstKeyword"; - SyntaxKind[SyntaxKind["LastKeyword"] = 152] = "LastKeyword"; - SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 113] = "FirstFutureReservedWord"; - SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 121] = "LastFutureReservedWord"; - SyntaxKind[SyntaxKind["FirstTypeNode"] = 168] = "FirstTypeNode"; - SyntaxKind[SyntaxKind["LastTypeNode"] = 188] = "LastTypeNode"; + SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 77] = "LastCompoundAssignment"; + SyntaxKind[SyntaxKind["FirstReservedWord"] = 80] = "FirstReservedWord"; + SyntaxKind[SyntaxKind["LastReservedWord"] = 115] = "LastReservedWord"; + SyntaxKind[SyntaxKind["FirstKeyword"] = 80] = "FirstKeyword"; + SyntaxKind[SyntaxKind["LastKeyword"] = 155] = "LastKeyword"; + SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 116] = "FirstFutureReservedWord"; + SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 124] = "LastFutureReservedWord"; + SyntaxKind[SyntaxKind["FirstTypeNode"] = 171] = "FirstTypeNode"; + SyntaxKind[SyntaxKind["LastTypeNode"] = 192] = "LastTypeNode"; SyntaxKind[SyntaxKind["FirstPunctuation"] = 18] = "FirstPunctuation"; - SyntaxKind[SyntaxKind["LastPunctuation"] = 74] = "LastPunctuation"; + SyntaxKind[SyntaxKind["LastPunctuation"] = 77] = "LastPunctuation"; SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken"; - SyntaxKind[SyntaxKind["LastToken"] = 152] = "LastToken"; + SyntaxKind[SyntaxKind["LastToken"] = 155] = "LastToken"; SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken"; SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken"; SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken"; @@ -3472,16 +3745,16 @@ var ts; SyntaxKind[SyntaxKind["FirstTemplateToken"] = 14] = "FirstTemplateToken"; SyntaxKind[SyntaxKind["LastTemplateToken"] = 17] = "LastTemplateToken"; SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 29] = "FirstBinaryOperator"; - SyntaxKind[SyntaxKind["LastBinaryOperator"] = 74] = "LastBinaryOperator"; - SyntaxKind[SyntaxKind["FirstStatement"] = 225] = "FirstStatement"; - SyntaxKind[SyntaxKind["LastStatement"] = 241] = "LastStatement"; - SyntaxKind[SyntaxKind["FirstNode"] = 153] = "FirstNode"; - SyntaxKind[SyntaxKind["FirstJSDocNode"] = 294] = "FirstJSDocNode"; - SyntaxKind[SyntaxKind["LastJSDocNode"] = 323] = "LastJSDocNode"; - SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 306] = "FirstJSDocTagNode"; - SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 323] = "LastJSDocTagNode"; - /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 122] = "FirstContextualKeyword"; - /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 152] = "LastContextualKeyword"; + SyntaxKind[SyntaxKind["LastBinaryOperator"] = 77] = "LastBinaryOperator"; + SyntaxKind[SyntaxKind["FirstStatement"] = 229] = "FirstStatement"; + SyntaxKind[SyntaxKind["LastStatement"] = 245] = "LastStatement"; + SyntaxKind[SyntaxKind["FirstNode"] = 156] = "FirstNode"; + SyntaxKind[SyntaxKind["FirstJSDocNode"] = 298] = "FirstJSDocNode"; + SyntaxKind[SyntaxKind["LastJSDocNode"] = 328] = "LastJSDocNode"; + SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 310] = "FirstJSDocTagNode"; + SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 328] = "LastJSDocTagNode"; + /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 125] = "FirstContextualKeyword"; + /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 155] = "LastContextualKeyword"; })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {})); var NodeFlags; (function (NodeFlags) { @@ -3522,6 +3795,7 @@ var ts; /* @internal */ NodeFlags[NodeFlags["InWithStatement"] = 16777216] = "InWithStatement"; NodeFlags[NodeFlags["JsonFile"] = 33554432] = "JsonFile"; /* @internal */ NodeFlags[NodeFlags["TypeCached"] = 67108864] = "TypeCached"; + /* @internal */ NodeFlags[NodeFlags["Deprecated"] = 134217728] = "Deprecated"; NodeFlags[NodeFlags["BlockScoped"] = 3] = "BlockScoped"; NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 768] = "ReachabilityCheckFlags"; NodeFlags[NodeFlags["ReachabilityAndEmitFlags"] = 2816] = "ReachabilityAndEmitFlags"; @@ -3548,6 +3822,8 @@ var ts; ModifierFlags[ModifierFlags["Async"] = 256] = "Async"; ModifierFlags[ModifierFlags["Default"] = 512] = "Default"; ModifierFlags[ModifierFlags["Const"] = 2048] = "Const"; + ModifierFlags[ModifierFlags["HasComputedJSDocModifiers"] = 4096] = "HasComputedJSDocModifiers"; + ModifierFlags[ModifierFlags["Deprecated"] = 8192] = "Deprecated"; ModifierFlags[ModifierFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags"; ModifierFlags[ModifierFlags["AccessibilityModifier"] = 28] = "AccessibilityModifier"; // Accessibility modifiers and 'readonly' can be attached to a parameter in a constructor to make it a property. @@ -3555,7 +3831,7 @@ var ts; ModifierFlags[ModifierFlags["NonPublicAccessibilityModifier"] = 24] = "NonPublicAccessibilityModifier"; ModifierFlags[ModifierFlags["TypeScriptModifier"] = 2270] = "TypeScriptModifier"; ModifierFlags[ModifierFlags["ExportDefault"] = 513] = "ExportDefault"; - ModifierFlags[ModifierFlags["All"] = 3071] = "All"; + ModifierFlags[ModifierFlags["All"] = 11263] = "All"; })(ModifierFlags = ts.ModifierFlags || (ts.ModifierFlags = {})); var JsxFlags; (function (JsxFlags) { @@ -3576,16 +3852,15 @@ var ts; RelationComparisonResult[RelationComparisonResult["ReportsUnreliable"] = 16] = "ReportsUnreliable"; RelationComparisonResult[RelationComparisonResult["ReportsMask"] = 24] = "ReportsMask"; })(RelationComparisonResult = ts.RelationComparisonResult || (ts.RelationComparisonResult = {})); - /*@internal*/ var GeneratedIdentifierFlags; (function (GeneratedIdentifierFlags) { // Kinds GeneratedIdentifierFlags[GeneratedIdentifierFlags["None"] = 0] = "None"; - GeneratedIdentifierFlags[GeneratedIdentifierFlags["Auto"] = 1] = "Auto"; - GeneratedIdentifierFlags[GeneratedIdentifierFlags["Loop"] = 2] = "Loop"; - GeneratedIdentifierFlags[GeneratedIdentifierFlags["Unique"] = 3] = "Unique"; - GeneratedIdentifierFlags[GeneratedIdentifierFlags["Node"] = 4] = "Node"; - GeneratedIdentifierFlags[GeneratedIdentifierFlags["KindMask"] = 7] = "KindMask"; + /*@internal*/ GeneratedIdentifierFlags[GeneratedIdentifierFlags["Auto"] = 1] = "Auto"; + /*@internal*/ GeneratedIdentifierFlags[GeneratedIdentifierFlags["Loop"] = 2] = "Loop"; + /*@internal*/ GeneratedIdentifierFlags[GeneratedIdentifierFlags["Unique"] = 3] = "Unique"; + /*@internal*/ GeneratedIdentifierFlags[GeneratedIdentifierFlags["Node"] = 4] = "Node"; + /*@internal*/ GeneratedIdentifierFlags[GeneratedIdentifierFlags["KindMask"] = 7] = "KindMask"; // Flags GeneratedIdentifierFlags[GeneratedIdentifierFlags["ReservedInNestedScopes"] = 8] = "ReservedInNestedScopes"; GeneratedIdentifierFlags[GeneratedIdentifierFlags["Optimistic"] = 16] = "Optimistic"; @@ -3617,6 +3892,8 @@ var ts; TokenFlags[TokenFlags["BinaryOrOctalSpecifier"] = 384] = "BinaryOrOctalSpecifier"; /* @internal */ TokenFlags[TokenFlags["NumericLiteralFlags"] = 1008] = "NumericLiteralFlags"; + /* @internal */ + TokenFlags[TokenFlags["TemplateLiteralLikeFlags"] = 2048] = "TemplateLiteralLikeFlags"; })(TokenFlags = ts.TokenFlags || (ts.TokenFlags = {})); // NOTE: Ensure this is up-to-date with src/debug/debug.ts var FlowFlags; @@ -3695,6 +3972,7 @@ var ts; ContextFlags[ContextFlags["Signature"] = 1] = "Signature"; ContextFlags[ContextFlags["NoConstraints"] = 2] = "NoConstraints"; ContextFlags[ContextFlags["Completions"] = 4] = "Completions"; + ContextFlags[ContextFlags["SkipBindingPatterns"] = 8] = "SkipBindingPatterns"; })(ContextFlags = ts.ContextFlags || (ts.ContextFlags = {})); // NOTE: If modifying this enum, must modify `TypeFormatFlags` too! var NodeBuilderFlags; @@ -3718,6 +3996,7 @@ var ts; NodeBuilderFlags[NodeBuilderFlags["UseAliasDefinedOutsideCurrentScope"] = 16384] = "UseAliasDefinedOutsideCurrentScope"; NodeBuilderFlags[NodeBuilderFlags["UseSingleQuotesForStringLiteralType"] = 268435456] = "UseSingleQuotesForStringLiteralType"; NodeBuilderFlags[NodeBuilderFlags["NoTypeReduction"] = 536870912] = "NoTypeReduction"; + NodeBuilderFlags[NodeBuilderFlags["NoUndefinedOptionalParameterType"] = 1073741824] = "NoUndefinedOptionalParameterType"; // Error handling NodeBuilderFlags[NodeBuilderFlags["AllowThisInObjectLiteral"] = 32768] = "AllowThisInObjectLiteral"; NodeBuilderFlags[NodeBuilderFlags["AllowQualifedNameInPlaceOfIdentifier"] = 65536] = "AllowQualifedNameInPlaceOfIdentifier"; @@ -4070,7 +4349,6 @@ var ts; // 'Narrowable' types are types where narrowing actually narrows. // This *should* be every type other than null, undefined, void, and never TypeFlags[TypeFlags["Narrowable"] = 133970943] = "Narrowable"; - TypeFlags[TypeFlags["NotUnionOrUnit"] = 67637251] = "NotUnionOrUnit"; /* @internal */ TypeFlags[TypeFlags["NotPrimitiveUnion"] = 66994211] = "NotPrimitiveUnion"; // The following flags are aggregated during union and intersection type construction @@ -4151,6 +4429,14 @@ var ts; VarianceFlags[VarianceFlags["Unreliable"] = 16] = "Unreliable"; VarianceFlags[VarianceFlags["AllowsStructuralFallback"] = 24] = "AllowsStructuralFallback"; })(VarianceFlags = ts.VarianceFlags || (ts.VarianceFlags = {})); + var ElementFlags; + (function (ElementFlags) { + ElementFlags[ElementFlags["Required"] = 1] = "Required"; + ElementFlags[ElementFlags["Optional"] = 2] = "Optional"; + ElementFlags[ElementFlags["Rest"] = 4] = "Rest"; + ElementFlags[ElementFlags["Variadic"] = 8] = "Variadic"; + ElementFlags[ElementFlags["Variable"] = 12] = "Variable"; + })(ElementFlags = ts.ElementFlags || (ts.ElementFlags = {})); /* @internal */ var JsxReferenceKind; (function (JsxReferenceKind) { @@ -4175,7 +4461,7 @@ var ts; // We do not propagate `IsInnerCallChain` to instantiated signatures, as that would result in us // attempting to add `| undefined` on each recursive call to `getReturnTypeOfSignature` when // instantiating the return type. - SignatureFlags[SignatureFlags["PropagatingFlags"] = 3] = "PropagatingFlags"; + SignatureFlags[SignatureFlags["PropagatingFlags"] = 19] = "PropagatingFlags"; SignatureFlags[SignatureFlags["CallChainFlags"] = 12] = "CallChainFlags"; })(SignatureFlags = ts.SignatureFlags || (ts.SignatureFlags = {})); var IndexKind; @@ -4195,16 +4481,17 @@ var ts; var InferencePriority; (function (InferencePriority) { InferencePriority[InferencePriority["NakedTypeVariable"] = 1] = "NakedTypeVariable"; - InferencePriority[InferencePriority["HomomorphicMappedType"] = 2] = "HomomorphicMappedType"; - InferencePriority[InferencePriority["PartialHomomorphicMappedType"] = 4] = "PartialHomomorphicMappedType"; - InferencePriority[InferencePriority["MappedTypeConstraint"] = 8] = "MappedTypeConstraint"; - InferencePriority[InferencePriority["ContravariantConditional"] = 16] = "ContravariantConditional"; - InferencePriority[InferencePriority["ReturnType"] = 32] = "ReturnType"; - InferencePriority[InferencePriority["LiteralKeyof"] = 64] = "LiteralKeyof"; - InferencePriority[InferencePriority["NoConstraints"] = 128] = "NoConstraints"; - InferencePriority[InferencePriority["AlwaysStrict"] = 256] = "AlwaysStrict"; - InferencePriority[InferencePriority["MaxValue"] = 512] = "MaxValue"; - InferencePriority[InferencePriority["PriorityImpliesCombination"] = 104] = "PriorityImpliesCombination"; + InferencePriority[InferencePriority["SpeculativeTuple"] = 2] = "SpeculativeTuple"; + InferencePriority[InferencePriority["HomomorphicMappedType"] = 4] = "HomomorphicMappedType"; + InferencePriority[InferencePriority["PartialHomomorphicMappedType"] = 8] = "PartialHomomorphicMappedType"; + InferencePriority[InferencePriority["MappedTypeConstraint"] = 16] = "MappedTypeConstraint"; + InferencePriority[InferencePriority["ContravariantConditional"] = 32] = "ContravariantConditional"; + InferencePriority[InferencePriority["ReturnType"] = 64] = "ReturnType"; + InferencePriority[InferencePriority["LiteralKeyof"] = 128] = "LiteralKeyof"; + InferencePriority[InferencePriority["NoConstraints"] = 256] = "NoConstraints"; + InferencePriority[InferencePriority["AlwaysStrict"] = 512] = "AlwaysStrict"; + InferencePriority[InferencePriority["MaxValue"] = 1024] = "MaxValue"; + InferencePriority[InferencePriority["PriorityImpliesCombination"] = 208] = "PriorityImpliesCombination"; InferencePriority[InferencePriority["Circularity"] = -1] = "Circularity"; })(InferencePriority = ts.InferencePriority || (ts.InferencePriority = {})); /* @internal */ @@ -4537,6 +4824,7 @@ var ts; TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 1048576] = "ContainsHoistedDeclarationOrCompletion"; TransformFlags[TransformFlags["ContainsDynamicImport"] = 2097152] = "ContainsDynamicImport"; TransformFlags[TransformFlags["ContainsClassFields"] = 4194304] = "ContainsClassFields"; + TransformFlags[TransformFlags["ContainsPossibleTopLevelAwait"] = 8388608] = "ContainsPossibleTopLevelAwait"; // Please leave this as 1 << 29. // It is the maximum bit we can set before we outgrow the size of a v8 small integer (SMI) on an x86 system. // It is a good reminder of how much room we have left @@ -4560,13 +4848,13 @@ var ts; TransformFlags[TransformFlags["OuterExpressionExcludes"] = 536870912] = "OuterExpressionExcludes"; TransformFlags[TransformFlags["PropertyAccessExcludes"] = 536870912] = "PropertyAccessExcludes"; TransformFlags[TransformFlags["NodeExcludes"] = 536870912] = "NodeExcludes"; - TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 538920960] = "ArrowFunctionExcludes"; - TransformFlags[TransformFlags["FunctionExcludes"] = 538925056] = "FunctionExcludes"; - TransformFlags[TransformFlags["ConstructorExcludes"] = 538923008] = "ConstructorExcludes"; + TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 547309568] = "ArrowFunctionExcludes"; + TransformFlags[TransformFlags["FunctionExcludes"] = 547313664] = "FunctionExcludes"; + TransformFlags[TransformFlags["ConstructorExcludes"] = 547311616] = "ConstructorExcludes"; TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 538923008] = "MethodOrAccessorExcludes"; TransformFlags[TransformFlags["PropertyExcludes"] = 536875008] = "PropertyExcludes"; TransformFlags[TransformFlags["ClassExcludes"] = 536905728] = "ClassExcludes"; - TransformFlags[TransformFlags["ModuleExcludes"] = 537991168] = "ModuleExcludes"; + TransformFlags[TransformFlags["ModuleExcludes"] = 546379776] = "ModuleExcludes"; TransformFlags[TransformFlags["TypeExcludes"] = -2] = "TypeExcludes"; TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 536922112] = "ObjectLiteralExcludes"; TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 536879104] = "ArrayLiteralOrCallOrNewExcludes"; @@ -4639,12 +4927,14 @@ var ts; ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegator"] = 16384] = "AsyncDelegator"; ExternalEmitHelpers[ExternalEmitHelpers["AsyncValues"] = 32768] = "AsyncValues"; ExternalEmitHelpers[ExternalEmitHelpers["ExportStar"] = 65536] = "ExportStar"; - ExternalEmitHelpers[ExternalEmitHelpers["MakeTemplateObject"] = 131072] = "MakeTemplateObject"; - ExternalEmitHelpers[ExternalEmitHelpers["ClassPrivateFieldGet"] = 262144] = "ClassPrivateFieldGet"; - ExternalEmitHelpers[ExternalEmitHelpers["ClassPrivateFieldSet"] = 524288] = "ClassPrivateFieldSet"; - ExternalEmitHelpers[ExternalEmitHelpers["CreateBinding"] = 1048576] = "CreateBinding"; + ExternalEmitHelpers[ExternalEmitHelpers["ImportStar"] = 131072] = "ImportStar"; + ExternalEmitHelpers[ExternalEmitHelpers["ImportDefault"] = 262144] = "ImportDefault"; + ExternalEmitHelpers[ExternalEmitHelpers["MakeTemplateObject"] = 524288] = "MakeTemplateObject"; + ExternalEmitHelpers[ExternalEmitHelpers["ClassPrivateFieldGet"] = 1048576] = "ClassPrivateFieldGet"; + ExternalEmitHelpers[ExternalEmitHelpers["ClassPrivateFieldSet"] = 2097152] = "ClassPrivateFieldSet"; + ExternalEmitHelpers[ExternalEmitHelpers["CreateBinding"] = 4194304] = "CreateBinding"; ExternalEmitHelpers[ExternalEmitHelpers["FirstEmitHelper"] = 1] = "FirstEmitHelper"; - ExternalEmitHelpers[ExternalEmitHelpers["LastEmitHelper"] = 1048576] = "LastEmitHelper"; + ExternalEmitHelpers[ExternalEmitHelpers["LastEmitHelper"] = 4194304] = "LastEmitHelper"; // Helpers included by ES2015 for..of ExternalEmitHelpers[ExternalEmitHelpers["ForOfIncludes"] = 256] = "ForOfIncludes"; // Helpers included by ES2017 for..await..of @@ -4666,6 +4956,15 @@ var ts; EmitHint[EmitHint["EmbeddedStatement"] = 5] = "EmbeddedStatement"; EmitHint[EmitHint["JsxAttributeValue"] = 6] = "JsxAttributeValue"; })(EmitHint = ts.EmitHint || (ts.EmitHint = {})); + var OuterExpressionKinds; + (function (OuterExpressionKinds) { + OuterExpressionKinds[OuterExpressionKinds["Parentheses"] = 1] = "Parentheses"; + OuterExpressionKinds[OuterExpressionKinds["TypeAssertions"] = 2] = "TypeAssertions"; + OuterExpressionKinds[OuterExpressionKinds["NonNullAssertions"] = 4] = "NonNullAssertions"; + OuterExpressionKinds[OuterExpressionKinds["PartiallyEmittedExpressions"] = 8] = "PartiallyEmittedExpressions"; + OuterExpressionKinds[OuterExpressionKinds["Assertions"] = 6] = "Assertions"; + OuterExpressionKinds[OuterExpressionKinds["All"] = 15] = "All"; + })(OuterExpressionKinds = ts.OuterExpressionKinds || (ts.OuterExpressionKinds = {})); /* @internal */ var LexicalEnvironmentFlags; (function (LexicalEnvironmentFlags) { @@ -4728,7 +5027,8 @@ var ts; ListFormat[ListFormat["HeritageClauses"] = 512] = "HeritageClauses"; ListFormat[ListFormat["SingleLineTypeLiteralMembers"] = 768] = "SingleLineTypeLiteralMembers"; ListFormat[ListFormat["MultiLineTypeLiteralMembers"] = 32897] = "MultiLineTypeLiteralMembers"; - ListFormat[ListFormat["TupleTypeElements"] = 528] = "TupleTypeElements"; + ListFormat[ListFormat["SingleLineTupleTypeElements"] = 528] = "SingleLineTupleTypeElements"; + ListFormat[ListFormat["MultiLineTupleTypeElements"] = 657] = "MultiLineTupleTypeElements"; ListFormat[ListFormat["UnionTypeConstituents"] = 516] = "UnionTypeConstituents"; ListFormat[ListFormat["IntersectionTypeConstituents"] = 520] = "IntersectionTypeConstituents"; ListFormat[ListFormat["ObjectBindingPatternElements"] = 525136] = "ObjectBindingPatternElements"; @@ -4817,6 +5117,10 @@ var ts; args: [{ name: "factory" }], kind: 4 /* MultiLine */ }, + "jsxfrag": { + args: [{ name: "factory" }], + kind: 4 /* MultiLine */ + }, }; })(ts || (ts = {})); var ts; @@ -5070,7 +5374,7 @@ var ts; function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) { // One file can have multiple watchers var fileWatcherCallbacks = ts.createMultiMap(); - var dirWatchers = ts.createMap(); + var dirWatchers = new ts.Map(); var toCanonicalName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames); return nonPollingWatchFile; function nonPollingWatchFile(fileName, callback, _pollingInterval, fallbackOptions) { @@ -5117,7 +5421,7 @@ var ts; } /* @internal */ function createSingleFileWatcherPerName(watchFile, useCaseSensitiveFileNames) { - var cache = ts.createMap(); + var cache = new ts.Map(); var callbacksCache = ts.createMultiMap(); var toCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames); return function (fileName, callback, pollingInterval, options) { @@ -5187,9 +5491,9 @@ var ts; */ /*@internal*/ function createDirectoryWatcherSupportingRecursive(host) { - var cache = ts.createMap(); + var cache = new ts.Map(); var callbackCache = ts.createMultiMap(); - var cacheToUpdateChildWatches = ts.createMap(); + var cacheToUpdateChildWatches = new ts.Map(); var timerToUpdateChildWatches; var filePathComparer = ts.getStringComparer(!host.useCaseSensitiveFileNames); var toCanonicalFilePath = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames); @@ -5245,7 +5549,7 @@ var ts; } }; } - function invokeCallbacks(dirPath, fileNameOrInvokeMap) { + function invokeCallbacks(dirPath, fileNameOrInvokeMap, fileNames) { var fileName; var invokeMap; if (ts.isString(fileNameOrInvokeMap)) { @@ -5256,11 +5560,23 @@ var ts; } // Call the actual callback callbackCache.forEach(function (callbacks, rootDirName) { - if (invokeMap && invokeMap.has(rootDirName)) + var _a; + if (invokeMap && invokeMap.get(rootDirName) === true) return; if (rootDirName === dirPath || (ts.startsWith(dirPath, rootDirName) && dirPath[rootDirName.length] === ts.directorySeparator)) { if (invokeMap) { - invokeMap.set(rootDirName, true); + if (fileNames) { + var existing = invokeMap.get(rootDirName); + if (existing) { + (_a = existing).push.apply(_a, fileNames); + } + else { + invokeMap.set(rootDirName, fileNames.slice()); + } + } + else { + invokeMap.set(rootDirName, true); + } } else { callbacks.forEach(function (_a) { @@ -5276,16 +5592,20 @@ var ts; var parentWatcher = cache.get(dirPath); if (parentWatcher && host.directoryExists(dirName)) { // Schedule the update and postpone invoke for callbacks - scheduleUpdateChildWatches(dirName, dirPath, options); + scheduleUpdateChildWatches(dirName, dirPath, fileName, options); return; } // Call the actual callbacks and remove child watches invokeCallbacks(dirPath, fileName); removeChildWatches(parentWatcher); } - function scheduleUpdateChildWatches(dirName, dirPath, options) { - if (!cacheToUpdateChildWatches.has(dirPath)) { - cacheToUpdateChildWatches.set(dirPath, { dirName: dirName, options: options }); + function scheduleUpdateChildWatches(dirName, dirPath, fileName, options) { + var existing = cacheToUpdateChildWatches.get(dirPath); + if (existing) { + existing.fileNames.push(fileName); + } + else { + cacheToUpdateChildWatches.set(dirPath, { dirName: dirName, options: options, fileNames: [fileName] }); } if (timerToUpdateChildWatches) { host.clearTimeout(timerToUpdateChildWatches); @@ -5297,22 +5617,28 @@ var ts; timerToUpdateChildWatches = undefined; ts.sysLog("sysLog:: onTimerToUpdateChildWatches:: " + cacheToUpdateChildWatches.size); var start = ts.timestamp(); - var invokeMap = ts.createMap(); + var invokeMap = new ts.Map(); while (!timerToUpdateChildWatches && cacheToUpdateChildWatches.size) { - var _a = cacheToUpdateChildWatches.entries().next(), _b = _a.value, dirPath = _b[0], _c = _b[1], dirName = _c.dirName, options = _c.options, done = _a.done; + var _a = cacheToUpdateChildWatches.entries().next(), _b = _a.value, dirPath = _b[0], _c = _b[1], dirName = _c.dirName, options = _c.options, fileNames = _c.fileNames, done = _a.done; ts.Debug.assert(!done); cacheToUpdateChildWatches.delete(dirPath); // Because the child refresh is fresh, we would need to invalidate whole root directory being watched // to ensure that all the changes are reflected at this time - invokeCallbacks(dirPath, invokeMap); - updateChildWatches(dirName, dirPath, options); + var hasChanges = updateChildWatches(dirName, dirPath, options); + invokeCallbacks(dirPath, invokeMap, hasChanges ? undefined : fileNames); } ts.sysLog("sysLog:: invokingWatchers:: " + (ts.timestamp() - start) + "ms:: " + cacheToUpdateChildWatches.size); callbackCache.forEach(function (callbacks, rootDirName) { - if (invokeMap.has(rootDirName)) { + var existing = invokeMap.get(rootDirName); + if (existing) { callbacks.forEach(function (_a) { var callback = _a.callback, dirName = _a.dirName; - return callback(dirName); + if (ts.isArray(existing)) { + existing.forEach(callback); + } + else { + callback(dirName); + } }); } }); @@ -5330,25 +5656,20 @@ var ts; removeChildWatches(cache.get(toCanonicalFilePath(childWatcher.dirName))); } } - function updateChildWatches(dirName, dirPath, options) { + function updateChildWatches(parentDir, parentDirPath, options) { // Iterate through existing children and update the watches if needed - var parentWatcher = cache.get(dirPath); - if (parentWatcher) { - parentWatcher.childWatches = watchChildDirectories(dirName, parentWatcher.childWatches, options); - } - } - /** - * Watch the directories in the parentDir - */ - function watchChildDirectories(parentDir, existingChildWatches, options) { + var parentWatcher = cache.get(parentDirPath); + if (!parentWatcher) + return false; var newChildWatches; - ts.enumerateInsertsAndDeletes(host.directoryExists(parentDir) ? ts.mapDefined(host.getAccessibleSortedChildDirectories(parentDir), function (child) { + var hasChanges = ts.enumerateInsertsAndDeletes(host.directoryExists(parentDir) ? ts.mapDefined(host.getAccessibleSortedChildDirectories(parentDir), function (child) { var childFullName = ts.getNormalizedAbsolutePath(child, parentDir); // Filter our the symbolic link directories since those arent included in recursive watch // which is same behaviour when recursive: true is passed to fs.watch return !isIgnoredPath(childFullName) && filePathComparer(childFullName, ts.normalizePath(host.realpath(childFullName))) === 0 /* EqualTo */ ? childFullName : undefined; - }) : ts.emptyArray, existingChildWatches, function (child, childWatcher) { return filePathComparer(child, childWatcher.dirName); }, createAndAddChildDirectoryWatcher, ts.closeFileWatcher, addChildDirectoryWatcher); - return newChildWatches || ts.emptyArray; + }) : ts.emptyArray, parentWatcher.childWatches, function (child, childWatcher) { return filePathComparer(child, childWatcher.dirName); }, createAndAddChildDirectoryWatcher, ts.closeFileWatcher, addChildDirectoryWatcher); + parentWatcher.childWatches = newChildWatches || ts.emptyArray; + return hasChanges; /** * Create new childDirectoryWatcher and add it to the new ChildDirectoryWatcher list */ @@ -5680,7 +6001,7 @@ var ts; enableCPUProfiler: enableCPUProfiler, disableCPUProfiler: disableCPUProfiler, realpath: realpath, - debugMode: !!process.env.NODE_INSPECTOR_IPC || ts.some(process.execArgv, function (arg) { return /^--(inspect|debug)(-brk)?(=\d+)?$/i.test(arg); }), + debugMode: !!process.env.NODE_INSPECTOR_IPC || !!process.env.VSCODE_INSPECTOR_OPTIONS || ts.some(process.execArgv, function (arg) { return /^--(inspect|debug)(-brk)?(=\d+)?$/i.test(arg); }), tryEnableSourceMapsForHost: function () { try { require("source-map-support").install(); @@ -5744,7 +6065,7 @@ var ts; */ function cleanupPaths(profile) { var externalFileCounter = 0; - var remappedPaths = ts.createMap(); + var remappedPaths = new ts.Map(); var normalizedDir = ts.normalizeSlashes(__dirname); // Windows rooted dir names need an extra `/` prepended to be valid file:/// urls var fileUrlRoot = "file://" + (ts.getRootLength(normalizedDir) === 1 ? "" : "/") + normalizedDir; @@ -6006,8 +6327,8 @@ var ts; var entries = _fs.readdirSync(path || ".", { withFileTypes: true }); var files = []; var directories = []; - for (var _i = 0, entries_2 = entries; _i < entries_2.length; _i++) { - var dirent = entries_2[_i]; + for (var _i = 0, entries_1 = entries; _i < entries_1.length; _i++) { + var dirent = entries_1[_i]; // withFileTypes is not supported before Node 10.10. var entry = typeof dirent === "string" ? dirent : dirent.name; // This is necessary because on some file system node fails to exclude @@ -6659,9 +6980,9 @@ var ts; var bComponents = reducePathComponents(getPathComponents(b)); var sharedLength = Math.min(aComponents.length, bComponents.length); for (var i = 1; i < sharedLength; i++) { - var result_1 = componentComparer(aComponents[i], bComponents[i]); - if (result_1 !== 0 /* EqualTo */) { - return result_1; + var result_2 = componentComparer(aComponents[i], bComponents[i]); + if (result_2 !== 0 /* EqualTo */) { + return result_2; } } return ts.compareValues(aComponents.length, bComponents.length); @@ -6805,8 +7126,8 @@ var ts; /* @internal */ var ts; (function (ts) { - function diag(code, category, key, message, reportsUnnecessary, elidedInCompatabilityPyramid) { - return { code: code, category: category, key: key, message: message, reportsUnnecessary: reportsUnnecessary, elidedInCompatabilityPyramid: elidedInCompatabilityPyramid }; + function diag(code, category, key, message, reportsUnnecessary, elidedInCompatabilityPyramid, reportsDeprecated) { + return { code: code, category: category, key: key, message: message, reportsUnnecessary: reportsUnnecessary, elidedInCompatabilityPyramid: elidedInCompatabilityPyramid, reportsDeprecated: reportsDeprecated }; } ts.Diagnostics = { Unterminated_string_literal: diag(1002, ts.DiagnosticCategory.Error, "Unterminated_string_literal_1002", "Unterminated string literal."), @@ -6863,7 +7184,7 @@ var ts; Enum_member_must_have_initializer: diag(1061, ts.DiagnosticCategory.Error, "Enum_member_must_have_initializer_1061", "Enum member must have initializer."), Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: diag(1062, ts.DiagnosticCategory.Error, "Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", "Type is referenced directly or indirectly in the fulfillment callback of its own 'then' method."), An_export_assignment_cannot_be_used_in_a_namespace: diag(1063, ts.DiagnosticCategory.Error, "An_export_assignment_cannot_be_used_in_a_namespace_1063", "An export assignment cannot be used in a namespace."), - The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type: diag(1064, ts.DiagnosticCategory.Error, "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_1064", "The return type of an async function or method must be the global Promise type."), + The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0: diag(1064, ts.DiagnosticCategory.Error, "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_wri_1064", "The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise<{0}>'?"), In_ambient_enum_declarations_member_initializer_must_be_constant_expression: diag(1066, ts.DiagnosticCategory.Error, "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", "In ambient enum declarations member initializer must be constant expression."), Unexpected_token_A_constructor_method_accessor_or_property_was_expected: diag(1068, ts.DiagnosticCategory.Error, "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", "Unexpected token. A constructor, method, accessor, or property was expected."), Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces: diag(1069, ts.DiagnosticCategory.Error, "Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces_1069", "Unexpected token. A type parameter name was expected without curly braces."), @@ -6964,7 +7285,7 @@ var ts; An_export_declaration_cannot_have_modifiers: diag(1193, ts.DiagnosticCategory.Error, "An_export_declaration_cannot_have_modifiers_1193", "An export declaration cannot have modifiers."), Export_declarations_are_not_permitted_in_a_namespace: diag(1194, ts.DiagnosticCategory.Error, "Export_declarations_are_not_permitted_in_a_namespace_1194", "Export declarations are not permitted in a namespace."), export_Asterisk_does_not_re_export_a_default: diag(1195, ts.DiagnosticCategory.Error, "export_Asterisk_does_not_re_export_a_default_1195", "'export *' does not re-export a default."), - Catch_clause_variable_cannot_have_a_type_annotation: diag(1196, ts.DiagnosticCategory.Error, "Catch_clause_variable_cannot_have_a_type_annotation_1196", "Catch clause variable cannot have a type annotation."), + Catch_clause_variable_type_annotation_must_be_any_or_unknown_if_specified: diag(1196, ts.DiagnosticCategory.Error, "Catch_clause_variable_type_annotation_must_be_any_or_unknown_if_specified_1196", "Catch clause variable type annotation must be 'any' or 'unknown' if specified."), Catch_clause_variable_cannot_have_an_initializer: diag(1197, ts.DiagnosticCategory.Error, "Catch_clause_variable_cannot_have_an_initializer_1197", "Catch clause variable cannot have an initializer."), An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: diag(1198, ts.DiagnosticCategory.Error, "An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198", "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive."), Unterminated_Unicode_escape_sequence: diag(1199, ts.DiagnosticCategory.Error, "Unterminated_Unicode_escape_sequence_1199", "Unterminated Unicode escape sequence."), @@ -7026,9 +7347,10 @@ var ts; Module_0_can_only_be_default_imported_using_the_1_flag: diag(1259, ts.DiagnosticCategory.Error, "Module_0_can_only_be_default_imported_using_the_1_flag_1259", "Module '{0}' can only be default-imported using the '{1}' flag"), Keywords_cannot_contain_escape_characters: diag(1260, ts.DiagnosticCategory.Error, "Keywords_cannot_contain_escape_characters_1260", "Keywords cannot contain escape characters."), Already_included_file_name_0_differs_from_file_name_1_only_in_casing: diag(1261, ts.DiagnosticCategory.Error, "Already_included_file_name_0_differs_from_file_name_1_only_in_casing_1261", "Already included file name '{0}' differs from file name '{1}' only in casing."), + Identifier_expected_0_is_a_reserved_word_at_the_top_level_of_a_module: diag(1262, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_at_the_top_level_of_a_module_1262", "Identifier expected. '{0}' is a reserved word at the top-level of a module."), with_statements_are_not_allowed_in_an_async_function_block: diag(1300, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."), await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules: diag(1308, ts.DiagnosticCategory.Error, "await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules_1308", "'await' expressions are only allowed within async functions and at the top levels of modules."), - can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: diag(1312, ts.DiagnosticCategory.Error, "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", "'=' can only be used in an object literal property inside a destructuring assignment."), + Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern: diag(1312, ts.DiagnosticCategory.Error, "Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_1312", "Did you mean to use a ':'? An '=' can only follow a property name when the containing object literal is part of a destructuring pattern."), The_body_of_an_if_statement_cannot_be_the_empty_statement: diag(1313, ts.DiagnosticCategory.Error, "The_body_of_an_if_statement_cannot_be_the_empty_statement_1313", "The body of an 'if' statement cannot be the empty statement."), Global_module_exports_may_only_appear_in_module_files: diag(1314, ts.DiagnosticCategory.Error, "Global_module_exports_may_only_appear_in_module_files_1314", "Global module exports may only appear in module files."), Global_module_exports_may_only_appear_in_declaration_files: diag(1315, ts.DiagnosticCategory.Error, "Global_module_exports_may_only_appear_in_declaration_files_1315", "Global module exports may only appear in declaration files."), @@ -7099,6 +7421,10 @@ var ts; Unexpected_token_Did_you_mean_or_gt: diag(1382, ts.DiagnosticCategory.Error, "Unexpected_token_Did_you_mean_or_gt_1382", "Unexpected token. Did you mean `{'>'}` or `>`?"), Only_named_exports_may_use_export_type: diag(1383, ts.DiagnosticCategory.Error, "Only_named_exports_may_use_export_type_1383", "Only named exports may use 'export type'."), A_new_expression_with_type_arguments_must_always_be_followed_by_a_parenthesized_argument_list: diag(1384, ts.DiagnosticCategory.Error, "A_new_expression_with_type_arguments_must_always_be_followed_by_a_parenthesized_argument_list_1384", "A 'new' expression with type arguments must always be followed by a parenthesized argument list."), + Function_type_notation_must_be_parenthesized_when_used_in_a_union_type: diag(1385, ts.DiagnosticCategory.Error, "Function_type_notation_must_be_parenthesized_when_used_in_a_union_type_1385", "Function type notation must be parenthesized when used in a union type."), + Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type: diag(1386, ts.DiagnosticCategory.Error, "Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type_1386", "Constructor type notation must be parenthesized when used in a union type."), + Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1387, ts.DiagnosticCategory.Error, "Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1387", "Function type notation must be parenthesized when used in an intersection type."), + Constructor_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1388, ts.DiagnosticCategory.Error, "Constructor_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1388", "Constructor type notation must be parenthesized when used in an intersection type."), The_types_of_0_are_incompatible_between_these_types: diag(2200, ts.DiagnosticCategory.Error, "The_types_of_0_are_incompatible_between_these_types_2200", "The types of '{0}' are incompatible between these types."), The_types_returned_by_0_are_incompatible_between_these_types: diag(2201, ts.DiagnosticCategory.Error, "The_types_returned_by_0_are_incompatible_between_these_types_2201", "The types returned by '{0}' are incompatible between these types."), Call_signature_return_types_0_and_1_are_incompatible: diag(2202, ts.DiagnosticCategory.Error, "Call_signature_return_types_0_and_1_are_incompatible_2202", "Call signature return types '{0}' and '{1}' are incompatible.", /*reportsUnnecessary*/ undefined, /*elidedInCompatabilityPyramid*/ true), @@ -7410,6 +7736,11 @@ var ts; Type_of_property_0_circularly_references_itself_in_mapped_type_1: diag(2615, ts.DiagnosticCategory.Error, "Type_of_property_0_circularly_references_itself_in_mapped_type_1_2615", "Type of property '{0}' circularly references itself in mapped type '{1}'."), _0_can_only_be_imported_by_using_import_1_require_2_or_a_default_import: diag(2616, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_using_import_1_require_2_or_a_default_import_2616", "'{0}' can only be imported by using 'import {1} = require({2})' or a default import."), _0_can_only_be_imported_by_using_import_1_require_2_or_by_turning_on_the_esModuleInterop_flag_and_using_a_default_import: diag(2617, ts.DiagnosticCategory.Error, "_0_can_only_be_imported_by_using_import_1_require_2_or_by_turning_on_the_esModuleInterop_flag_and_us_2617", "'{0}' can only be imported by using 'import {1} = require({2})' or by turning on the 'esModuleInterop' flag and using a default import."), + Source_has_0_element_s_but_target_requires_1: diag(2618, ts.DiagnosticCategory.Error, "Source_has_0_element_s_but_target_requires_1_2618", "Source has {0} element(s) but target requires {1}."), + Source_has_0_element_s_but_target_allows_only_1: diag(2619, ts.DiagnosticCategory.Error, "Source_has_0_element_s_but_target_allows_only_1_2619", "Source has {0} element(s) but target allows only {1}."), + Target_requires_0_element_s_but_source_may_have_fewer: diag(2620, ts.DiagnosticCategory.Error, "Target_requires_0_element_s_but_source_may_have_fewer_2620", "Target requires {0} element(s) but source may have fewer."), + Target_allows_only_0_element_s_but_source_may_have_more: diag(2621, ts.DiagnosticCategory.Error, "Target_allows_only_0_element_s_but_source_may_have_more_2621", "Target allows only {0} element(s) but source may have more."), + Element_at_index_0_is_variadic_in_one_type_but_not_in_the_other: diag(2622, ts.DiagnosticCategory.Error, "Element_at_index_0_is_variadic_in_one_type_but_not_in_the_other_2622", "Element at index {0} is variadic in one type but not in the other."), Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity: diag(2649, ts.DiagnosticCategory.Error, "Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity_2649", "Cannot augment module '{0}' with value exports because it resolves to a non-module entity."), A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: diag(2651, ts.DiagnosticCategory.Error, "A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_memb_2651", "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums."), Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: diag(2652, ts.DiagnosticCategory.Error, "Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652", "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead."), @@ -7548,6 +7879,9 @@ var ts; Its_return_type_0_is_not_a_valid_JSX_element: diag(2787, ts.DiagnosticCategory.Error, "Its_return_type_0_is_not_a_valid_JSX_element_2787", "Its return type '{0}' is not a valid JSX element."), Its_instance_type_0_is_not_a_valid_JSX_element: diag(2788, ts.DiagnosticCategory.Error, "Its_instance_type_0_is_not_a_valid_JSX_element_2788", "Its instance type '{0}' is not a valid JSX element."), Its_element_type_0_is_not_a_valid_JSX_element: diag(2789, ts.DiagnosticCategory.Error, "Its_element_type_0_is_not_a_valid_JSX_element_2789", "Its element type '{0}' is not a valid JSX element."), + The_operand_of_a_delete_operator_must_be_optional: diag(2790, ts.DiagnosticCategory.Error, "The_operand_of_a_delete_operator_must_be_optional_2790", "The operand of a 'delete' operator must be optional."), + Exponentiation_cannot_be_performed_on_bigint_values_unless_the_target_option_is_set_to_es2016_or_later: diag(2791, ts.DiagnosticCategory.Error, "Exponentiation_cannot_be_performed_on_bigint_values_unless_the_target_option_is_set_to_es2016_or_lat_2791", "Exponentiation cannot be performed on 'bigint' values unless the 'target' option is set to 'es2016' or later."), + Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_node_or_to_add_aliases_to_the_paths_option: diag(2792, ts.DiagnosticCategory.Error, "Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_node_or_to_add_aliases_to_th_2792", "Cannot find module '{0}'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?"), Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."), Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."), Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."), @@ -7559,6 +7893,7 @@ var ts; Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: diag(4016, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_function_has_or_is_using_private_name_1_4016", "Type parameter '{0}' of exported function has or is using private name '{1}'."), Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: diag(4019, ts.DiagnosticCategory.Error, "Implements_clause_of_exported_class_0_has_or_is_using_private_name_1_4019", "Implements clause of exported class '{0}' has or is using private name '{1}'."), extends_clause_of_exported_class_0_has_or_is_using_private_name_1: diag(4020, ts.DiagnosticCategory.Error, "extends_clause_of_exported_class_0_has_or_is_using_private_name_1_4020", "'extends' clause of exported class '{0}' has or is using private name '{1}'."), + extends_clause_of_exported_class_has_or_is_using_private_name_0: diag(4021, ts.DiagnosticCategory.Error, "extends_clause_of_exported_class_has_or_is_using_private_name_0_4021", "'extends' clause of exported class has or is using private name '{0}'."), extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: diag(4022, ts.DiagnosticCategory.Error, "extends_clause_of_exported_interface_0_has_or_is_using_private_name_1_4022", "'extends' clause of exported interface '{0}' has or is using private name '{1}'."), Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4023, ts.DiagnosticCategory.Error, "Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4023", "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named."), Exported_variable_0_has_or_is_using_name_1_from_private_module_2: diag(4024, ts.DiagnosticCategory.Error, "Exported_variable_0_has_or_is_using_name_1_from_private_module_2_4024", "Exported variable '{0}' has or is using name '{1}' from private module '{2}'."), @@ -7684,6 +8019,10 @@ var ts; Cannot_find_a_tsconfig_json_file_at_the_current_directory_Colon_0: diag(5081, ts.DiagnosticCategory.Error, "Cannot_find_a_tsconfig_json_file_at_the_current_directory_Colon_0_5081", "Cannot find a tsconfig.json file at the current directory: {0}."), _0_could_be_instantiated_with_an_arbitrary_type_which_could_be_unrelated_to_1: diag(5082, ts.DiagnosticCategory.Error, "_0_could_be_instantiated_with_an_arbitrary_type_which_could_be_unrelated_to_1_5082", "'{0}' could be instantiated with an arbitrary type which could be unrelated to '{1}'."), Cannot_read_file_0: diag(5083, ts.DiagnosticCategory.Error, "Cannot_read_file_0_5083", "Cannot read file '{0}'."), + Tuple_members_must_all_have_names_or_all_not_have_names: diag(5084, ts.DiagnosticCategory.Error, "Tuple_members_must_all_have_names_or_all_not_have_names_5084", "Tuple members must all have names or all not have names."), + A_tuple_member_cannot_be_both_optional_and_rest: diag(5085, ts.DiagnosticCategory.Error, "A_tuple_member_cannot_be_both_optional_and_rest_5085", "A tuple member cannot be both optional and rest."), + A_labeled_tuple_element_is_declared_as_optional_with_a_question_mark_after_the_name_and_before_the_colon_rather_than_after_the_type: diag(5086, ts.DiagnosticCategory.Error, "A_labeled_tuple_element_is_declared_as_optional_with_a_question_mark_after_the_name_and_before_the_c_5086", "A labeled tuple element is declared as optional with a question mark after the name and before the colon, rather than after the type."), + A_labeled_tuple_element_is_declared_as_rest_with_a_before_the_name_rather_than_before_the_type: diag(5087, ts.DiagnosticCategory.Error, "A_labeled_tuple_element_is_declared_as_rest_with_a_before_the_name_rather_than_before_the_type_5087", "A labeled tuple element is declared as rest with a `...` before the name, rather than before the type."), The_inferred_type_of_0_references_a_type_with_a_cyclic_structure_which_cannot_be_trivially_serialized_A_type_annotation_is_necessary: diag(5088, ts.DiagnosticCategory.Error, "The_inferred_type_of_0_references_a_type_with_a_cyclic_structure_which_cannot_be_trivially_serialize_5088", "The inferred type of '{0}' references a type with a cyclic structure which cannot be trivially serialized. A type annotation is necessary."), Generates_a_sourcemap_for_each_corresponding_d_ts_file: diag(6000, ts.DiagnosticCategory.Message, "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000", "Generates a sourcemap for each corresponding '.d.ts' file."), Concatenate_and_emit_output_to_single_file: diag(6001, ts.DiagnosticCategory.Message, "Concatenate_and_emit_output_to_single_file_6001", "Concatenate and emit output to single file."), @@ -7904,6 +8243,9 @@ var ts; Could_not_resolve_the_path_0_with_the_extensions_Colon_1: diag(6231, ts.DiagnosticCategory.Error, "Could_not_resolve_the_path_0_with_the_extensions_Colon_1_6231", "Could not resolve the path '{0}' with the extensions: {1}."), Declaration_augments_declaration_in_another_file_This_cannot_be_serialized: diag(6232, ts.DiagnosticCategory.Error, "Declaration_augments_declaration_in_another_file_This_cannot_be_serialized_6232", "Declaration augments declaration in another file. This cannot be serialized."), This_is_the_declaration_being_augmented_Consider_moving_the_augmenting_declaration_into_the_same_file: diag(6233, ts.DiagnosticCategory.Error, "This_is_the_declaration_being_augmented_Consider_moving_the_augmenting_declaration_into_the_same_fil_6233", "This is the declaration being augmented. Consider moving the augmenting declaration into the same file."), + This_expression_is_not_callable_because_it_is_a_get_accessor_Did_you_mean_to_use_it_without: diag(6234, ts.DiagnosticCategory.Error, "This_expression_is_not_callable_because_it_is_a_get_accessor_Did_you_mean_to_use_it_without_6234", "This expression is not callable because it is a 'get' accessor. Did you mean to use it without '()'?"), + Disable_loading_referenced_projects: diag(6235, ts.DiagnosticCategory.Message, "Disable_loading_referenced_projects_6235", "Disable loading referenced projects."), + Arguments_for_the_rest_parameter_0_were_not_provided: diag(6236, ts.DiagnosticCategory.Error, "Arguments_for_the_rest_parameter_0_were_not_provided_6236", "Arguments for the rest parameter '{0}' were not provided."), Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"), Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"), Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."), @@ -7912,6 +8254,7 @@ var ts; File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_listed_within_the_file_list_of_project_1_Projects_must_list_all_files_or_use_an_includ_6307", "File '{0}' is not listed within the file list of project '{1}'. Projects must list all files or use an 'include' pattern."), Cannot_prepend_project_0_because_it_does_not_have_outFile_set: diag(6308, ts.DiagnosticCategory.Error, "Cannot_prepend_project_0_because_it_does_not_have_outFile_set_6308", "Cannot prepend project '{0}' because it does not have 'outFile' set"), Output_file_0_from_project_1_does_not_exist: diag(6309, ts.DiagnosticCategory.Error, "Output_file_0_from_project_1_does_not_exist_6309", "Output file '{0}' from project '{1}' does not exist"), + Referenced_project_0_may_not_disable_emit: diag(6310, ts.DiagnosticCategory.Error, "Referenced_project_0_may_not_disable_emit_6310", "Referenced project '{0}' may not disable emit."), Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2: diag(6350, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2_6350", "Project '{0}' is out of date because oldest output '{1}' is older than newest input '{2}'"), Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2: diag(6351, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2_6351", "Project '{0}' is up to date because newest input '{1}' is older than oldest output '{2}'"), Project_0_is_out_of_date_because_output_file_1_does_not_exist: diag(6352, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_output_file_1_does_not_exist_6352", "Project '{0}' is out of date because output file '{1}' does not exist"), @@ -7947,6 +8290,7 @@ var ts; Skipping_build_of_project_0_because_its_dependency_1_was_not_built: diag(6382, ts.DiagnosticCategory.Message, "Skipping_build_of_project_0_because_its_dependency_1_was_not_built_6382", "Skipping build of project '{0}' because its dependency '{1}' was not built"), Project_0_can_t_be_built_because_its_dependency_1_was_not_built: diag(6383, ts.DiagnosticCategory.Message, "Project_0_can_t_be_built_because_its_dependency_1_was_not_built_6383", "Project '{0}' can't be built because its dependency '{1}' was not built"), Have_recompiles_in_incremental_and_watch_assume_that_changes_within_a_file_will_only_affect_files_directly_depending_on_it: diag(6384, ts.DiagnosticCategory.Message, "Have_recompiles_in_incremental_and_watch_assume_that_changes_within_a_file_will_only_affect_files_di_6384", "Have recompiles in '--incremental' and '--watch' assume that changes within a file will only affect files directly depending on it."), + _0_is_deprecated: diag(6385, ts.DiagnosticCategory.Suggestion, "_0_is_deprecated_6385", "'{0}' is deprecated", /*reportsUnnecessary*/ undefined, /*elidedInCompatabilityPyramid*/ undefined, /*reportsDeprecated*/ true), The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"), The_expected_type_comes_from_this_index_signature: diag(6501, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."), The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."), @@ -8030,6 +8374,8 @@ var ts; The_type_of_a_function_declaration_must_match_the_function_s_signature: diag(8030, ts.DiagnosticCategory.Error, "The_type_of_a_function_declaration_must_match_the_function_s_signature_8030", "The type of a function declaration must match the function's signature."), You_cannot_rename_a_module_via_a_global_import: diag(8031, ts.DiagnosticCategory.Error, "You_cannot_rename_a_module_via_a_global_import_8031", "You cannot rename a module via a global import."), Qualified_name_0_is_not_allowed_without_a_leading_param_object_1: diag(8032, ts.DiagnosticCategory.Error, "Qualified_name_0_is_not_allowed_without_a_leading_param_object_1_8032", "Qualified name '{0}' is not allowed without a leading '@param {object} {1}'."), + A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags: diag(8033, ts.DiagnosticCategory.Error, "A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags_8033", "A JSDoc '@typedef' comment may not contain multiple '@type' tags."), + The_tag_was_first_specified_here: diag(8034, ts.DiagnosticCategory.Error, "The_tag_was_first_specified_here_8034", "The tag was first specified here."), Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clause: diag(9002, ts.DiagnosticCategory.Error, "Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_clas_9002", "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clause."), class_expressions_are_not_currently_supported: diag(9003, ts.DiagnosticCategory.Error, "class_expressions_are_not_currently_supported_9003", "'class' expressions are not currently supported."), Language_service_is_disabled: diag(9004, ts.DiagnosticCategory.Error, "Language_service_is_disabled_9004", "Language service is disabled."), @@ -8051,8 +8397,8 @@ var ts; Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constructor: diag(17013, ts.DiagnosticCategory.Error, "Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constru_17013", "Meta-property '{0}' is only allowed in the body of a function declaration, function expression, or constructor."), JSX_fragment_has_no_corresponding_closing_tag: diag(17014, ts.DiagnosticCategory.Error, "JSX_fragment_has_no_corresponding_closing_tag_17014", "JSX fragment has no corresponding closing tag."), Expected_corresponding_closing_tag_for_JSX_fragment: diag(17015, ts.DiagnosticCategory.Error, "Expected_corresponding_closing_tag_for_JSX_fragment_17015", "Expected corresponding closing tag for JSX fragment."), - JSX_fragment_is_not_supported_when_using_jsxFactory: diag(17016, ts.DiagnosticCategory.Error, "JSX_fragment_is_not_supported_when_using_jsxFactory_17016", "JSX fragment is not supported when using --jsxFactory"), - JSX_fragment_is_not_supported_when_using_an_inline_JSX_factory_pragma: diag(17017, ts.DiagnosticCategory.Error, "JSX_fragment_is_not_supported_when_using_an_inline_JSX_factory_pragma_17017", "JSX fragment is not supported when using an inline JSX factory pragma"), + The_jsxFragmentFactory_compiler_option_must_be_provided_to_use_JSX_fragments_with_the_jsxFactory_compiler_option: diag(17016, ts.DiagnosticCategory.Error, "The_jsxFragmentFactory_compiler_option_must_be_provided_to_use_JSX_fragments_with_the_jsxFactory_com_17016", "The 'jsxFragmentFactory' compiler option must be provided to use JSX fragments with the 'jsxFactory' compiler option."), + An_jsxFrag_pragma_is_required_when_using_an_jsx_pragma_with_JSX_fragments: diag(17017, ts.DiagnosticCategory.Error, "An_jsxFrag_pragma_is_required_when_using_an_jsx_pragma_with_JSX_fragments_17017", "An @jsxFrag pragma is required when using an @jsx pragma with JSX fragments."), Unknown_type_acquisition_option_0_Did_you_mean_1: diag(17018, ts.DiagnosticCategory.Error, "Unknown_type_acquisition_option_0_Did_you_mean_1_17018", "Unknown type acquisition option '{0}'. Did you mean '{1}'?"), Circularity_detected_while_resolving_configuration_Colon_0: diag(18000, ts.DiagnosticCategory.Error, "Circularity_detected_while_resolving_configuration_Colon_0_18000", "Circularity detected while resolving configuration: {0}"), A_path_in_an_extends_option_must_be_relative_or_rooted_but_0_is_not: diag(18001, ts.DiagnosticCategory.Error, "A_path_in_an_extends_option_must_be_relative_or_rooted_but_0_is_not_18001", "A path in an 'extends' option must be relative or rooted, but '{0}' is not."), @@ -8074,7 +8420,6 @@ var ts; Implement_interface_0: diag(90006, ts.DiagnosticCategory.Message, "Implement_interface_0_90006", "Implement interface '{0}'"), Implement_inherited_abstract_class: diag(90007, ts.DiagnosticCategory.Message, "Implement_inherited_abstract_class_90007", "Implement inherited abstract class"), Add_0_to_unresolved_variable: diag(90008, ts.DiagnosticCategory.Message, "Add_0_to_unresolved_variable_90008", "Add '{0}.' to unresolved variable"), - Remove_destructuring: diag(90009, ts.DiagnosticCategory.Message, "Remove_destructuring_90009", "Remove destructuring"), Remove_variable_statement: diag(90010, ts.DiagnosticCategory.Message, "Remove_variable_statement_90010", "Remove variable statement"), Remove_template_tag: diag(90011, ts.DiagnosticCategory.Message, "Remove_template_tag_90011", "Remove template tag"), Remove_type_parameters: diag(90012, ts.DiagnosticCategory.Message, "Remove_type_parameters_90012", "Remove type parameters"), @@ -8101,6 +8446,11 @@ var ts; Add_default_import_0_to_existing_import_declaration_from_1: diag(90033, ts.DiagnosticCategory.Message, "Add_default_import_0_to_existing_import_declaration_from_1_90033", "Add default import '{0}' to existing import declaration from \"{1}\""), Add_parameter_name: diag(90034, ts.DiagnosticCategory.Message, "Add_parameter_name_90034", "Add parameter name"), Declare_private_property_0: diag(90035, ts.DiagnosticCategory.Message, "Declare_private_property_0_90035", "Declare private property '{0}'"), + Replace_0_with_Promise_1: diag(90036, ts.DiagnosticCategory.Message, "Replace_0_with_Promise_1_90036", "Replace '{0}' with 'Promise<{1}>'"), + Fix_all_incorrect_return_type_of_an_async_functions: diag(90037, ts.DiagnosticCategory.Message, "Fix_all_incorrect_return_type_of_an_async_functions_90037", "Fix all incorrect return type of an async functions"), + Declare_private_method_0: diag(90038, ts.DiagnosticCategory.Message, "Declare_private_method_0_90038", "Declare private method '{0}'"), + Remove_unused_destructuring_declaration: diag(90039, ts.DiagnosticCategory.Message, "Remove_unused_destructuring_declaration_90039", "Remove unused destructuring declaration"), + Remove_unused_declarations_for_Colon_0: diag(90041, ts.DiagnosticCategory.Message, "Remove_unused_declarations_for_Colon_0_90041", "Remove unused declarations for: '{0}'"), Declare_a_private_field_named_0: diag(90053, ts.DiagnosticCategory.Message, "Declare_a_private_field_named_0_90053", "Declare a private field named '{0}'."), Convert_function_to_an_ES2015_class: diag(95001, ts.DiagnosticCategory.Message, "Convert_function_to_an_ES2015_class_95001", "Convert function to an ES2015 class"), Convert_function_0_to_class: diag(95002, ts.DiagnosticCategory.Message, "Convert_function_0_to_class_95002", "Convert function '{0}' to class"), @@ -8211,11 +8561,37 @@ var ts; Wrap_all_invalid_characters_in_an_expression_container: diag(95109, ts.DiagnosticCategory.Message, "Wrap_all_invalid_characters_in_an_expression_container_95109", "Wrap all invalid characters in an expression container"), Visit_https_Colon_Slash_Slashaka_ms_Slashtsconfig_json_to_read_more_about_this_file: diag(95110, ts.DiagnosticCategory.Message, "Visit_https_Colon_Slash_Slashaka_ms_Slashtsconfig_json_to_read_more_about_this_file_95110", "Visit https://aka.ms/tsconfig.json to read more about this file"), Add_a_return_statement: diag(95111, ts.DiagnosticCategory.Message, "Add_a_return_statement_95111", "Add a return statement"), - Remove_block_body_braces: diag(95112, ts.DiagnosticCategory.Message, "Remove_block_body_braces_95112", "Remove block body braces"), + Remove_braces_from_arrow_function_body: diag(95112, ts.DiagnosticCategory.Message, "Remove_braces_from_arrow_function_body_95112", "Remove braces from arrow function body"), Wrap_the_following_body_with_parentheses_which_should_be_an_object_literal: diag(95113, ts.DiagnosticCategory.Message, "Wrap_the_following_body_with_parentheses_which_should_be_an_object_literal_95113", "Wrap the following body with parentheses which should be an object literal"), Add_all_missing_return_statement: diag(95114, ts.DiagnosticCategory.Message, "Add_all_missing_return_statement_95114", "Add all missing return statement"), - Remove_all_incorrect_body_block_braces: diag(95115, ts.DiagnosticCategory.Message, "Remove_all_incorrect_body_block_braces_95115", "Remove all incorrect body block braces"), + Remove_braces_from_all_arrow_function_bodies_with_relevant_issues: diag(95115, ts.DiagnosticCategory.Message, "Remove_braces_from_all_arrow_function_bodies_with_relevant_issues_95115", "Remove braces from all arrow function bodies with relevant issues"), Wrap_all_object_literal_with_parentheses: diag(95116, ts.DiagnosticCategory.Message, "Wrap_all_object_literal_with_parentheses_95116", "Wrap all object literal with parentheses"), + Move_labeled_tuple_element_modifiers_to_labels: diag(95117, ts.DiagnosticCategory.Message, "Move_labeled_tuple_element_modifiers_to_labels_95117", "Move labeled tuple element modifiers to labels"), + Convert_overload_list_to_single_signature: diag(95118, ts.DiagnosticCategory.Message, "Convert_overload_list_to_single_signature_95118", "Convert overload list to single signature"), + Generate_get_and_set_accessors_for_all_overriding_properties: diag(95119, ts.DiagnosticCategory.Message, "Generate_get_and_set_accessors_for_all_overriding_properties_95119", "Generate 'get' and 'set' accessors for all overriding properties"), + Wrap_in_JSX_fragment: diag(95120, ts.DiagnosticCategory.Message, "Wrap_in_JSX_fragment_95120", "Wrap in JSX fragment"), + Wrap_all_unparented_JSX_in_JSX_fragment: diag(95121, ts.DiagnosticCategory.Message, "Wrap_all_unparented_JSX_in_JSX_fragment_95121", "Wrap all unparented JSX in JSX fragment"), + Convert_arrow_function_or_function_expression: diag(95122, ts.DiagnosticCategory.Message, "Convert_arrow_function_or_function_expression_95122", "Convert arrow function or function expression"), + Convert_to_anonymous_function: diag(95123, ts.DiagnosticCategory.Message, "Convert_to_anonymous_function_95123", "Convert to anonymous function"), + Convert_to_named_function: diag(95124, ts.DiagnosticCategory.Message, "Convert_to_named_function_95124", "Convert to named function"), + Convert_to_arrow_function: diag(95125, ts.DiagnosticCategory.Message, "Convert_to_arrow_function_95125", "Convert to arrow function"), + Remove_parentheses: diag(95126, ts.DiagnosticCategory.Message, "Remove_parentheses_95126", "Remove parentheses"), + Could_not_find_a_containing_arrow_function: diag(95127, ts.DiagnosticCategory.Message, "Could_not_find_a_containing_arrow_function_95127", "Could not find a containing arrow function"), + Containing_function_is_not_an_arrow_function: diag(95128, ts.DiagnosticCategory.Message, "Containing_function_is_not_an_arrow_function_95128", "Containing function is not an arrow function"), + Could_not_find_export_statement: diag(95129, ts.DiagnosticCategory.Message, "Could_not_find_export_statement_95129", "Could not find export statement"), + This_file_already_has_a_default_export: diag(95130, ts.DiagnosticCategory.Message, "This_file_already_has_a_default_export_95130", "This file already has a default export"), + Could_not_find_import_clause: diag(95131, ts.DiagnosticCategory.Message, "Could_not_find_import_clause_95131", "Could not find import clause"), + Could_not_find_namespace_import_or_named_imports: diag(95132, ts.DiagnosticCategory.Message, "Could_not_find_namespace_import_or_named_imports_95132", "Could not find namespace import or named imports"), + Selection_is_not_a_valid_type_node: diag(95133, ts.DiagnosticCategory.Message, "Selection_is_not_a_valid_type_node_95133", "Selection is not a valid type node"), + No_type_could_be_extracted_from_this_type_node: diag(95134, ts.DiagnosticCategory.Message, "No_type_could_be_extracted_from_this_type_node_95134", "No type could be extracted from this type node"), + Could_not_find_property_for_which_to_generate_accessor: diag(95135, ts.DiagnosticCategory.Message, "Could_not_find_property_for_which_to_generate_accessor_95135", "Could not find property for which to generate accessor"), + Name_is_not_valid: diag(95136, ts.DiagnosticCategory.Message, "Name_is_not_valid_95136", "Name is not valid"), + Can_only_convert_property_with_modifier: diag(95137, ts.DiagnosticCategory.Message, "Can_only_convert_property_with_modifier_95137", "Can only convert property with modifier"), + Switch_each_misused_0_to_1: diag(95138, ts.DiagnosticCategory.Message, "Switch_each_misused_0_to_1_95138", "Switch each misused '{0}' to '{1}'"), + Convert_to_optional_chain_expression: diag(95139, ts.DiagnosticCategory.Message, "Convert_to_optional_chain_expression_95139", "Convert to optional chain expression"), + Could_not_find_convertible_access_expression: diag(95140, ts.DiagnosticCategory.Message, "Could_not_find_convertible_access_expression_95140", "Could not find convertible access expression"), + Could_not_find_matching_access_expressions: diag(95141, ts.DiagnosticCategory.Message, "Could_not_find_matching_access_expressions_95141", "Could not find matching access expressions"), + Can_only_convert_logical_AND_access_chains: diag(95142, ts.DiagnosticCategory.Message, "Can_only_convert_logical_AND_access_chains_95142", "Can only convert logical AND access chains"), No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."), Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."), JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"), @@ -8241,6 +8617,8 @@ var ts; The_intersection_0_was_reduced_to_never_because_property_1_has_conflicting_types_in_some_constituents: diag(18031, ts.DiagnosticCategory.Error, "The_intersection_0_was_reduced_to_never_because_property_1_has_conflicting_types_in_some_constituent_18031", "The intersection '{0}' was reduced to 'never' because property '{1}' has conflicting types in some constituents."), The_intersection_0_was_reduced_to_never_because_property_1_exists_in_multiple_constituents_and_is_private_in_some: diag(18032, ts.DiagnosticCategory.Error, "The_intersection_0_was_reduced_to_never_because_property_1_exists_in_multiple_constituents_and_is_pr_18032", "The intersection '{0}' was reduced to 'never' because property '{1}' exists in multiple constituents and is private in some."), Only_numeric_enums_can_have_computed_members_but_this_expression_has_type_0_If_you_do_not_need_exhaustiveness_checks_consider_using_an_object_literal_instead: diag(18033, ts.DiagnosticCategory.Error, "Only_numeric_enums_can_have_computed_members_but_this_expression_has_type_0_If_you_do_not_need_exhau_18033", "Only numeric enums can have computed members, but this expression has type '{0}'. If you do not need exhaustiveness checks, consider using an object literal instead."), + Specify_the_JSX_fragment_factory_function_to_use_when_targeting_react_JSX_emit_with_jsxFactory_compiler_option_is_specified_e_g_Fragment: diag(18034, ts.DiagnosticCategory.Message, "Specify_the_JSX_fragment_factory_function_to_use_when_targeting_react_JSX_emit_with_jsxFactory_compi_18034", "Specify the JSX fragment factory function to use when targeting 'react' JSX emit with 'jsxFactory' compiler option is specified, e.g. 'Fragment'."), + Invalid_value_for_jsxFragmentFactory_0_is_not_a_valid_identifier_or_qualified_name: diag(18035, ts.DiagnosticCategory.Error, "Invalid_value_for_jsxFragmentFactory_0_is_not_a_valid_identifier_or_qualified_name_18035", "Invalid value for 'jsxFragmentFactory'. '{0}' is not a valid identifier or qualified-name."), }; })(ts || (ts = {})); var ts; @@ -8248,7 +8626,7 @@ var ts; var _a; /* @internal */ function tokenIsIdentifierOrKeyword(token) { - return token >= 75 /* Identifier */; + return token >= 78 /* Identifier */; } ts.tokenIsIdentifierOrKeyword = tokenIsIdentifierOrKeyword; /* @internal */ @@ -8257,86 +8635,86 @@ var ts; } ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan; var textToKeywordObj = (_a = { - abstract: 122 /* AbstractKeyword */, - any: 125 /* AnyKeyword */, - as: 123 /* AsKeyword */, - asserts: 124 /* AssertsKeyword */, - bigint: 151 /* BigIntKeyword */, - boolean: 128 /* BooleanKeyword */, - break: 77 /* BreakKeyword */, - case: 78 /* CaseKeyword */, - catch: 79 /* CatchKeyword */, - class: 80 /* ClassKeyword */, - continue: 82 /* ContinueKeyword */, - const: 81 /* ConstKeyword */ + abstract: 125 /* AbstractKeyword */, + any: 128 /* AnyKeyword */, + as: 126 /* AsKeyword */, + asserts: 127 /* AssertsKeyword */, + bigint: 154 /* BigIntKeyword */, + boolean: 131 /* BooleanKeyword */, + break: 80 /* BreakKeyword */, + case: 81 /* CaseKeyword */, + catch: 82 /* CatchKeyword */, + class: 83 /* ClassKeyword */, + continue: 85 /* ContinueKeyword */, + const: 84 /* ConstKeyword */ }, - _a["" + "constructor"] = 129 /* ConstructorKeyword */, - _a.debugger = 83 /* DebuggerKeyword */, - _a.declare = 130 /* DeclareKeyword */, - _a.default = 84 /* DefaultKeyword */, - _a.delete = 85 /* DeleteKeyword */, - _a.do = 86 /* DoKeyword */, - _a.else = 87 /* ElseKeyword */, - _a.enum = 88 /* EnumKeyword */, - _a.export = 89 /* ExportKeyword */, - _a.extends = 90 /* ExtendsKeyword */, - _a.false = 91 /* FalseKeyword */, - _a.finally = 92 /* FinallyKeyword */, - _a.for = 93 /* ForKeyword */, - _a.from = 149 /* FromKeyword */, - _a.function = 94 /* FunctionKeyword */, - _a.get = 131 /* GetKeyword */, - _a.if = 95 /* IfKeyword */, - _a.implements = 113 /* ImplementsKeyword */, - _a.import = 96 /* ImportKeyword */, - _a.in = 97 /* InKeyword */, - _a.infer = 132 /* InferKeyword */, - _a.instanceof = 98 /* InstanceOfKeyword */, - _a.interface = 114 /* InterfaceKeyword */, - _a.is = 133 /* IsKeyword */, - _a.keyof = 134 /* KeyOfKeyword */, - _a.let = 115 /* LetKeyword */, - _a.module = 135 /* ModuleKeyword */, - _a.namespace = 136 /* NamespaceKeyword */, - _a.never = 137 /* NeverKeyword */, - _a.new = 99 /* NewKeyword */, - _a.null = 100 /* NullKeyword */, - _a.number = 140 /* NumberKeyword */, - _a.object = 141 /* ObjectKeyword */, - _a.package = 116 /* PackageKeyword */, - _a.private = 117 /* PrivateKeyword */, - _a.protected = 118 /* ProtectedKeyword */, - _a.public = 119 /* PublicKeyword */, - _a.readonly = 138 /* ReadonlyKeyword */, - _a.require = 139 /* RequireKeyword */, - _a.global = 150 /* GlobalKeyword */, - _a.return = 101 /* ReturnKeyword */, - _a.set = 142 /* SetKeyword */, - _a.static = 120 /* StaticKeyword */, - _a.string = 143 /* StringKeyword */, - _a.super = 102 /* SuperKeyword */, - _a.switch = 103 /* SwitchKeyword */, - _a.symbol = 144 /* SymbolKeyword */, - _a.this = 104 /* ThisKeyword */, - _a.throw = 105 /* ThrowKeyword */, - _a.true = 106 /* TrueKeyword */, - _a.try = 107 /* TryKeyword */, - _a.type = 145 /* TypeKeyword */, - _a.typeof = 108 /* TypeOfKeyword */, - _a.undefined = 146 /* UndefinedKeyword */, - _a.unique = 147 /* UniqueKeyword */, - _a.unknown = 148 /* UnknownKeyword */, - _a.var = 109 /* VarKeyword */, - _a.void = 110 /* VoidKeyword */, - _a.while = 111 /* WhileKeyword */, - _a.with = 112 /* WithKeyword */, - _a.yield = 121 /* YieldKeyword */, - _a.async = 126 /* AsyncKeyword */, - _a.await = 127 /* AwaitKeyword */, - _a.of = 152 /* OfKeyword */, + _a["" + "constructor"] = 132 /* ConstructorKeyword */, + _a.debugger = 86 /* DebuggerKeyword */, + _a.declare = 133 /* DeclareKeyword */, + _a.default = 87 /* DefaultKeyword */, + _a.delete = 88 /* DeleteKeyword */, + _a.do = 89 /* DoKeyword */, + _a.else = 90 /* ElseKeyword */, + _a.enum = 91 /* EnumKeyword */, + _a.export = 92 /* ExportKeyword */, + _a.extends = 93 /* ExtendsKeyword */, + _a.false = 94 /* FalseKeyword */, + _a.finally = 95 /* FinallyKeyword */, + _a.for = 96 /* ForKeyword */, + _a.from = 152 /* FromKeyword */, + _a.function = 97 /* FunctionKeyword */, + _a.get = 134 /* GetKeyword */, + _a.if = 98 /* IfKeyword */, + _a.implements = 116 /* ImplementsKeyword */, + _a.import = 99 /* ImportKeyword */, + _a.in = 100 /* InKeyword */, + _a.infer = 135 /* InferKeyword */, + _a.instanceof = 101 /* InstanceOfKeyword */, + _a.interface = 117 /* InterfaceKeyword */, + _a.is = 136 /* IsKeyword */, + _a.keyof = 137 /* KeyOfKeyword */, + _a.let = 118 /* LetKeyword */, + _a.module = 138 /* ModuleKeyword */, + _a.namespace = 139 /* NamespaceKeyword */, + _a.never = 140 /* NeverKeyword */, + _a.new = 102 /* NewKeyword */, + _a.null = 103 /* NullKeyword */, + _a.number = 143 /* NumberKeyword */, + _a.object = 144 /* ObjectKeyword */, + _a.package = 119 /* PackageKeyword */, + _a.private = 120 /* PrivateKeyword */, + _a.protected = 121 /* ProtectedKeyword */, + _a.public = 122 /* PublicKeyword */, + _a.readonly = 141 /* ReadonlyKeyword */, + _a.require = 142 /* RequireKeyword */, + _a.global = 153 /* GlobalKeyword */, + _a.return = 104 /* ReturnKeyword */, + _a.set = 145 /* SetKeyword */, + _a.static = 123 /* StaticKeyword */, + _a.string = 146 /* StringKeyword */, + _a.super = 105 /* SuperKeyword */, + _a.switch = 106 /* SwitchKeyword */, + _a.symbol = 147 /* SymbolKeyword */, + _a.this = 107 /* ThisKeyword */, + _a.throw = 108 /* ThrowKeyword */, + _a.true = 109 /* TrueKeyword */, + _a.try = 110 /* TryKeyword */, + _a.type = 148 /* TypeKeyword */, + _a.typeof = 111 /* TypeOfKeyword */, + _a.undefined = 149 /* UndefinedKeyword */, + _a.unique = 150 /* UniqueKeyword */, + _a.unknown = 151 /* UnknownKeyword */, + _a.var = 112 /* VarKeyword */, + _a.void = 113 /* VoidKeyword */, + _a.while = 114 /* WhileKeyword */, + _a.with = 115 /* WithKeyword */, + _a.yield = 124 /* YieldKeyword */, + _a.async = 129 /* AsyncKeyword */, + _a.await = 130 /* AwaitKeyword */, + _a.of = 155 /* OfKeyword */, _a); - var textToKeyword = ts.createMapFromTemplate(textToKeywordObj); - var textToToken = ts.createMapFromTemplate(__assign(__assign({}, textToKeywordObj), { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 29 /* LessThanToken */, ">": 31 /* GreaterThanToken */, "<=": 32 /* LessThanEqualsToken */, ">=": 33 /* GreaterThanEqualsToken */, "==": 34 /* EqualsEqualsToken */, "!=": 35 /* ExclamationEqualsToken */, "===": 36 /* EqualsEqualsEqualsToken */, "!==": 37 /* ExclamationEqualsEqualsToken */, "=>": 38 /* EqualsGreaterThanToken */, "+": 39 /* PlusToken */, "-": 40 /* MinusToken */, "**": 42 /* AsteriskAsteriskToken */, "*": 41 /* AsteriskToken */, "/": 43 /* SlashToken */, "%": 44 /* PercentToken */, "++": 45 /* PlusPlusToken */, "--": 46 /* MinusMinusToken */, "<<": 47 /* LessThanLessThanToken */, ">": 48 /* GreaterThanGreaterThanToken */, ">>>": 49 /* GreaterThanGreaterThanGreaterThanToken */, "&": 50 /* AmpersandToken */, "|": 51 /* BarToken */, "^": 52 /* CaretToken */, "!": 53 /* ExclamationToken */, "~": 54 /* TildeToken */, "&&": 55 /* AmpersandAmpersandToken */, "||": 56 /* BarBarToken */, "?": 57 /* QuestionToken */, "??": 60 /* QuestionQuestionToken */, "?.": 28 /* QuestionDotToken */, ":": 58 /* ColonToken */, "=": 62 /* EqualsToken */, "+=": 63 /* PlusEqualsToken */, "-=": 64 /* MinusEqualsToken */, "*=": 65 /* AsteriskEqualsToken */, "**=": 66 /* AsteriskAsteriskEqualsToken */, "/=": 67 /* SlashEqualsToken */, "%=": 68 /* PercentEqualsToken */, "<<=": 69 /* LessThanLessThanEqualsToken */, ">>=": 70 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 72 /* AmpersandEqualsToken */, "|=": 73 /* BarEqualsToken */, "^=": 74 /* CaretEqualsToken */, "@": 59 /* AtToken */, "`": 61 /* BacktickToken */ })); + var textToKeyword = new ts.Map(ts.getEntries(textToKeywordObj)); + var textToToken = new ts.Map(ts.getEntries(__assign(__assign({}, textToKeywordObj), { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 29 /* LessThanToken */, ">": 31 /* GreaterThanToken */, "<=": 32 /* LessThanEqualsToken */, ">=": 33 /* GreaterThanEqualsToken */, "==": 34 /* EqualsEqualsToken */, "!=": 35 /* ExclamationEqualsToken */, "===": 36 /* EqualsEqualsEqualsToken */, "!==": 37 /* ExclamationEqualsEqualsToken */, "=>": 38 /* EqualsGreaterThanToken */, "+": 39 /* PlusToken */, "-": 40 /* MinusToken */, "**": 42 /* AsteriskAsteriskToken */, "*": 41 /* AsteriskToken */, "/": 43 /* SlashToken */, "%": 44 /* PercentToken */, "++": 45 /* PlusPlusToken */, "--": 46 /* MinusMinusToken */, "<<": 47 /* LessThanLessThanToken */, ">": 48 /* GreaterThanGreaterThanToken */, ">>>": 49 /* GreaterThanGreaterThanGreaterThanToken */, "&": 50 /* AmpersandToken */, "|": 51 /* BarToken */, "^": 52 /* CaretToken */, "!": 53 /* ExclamationToken */, "~": 54 /* TildeToken */, "&&": 55 /* AmpersandAmpersandToken */, "||": 56 /* BarBarToken */, "?": 57 /* QuestionToken */, "??": 60 /* QuestionQuestionToken */, "?.": 28 /* QuestionDotToken */, ":": 58 /* ColonToken */, "=": 62 /* EqualsToken */, "+=": 63 /* PlusEqualsToken */, "-=": 64 /* MinusEqualsToken */, "*=": 65 /* AsteriskEqualsToken */, "**=": 66 /* AsteriskAsteriskEqualsToken */, "/=": 67 /* SlashEqualsToken */, "%=": 68 /* PercentEqualsToken */, "<<=": 69 /* LessThanLessThanEqualsToken */, ">>=": 70 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 72 /* AmpersandEqualsToken */, "|=": 73 /* BarEqualsToken */, "^=": 77 /* CaretEqualsToken */, "||=": 74 /* BarBarEqualsToken */, "&&=": 75 /* AmpersandAmpersandEqualsToken */, "??=": 76 /* QuestionQuestionEqualsToken */, "@": 59 /* AtToken */, "`": 61 /* BacktickToken */ }))); /* As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers IdentifierStart :: @@ -8999,12 +9377,15 @@ var ts; hasUnicodeEscape: function () { return (tokenFlags & 1024 /* UnicodeEscape */) !== 0; }, hasExtendedUnicodeEscape: function () { return (tokenFlags & 8 /* ExtendedUnicodeEscape */) !== 0; }, hasPrecedingLineBreak: function () { return (tokenFlags & 1 /* PrecedingLineBreak */) !== 0; }, - isIdentifier: function () { return token === 75 /* Identifier */ || token > 112 /* LastReservedWord */; }, - isReservedWord: function () { return token >= 77 /* FirstReservedWord */ && token <= 112 /* LastReservedWord */; }, + hasPrecedingJSDocComment: function () { return (tokenFlags & 2 /* PrecedingJSDocComment */) !== 0; }, + isIdentifier: function () { return token === 78 /* Identifier */ || token > 115 /* LastReservedWord */; }, + isReservedWord: function () { return token >= 80 /* FirstReservedWord */ && token <= 115 /* LastReservedWord */; }, isUnterminated: function () { return (tokenFlags & 4 /* Unterminated */) !== 0; }, getCommentDirectives: function () { return commentDirectives; }, + getNumericLiteralFlags: function () { return tokenFlags & 1008 /* NumericLiteralFlags */; }, getTokenFlags: function () { return tokenFlags; }, reScanGreaterToken: reScanGreaterToken, + reScanAsteriskEqualsToken: reScanAsteriskEqualsToken, reScanSlashToken: reScanSlashToken, reScanTemplateToken: reScanTemplateToken, reScanTemplateHeadOrNoSubstitutionTemplate: reScanTemplateHeadOrNoSubstitutionTemplate, @@ -9522,7 +9903,7 @@ var ts; } } } - return token = 75 /* Identifier */; + return token = 78 /* Identifier */; } function scanBinaryOrOctalDigits(base) { var value = ""; @@ -9677,6 +10058,9 @@ var ts; return token = 44 /* PercentToken */; case 38 /* ampersand */: if (text.charCodeAt(pos + 1) === 38 /* ampersand */) { + if (text.charCodeAt(pos + 2) === 61 /* equals */) { + return pos += 3, token = 75 /* AmpersandAmpersandEqualsToken */; + } return pos += 2, token = 55 /* AmpersandAmpersandToken */; } if (text.charCodeAt(pos + 1) === 61 /* equals */) { @@ -9917,15 +10301,16 @@ var ts; pos++; return token = 31 /* GreaterThanToken */; case 63 /* question */: + if (text.charCodeAt(pos + 1) === 46 /* dot */ && !isDigit(text.charCodeAt(pos + 2))) { + return pos += 2, token = 28 /* QuestionDotToken */; + } + if (text.charCodeAt(pos + 1) === 63 /* question */) { + if (text.charCodeAt(pos + 2) === 61 /* equals */) { + return pos += 3, token = 76 /* QuestionQuestionEqualsToken */; + } + return pos += 2, token = 60 /* QuestionQuestionToken */; + } pos++; - if (text.charCodeAt(pos) === 46 /* dot */ && !isDigit(text.charCodeAt(pos + 1))) { - pos++; - return token = 28 /* QuestionDotToken */; - } - if (text.charCodeAt(pos) === 63 /* question */) { - pos++; - return token = 60 /* QuestionQuestionToken */; - } return token = 57 /* QuestionToken */; case 91 /* openBracket */: pos++; @@ -9935,7 +10320,7 @@ var ts; return token = 23 /* CloseBracketToken */; case 94 /* caret */: if (text.charCodeAt(pos + 1) === 61 /* equals */) { - return pos += 2, token = 74 /* CaretEqualsToken */; + return pos += 2, token = 77 /* CaretEqualsToken */; } pos++; return token = 52 /* CaretToken */; @@ -9953,6 +10338,9 @@ var ts; } } if (text.charCodeAt(pos + 1) === 124 /* bar */) { + if (text.charCodeAt(pos + 2) === 61 /* equals */) { + return pos += 3, token = 74 /* BarBarEqualsToken */; + } return pos += 2, token = 56 /* BarBarToken */; } if (text.charCodeAt(pos + 1) === 61 /* equals */) { @@ -10007,7 +10395,7 @@ var ts; tokenValue = "#"; error(ts.Diagnostics.Invalid_character); } - return token = 76 /* PrivateIdentifier */; + return token = 79 /* PrivateIdentifier */; default: if (isIdentifierStart(ch, languageVersion)) { pos += charSize(ch); @@ -10056,6 +10444,11 @@ var ts; } return token; } + function reScanAsteriskEqualsToken() { + ts.Debug.assert(token === 65 /* AsteriskEqualsToken */, "'reScanAsteriskEqualsToken' should only be called on a '*='"); + pos = tokenPos + 1; + return token = 62 /* EqualsToken */; + } function reScanSlashToken() { if (token === 43 /* SlashToken */ || token === 67 /* SlashEqualsToken */) { var p = tokenPos + 1; @@ -10281,8 +10674,12 @@ var ts; return token = 5 /* WhitespaceTrivia */; case 64 /* at */: return token = 59 /* AtToken */; - case 10 /* lineFeed */: case 13 /* carriageReturn */: + if (text.charCodeAt(pos) === 10 /* lineFeed */) { + pos++; + } + // falls through + case 10 /* lineFeed */: tokenFlags |= 1 /* PrecedingLineBreak */; return token = 4 /* NewLineTrivia */; case 42 /* asterisk */: @@ -10700,9 +11097,9 @@ var ts; } ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions; function getTypeParameterOwner(d) { - if (d && d.kind === 155 /* TypeParameter */) { + if (d && d.kind === 158 /* TypeParameter */) { for (var current = d; current; current = current.parent) { - if (isFunctionLike(current) || isClassLike(current) || current.kind === 246 /* InterfaceDeclaration */) { + if (isFunctionLike(current) || isClassLike(current) || current.kind === 250 /* InterfaceDeclaration */) { return current; } } @@ -10710,7 +11107,7 @@ var ts; } ts.getTypeParameterOwner = getTypeParameterOwner; function isParameterPropertyDeclaration(node, parent) { - return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && parent.kind === 162 /* Constructor */; + return ts.hasSyntacticModifier(node, 92 /* ParameterPropertyModifier */) && parent.kind === 165 /* Constructor */; } ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration; function isEmptyBindingPattern(node) { @@ -10721,7 +11118,7 @@ var ts; } ts.isEmptyBindingPattern = isEmptyBindingPattern; function isEmptyBindingElement(node) { - if (isOmittedExpression(node)) { + if (ts.isOmittedExpression(node)) { return true; } return isEmptyBindingPattern(node.name); @@ -10729,33 +11126,38 @@ var ts; ts.isEmptyBindingElement = isEmptyBindingElement; function walkUpBindingElementsAndPatterns(binding) { var node = binding.parent; - while (isBindingElement(node.parent)) { + while (ts.isBindingElement(node.parent)) { node = node.parent.parent; } return node.parent; } ts.walkUpBindingElementsAndPatterns = walkUpBindingElementsAndPatterns; function getCombinedFlags(node, getFlags) { - if (isBindingElement(node)) { + if (ts.isBindingElement(node)) { node = walkUpBindingElementsAndPatterns(node); } var flags = getFlags(node); - if (node.kind === 242 /* VariableDeclaration */) { + if (node.kind === 246 /* VariableDeclaration */) { node = node.parent; } - if (node && node.kind === 243 /* VariableDeclarationList */) { + if (node && node.kind === 247 /* VariableDeclarationList */) { flags |= getFlags(node); node = node.parent; } - if (node && node.kind === 225 /* VariableStatement */) { + if (node && node.kind === 229 /* VariableStatement */) { flags |= getFlags(node); } return flags; } function getCombinedModifierFlags(node) { - return getCombinedFlags(node, ts.getModifierFlags); + return getCombinedFlags(node, ts.getEffectiveModifierFlags); } ts.getCombinedModifierFlags = getCombinedModifierFlags; + /* @internal */ + function getCombinedNodeFlagsAlwaysIncludeJSDoc(node) { + return getCombinedFlags(node, ts.getEffectiveModifierFlagsAlwaysIncludeJSDoc); + } + ts.getCombinedNodeFlagsAlwaysIncludeJSDoc = getCombinedNodeFlagsAlwaysIncludeJSDoc; // Returns the node flags for this node and all relevant parent nodes. This is done so that // nodes like variable declarations and binding elements can returned a view of their flags // that includes the modifiers from their container. i.e. flags like export/declare aren't @@ -10846,11 +11248,13 @@ var ts; if (node === undefined || isParseTreeNode(node)) { return node; } - node = getOriginalNode(node); - if (isParseTreeNode(node) && (!nodeTest || nodeTest(node))) { - return node; + node = node.original; + while (node) { + if (isParseTreeNode(node)) { + return !nodeTest || nodeTest(node) ? node : undefined; + } + node = node.original; } - return undefined; } ts.getParseTreeNode = getParseTreeNode; /** Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' */ @@ -10896,30 +11300,30 @@ var ts; } // Covers remaining cases (returning undefined if none match). switch (hostNode.kind) { - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: if (hostNode.declarationList && hostNode.declarationList.declarations[0]) { return getDeclarationIdentifier(hostNode.declarationList.declarations[0]); } break; - case 226 /* ExpressionStatement */: + case 230 /* ExpressionStatement */: var expr = hostNode.expression; - if (expr.kind === 209 /* BinaryExpression */ && expr.operatorToken.kind === 62 /* EqualsToken */) { + if (expr.kind === 213 /* BinaryExpression */ && expr.operatorToken.kind === 62 /* EqualsToken */) { expr = expr.left; } switch (expr.kind) { - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: return expr.name; - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: var arg = expr.argumentExpression; - if (isIdentifier(arg)) { + if (ts.isIdentifier(arg)) { return arg; } } break; - case 200 /* ParenthesizedExpression */: { + case 204 /* ParenthesizedExpression */: { return getDeclarationIdentifier(hostNode.expression); } - case 238 /* LabeledStatement */: { + case 242 /* LabeledStatement */: { if (isDeclaration(hostNode.statement) || isExpression(hostNode.statement)) { return getDeclarationIdentifier(hostNode.statement); } @@ -10929,14 +11333,14 @@ var ts; } function getDeclarationIdentifier(node) { var name = getNameOfDeclaration(node); - return name && isIdentifier(name) ? name : undefined; + return name && ts.isIdentifier(name) ? name : undefined; } /** @internal */ function nodeHasName(statement, name) { - if (isNamedDeclaration(statement) && isIdentifier(statement.name) && idText(statement.name) === idText(name)) { + if (isNamedDeclaration(statement) && ts.isIdentifier(statement.name) && idText(statement.name) === idText(name)) { return true; } - if (isVariableStatement(statement) && ts.some(statement.declarationList.declarations, function (d) { return nodeHasName(d, name); })) { + if (ts.isVariableStatement(statement) && ts.some(statement.declarationList.declarations, function (d) { return nodeHasName(d, name); })) { return true; } return false; @@ -10954,18 +11358,18 @@ var ts; /** @internal */ function getNonAssignedNameOfDeclaration(declaration) { switch (declaration.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return declaration; - case 323 /* JSDocPropertyTag */: - case 317 /* JSDocParameterTag */: { + case 328 /* JSDocPropertyTag */: + case 322 /* JSDocParameterTag */: { var name = declaration.name; - if (name.kind === 153 /* QualifiedName */) { + if (name.kind === 156 /* QualifiedName */) { return name.right; } break; } - case 196 /* CallExpression */: - case 209 /* BinaryExpression */: { + case 200 /* CallExpression */: + case 213 /* BinaryExpression */: { var expr_1 = declaration; switch (ts.getAssignmentDeclarationKind(expr_1)) { case 1 /* ExportsProperty */: @@ -10981,15 +11385,15 @@ var ts; return undefined; } } - case 322 /* JSDocTypedefTag */: + case 327 /* JSDocTypedefTag */: return getNameOfJSDocTypedef(declaration); - case 316 /* JSDocEnumTag */: + case 321 /* JSDocEnumTag */: return nameForNamelessJSDocTypedef(declaration); - case 259 /* ExportAssignment */: { + case 263 /* ExportAssignment */: { var expression = declaration.expression; - return isIdentifier(expression) ? expression : undefined; + return ts.isIdentifier(expression) ? expression : undefined; } - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: var expr = declaration; if (ts.isBindableStaticElementAccessExpression(expr)) { return expr.argumentExpression; @@ -11002,28 +11406,48 @@ var ts; if (declaration === undefined) return undefined; return getNonAssignedNameOfDeclaration(declaration) || - (isFunctionExpression(declaration) || isClassExpression(declaration) ? getAssignedName(declaration) : undefined); + (ts.isFunctionExpression(declaration) || ts.isClassExpression(declaration) ? getAssignedName(declaration) : undefined); } ts.getNameOfDeclaration = getNameOfDeclaration; + /*@internal*/ function getAssignedName(node) { if (!node.parent) { return undefined; } - else if (isPropertyAssignment(node.parent) || isBindingElement(node.parent)) { + else if (ts.isPropertyAssignment(node.parent) || ts.isBindingElement(node.parent)) { return node.parent.name; } - else if (isBinaryExpression(node.parent) && node === node.parent.right) { - if (isIdentifier(node.parent.left)) { + else if (ts.isBinaryExpression(node.parent) && node === node.parent.right) { + if (ts.isIdentifier(node.parent.left)) { return node.parent.left; } else if (ts.isAccessExpression(node.parent.left)) { return ts.getElementOrPropertyAccessArgumentExpressionOrName(node.parent.left); } } - else if (isVariableDeclaration(node.parent) && isIdentifier(node.parent.name)) { + else if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) { return node.parent.name; } } + ts.getAssignedName = getAssignedName; + function getJSDocParameterTagsWorker(param, noCache) { + if (param.name) { + if (ts.isIdentifier(param.name)) { + var name_1 = param.name.escapedText; + return getJSDocTagsWorker(param.parent, noCache).filter(function (tag) { return ts.isJSDocParameterTag(tag) && ts.isIdentifier(tag.name) && tag.name.escapedText === name_1; }); + } + else { + var i = param.parent.parameters.indexOf(param); + ts.Debug.assert(i > -1, "Parameters should always be in their parents' parameter list"); + var paramTags = getJSDocTagsWorker(param.parent, noCache).filter(ts.isJSDocParameterTag); + if (i < paramTags.length) { + return [paramTags[i]]; + } + } + } + // return empty array for: out-of-order binding patterns and JSDoc function syntax, which has un-named parameters + return ts.emptyArray; + } /** * Gets the JSDoc parameter tags for the node if present. * @@ -11037,24 +11461,20 @@ var ts; * For binding patterns, parameter tags are matched by position. */ function getJSDocParameterTags(param) { - if (param.name) { - if (isIdentifier(param.name)) { - var name_1 = param.name.escapedText; - return getJSDocTags(param.parent).filter(function (tag) { return isJSDocParameterTag(tag) && isIdentifier(tag.name) && tag.name.escapedText === name_1; }); - } - else { - var i = param.parent.parameters.indexOf(param); - ts.Debug.assert(i > -1, "Parameters should always be in their parents' parameter list"); - var paramTags = getJSDocTags(param.parent).filter(isJSDocParameterTag); - if (i < paramTags.length) { - return [paramTags[i]]; - } - } - } - // return empty array for: out-of-order binding patterns and JSDoc function syntax, which has un-named parameters - return ts.emptyArray; + return getJSDocParameterTagsWorker(param, /*noCache*/ false); } ts.getJSDocParameterTags = getJSDocParameterTags; + /* @internal */ + function getJSDocParameterTagsNoCache(param) { + return getJSDocParameterTagsWorker(param, /*noCache*/ true); + } + ts.getJSDocParameterTagsNoCache = getJSDocParameterTagsNoCache; + function getJSDocTypeParameterTagsWorker(param, noCache) { + var name = param.name.escapedText; + return getJSDocTagsWorker(param.parent, noCache).filter(function (tag) { + return ts.isJSDocTemplateTag(tag) && tag.typeParameters.some(function (tp) { return tp.name.escapedText === name; }); + }); + } /** * Gets the JSDoc type parameter tags for the node if present. * @@ -11066,12 +11486,14 @@ var ts; * tag on the containing function expression would be first. */ function getJSDocTypeParameterTags(param) { - var name = param.name.escapedText; - return getJSDocTags(param.parent).filter(function (tag) { - return isJSDocTemplateTag(tag) && tag.typeParameters.some(function (tp) { return tp.name.escapedText === name; }); - }); + return getJSDocTypeParameterTagsWorker(param, /*noCache*/ false); } ts.getJSDocTypeParameterTags = getJSDocTypeParameterTags; + /* @internal */ + function getJSDocTypeParameterTagsNoCache(param) { + return getJSDocTypeParameterTagsWorker(param, /*noCache*/ true); + } + ts.getJSDocTypeParameterTagsNoCache = getJSDocTypeParameterTagsNoCache; /** * Return true if the node has JSDoc parameter tags. * @@ -11079,68 +11501,98 @@ var ts; * for example on a variable declaration whose initializer is a function expression. */ function hasJSDocParameterTags(node) { - return !!getFirstJSDocTag(node, isJSDocParameterTag); + return !!getFirstJSDocTag(node, ts.isJSDocParameterTag); } ts.hasJSDocParameterTags = hasJSDocParameterTags; /** Gets the JSDoc augments tag for the node if present */ function getJSDocAugmentsTag(node) { - return getFirstJSDocTag(node, isJSDocAugmentsTag); + return getFirstJSDocTag(node, ts.isJSDocAugmentsTag); } ts.getJSDocAugmentsTag = getJSDocAugmentsTag; /** Gets the JSDoc implements tags for the node if present */ function getJSDocImplementsTags(node) { - return getAllJSDocTags(node, isJSDocImplementsTag); + return getAllJSDocTags(node, ts.isJSDocImplementsTag); } ts.getJSDocImplementsTags = getJSDocImplementsTags; /** Gets the JSDoc class tag for the node if present */ function getJSDocClassTag(node) { - return getFirstJSDocTag(node, isJSDocClassTag); + return getFirstJSDocTag(node, ts.isJSDocClassTag); } ts.getJSDocClassTag = getJSDocClassTag; /** Gets the JSDoc public tag for the node if present */ function getJSDocPublicTag(node) { - return getFirstJSDocTag(node, isJSDocPublicTag); + return getFirstJSDocTag(node, ts.isJSDocPublicTag); } ts.getJSDocPublicTag = getJSDocPublicTag; + /*@internal*/ + function getJSDocPublicTagNoCache(node) { + return getFirstJSDocTag(node, ts.isJSDocPublicTag, /*noCache*/ true); + } + ts.getJSDocPublicTagNoCache = getJSDocPublicTagNoCache; /** Gets the JSDoc private tag for the node if present */ function getJSDocPrivateTag(node) { - return getFirstJSDocTag(node, isJSDocPrivateTag); + return getFirstJSDocTag(node, ts.isJSDocPrivateTag); } ts.getJSDocPrivateTag = getJSDocPrivateTag; + /*@internal*/ + function getJSDocPrivateTagNoCache(node) { + return getFirstJSDocTag(node, ts.isJSDocPrivateTag, /*noCache*/ true); + } + ts.getJSDocPrivateTagNoCache = getJSDocPrivateTagNoCache; /** Gets the JSDoc protected tag for the node if present */ function getJSDocProtectedTag(node) { - return getFirstJSDocTag(node, isJSDocProtectedTag); + return getFirstJSDocTag(node, ts.isJSDocProtectedTag); } ts.getJSDocProtectedTag = getJSDocProtectedTag; + /*@internal*/ + function getJSDocProtectedTagNoCache(node) { + return getFirstJSDocTag(node, ts.isJSDocProtectedTag, /*noCache*/ true); + } + ts.getJSDocProtectedTagNoCache = getJSDocProtectedTagNoCache; /** Gets the JSDoc protected tag for the node if present */ function getJSDocReadonlyTag(node) { - return getFirstJSDocTag(node, isJSDocReadonlyTag); + return getFirstJSDocTag(node, ts.isJSDocReadonlyTag); } ts.getJSDocReadonlyTag = getJSDocReadonlyTag; + /*@internal*/ + function getJSDocReadonlyTagNoCache(node) { + return getFirstJSDocTag(node, ts.isJSDocReadonlyTag, /*noCache*/ true); + } + ts.getJSDocReadonlyTagNoCache = getJSDocReadonlyTagNoCache; + /** Gets the JSDoc deprecated tag for the node if present */ + function getJSDocDeprecatedTag(node) { + return getFirstJSDocTag(node, ts.isJSDocDeprecatedTag); + } + ts.getJSDocDeprecatedTag = getJSDocDeprecatedTag; + /*@internal */ + function getJSDocDeprecatedTagNoCache(node) { + return getFirstJSDocTag(node, ts.isJSDocDeprecatedTag, /*noCache*/ true); + } + ts.getJSDocDeprecatedTagNoCache = getJSDocDeprecatedTagNoCache; /** Gets the JSDoc enum tag for the node if present */ function getJSDocEnumTag(node) { - return getFirstJSDocTag(node, isJSDocEnumTag); + return getFirstJSDocTag(node, ts.isJSDocEnumTag); } ts.getJSDocEnumTag = getJSDocEnumTag; /** Gets the JSDoc this tag for the node if present */ function getJSDocThisTag(node) { - return getFirstJSDocTag(node, isJSDocThisTag); + return getFirstJSDocTag(node, ts.isJSDocThisTag); } ts.getJSDocThisTag = getJSDocThisTag; /** Gets the JSDoc return tag for the node if present */ function getJSDocReturnTag(node) { - return getFirstJSDocTag(node, isJSDocReturnTag); + return getFirstJSDocTag(node, ts.isJSDocReturnTag); } ts.getJSDocReturnTag = getJSDocReturnTag; /** Gets the JSDoc template tag for the node if present */ function getJSDocTemplateTag(node) { - return getFirstJSDocTag(node, isJSDocTemplateTag); + return getFirstJSDocTag(node, ts.isJSDocTemplateTag); } ts.getJSDocTemplateTag = getJSDocTemplateTag; /** Gets the JSDoc type tag for the node if present and valid */ function getJSDocTypeTag(node) { // We should have already issued an error if there were multiple type jsdocs, so just use the first one. - var tag = getFirstJSDocTag(node, isJSDocTypeTag); + var tag = getFirstJSDocTag(node, ts.isJSDocTypeTag); if (tag && tag.typeExpression && tag.typeExpression.type) { return tag; } @@ -11159,8 +11611,8 @@ var ts; * tag directly on the node would be returned. */ function getJSDocType(node) { - var tag = getFirstJSDocTag(node, isJSDocTypeTag); - if (!tag && isParameter(node)) { + var tag = getFirstJSDocTag(node, ts.isJSDocTypeTag); + if (!tag && ts.isParameter(node)) { tag = ts.find(getJSDocParameterTags(node), function (tag) { return !!tag.typeExpression; }); } return tag && tag.typeExpression && tag.typeExpression.type; @@ -11180,31 +11632,42 @@ var ts; var typeTag = getJSDocTypeTag(node); if (typeTag && typeTag.typeExpression) { var type = typeTag.typeExpression.type; - if (isTypeLiteralNode(type)) { - var sig = ts.find(type.members, isCallSignatureDeclaration); + if (ts.isTypeLiteralNode(type)) { + var sig = ts.find(type.members, ts.isCallSignatureDeclaration); return sig && sig.type; } - if (isFunctionTypeNode(type) || isJSDocFunctionType(type)) { + if (ts.isFunctionTypeNode(type) || ts.isJSDocFunctionType(type)) { return type.type; } } } ts.getJSDocReturnType = getJSDocReturnType; - /** Get all JSDoc tags related to a node, including those on parent nodes. */ - function getJSDocTags(node) { + function getJSDocTagsWorker(node, noCache) { var tags = node.jsDocCache; // If cache is 'null', that means we did the work of searching for JSDoc tags and came up with nothing. - if (tags === undefined) { - var comments = ts.getJSDocCommentsAndTags(node); + if (tags === undefined || noCache) { + var comments = ts.getJSDocCommentsAndTags(node, noCache); ts.Debug.assert(comments.length < 2 || comments[0] !== comments[1]); - node.jsDocCache = tags = ts.flatMap(comments, function (j) { return isJSDoc(j) ? j.tags : j; }); + tags = ts.flatMap(comments, function (j) { return ts.isJSDoc(j) ? j.tags : j; }); + if (!noCache) { + node.jsDocCache = tags; + } } return tags; } + /** Get all JSDoc tags related to a node, including those on parent nodes. */ + function getJSDocTags(node) { + return getJSDocTagsWorker(node, /*noCache*/ false); + } ts.getJSDocTags = getJSDocTags; + /* @internal */ + function getJSDocTagsNoCache(node) { + return getJSDocTagsWorker(node, /*noCache*/ true); + } + ts.getJSDocTagsNoCache = getJSDocTagsNoCache; /** Get the first JSDoc tag of a specified kind, or undefined if not present. */ - function getFirstJSDocTag(node, predicate) { - return ts.find(getJSDocTags(node), predicate); + function getFirstJSDocTag(node, predicate, noCache) { + return ts.find(getJSDocTagsWorker(node, noCache), predicate); } /** Gets all JSDoc tags that match a specified predicate */ function getAllJSDocTags(node, predicate) { @@ -11221,12 +11684,12 @@ var ts; * JavaScript file, gets the type parameters from the `@template` tag from JSDoc. */ function getEffectiveTypeParameterDeclarations(node) { - if (isJSDocSignature(node)) { + if (ts.isJSDocSignature(node)) { return ts.emptyArray; } if (ts.isJSDocTypeAlias(node)) { - ts.Debug.assert(node.parent.kind === 303 /* JSDocComment */); - return ts.flatMap(node.parent.tags, function (tag) { return isJSDocTemplateTag(tag) ? tag.typeParameters : undefined; }); + ts.Debug.assert(node.parent.kind === 307 /* JSDocComment */); + return ts.flatMap(node.parent.tags, function (tag) { return ts.isJSDocTemplateTag(tag) ? tag.typeParameters : undefined; }); } if (node.typeParameters) { return node.typeParameters; @@ -11237,7 +11700,7 @@ var ts; return decls; } var typeTag = getJSDocType(node); - if (typeTag && isFunctionTypeNode(typeTag) && typeTag.typeParameters) { + if (typeTag && ts.isFunctionTypeNode(typeTag) && typeTag.typeParameters) { return typeTag.typeParameters; } } @@ -11246,265 +11709,44 @@ var ts; ts.getEffectiveTypeParameterDeclarations = getEffectiveTypeParameterDeclarations; function getEffectiveConstraintOfTypeParameter(node) { return node.constraint ? node.constraint : - isJSDocTemplateTag(node.parent) && node === node.parent.typeParameters[0] ? node.parent.constraint : + ts.isJSDocTemplateTag(node.parent) && node === node.parent.typeParameters[0] ? node.parent.constraint : undefined; } ts.getEffectiveConstraintOfTypeParameter = getEffectiveConstraintOfTypeParameter; // #region - // Simple node tests of the form `node.kind === SyntaxKind.Foo`. - // Literals - function isNumericLiteral(node) { - return node.kind === 8 /* NumericLiteral */; - } - ts.isNumericLiteral = isNumericLiteral; - function isBigIntLiteral(node) { - return node.kind === 9 /* BigIntLiteral */; - } - ts.isBigIntLiteral = isBigIntLiteral; - function isStringLiteral(node) { - return node.kind === 10 /* StringLiteral */; - } - ts.isStringLiteral = isStringLiteral; - function isJsxText(node) { - return node.kind === 11 /* JsxText */; - } - ts.isJsxText = isJsxText; - function isRegularExpressionLiteral(node) { - return node.kind === 13 /* RegularExpressionLiteral */; - } - ts.isRegularExpressionLiteral = isRegularExpressionLiteral; - function isNoSubstitutionTemplateLiteral(node) { - return node.kind === 14 /* NoSubstitutionTemplateLiteral */; - } - ts.isNoSubstitutionTemplateLiteral = isNoSubstitutionTemplateLiteral; - // Pseudo-literals - function isTemplateHead(node) { - return node.kind === 15 /* TemplateHead */; - } - ts.isTemplateHead = isTemplateHead; - function isTemplateMiddle(node) { - return node.kind === 16 /* TemplateMiddle */; - } - ts.isTemplateMiddle = isTemplateMiddle; - function isTemplateTail(node) { - return node.kind === 17 /* TemplateTail */; - } - ts.isTemplateTail = isTemplateTail; - function isIdentifier(node) { - return node.kind === 75 /* Identifier */; - } - ts.isIdentifier = isIdentifier; - // Names - function isQualifiedName(node) { - return node.kind === 153 /* QualifiedName */; - } - ts.isQualifiedName = isQualifiedName; - function isComputedPropertyName(node) { - return node.kind === 154 /* ComputedPropertyName */; - } - ts.isComputedPropertyName = isComputedPropertyName; - function isPrivateIdentifier(node) { - return node.kind === 76 /* PrivateIdentifier */; - } - ts.isPrivateIdentifier = isPrivateIdentifier; function isIdentifierOrPrivateIdentifier(node) { - return node.kind === 75 /* Identifier */ || node.kind === 76 /* PrivateIdentifier */; + return node.kind === 78 /* Identifier */ || node.kind === 79 /* PrivateIdentifier */; } ts.isIdentifierOrPrivateIdentifier = isIdentifierOrPrivateIdentifier; - // Signature elements - function isTypeParameterDeclaration(node) { - return node.kind === 155 /* TypeParameter */; - } - ts.isTypeParameterDeclaration = isTypeParameterDeclaration; - function isParameter(node) { - return node.kind === 156 /* Parameter */; - } - ts.isParameter = isParameter; - function isDecorator(node) { - return node.kind === 157 /* Decorator */; - } - ts.isDecorator = isDecorator; - // TypeMember - function isPropertySignature(node) { - return node.kind === 158 /* PropertySignature */; - } - ts.isPropertySignature = isPropertySignature; - function isPropertyDeclaration(node) { - return node.kind === 159 /* PropertyDeclaration */; - } - ts.isPropertyDeclaration = isPropertyDeclaration; - function isMethodSignature(node) { - return node.kind === 160 /* MethodSignature */; - } - ts.isMethodSignature = isMethodSignature; - function isMethodDeclaration(node) { - return node.kind === 161 /* MethodDeclaration */; - } - ts.isMethodDeclaration = isMethodDeclaration; - function isConstructorDeclaration(node) { - return node.kind === 162 /* Constructor */; - } - ts.isConstructorDeclaration = isConstructorDeclaration; - function isGetAccessorDeclaration(node) { - return node.kind === 163 /* GetAccessor */; - } - ts.isGetAccessorDeclaration = isGetAccessorDeclaration; - function isSetAccessorDeclaration(node) { - return node.kind === 164 /* SetAccessor */; - } - ts.isSetAccessorDeclaration = isSetAccessorDeclaration; - function isCallSignatureDeclaration(node) { - return node.kind === 165 /* CallSignature */; - } - ts.isCallSignatureDeclaration = isCallSignatureDeclaration; - function isConstructSignatureDeclaration(node) { - return node.kind === 166 /* ConstructSignature */; - } - ts.isConstructSignatureDeclaration = isConstructSignatureDeclaration; - function isIndexSignatureDeclaration(node) { - return node.kind === 167 /* IndexSignature */; - } - ts.isIndexSignatureDeclaration = isIndexSignatureDeclaration; /* @internal */ function isGetOrSetAccessorDeclaration(node) { - return node.kind === 164 /* SetAccessor */ || node.kind === 163 /* GetAccessor */; + return node.kind === 167 /* SetAccessor */ || node.kind === 166 /* GetAccessor */; } ts.isGetOrSetAccessorDeclaration = isGetOrSetAccessorDeclaration; - // Type - function isTypePredicateNode(node) { - return node.kind === 168 /* TypePredicate */; - } - ts.isTypePredicateNode = isTypePredicateNode; - function isTypeReferenceNode(node) { - return node.kind === 169 /* TypeReference */; - } - ts.isTypeReferenceNode = isTypeReferenceNode; - function isFunctionTypeNode(node) { - return node.kind === 170 /* FunctionType */; - } - ts.isFunctionTypeNode = isFunctionTypeNode; - function isConstructorTypeNode(node) { - return node.kind === 171 /* ConstructorType */; - } - ts.isConstructorTypeNode = isConstructorTypeNode; - function isTypeQueryNode(node) { - return node.kind === 172 /* TypeQuery */; - } - ts.isTypeQueryNode = isTypeQueryNode; - function isTypeLiteralNode(node) { - return node.kind === 173 /* TypeLiteral */; - } - ts.isTypeLiteralNode = isTypeLiteralNode; - function isArrayTypeNode(node) { - return node.kind === 174 /* ArrayType */; - } - ts.isArrayTypeNode = isArrayTypeNode; - function isTupleTypeNode(node) { - return node.kind === 175 /* TupleType */; - } - ts.isTupleTypeNode = isTupleTypeNode; - function isUnionTypeNode(node) { - return node.kind === 178 /* UnionType */; - } - ts.isUnionTypeNode = isUnionTypeNode; - function isIntersectionTypeNode(node) { - return node.kind === 179 /* IntersectionType */; - } - ts.isIntersectionTypeNode = isIntersectionTypeNode; - function isConditionalTypeNode(node) { - return node.kind === 180 /* ConditionalType */; - } - ts.isConditionalTypeNode = isConditionalTypeNode; - function isInferTypeNode(node) { - return node.kind === 181 /* InferType */; - } - ts.isInferTypeNode = isInferTypeNode; - function isParenthesizedTypeNode(node) { - return node.kind === 182 /* ParenthesizedType */; - } - ts.isParenthesizedTypeNode = isParenthesizedTypeNode; - function isThisTypeNode(node) { - return node.kind === 183 /* ThisType */; - } - ts.isThisTypeNode = isThisTypeNode; - function isTypeOperatorNode(node) { - return node.kind === 184 /* TypeOperator */; - } - ts.isTypeOperatorNode = isTypeOperatorNode; - function isIndexedAccessTypeNode(node) { - return node.kind === 185 /* IndexedAccessType */; - } - ts.isIndexedAccessTypeNode = isIndexedAccessTypeNode; - function isMappedTypeNode(node) { - return node.kind === 186 /* MappedType */; - } - ts.isMappedTypeNode = isMappedTypeNode; - function isLiteralTypeNode(node) { - return node.kind === 187 /* LiteralType */; - } - ts.isLiteralTypeNode = isLiteralTypeNode; - function isImportTypeNode(node) { - return node.kind === 188 /* ImportType */; - } - ts.isImportTypeNode = isImportTypeNode; - // Binding patterns - function isObjectBindingPattern(node) { - return node.kind === 189 /* ObjectBindingPattern */; - } - ts.isObjectBindingPattern = isObjectBindingPattern; - function isArrayBindingPattern(node) { - return node.kind === 190 /* ArrayBindingPattern */; - } - ts.isArrayBindingPattern = isArrayBindingPattern; - function isBindingElement(node) { - return node.kind === 191 /* BindingElement */; - } - ts.isBindingElement = isBindingElement; - // Expression - function isArrayLiteralExpression(node) { - return node.kind === 192 /* ArrayLiteralExpression */; - } - ts.isArrayLiteralExpression = isArrayLiteralExpression; - function isObjectLiteralExpression(node) { - return node.kind === 193 /* ObjectLiteralExpression */; - } - ts.isObjectLiteralExpression = isObjectLiteralExpression; - function isPropertyAccessExpression(node) { - return node.kind === 194 /* PropertyAccessExpression */; - } - ts.isPropertyAccessExpression = isPropertyAccessExpression; function isPropertyAccessChain(node) { - return isPropertyAccessExpression(node) && !!(node.flags & 32 /* OptionalChain */); + return ts.isPropertyAccessExpression(node) && !!(node.flags & 32 /* OptionalChain */); } ts.isPropertyAccessChain = isPropertyAccessChain; - function isElementAccessExpression(node) { - return node.kind === 195 /* ElementAccessExpression */; - } - ts.isElementAccessExpression = isElementAccessExpression; function isElementAccessChain(node) { - return isElementAccessExpression(node) && !!(node.flags & 32 /* OptionalChain */); + return ts.isElementAccessExpression(node) && !!(node.flags & 32 /* OptionalChain */); } ts.isElementAccessChain = isElementAccessChain; - function isCallExpression(node) { - return node.kind === 196 /* CallExpression */; - } - ts.isCallExpression = isCallExpression; function isCallChain(node) { - return isCallExpression(node) && !!(node.flags & 32 /* OptionalChain */); + return ts.isCallExpression(node) && !!(node.flags & 32 /* OptionalChain */); } ts.isCallChain = isCallChain; function isOptionalChain(node) { var kind = node.kind; return !!(node.flags & 32 /* OptionalChain */) && - (kind === 194 /* PropertyAccessExpression */ - || kind === 195 /* ElementAccessExpression */ - || kind === 196 /* CallExpression */ - || kind === 218 /* NonNullExpression */); + (kind === 198 /* PropertyAccessExpression */ + || kind === 199 /* ElementAccessExpression */ + || kind === 200 /* CallExpression */ + || kind === 222 /* NonNullExpression */); } ts.isOptionalChain = isOptionalChain; /* @internal */ function isOptionalChainRoot(node) { - return isOptionalChain(node) && !isNonNullExpression(node) && !!node.questionDotToken; + return isOptionalChain(node) && !ts.isNonNullExpression(node) && !!node.questionDotToken; } ts.isOptionalChainRoot = isOptionalChainRoot; /** @@ -11534,406 +11776,34 @@ var ts; } ts.isOutermostOptionalChain = isOutermostOptionalChain; function isNullishCoalesce(node) { - return node.kind === 209 /* BinaryExpression */ && node.operatorToken.kind === 60 /* QuestionQuestionToken */; + return node.kind === 213 /* BinaryExpression */ && node.operatorToken.kind === 60 /* QuestionQuestionToken */; } ts.isNullishCoalesce = isNullishCoalesce; - function isNewExpression(node) { - return node.kind === 197 /* NewExpression */; - } - ts.isNewExpression = isNewExpression; - function isTaggedTemplateExpression(node) { - return node.kind === 198 /* TaggedTemplateExpression */; - } - ts.isTaggedTemplateExpression = isTaggedTemplateExpression; - function isTypeAssertion(node) { - return node.kind === 199 /* TypeAssertionExpression */; - } - ts.isTypeAssertion = isTypeAssertion; function isConstTypeReference(node) { - return isTypeReferenceNode(node) && isIdentifier(node.typeName) && + return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "const" && !node.typeArguments; } ts.isConstTypeReference = isConstTypeReference; - function isParenthesizedExpression(node) { - return node.kind === 200 /* ParenthesizedExpression */; - } - ts.isParenthesizedExpression = isParenthesizedExpression; function skipPartiallyEmittedExpressions(node) { return ts.skipOuterExpressions(node, 8 /* PartiallyEmittedExpressions */); } ts.skipPartiallyEmittedExpressions = skipPartiallyEmittedExpressions; - function isFunctionExpression(node) { - return node.kind === 201 /* FunctionExpression */; - } - ts.isFunctionExpression = isFunctionExpression; - function isArrowFunction(node) { - return node.kind === 202 /* ArrowFunction */; - } - ts.isArrowFunction = isArrowFunction; - function isDeleteExpression(node) { - return node.kind === 203 /* DeleteExpression */; - } - ts.isDeleteExpression = isDeleteExpression; - function isTypeOfExpression(node) { - return node.kind === 204 /* TypeOfExpression */; - } - ts.isTypeOfExpression = isTypeOfExpression; - function isVoidExpression(node) { - return node.kind === 205 /* VoidExpression */; - } - ts.isVoidExpression = isVoidExpression; - function isAwaitExpression(node) { - return node.kind === 206 /* AwaitExpression */; - } - ts.isAwaitExpression = isAwaitExpression; - function isPrefixUnaryExpression(node) { - return node.kind === 207 /* PrefixUnaryExpression */; - } - ts.isPrefixUnaryExpression = isPrefixUnaryExpression; - function isPostfixUnaryExpression(node) { - return node.kind === 208 /* PostfixUnaryExpression */; - } - ts.isPostfixUnaryExpression = isPostfixUnaryExpression; - function isBinaryExpression(node) { - return node.kind === 209 /* BinaryExpression */; - } - ts.isBinaryExpression = isBinaryExpression; - function isConditionalExpression(node) { - return node.kind === 210 /* ConditionalExpression */; - } - ts.isConditionalExpression = isConditionalExpression; - function isTemplateExpression(node) { - return node.kind === 211 /* TemplateExpression */; - } - ts.isTemplateExpression = isTemplateExpression; - function isYieldExpression(node) { - return node.kind === 212 /* YieldExpression */; - } - ts.isYieldExpression = isYieldExpression; - function isSpreadElement(node) { - return node.kind === 213 /* SpreadElement */; - } - ts.isSpreadElement = isSpreadElement; - function isClassExpression(node) { - return node.kind === 214 /* ClassExpression */; - } - ts.isClassExpression = isClassExpression; - function isOmittedExpression(node) { - return node.kind === 215 /* OmittedExpression */; - } - ts.isOmittedExpression = isOmittedExpression; - function isExpressionWithTypeArguments(node) { - return node.kind === 216 /* ExpressionWithTypeArguments */; - } - ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments; - function isAsExpression(node) { - return node.kind === 217 /* AsExpression */; - } - ts.isAsExpression = isAsExpression; - function isNonNullExpression(node) { - return node.kind === 218 /* NonNullExpression */; - } - ts.isNonNullExpression = isNonNullExpression; function isNonNullChain(node) { - return isNonNullExpression(node) && !!(node.flags & 32 /* OptionalChain */); + return ts.isNonNullExpression(node) && !!(node.flags & 32 /* OptionalChain */); } ts.isNonNullChain = isNonNullChain; - function isMetaProperty(node) { - return node.kind === 219 /* MetaProperty */; - } - ts.isMetaProperty = isMetaProperty; - // Misc - function isTemplateSpan(node) { - return node.kind === 221 /* TemplateSpan */; - } - ts.isTemplateSpan = isTemplateSpan; - function isSemicolonClassElement(node) { - return node.kind === 222 /* SemicolonClassElement */; - } - ts.isSemicolonClassElement = isSemicolonClassElement; - // Block - function isBlock(node) { - return node.kind === 223 /* Block */; - } - ts.isBlock = isBlock; - function isVariableStatement(node) { - return node.kind === 225 /* VariableStatement */; - } - ts.isVariableStatement = isVariableStatement; - function isEmptyStatement(node) { - return node.kind === 224 /* EmptyStatement */; - } - ts.isEmptyStatement = isEmptyStatement; - function isExpressionStatement(node) { - return node.kind === 226 /* ExpressionStatement */; - } - ts.isExpressionStatement = isExpressionStatement; - function isIfStatement(node) { - return node.kind === 227 /* IfStatement */; - } - ts.isIfStatement = isIfStatement; - function isDoStatement(node) { - return node.kind === 228 /* DoStatement */; - } - ts.isDoStatement = isDoStatement; - function isWhileStatement(node) { - return node.kind === 229 /* WhileStatement */; - } - ts.isWhileStatement = isWhileStatement; - function isForStatement(node) { - return node.kind === 230 /* ForStatement */; - } - ts.isForStatement = isForStatement; - function isForInStatement(node) { - return node.kind === 231 /* ForInStatement */; - } - ts.isForInStatement = isForInStatement; - function isForOfStatement(node) { - return node.kind === 232 /* ForOfStatement */; - } - ts.isForOfStatement = isForOfStatement; - function isContinueStatement(node) { - return node.kind === 233 /* ContinueStatement */; - } - ts.isContinueStatement = isContinueStatement; - function isBreakStatement(node) { - return node.kind === 234 /* BreakStatement */; - } - ts.isBreakStatement = isBreakStatement; function isBreakOrContinueStatement(node) { - return node.kind === 234 /* BreakStatement */ || node.kind === 233 /* ContinueStatement */; + return node.kind === 238 /* BreakStatement */ || node.kind === 237 /* ContinueStatement */; } ts.isBreakOrContinueStatement = isBreakOrContinueStatement; - function isReturnStatement(node) { - return node.kind === 235 /* ReturnStatement */; - } - ts.isReturnStatement = isReturnStatement; - function isWithStatement(node) { - return node.kind === 236 /* WithStatement */; - } - ts.isWithStatement = isWithStatement; - function isSwitchStatement(node) { - return node.kind === 237 /* SwitchStatement */; - } - ts.isSwitchStatement = isSwitchStatement; - function isLabeledStatement(node) { - return node.kind === 238 /* LabeledStatement */; - } - ts.isLabeledStatement = isLabeledStatement; - function isThrowStatement(node) { - return node.kind === 239 /* ThrowStatement */; - } - ts.isThrowStatement = isThrowStatement; - function isTryStatement(node) { - return node.kind === 240 /* TryStatement */; - } - ts.isTryStatement = isTryStatement; - function isDebuggerStatement(node) { - return node.kind === 241 /* DebuggerStatement */; - } - ts.isDebuggerStatement = isDebuggerStatement; - function isVariableDeclaration(node) { - return node.kind === 242 /* VariableDeclaration */; - } - ts.isVariableDeclaration = isVariableDeclaration; - function isVariableDeclarationList(node) { - return node.kind === 243 /* VariableDeclarationList */; - } - ts.isVariableDeclarationList = isVariableDeclarationList; - function isFunctionDeclaration(node) { - return node.kind === 244 /* FunctionDeclaration */; - } - ts.isFunctionDeclaration = isFunctionDeclaration; - function isClassDeclaration(node) { - return node.kind === 245 /* ClassDeclaration */; - } - ts.isClassDeclaration = isClassDeclaration; - function isInterfaceDeclaration(node) { - return node.kind === 246 /* InterfaceDeclaration */; - } - ts.isInterfaceDeclaration = isInterfaceDeclaration; - function isTypeAliasDeclaration(node) { - return node.kind === 247 /* TypeAliasDeclaration */; - } - ts.isTypeAliasDeclaration = isTypeAliasDeclaration; - function isEnumDeclaration(node) { - return node.kind === 248 /* EnumDeclaration */; - } - ts.isEnumDeclaration = isEnumDeclaration; - function isModuleDeclaration(node) { - return node.kind === 249 /* ModuleDeclaration */; - } - ts.isModuleDeclaration = isModuleDeclaration; - function isModuleBlock(node) { - return node.kind === 250 /* ModuleBlock */; - } - ts.isModuleBlock = isModuleBlock; - function isCaseBlock(node) { - return node.kind === 251 /* CaseBlock */; - } - ts.isCaseBlock = isCaseBlock; - function isNamespaceExportDeclaration(node) { - return node.kind === 252 /* NamespaceExportDeclaration */; - } - ts.isNamespaceExportDeclaration = isNamespaceExportDeclaration; - function isImportEqualsDeclaration(node) { - return node.kind === 253 /* ImportEqualsDeclaration */; - } - ts.isImportEqualsDeclaration = isImportEqualsDeclaration; - function isImportDeclaration(node) { - return node.kind === 254 /* ImportDeclaration */; - } - ts.isImportDeclaration = isImportDeclaration; - function isImportClause(node) { - return node.kind === 255 /* ImportClause */; - } - ts.isImportClause = isImportClause; - function isNamespaceImport(node) { - return node.kind === 256 /* NamespaceImport */; - } - ts.isNamespaceImport = isNamespaceImport; - function isNamespaceExport(node) { - return node.kind === 262 /* NamespaceExport */; - } - ts.isNamespaceExport = isNamespaceExport; function isNamedExportBindings(node) { - return node.kind === 262 /* NamespaceExport */ || node.kind === 261 /* NamedExports */; + return node.kind === 266 /* NamespaceExport */ || node.kind === 265 /* NamedExports */; } ts.isNamedExportBindings = isNamedExportBindings; - function isNamedImports(node) { - return node.kind === 257 /* NamedImports */; - } - ts.isNamedImports = isNamedImports; - function isImportSpecifier(node) { - return node.kind === 258 /* ImportSpecifier */; - } - ts.isImportSpecifier = isImportSpecifier; - function isExportAssignment(node) { - return node.kind === 259 /* ExportAssignment */; - } - ts.isExportAssignment = isExportAssignment; - function isExportDeclaration(node) { - return node.kind === 260 /* ExportDeclaration */; - } - ts.isExportDeclaration = isExportDeclaration; - function isNamedExports(node) { - return node.kind === 261 /* NamedExports */; - } - ts.isNamedExports = isNamedExports; - function isExportSpecifier(node) { - return node.kind === 263 /* ExportSpecifier */; - } - ts.isExportSpecifier = isExportSpecifier; - function isMissingDeclaration(node) { - return node.kind === 264 /* MissingDeclaration */; - } - ts.isMissingDeclaration = isMissingDeclaration; - // Module References - function isExternalModuleReference(node) { - return node.kind === 265 /* ExternalModuleReference */; - } - ts.isExternalModuleReference = isExternalModuleReference; - // JSX - function isJsxElement(node) { - return node.kind === 266 /* JsxElement */; - } - ts.isJsxElement = isJsxElement; - function isJsxSelfClosingElement(node) { - return node.kind === 267 /* JsxSelfClosingElement */; - } - ts.isJsxSelfClosingElement = isJsxSelfClosingElement; - function isJsxOpeningElement(node) { - return node.kind === 268 /* JsxOpeningElement */; - } - ts.isJsxOpeningElement = isJsxOpeningElement; - function isJsxClosingElement(node) { - return node.kind === 269 /* JsxClosingElement */; - } - ts.isJsxClosingElement = isJsxClosingElement; - function isJsxFragment(node) { - return node.kind === 270 /* JsxFragment */; - } - ts.isJsxFragment = isJsxFragment; - function isJsxOpeningFragment(node) { - return node.kind === 271 /* JsxOpeningFragment */; - } - ts.isJsxOpeningFragment = isJsxOpeningFragment; - function isJsxClosingFragment(node) { - return node.kind === 272 /* JsxClosingFragment */; - } - ts.isJsxClosingFragment = isJsxClosingFragment; - function isJsxAttribute(node) { - return node.kind === 273 /* JsxAttribute */; - } - ts.isJsxAttribute = isJsxAttribute; - function isJsxAttributes(node) { - return node.kind === 274 /* JsxAttributes */; - } - ts.isJsxAttributes = isJsxAttributes; - function isJsxSpreadAttribute(node) { - return node.kind === 275 /* JsxSpreadAttribute */; - } - ts.isJsxSpreadAttribute = isJsxSpreadAttribute; - function isJsxExpression(node) { - return node.kind === 276 /* JsxExpression */; - } - ts.isJsxExpression = isJsxExpression; - // Clauses - function isCaseClause(node) { - return node.kind === 277 /* CaseClause */; - } - ts.isCaseClause = isCaseClause; - function isDefaultClause(node) { - return node.kind === 278 /* DefaultClause */; - } - ts.isDefaultClause = isDefaultClause; - function isHeritageClause(node) { - return node.kind === 279 /* HeritageClause */; - } - ts.isHeritageClause = isHeritageClause; - function isCatchClause(node) { - return node.kind === 280 /* CatchClause */; - } - ts.isCatchClause = isCatchClause; - // Property assignments - function isPropertyAssignment(node) { - return node.kind === 281 /* PropertyAssignment */; - } - ts.isPropertyAssignment = isPropertyAssignment; - function isShorthandPropertyAssignment(node) { - return node.kind === 282 /* ShorthandPropertyAssignment */; - } - ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment; - function isSpreadAssignment(node) { - return node.kind === 283 /* SpreadAssignment */; - } - ts.isSpreadAssignment = isSpreadAssignment; - // Enum - function isEnumMember(node) { - return node.kind === 284 /* EnumMember */; - } - ts.isEnumMember = isEnumMember; - // Top-level nodes - function isSourceFile(node) { - return node.kind === 290 /* SourceFile */; - } - ts.isSourceFile = isSourceFile; - function isBundle(node) { - return node.kind === 291 /* Bundle */; - } - ts.isBundle = isBundle; - function isUnparsedSource(node) { - return node.kind === 292 /* UnparsedSource */; - } - ts.isUnparsedSource = isUnparsedSource; - function isUnparsedPrepend(node) { - return node.kind === 286 /* UnparsedPrepend */; - } - ts.isUnparsedPrepend = isUnparsedPrepend; function isUnparsedTextLike(node) { switch (node.kind) { - case 287 /* UnparsedText */: - case 288 /* UnparsedInternalText */: + case 291 /* UnparsedText */: + case 292 /* UnparsedInternalText */: return true; default: return false; @@ -11942,127 +11812,14 @@ var ts; ts.isUnparsedTextLike = isUnparsedTextLike; function isUnparsedNode(node) { return isUnparsedTextLike(node) || - node.kind === 285 /* UnparsedPrologue */ || - node.kind === 289 /* UnparsedSyntheticReference */; + node.kind === 289 /* UnparsedPrologue */ || + node.kind === 293 /* UnparsedSyntheticReference */; } ts.isUnparsedNode = isUnparsedNode; - // JSDoc - function isJSDocTypeExpression(node) { - return node.kind === 294 /* JSDocTypeExpression */; - } - ts.isJSDocTypeExpression = isJSDocTypeExpression; - function isJSDocAllType(node) { - return node.kind === 295 /* JSDocAllType */; - } - ts.isJSDocAllType = isJSDocAllType; - function isJSDocUnknownType(node) { - return node.kind === 296 /* JSDocUnknownType */; - } - ts.isJSDocUnknownType = isJSDocUnknownType; - function isJSDocNullableType(node) { - return node.kind === 297 /* JSDocNullableType */; - } - ts.isJSDocNullableType = isJSDocNullableType; - function isJSDocNonNullableType(node) { - return node.kind === 298 /* JSDocNonNullableType */; - } - ts.isJSDocNonNullableType = isJSDocNonNullableType; - function isJSDocOptionalType(node) { - return node.kind === 299 /* JSDocOptionalType */; - } - ts.isJSDocOptionalType = isJSDocOptionalType; - function isJSDocFunctionType(node) { - return node.kind === 300 /* JSDocFunctionType */; - } - ts.isJSDocFunctionType = isJSDocFunctionType; - function isJSDocVariadicType(node) { - return node.kind === 301 /* JSDocVariadicType */; - } - ts.isJSDocVariadicType = isJSDocVariadicType; - function isJSDoc(node) { - return node.kind === 303 /* JSDocComment */; - } - ts.isJSDoc = isJSDoc; - function isJSDocAuthorTag(node) { - return node.kind === 309 /* JSDocAuthorTag */; - } - ts.isJSDocAuthorTag = isJSDocAuthorTag; - function isJSDocAugmentsTag(node) { - return node.kind === 307 /* JSDocAugmentsTag */; - } - ts.isJSDocAugmentsTag = isJSDocAugmentsTag; - function isJSDocImplementsTag(node) { - return node.kind === 308 /* JSDocImplementsTag */; - } - ts.isJSDocImplementsTag = isJSDocImplementsTag; - function isJSDocClassTag(node) { - return node.kind === 310 /* JSDocClassTag */; - } - ts.isJSDocClassTag = isJSDocClassTag; - function isJSDocPublicTag(node) { - return node.kind === 311 /* JSDocPublicTag */; - } - ts.isJSDocPublicTag = isJSDocPublicTag; - function isJSDocPrivateTag(node) { - return node.kind === 312 /* JSDocPrivateTag */; - } - ts.isJSDocPrivateTag = isJSDocPrivateTag; - function isJSDocProtectedTag(node) { - return node.kind === 313 /* JSDocProtectedTag */; - } - ts.isJSDocProtectedTag = isJSDocProtectedTag; - function isJSDocReadonlyTag(node) { - return node.kind === 314 /* JSDocReadonlyTag */; - } - ts.isJSDocReadonlyTag = isJSDocReadonlyTag; - function isJSDocEnumTag(node) { - return node.kind === 316 /* JSDocEnumTag */; - } - ts.isJSDocEnumTag = isJSDocEnumTag; - function isJSDocThisTag(node) { - return node.kind === 319 /* JSDocThisTag */; - } - ts.isJSDocThisTag = isJSDocThisTag; - function isJSDocParameterTag(node) { - return node.kind === 317 /* JSDocParameterTag */; - } - ts.isJSDocParameterTag = isJSDocParameterTag; - function isJSDocReturnTag(node) { - return node.kind === 318 /* JSDocReturnTag */; - } - ts.isJSDocReturnTag = isJSDocReturnTag; - function isJSDocTypeTag(node) { - return node.kind === 320 /* JSDocTypeTag */; - } - ts.isJSDocTypeTag = isJSDocTypeTag; - function isJSDocTemplateTag(node) { - return node.kind === 321 /* JSDocTemplateTag */; - } - ts.isJSDocTemplateTag = isJSDocTemplateTag; - function isJSDocTypedefTag(node) { - return node.kind === 322 /* JSDocTypedefTag */; - } - ts.isJSDocTypedefTag = isJSDocTypedefTag; - function isJSDocPropertyTag(node) { - return node.kind === 323 /* JSDocPropertyTag */; - } - ts.isJSDocPropertyTag = isJSDocPropertyTag; function isJSDocPropertyLikeTag(node) { - return node.kind === 323 /* JSDocPropertyTag */ || node.kind === 317 /* JSDocParameterTag */; + return node.kind === 328 /* JSDocPropertyTag */ || node.kind === 322 /* JSDocParameterTag */; } ts.isJSDocPropertyLikeTag = isJSDocPropertyLikeTag; - function isJSDocTypeLiteral(node) { - return node.kind === 304 /* JSDocTypeLiteral */; - } - ts.isJSDocTypeLiteral = isJSDocTypeLiteral; - function isJSDocCallbackTag(node) { - return node.kind === 315 /* JSDocCallbackTag */; - } - ts.isJSDocCallbackTag = isJSDocCallbackTag; - function isJSDocSignature(node) { - return node.kind === 305 /* JSDocSignature */; - } - ts.isJSDocSignature = isJSDocSignature; // #endregion // #region // Node tests @@ -12070,18 +11827,13 @@ var ts; // All node tests in the following list should *not* reference parent pointers so that // they may be used with transformations. /* @internal */ - function isSyntaxList(n) { - return n.kind === 324 /* SyntaxList */; - } - ts.isSyntaxList = isSyntaxList; - /* @internal */ function isNode(node) { return isNodeKind(node.kind); } ts.isNode = isNode; /* @internal */ function isNodeKind(kind) { - return kind >= 153 /* FirstNode */; + return kind >= 156 /* FirstNode */; } ts.isNodeKind = isNodeKind; /** @@ -12090,7 +11842,7 @@ var ts; * Literals are considered tokens, except TemplateLiteral, but does include TemplateHead/Middle/Tail. */ function isToken(n) { - return n.kind >= 0 /* FirstToken */ && n.kind <= 152 /* LastToken */; + return n.kind >= 0 /* FirstToken */ && n.kind <= 155 /* LastToken */; } ts.isToken = isToken; // Node Arrays @@ -12126,17 +11878,17 @@ var ts; } ts.isTemplateMiddleOrTemplateTail = isTemplateMiddleOrTemplateTail; function isImportOrExportSpecifier(node) { - return isImportSpecifier(node) || isExportSpecifier(node); + return ts.isImportSpecifier(node) || ts.isExportSpecifier(node); } ts.isImportOrExportSpecifier = isImportOrExportSpecifier; function isTypeOnlyImportOrExportDeclaration(node) { switch (node.kind) { - case 258 /* ImportSpecifier */: - case 263 /* ExportSpecifier */: + case 262 /* ImportSpecifier */: + case 267 /* ExportSpecifier */: return node.parent.parent.isTypeOnly; - case 256 /* NamespaceImport */: + case 260 /* NamespaceImport */: return node.parent.isTypeOnly; - case 255 /* ImportClause */: + case 259 /* ImportClause */: return node.isTypeOnly; default: return false; @@ -12150,35 +11902,35 @@ var ts; // Identifiers /* @internal */ function isGeneratedIdentifier(node) { - return isIdentifier(node) && (node.autoGenerateFlags & 7 /* KindMask */) > 0 /* None */; + return ts.isIdentifier(node) && (node.autoGenerateFlags & 7 /* KindMask */) > 0 /* None */; } ts.isGeneratedIdentifier = isGeneratedIdentifier; // Private Identifiers /*@internal*/ function isPrivateIdentifierPropertyDeclaration(node) { - return isPropertyDeclaration(node) && isPrivateIdentifier(node.name); + return ts.isPropertyDeclaration(node) && ts.isPrivateIdentifier(node.name); } ts.isPrivateIdentifierPropertyDeclaration = isPrivateIdentifierPropertyDeclaration; /*@internal*/ function isPrivateIdentifierPropertyAccessExpression(node) { - return isPropertyAccessExpression(node) && isPrivateIdentifier(node.name); + return ts.isPropertyAccessExpression(node) && ts.isPrivateIdentifier(node.name); } ts.isPrivateIdentifierPropertyAccessExpression = isPrivateIdentifierPropertyAccessExpression; // Keywords /* @internal */ function isModifierKind(token) { switch (token) { - case 122 /* AbstractKeyword */: - case 126 /* AsyncKeyword */: - case 81 /* ConstKeyword */: - case 130 /* DeclareKeyword */: - case 84 /* DefaultKeyword */: - case 89 /* ExportKeyword */: - case 119 /* PublicKeyword */: - case 117 /* PrivateKeyword */: - case 118 /* ProtectedKeyword */: - case 138 /* ReadonlyKeyword */: - case 120 /* StaticKeyword */: + case 125 /* AbstractKeyword */: + case 129 /* AsyncKeyword */: + case 84 /* ConstKeyword */: + case 133 /* DeclareKeyword */: + case 87 /* DefaultKeyword */: + case 92 /* ExportKeyword */: + case 122 /* PublicKeyword */: + case 120 /* PrivateKeyword */: + case 121 /* ProtectedKeyword */: + case 141 /* ReadonlyKeyword */: + case 123 /* StaticKeyword */: return true; } return false; @@ -12191,7 +11943,7 @@ var ts; ts.isParameterPropertyModifier = isParameterPropertyModifier; /* @internal */ function isClassMemberModifier(idToken) { - return isParameterPropertyModifier(idToken) || idToken === 120 /* StaticKeyword */; + return isParameterPropertyModifier(idToken) || idToken === 123 /* StaticKeyword */; } ts.isClassMemberModifier = isClassMemberModifier; function isModifier(node) { @@ -12200,24 +11952,24 @@ var ts; ts.isModifier = isModifier; function isEntityName(node) { var kind = node.kind; - return kind === 153 /* QualifiedName */ - || kind === 75 /* Identifier */; + return kind === 156 /* QualifiedName */ + || kind === 78 /* Identifier */; } ts.isEntityName = isEntityName; function isPropertyName(node) { var kind = node.kind; - return kind === 75 /* Identifier */ - || kind === 76 /* PrivateIdentifier */ + return kind === 78 /* Identifier */ + || kind === 79 /* PrivateIdentifier */ || kind === 10 /* StringLiteral */ || kind === 8 /* NumericLiteral */ - || kind === 154 /* ComputedPropertyName */; + || kind === 157 /* ComputedPropertyName */; } ts.isPropertyName = isPropertyName; function isBindingName(node) { var kind = node.kind; - return kind === 75 /* Identifier */ - || kind === 189 /* ObjectBindingPattern */ - || kind === 190 /* ArrayBindingPattern */; + return kind === 78 /* Identifier */ + || kind === 193 /* ObjectBindingPattern */ + || kind === 194 /* ArrayBindingPattern */; } ts.isBindingName = isBindingName; // Functions @@ -12232,13 +11984,13 @@ var ts; ts.isFunctionLikeDeclaration = isFunctionLikeDeclaration; function isFunctionLikeDeclarationKind(kind) { switch (kind) { - case 244 /* FunctionDeclaration */: - case 161 /* MethodDeclaration */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 248 /* FunctionDeclaration */: + case 164 /* MethodDeclaration */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: return true; default: return false; @@ -12247,14 +11999,14 @@ var ts; /* @internal */ function isFunctionLikeKind(kind) { switch (kind) { - case 160 /* MethodSignature */: - case 165 /* CallSignature */: - case 305 /* JSDocSignature */: - case 166 /* ConstructSignature */: - case 167 /* IndexSignature */: - case 170 /* FunctionType */: - case 300 /* JSDocFunctionType */: - case 171 /* ConstructorType */: + case 163 /* MethodSignature */: + case 168 /* CallSignature */: + case 309 /* JSDocSignature */: + case 169 /* ConstructSignature */: + case 170 /* IndexSignature */: + case 173 /* FunctionType */: + case 304 /* JSDocFunctionType */: + case 174 /* ConstructorType */: return true; default: return isFunctionLikeDeclarationKind(kind); @@ -12263,35 +12015,35 @@ var ts; ts.isFunctionLikeKind = isFunctionLikeKind; /* @internal */ function isFunctionOrModuleBlock(node) { - return isSourceFile(node) || isModuleBlock(node) || isBlock(node) && isFunctionLike(node.parent); + return ts.isSourceFile(node) || ts.isModuleBlock(node) || ts.isBlock(node) && isFunctionLike(node.parent); } ts.isFunctionOrModuleBlock = isFunctionOrModuleBlock; // Classes function isClassElement(node) { var kind = node.kind; - return kind === 162 /* Constructor */ - || kind === 159 /* PropertyDeclaration */ - || kind === 161 /* MethodDeclaration */ - || kind === 163 /* GetAccessor */ - || kind === 164 /* SetAccessor */ - || kind === 167 /* IndexSignature */ - || kind === 222 /* SemicolonClassElement */; + return kind === 165 /* Constructor */ + || kind === 162 /* PropertyDeclaration */ + || kind === 164 /* MethodDeclaration */ + || kind === 166 /* GetAccessor */ + || kind === 167 /* SetAccessor */ + || kind === 170 /* IndexSignature */ + || kind === 226 /* SemicolonClassElement */; } ts.isClassElement = isClassElement; function isClassLike(node) { - return node && (node.kind === 245 /* ClassDeclaration */ || node.kind === 214 /* ClassExpression */); + return node && (node.kind === 249 /* ClassDeclaration */ || node.kind === 218 /* ClassExpression */); } ts.isClassLike = isClassLike; function isAccessor(node) { - return node && (node.kind === 163 /* GetAccessor */ || node.kind === 164 /* SetAccessor */); + return node && (node.kind === 166 /* GetAccessor */ || node.kind === 167 /* SetAccessor */); } ts.isAccessor = isAccessor; /* @internal */ function isMethodOrAccessor(node) { switch (node.kind) { - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return true; default: return false; @@ -12301,11 +12053,11 @@ var ts; // Type members function isTypeElement(node) { var kind = node.kind; - return kind === 166 /* ConstructSignature */ - || kind === 165 /* CallSignature */ - || kind === 158 /* PropertySignature */ - || kind === 160 /* MethodSignature */ - || kind === 167 /* IndexSignature */; + return kind === 169 /* ConstructSignature */ + || kind === 168 /* CallSignature */ + || kind === 161 /* PropertySignature */ + || kind === 163 /* MethodSignature */ + || kind === 170 /* IndexSignature */; } ts.isTypeElement = isTypeElement; function isClassOrTypeElement(node) { @@ -12314,12 +12066,12 @@ var ts; ts.isClassOrTypeElement = isClassOrTypeElement; function isObjectLiteralElementLike(node) { var kind = node.kind; - return kind === 281 /* PropertyAssignment */ - || kind === 282 /* ShorthandPropertyAssignment */ - || kind === 283 /* SpreadAssignment */ - || kind === 161 /* MethodDeclaration */ - || kind === 163 /* GetAccessor */ - || kind === 164 /* SetAccessor */; + return kind === 285 /* PropertyAssignment */ + || kind === 286 /* ShorthandPropertyAssignment */ + || kind === 287 /* SpreadAssignment */ + || kind === 164 /* MethodDeclaration */ + || kind === 166 /* GetAccessor */ + || kind === 167 /* SetAccessor */; } ts.isObjectLiteralElementLike = isObjectLiteralElementLike; // Type @@ -12334,8 +12086,8 @@ var ts; ts.isTypeNode = isTypeNode; function isFunctionOrConstructorTypeNode(node) { switch (node.kind) { - case 170 /* FunctionType */: - case 171 /* ConstructorType */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: return true; } return false; @@ -12346,8 +12098,8 @@ var ts; function isBindingPattern(node) { if (node) { var kind = node.kind; - return kind === 190 /* ArrayBindingPattern */ - || kind === 189 /* ObjectBindingPattern */; + return kind === 194 /* ArrayBindingPattern */ + || kind === 193 /* ObjectBindingPattern */; } return false; } @@ -12355,15 +12107,15 @@ var ts; /* @internal */ function isAssignmentPattern(node) { var kind = node.kind; - return kind === 192 /* ArrayLiteralExpression */ - || kind === 193 /* ObjectLiteralExpression */; + return kind === 196 /* ArrayLiteralExpression */ + || kind === 197 /* ObjectLiteralExpression */; } ts.isAssignmentPattern = isAssignmentPattern; /* @internal */ function isArrayBindingElement(node) { var kind = node.kind; - return kind === 191 /* BindingElement */ - || kind === 215 /* OmittedExpression */; + return kind === 195 /* BindingElement */ + || kind === 219 /* OmittedExpression */; } ts.isArrayBindingElement = isArrayBindingElement; /** @@ -12372,9 +12124,9 @@ var ts; /* @internal */ function isDeclarationBindingElement(bindingElement) { switch (bindingElement.kind) { - case 242 /* VariableDeclaration */: - case 156 /* Parameter */: - case 191 /* BindingElement */: + case 246 /* VariableDeclaration */: + case 159 /* Parameter */: + case 195 /* BindingElement */: return true; } return false; @@ -12395,8 +12147,8 @@ var ts; /* @internal */ function isObjectBindingOrAssignmentPattern(node) { switch (node.kind) { - case 189 /* ObjectBindingPattern */: - case 193 /* ObjectLiteralExpression */: + case 193 /* ObjectBindingPattern */: + case 197 /* ObjectLiteralExpression */: return true; } return false; @@ -12408,8 +12160,8 @@ var ts; /* @internal */ function isArrayBindingOrAssignmentPattern(node) { switch (node.kind) { - case 190 /* ArrayBindingPattern */: - case 192 /* ArrayLiteralExpression */: + case 194 /* ArrayBindingPattern */: + case 196 /* ArrayLiteralExpression */: return true; } return false; @@ -12418,26 +12170,26 @@ var ts; /* @internal */ function isPropertyAccessOrQualifiedNameOrImportTypeNode(node) { var kind = node.kind; - return kind === 194 /* PropertyAccessExpression */ - || kind === 153 /* QualifiedName */ - || kind === 188 /* ImportType */; + return kind === 198 /* PropertyAccessExpression */ + || kind === 156 /* QualifiedName */ + || kind === 192 /* ImportType */; } ts.isPropertyAccessOrQualifiedNameOrImportTypeNode = isPropertyAccessOrQualifiedNameOrImportTypeNode; // Expression function isPropertyAccessOrQualifiedName(node) { var kind = node.kind; - return kind === 194 /* PropertyAccessExpression */ - || kind === 153 /* QualifiedName */; + return kind === 198 /* PropertyAccessExpression */ + || kind === 156 /* QualifiedName */; } ts.isPropertyAccessOrQualifiedName = isPropertyAccessOrQualifiedName; function isCallLikeExpression(node) { switch (node.kind) { - case 268 /* JsxOpeningElement */: - case 267 /* JsxSelfClosingElement */: - case 196 /* CallExpression */: - case 197 /* NewExpression */: - case 198 /* TaggedTemplateExpression */: - case 157 /* Decorator */: + case 272 /* JsxOpeningElement */: + case 271 /* JsxSelfClosingElement */: + case 200 /* CallExpression */: + case 201 /* NewExpression */: + case 202 /* TaggedTemplateExpression */: + case 160 /* Decorator */: return true; default: return false; @@ -12445,12 +12197,12 @@ var ts; } ts.isCallLikeExpression = isCallLikeExpression; function isCallOrNewExpression(node) { - return node.kind === 196 /* CallExpression */ || node.kind === 197 /* NewExpression */; + return node.kind === 200 /* CallExpression */ || node.kind === 201 /* NewExpression */; } ts.isCallOrNewExpression = isCallOrNewExpression; function isTemplateLiteral(node) { var kind = node.kind; - return kind === 211 /* TemplateExpression */ + return kind === 215 /* TemplateExpression */ || kind === 14 /* NoSubstitutionTemplateLiteral */; } ts.isTemplateLiteral = isTemplateLiteral; @@ -12461,34 +12213,34 @@ var ts; ts.isLeftHandSideExpression = isLeftHandSideExpression; function isLeftHandSideExpressionKind(kind) { switch (kind) { - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: - case 197 /* NewExpression */: - case 196 /* CallExpression */: - case 266 /* JsxElement */: - case 267 /* JsxSelfClosingElement */: - case 270 /* JsxFragment */: - case 198 /* TaggedTemplateExpression */: - case 192 /* ArrayLiteralExpression */: - case 200 /* ParenthesizedExpression */: - case 193 /* ObjectLiteralExpression */: - case 214 /* ClassExpression */: - case 201 /* FunctionExpression */: - case 75 /* Identifier */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: + case 201 /* NewExpression */: + case 200 /* CallExpression */: + case 270 /* JsxElement */: + case 271 /* JsxSelfClosingElement */: + case 274 /* JsxFragment */: + case 202 /* TaggedTemplateExpression */: + case 196 /* ArrayLiteralExpression */: + case 204 /* ParenthesizedExpression */: + case 197 /* ObjectLiteralExpression */: + case 218 /* ClassExpression */: + case 205 /* FunctionExpression */: + case 78 /* Identifier */: case 13 /* RegularExpressionLiteral */: case 8 /* NumericLiteral */: case 9 /* BigIntLiteral */: case 10 /* StringLiteral */: case 14 /* NoSubstitutionTemplateLiteral */: - case 211 /* TemplateExpression */: - case 91 /* FalseKeyword */: - case 100 /* NullKeyword */: - case 104 /* ThisKeyword */: - case 106 /* TrueKeyword */: - case 102 /* SuperKeyword */: - case 218 /* NonNullExpression */: - case 219 /* MetaProperty */: - case 96 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression + case 215 /* TemplateExpression */: + case 94 /* FalseKeyword */: + case 103 /* NullKeyword */: + case 107 /* ThisKeyword */: + case 109 /* TrueKeyword */: + case 105 /* SuperKeyword */: + case 222 /* NonNullExpression */: + case 223 /* MetaProperty */: + case 99 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression return true; default: return false; @@ -12501,13 +12253,13 @@ var ts; ts.isUnaryExpression = isUnaryExpression; function isUnaryExpressionKind(kind) { switch (kind) { - case 207 /* PrefixUnaryExpression */: - case 208 /* PostfixUnaryExpression */: - case 203 /* DeleteExpression */: - case 204 /* TypeOfExpression */: - case 205 /* VoidExpression */: - case 206 /* AwaitExpression */: - case 199 /* TypeAssertionExpression */: + case 211 /* PrefixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: + case 207 /* DeleteExpression */: + case 208 /* TypeOfExpression */: + case 209 /* VoidExpression */: + case 210 /* AwaitExpression */: + case 203 /* TypeAssertionExpression */: return true; default: return isLeftHandSideExpressionKind(kind); @@ -12516,9 +12268,9 @@ var ts; /* @internal */ function isUnaryExpressionWithWrite(expr) { switch (expr.kind) { - case 208 /* PostfixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: return true; - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: return expr.operator === 45 /* PlusPlusToken */ || expr.operator === 46 /* MinusMinusToken */; default: @@ -12537,15 +12289,15 @@ var ts; ts.isExpression = isExpression; function isExpressionKind(kind) { switch (kind) { - case 210 /* ConditionalExpression */: - case 212 /* YieldExpression */: - case 202 /* ArrowFunction */: - case 209 /* BinaryExpression */: - case 213 /* SpreadElement */: - case 217 /* AsExpression */: - case 215 /* OmittedExpression */: - case 327 /* CommaListExpression */: - case 326 /* PartiallyEmittedExpression */: + case 214 /* ConditionalExpression */: + case 216 /* YieldExpression */: + case 206 /* ArrowFunction */: + case 213 /* BinaryExpression */: + case 217 /* SpreadElement */: + case 221 /* AsExpression */: + case 219 /* OmittedExpression */: + case 332 /* CommaListExpression */: + case 331 /* PartiallyEmittedExpression */: return true; default: return isUnaryExpressionKind(kind); @@ -12553,40 +12305,25 @@ var ts; } function isAssertionExpression(node) { var kind = node.kind; - return kind === 199 /* TypeAssertionExpression */ - || kind === 217 /* AsExpression */; + return kind === 203 /* TypeAssertionExpression */ + || kind === 221 /* AsExpression */; } ts.isAssertionExpression = isAssertionExpression; /* @internal */ - function isPartiallyEmittedExpression(node) { - return node.kind === 326 /* PartiallyEmittedExpression */; - } - ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression; - /* @internal */ - function isNotEmittedStatement(node) { - return node.kind === 325 /* NotEmittedStatement */; - } - ts.isNotEmittedStatement = isNotEmittedStatement; - /* @internal */ - function isSyntheticReference(node) { - return node.kind === 330 /* SyntheticReferenceExpression */; - } - ts.isSyntheticReference = isSyntheticReference; - /* @internal */ function isNotEmittedOrPartiallyEmittedNode(node) { - return isNotEmittedStatement(node) - || isPartiallyEmittedExpression(node); + return ts.isNotEmittedStatement(node) + || ts.isPartiallyEmittedExpression(node); } ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode; function isIterationStatement(node, lookInLabeledStatements) { switch (node.kind) { - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - case 228 /* DoStatement */: - case 229 /* WhileStatement */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 232 /* DoStatement */: + case 233 /* WhileStatement */: return true; - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements); } return false; @@ -12594,7 +12331,7 @@ var ts; ts.isIterationStatement = isIterationStatement; /* @internal */ function isScopeMarker(node) { - return isExportAssignment(node) || isExportDeclaration(node); + return ts.isExportAssignment(node) || ts.isExportDeclaration(node); } ts.isScopeMarker = isScopeMarker; /* @internal */ @@ -12604,149 +12341,149 @@ var ts; ts.hasScopeMarker = hasScopeMarker; /* @internal */ function needsScopeMarker(result) { - return !ts.isAnyImportOrReExport(result) && !isExportAssignment(result) && !ts.hasModifier(result, 1 /* Export */) && !ts.isAmbientModule(result); + return !ts.isAnyImportOrReExport(result) && !ts.isExportAssignment(result) && !ts.hasSyntacticModifier(result, 1 /* Export */) && !ts.isAmbientModule(result); } ts.needsScopeMarker = needsScopeMarker; /* @internal */ function isExternalModuleIndicator(result) { // Exported top-level member indicates moduleness - return ts.isAnyImportOrReExport(result) || isExportAssignment(result) || ts.hasModifier(result, 1 /* Export */); + return ts.isAnyImportOrReExport(result) || ts.isExportAssignment(result) || ts.hasSyntacticModifier(result, 1 /* Export */); } ts.isExternalModuleIndicator = isExternalModuleIndicator; /* @internal */ function isForInOrOfStatement(node) { - return node.kind === 231 /* ForInStatement */ || node.kind === 232 /* ForOfStatement */; + return node.kind === 235 /* ForInStatement */ || node.kind === 236 /* ForOfStatement */; } ts.isForInOrOfStatement = isForInOrOfStatement; // Element /* @internal */ function isConciseBody(node) { - return isBlock(node) + return ts.isBlock(node) || isExpression(node); } ts.isConciseBody = isConciseBody; /* @internal */ function isFunctionBody(node) { - return isBlock(node); + return ts.isBlock(node); } ts.isFunctionBody = isFunctionBody; /* @internal */ function isForInitializer(node) { - return isVariableDeclarationList(node) + return ts.isVariableDeclarationList(node) || isExpression(node); } ts.isForInitializer = isForInitializer; /* @internal */ function isModuleBody(node) { var kind = node.kind; - return kind === 250 /* ModuleBlock */ - || kind === 249 /* ModuleDeclaration */ - || kind === 75 /* Identifier */; + return kind === 254 /* ModuleBlock */ + || kind === 253 /* ModuleDeclaration */ + || kind === 78 /* Identifier */; } ts.isModuleBody = isModuleBody; /* @internal */ function isNamespaceBody(node) { var kind = node.kind; - return kind === 250 /* ModuleBlock */ - || kind === 249 /* ModuleDeclaration */; + return kind === 254 /* ModuleBlock */ + || kind === 253 /* ModuleDeclaration */; } ts.isNamespaceBody = isNamespaceBody; /* @internal */ function isJSDocNamespaceBody(node) { var kind = node.kind; - return kind === 75 /* Identifier */ - || kind === 249 /* ModuleDeclaration */; + return kind === 78 /* Identifier */ + || kind === 253 /* ModuleDeclaration */; } ts.isJSDocNamespaceBody = isJSDocNamespaceBody; /* @internal */ function isNamedImportBindings(node) { var kind = node.kind; - return kind === 257 /* NamedImports */ - || kind === 256 /* NamespaceImport */; + return kind === 261 /* NamedImports */ + || kind === 260 /* NamespaceImport */; } ts.isNamedImportBindings = isNamedImportBindings; /* @internal */ function isModuleOrEnumDeclaration(node) { - return node.kind === 249 /* ModuleDeclaration */ || node.kind === 248 /* EnumDeclaration */; + return node.kind === 253 /* ModuleDeclaration */ || node.kind === 252 /* EnumDeclaration */; } ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration; function isDeclarationKind(kind) { - return kind === 202 /* ArrowFunction */ - || kind === 191 /* BindingElement */ - || kind === 245 /* ClassDeclaration */ - || kind === 214 /* ClassExpression */ - || kind === 162 /* Constructor */ - || kind === 248 /* EnumDeclaration */ - || kind === 284 /* EnumMember */ - || kind === 263 /* ExportSpecifier */ - || kind === 244 /* FunctionDeclaration */ - || kind === 201 /* FunctionExpression */ - || kind === 163 /* GetAccessor */ - || kind === 255 /* ImportClause */ - || kind === 253 /* ImportEqualsDeclaration */ - || kind === 258 /* ImportSpecifier */ - || kind === 246 /* InterfaceDeclaration */ - || kind === 273 /* JsxAttribute */ - || kind === 161 /* MethodDeclaration */ - || kind === 160 /* MethodSignature */ - || kind === 249 /* ModuleDeclaration */ - || kind === 252 /* NamespaceExportDeclaration */ - || kind === 256 /* NamespaceImport */ - || kind === 262 /* NamespaceExport */ - || kind === 156 /* Parameter */ - || kind === 281 /* PropertyAssignment */ - || kind === 159 /* PropertyDeclaration */ - || kind === 158 /* PropertySignature */ - || kind === 164 /* SetAccessor */ - || kind === 282 /* ShorthandPropertyAssignment */ - || kind === 247 /* TypeAliasDeclaration */ - || kind === 155 /* TypeParameter */ - || kind === 242 /* VariableDeclaration */ - || kind === 322 /* JSDocTypedefTag */ - || kind === 315 /* JSDocCallbackTag */ - || kind === 323 /* JSDocPropertyTag */; + return kind === 206 /* ArrowFunction */ + || kind === 195 /* BindingElement */ + || kind === 249 /* ClassDeclaration */ + || kind === 218 /* ClassExpression */ + || kind === 165 /* Constructor */ + || kind === 252 /* EnumDeclaration */ + || kind === 288 /* EnumMember */ + || kind === 267 /* ExportSpecifier */ + || kind === 248 /* FunctionDeclaration */ + || kind === 205 /* FunctionExpression */ + || kind === 166 /* GetAccessor */ + || kind === 259 /* ImportClause */ + || kind === 257 /* ImportEqualsDeclaration */ + || kind === 262 /* ImportSpecifier */ + || kind === 250 /* InterfaceDeclaration */ + || kind === 277 /* JsxAttribute */ + || kind === 164 /* MethodDeclaration */ + || kind === 163 /* MethodSignature */ + || kind === 253 /* ModuleDeclaration */ + || kind === 256 /* NamespaceExportDeclaration */ + || kind === 260 /* NamespaceImport */ + || kind === 266 /* NamespaceExport */ + || kind === 159 /* Parameter */ + || kind === 285 /* PropertyAssignment */ + || kind === 162 /* PropertyDeclaration */ + || kind === 161 /* PropertySignature */ + || kind === 167 /* SetAccessor */ + || kind === 286 /* ShorthandPropertyAssignment */ + || kind === 251 /* TypeAliasDeclaration */ + || kind === 158 /* TypeParameter */ + || kind === 246 /* VariableDeclaration */ + || kind === 327 /* JSDocTypedefTag */ + || kind === 320 /* JSDocCallbackTag */ + || kind === 328 /* JSDocPropertyTag */; } function isDeclarationStatementKind(kind) { - return kind === 244 /* FunctionDeclaration */ - || kind === 264 /* MissingDeclaration */ - || kind === 245 /* ClassDeclaration */ - || kind === 246 /* InterfaceDeclaration */ - || kind === 247 /* TypeAliasDeclaration */ - || kind === 248 /* EnumDeclaration */ - || kind === 249 /* ModuleDeclaration */ - || kind === 254 /* ImportDeclaration */ - || kind === 253 /* ImportEqualsDeclaration */ - || kind === 260 /* ExportDeclaration */ - || kind === 259 /* ExportAssignment */ - || kind === 252 /* NamespaceExportDeclaration */; + return kind === 248 /* FunctionDeclaration */ + || kind === 268 /* MissingDeclaration */ + || kind === 249 /* ClassDeclaration */ + || kind === 250 /* InterfaceDeclaration */ + || kind === 251 /* TypeAliasDeclaration */ + || kind === 252 /* EnumDeclaration */ + || kind === 253 /* ModuleDeclaration */ + || kind === 258 /* ImportDeclaration */ + || kind === 257 /* ImportEqualsDeclaration */ + || kind === 264 /* ExportDeclaration */ + || kind === 263 /* ExportAssignment */ + || kind === 256 /* NamespaceExportDeclaration */; } function isStatementKindButNotDeclarationKind(kind) { - return kind === 234 /* BreakStatement */ - || kind === 233 /* ContinueStatement */ - || kind === 241 /* DebuggerStatement */ - || kind === 228 /* DoStatement */ - || kind === 226 /* ExpressionStatement */ - || kind === 224 /* EmptyStatement */ - || kind === 231 /* ForInStatement */ - || kind === 232 /* ForOfStatement */ - || kind === 230 /* ForStatement */ - || kind === 227 /* IfStatement */ - || kind === 238 /* LabeledStatement */ - || kind === 235 /* ReturnStatement */ - || kind === 237 /* SwitchStatement */ - || kind === 239 /* ThrowStatement */ - || kind === 240 /* TryStatement */ - || kind === 225 /* VariableStatement */ - || kind === 229 /* WhileStatement */ - || kind === 236 /* WithStatement */ - || kind === 325 /* NotEmittedStatement */ - || kind === 329 /* EndOfDeclarationMarker */ - || kind === 328 /* MergeDeclarationMarker */; + return kind === 238 /* BreakStatement */ + || kind === 237 /* ContinueStatement */ + || kind === 245 /* DebuggerStatement */ + || kind === 232 /* DoStatement */ + || kind === 230 /* ExpressionStatement */ + || kind === 228 /* EmptyStatement */ + || kind === 235 /* ForInStatement */ + || kind === 236 /* ForOfStatement */ + || kind === 234 /* ForStatement */ + || kind === 231 /* IfStatement */ + || kind === 242 /* LabeledStatement */ + || kind === 239 /* ReturnStatement */ + || kind === 241 /* SwitchStatement */ + || kind === 243 /* ThrowStatement */ + || kind === 244 /* TryStatement */ + || kind === 229 /* VariableStatement */ + || kind === 233 /* WhileStatement */ + || kind === 240 /* WithStatement */ + || kind === 330 /* NotEmittedStatement */ + || kind === 334 /* EndOfDeclarationMarker */ + || kind === 333 /* MergeDeclarationMarker */; } /* @internal */ function isDeclaration(node) { - if (node.kind === 155 /* TypeParameter */) { - return (node.parent && node.parent.kind !== 321 /* JSDocTemplateTag */) || ts.isInJSFile(node); + if (node.kind === 158 /* TypeParameter */) { + return (node.parent && node.parent.kind !== 326 /* JSDocTemplateTag */) || ts.isInJSFile(node); } return isDeclarationKind(node.kind); } @@ -12773,94 +12510,105 @@ var ts; } ts.isStatement = isStatement; function isBlockStatement(node) { - if (node.kind !== 223 /* Block */) + if (node.kind !== 227 /* Block */) return false; if (node.parent !== undefined) { - if (node.parent.kind === 240 /* TryStatement */ || node.parent.kind === 280 /* CatchClause */) { + if (node.parent.kind === 244 /* TryStatement */ || node.parent.kind === 284 /* CatchClause */) { return false; } } return !ts.isFunctionBlock(node); } + /** + * NOTE: This is similar to `isStatement` but does not access parent pointers. + */ + /* @internal */ + function isStatementOrBlock(node) { + var kind = node.kind; + return isStatementKindButNotDeclarationKind(kind) + || isDeclarationStatementKind(kind) + || kind === 227 /* Block */; + } + ts.isStatementOrBlock = isStatementOrBlock; // Module references /* @internal */ function isModuleReference(node) { var kind = node.kind; - return kind === 265 /* ExternalModuleReference */ - || kind === 153 /* QualifiedName */ - || kind === 75 /* Identifier */; + return kind === 269 /* ExternalModuleReference */ + || kind === 156 /* QualifiedName */ + || kind === 78 /* Identifier */; } ts.isModuleReference = isModuleReference; // JSX /* @internal */ function isJsxTagNameExpression(node) { var kind = node.kind; - return kind === 104 /* ThisKeyword */ - || kind === 75 /* Identifier */ - || kind === 194 /* PropertyAccessExpression */; + return kind === 107 /* ThisKeyword */ + || kind === 78 /* Identifier */ + || kind === 198 /* PropertyAccessExpression */; } ts.isJsxTagNameExpression = isJsxTagNameExpression; /* @internal */ function isJsxChild(node) { var kind = node.kind; - return kind === 266 /* JsxElement */ - || kind === 276 /* JsxExpression */ - || kind === 267 /* JsxSelfClosingElement */ + return kind === 270 /* JsxElement */ + || kind === 280 /* JsxExpression */ + || kind === 271 /* JsxSelfClosingElement */ || kind === 11 /* JsxText */ - || kind === 270 /* JsxFragment */; + || kind === 274 /* JsxFragment */; } ts.isJsxChild = isJsxChild; /* @internal */ function isJsxAttributeLike(node) { var kind = node.kind; - return kind === 273 /* JsxAttribute */ - || kind === 275 /* JsxSpreadAttribute */; + return kind === 277 /* JsxAttribute */ + || kind === 279 /* JsxSpreadAttribute */; } ts.isJsxAttributeLike = isJsxAttributeLike; /* @internal */ function isStringLiteralOrJsxExpression(node) { var kind = node.kind; return kind === 10 /* StringLiteral */ - || kind === 276 /* JsxExpression */; + || kind === 280 /* JsxExpression */; } ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression; function isJsxOpeningLikeElement(node) { var kind = node.kind; - return kind === 268 /* JsxOpeningElement */ - || kind === 267 /* JsxSelfClosingElement */; + return kind === 272 /* JsxOpeningElement */ + || kind === 271 /* JsxSelfClosingElement */; } ts.isJsxOpeningLikeElement = isJsxOpeningLikeElement; // Clauses function isCaseOrDefaultClause(node) { var kind = node.kind; - return kind === 277 /* CaseClause */ - || kind === 278 /* DefaultClause */; + return kind === 281 /* CaseClause */ + || kind === 282 /* DefaultClause */; } ts.isCaseOrDefaultClause = isCaseOrDefaultClause; // JSDoc /** True if node is of some JSDoc syntax kind. */ /* @internal */ function isJSDocNode(node) { - return node.kind >= 294 /* FirstJSDocNode */ && node.kind <= 323 /* LastJSDocNode */; + return node.kind >= 298 /* FirstJSDocNode */ && node.kind <= 328 /* LastJSDocNode */; } ts.isJSDocNode = isJSDocNode; /** True if node is of a kind that may contain comment text. */ function isJSDocCommentContainingNode(node) { - return node.kind === 303 /* JSDocComment */ || node.kind === 302 /* JSDocNamepathType */ || isJSDocTag(node) || isJSDocTypeLiteral(node) || isJSDocSignature(node); + return node.kind === 307 /* JSDocComment */ || node.kind === 306 /* JSDocNamepathType */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node); } ts.isJSDocCommentContainingNode = isJSDocCommentContainingNode; // TODO: determine what this does before making it public. /* @internal */ function isJSDocTag(node) { - return node.kind >= 306 /* FirstJSDocTagNode */ && node.kind <= 323 /* LastJSDocTagNode */; + return node.kind >= 310 /* FirstJSDocTagNode */ && node.kind <= 328 /* LastJSDocTagNode */; } ts.isJSDocTag = isJSDocTag; function isSetAccessor(node) { - return node.kind === 164 /* SetAccessor */; + return node.kind === 167 /* SetAccessor */; } ts.isSetAccessor = isSetAccessor; function isGetAccessor(node) { - return node.kind === 163 /* GetAccessor */; + return node.kind === 166 /* GetAccessor */; } ts.isGetAccessor = isGetAccessor; /** True if has jsdoc nodes attached to it. */ @@ -12886,13 +12634,13 @@ var ts; /** True if has initializer node attached to it. */ function hasOnlyExpressionInitializer(node) { switch (node.kind) { - case 242 /* VariableDeclaration */: - case 156 /* Parameter */: - case 191 /* BindingElement */: - case 158 /* PropertySignature */: - case 159 /* PropertyDeclaration */: - case 281 /* PropertyAssignment */: - case 284 /* EnumMember */: + case 246 /* VariableDeclaration */: + case 159 /* Parameter */: + case 195 /* BindingElement */: + case 161 /* PropertySignature */: + case 162 /* PropertyDeclaration */: + case 285 /* PropertyAssignment */: + case 288 /* EnumMember */: return true; default: return false; @@ -12900,12 +12648,12 @@ var ts; } ts.hasOnlyExpressionInitializer = hasOnlyExpressionInitializer; function isObjectLiteralElement(node) { - return node.kind === 273 /* JsxAttribute */ || node.kind === 275 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node); + return node.kind === 277 /* JsxAttribute */ || node.kind === 279 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node); } ts.isObjectLiteralElement = isObjectLiteralElement; /* @internal */ function isTypeReferenceType(node) { - return node.kind === 169 /* TypeReference */ || node.kind === 216 /* ExpressionWithTypeArguments */; + return node.kind === 172 /* TypeReference */ || node.kind === 220 /* ExpressionWithTypeArguments */; } ts.isTypeReferenceType = isTypeReferenceType; var MAX_SMI_X86 = 1073741823; @@ -12943,8 +12691,6 @@ var ts; var ts; (function (ts) { ts.resolvingEmptyArray = []; - ts.emptyMap = ts.createMap(); - ts.emptyUnderscoreEscapedMap = ts.emptyMap; ts.externalHelpersModuleNameText = "tslib"; ts.defaultMaximumTruncationLength = 160; ts.noTruncationMaximumTruncationLength = 1000000; @@ -12961,17 +12707,23 @@ var ts; return undefined; } ts.getDeclarationOfKind = getDeclarationOfKind; - /** Create a new escaped identifier map. */ + /** + * Create a new escaped identifier map. + * @deprecated Use `new Map<__String, T>()` instead. + */ function createUnderscoreEscapedMap() { return new ts.Map(); } ts.createUnderscoreEscapedMap = createUnderscoreEscapedMap; + /** + * @deprecated Use `!!map?.size` instead + */ function hasEntries(map) { return !!map && !!map.size; } ts.hasEntries = hasEntries; function createSymbolTable(symbols) { - var result = ts.createMap(); + var result = new ts.Map(); if (symbols) { for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) { var symbol = symbols_1[_i]; @@ -13061,6 +12813,10 @@ var ts; } } ts.forEachAncestor = forEachAncestor; + /** + * Calls `callback` for each entry in the map, returning the first truthy result. + * Use `map.forEach` instead for normal iteration. + */ function forEachEntry(map, callback) { var iterator = map.entries(); for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) { @@ -13073,6 +12829,7 @@ var ts; return undefined; } ts.forEachEntry = forEachEntry; + /** `forEachEntry` for just keys. */ function forEachKey(map, callback) { var iterator = map.keys(); for (var iterResult = iterator.next(); !iterResult.done; iterResult = iterator.next()) { @@ -13084,22 +12841,13 @@ var ts; return undefined; } ts.forEachKey = forEachKey; + /** Copy entries from `source` to `target`. */ function copyEntries(source, target) { source.forEach(function (value, key) { target.set(key, value); }); } ts.copyEntries = copyEntries; - function arrayToSet(array, makeKey) { - return ts.arrayToMap(array, makeKey || (function (s) { return s; }), ts.returnTrue); - } - ts.arrayToSet = arrayToSet; - function cloneMap(map) { - var clone = ts.createMap(); - copyEntries(map, clone); - return clone; - } - ts.cloneMap = cloneMap; function usingSingleLineStringWriter(action) { var oldString = stringWriter.getText(); try { @@ -13122,14 +12870,14 @@ var ts; ts.getResolvedModule = getResolvedModule; function setResolvedModule(sourceFile, moduleNameText, resolvedModule) { if (!sourceFile.resolvedModules) { - sourceFile.resolvedModules = ts.createMap(); + sourceFile.resolvedModules = new ts.Map(); } sourceFile.resolvedModules.set(moduleNameText, resolvedModule); } ts.setResolvedModule = setResolvedModule; function setResolvedTypeReferenceDirective(sourceFile, typeReferenceDirectiveName, resolvedTypeReferenceDirective) { if (!sourceFile.resolvedTypeReferenceDirectiveNames) { - sourceFile.resolvedTypeReferenceDirectiveNames = ts.createMap(); + sourceFile.resolvedTypeReferenceDirectiveNames = new ts.Map(); } sourceFile.resolvedTypeReferenceDirectiveNames.set(typeReferenceDirectiveName, resolvedTypeReferenceDirective); } @@ -13200,7 +12948,7 @@ var ts; } } function getSourceFileOfNode(node) { - while (node && node.kind !== 290 /* SourceFile */) { + while (node && node.kind !== 294 /* SourceFile */) { node = node.parent; } return node; @@ -13208,11 +12956,11 @@ var ts; ts.getSourceFileOfNode = getSourceFileOfNode; function isStatementWithLocals(node) { switch (node.kind) { - case 223 /* Block */: - case 251 /* CaseBlock */: - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: + case 227 /* Block */: + case 255 /* CaseBlock */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: return true; } return false; @@ -13365,11 +13113,11 @@ var ts; } ts.isPinnedComment = isPinnedComment; function createCommentDirectivesMap(sourceFile, commentDirectives) { - var directivesByLine = ts.createMapFromEntries(commentDirectives.map(function (commentDirective) { return ([ + var directivesByLine = new ts.Map(commentDirectives.map(function (commentDirective) { return ([ "" + ts.getLineAndCharacterOfPosition(sourceFile, commentDirective.range.end).line, commentDirective, ]); })); - var usedLines = ts.createMap(); + var usedLines = new ts.Map(); return { getUnusedExpectations: getUnusedExpectations, markUsed: markUsed }; function getUnusedExpectations() { return ts.arrayFrom(directivesByLine.entries()) @@ -13397,7 +13145,8 @@ var ts; if (nodeIsMissing(node)) { return node.pos; } - if (ts.isJSDocNode(node)) { + if (ts.isJSDocNode(node) || node.kind === 11 /* JsxText */) { + // JsxText cannot actually contain comments, even though the scanner will think it sees comments return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, /*stopAfterLineBreak*/ false, /*stopAtComments*/ true); } if (includeJsDoc && ts.hasJSDocNodes(node)) { @@ -13407,7 +13156,7 @@ var ts; // the syntax list itself considers them as normal trivia. Therefore if we simply skip // trivia for the list, we may have skipped the JSDocComment as well. So we should process its // first child to determine the actual position of its first token. - if (node.kind === 324 /* SyntaxList */ && node._children.length > 0) { + if (node.kind === 329 /* SyntaxList */ && node._children.length > 0) { return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc); } return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos); @@ -13532,7 +13281,7 @@ var ts; ts.isBlockOrCatchScoped = isBlockOrCatchScoped; function isCatchClauseVariableDeclarationOrBindingElement(declaration) { var node = getRootDeclaration(declaration); - return node.kind === 242 /* VariableDeclaration */ && node.parent.kind === 280 /* CatchClause */; + return node.kind === 246 /* VariableDeclaration */ && node.parent.kind === 284 /* CatchClause */; } ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement; function isAmbientModule(node) { @@ -13564,11 +13313,11 @@ var ts; ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol; function isShorthandAmbientModule(node) { // The only kind of module that can be missing a body is a shorthand ambient module. - return node && node.kind === 249 /* ModuleDeclaration */ && (!node.body); + return node && node.kind === 253 /* ModuleDeclaration */ && (!node.body); } function isBlockScopedContainerTopLevel(node) { - return node.kind === 290 /* SourceFile */ || - node.kind === 249 /* ModuleDeclaration */ || + return node.kind === 294 /* SourceFile */ || + node.kind === 253 /* ModuleDeclaration */ || ts.isFunctionLike(node); } ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel; @@ -13585,9 +13334,9 @@ var ts; // - defined in the top level scope and source file is an external module // - defined inside ambient module declaration located in the top level scope and source file not an external module switch (node.parent.kind) { - case 290 /* SourceFile */: + case 294 /* SourceFile */: return ts.isExternalModule(node.parent); - case 250 /* ModuleBlock */: + case 254 /* ModuleBlock */: return isAmbientModule(node.parent.parent) && ts.isSourceFile(node.parent.parent.parent) && !ts.isExternalModule(node.parent.parent.parent); } return false; @@ -13640,22 +13389,22 @@ var ts; ts.isEffectiveStrictModeSourceFile = isEffectiveStrictModeSourceFile; function isBlockScope(node, parentNode) { switch (node.kind) { - case 290 /* SourceFile */: - case 251 /* CaseBlock */: - case 280 /* CatchClause */: - case 249 /* ModuleDeclaration */: - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - case 162 /* Constructor */: - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 294 /* SourceFile */: + case 255 /* CaseBlock */: + case 284 /* CatchClause */: + case 253 /* ModuleDeclaration */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 165 /* Constructor */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: return true; - case 223 /* Block */: + case 227 /* Block */: // function block is not considered block-scope container // see comment in binder.ts: bind(...), case for SyntaxKind.Block return !ts.isFunctionLike(parentNode); @@ -13665,9 +13414,9 @@ var ts; ts.isBlockScope = isBlockScope; function isDeclarationWithTypeParameters(node) { switch (node.kind) { - case 315 /* JSDocCallbackTag */: - case 322 /* JSDocTypedefTag */: - case 305 /* JSDocSignature */: + case 320 /* JSDocCallbackTag */: + case 327 /* JSDocTypedefTag */: + case 309 /* JSDocSignature */: return true; default: ts.assertType(node); @@ -13677,25 +13426,25 @@ var ts; ts.isDeclarationWithTypeParameters = isDeclarationWithTypeParameters; function isDeclarationWithTypeParameterChildren(node) { switch (node.kind) { - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 160 /* MethodSignature */: - case 167 /* IndexSignature */: - case 170 /* FunctionType */: - case 171 /* ConstructorType */: - case 300 /* JSDocFunctionType */: - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 246 /* InterfaceDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 321 /* JSDocTemplateTag */: - case 244 /* FunctionDeclaration */: - case 161 /* MethodDeclaration */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 163 /* MethodSignature */: + case 170 /* IndexSignature */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: + case 304 /* JSDocFunctionType */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 250 /* InterfaceDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 326 /* JSDocTemplateTag */: + case 248 /* FunctionDeclaration */: + case 164 /* MethodDeclaration */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: return true; default: ts.assertType(node); @@ -13705,8 +13454,8 @@ var ts; ts.isDeclarationWithTypeParameterChildren = isDeclarationWithTypeParameterChildren; function isAnyImportSyntax(node) { switch (node.kind) { - case 254 /* ImportDeclaration */: - case 253 /* ImportEqualsDeclaration */: + case 258 /* ImportDeclaration */: + case 257 /* ImportEqualsDeclaration */: return true; default: return false; @@ -13715,15 +13464,15 @@ var ts; ts.isAnyImportSyntax = isAnyImportSyntax; function isLateVisibilityPaintedStatement(node) { switch (node.kind) { - case 254 /* ImportDeclaration */: - case 253 /* ImportEqualsDeclaration */: - case 225 /* VariableStatement */: - case 245 /* ClassDeclaration */: - case 244 /* FunctionDeclaration */: - case 249 /* ModuleDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 246 /* InterfaceDeclaration */: - case 248 /* EnumDeclaration */: + case 258 /* ImportDeclaration */: + case 257 /* ImportEqualsDeclaration */: + case 229 /* VariableStatement */: + case 249 /* ClassDeclaration */: + case 248 /* FunctionDeclaration */: + case 253 /* ModuleDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 250 /* InterfaceDeclaration */: + case 252 /* EnumDeclaration */: return true; default: return false; @@ -13752,19 +13501,19 @@ var ts; } ts.getNameFromIndexInfo = getNameFromIndexInfo; function isComputedNonLiteralName(name) { - return name.kind === 154 /* ComputedPropertyName */ && !isStringOrNumericLiteralLike(name.expression); + return name.kind === 157 /* ComputedPropertyName */ && !isStringOrNumericLiteralLike(name.expression); } ts.isComputedNonLiteralName = isComputedNonLiteralName; function getTextOfPropertyName(name) { switch (name.kind) { - case 75 /* Identifier */: - case 76 /* PrivateIdentifier */: + case 78 /* Identifier */: + case 79 /* PrivateIdentifier */: return name.escapedText; case 10 /* StringLiteral */: case 8 /* NumericLiteral */: case 14 /* NoSubstitutionTemplateLiteral */: return ts.escapeLeadingUnderscores(name.text); - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: if (isStringOrNumericLiteralLike(name.expression)) return ts.escapeLeadingUnderscores(name.expression.text); return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames"); @@ -13775,14 +13524,14 @@ var ts; ts.getTextOfPropertyName = getTextOfPropertyName; function entityNameToString(name) { switch (name.kind) { - case 104 /* ThisKeyword */: + case 107 /* ThisKeyword */: return "this"; - case 76 /* PrivateIdentifier */: - case 75 /* Identifier */: + case 79 /* PrivateIdentifier */: + case 78 /* Identifier */: return getFullWidth(name) === 0 ? ts.idText(name) : getTextOfNode(name); - case 153 /* QualifiedName */: + case 156 /* QualifiedName */: return entityNameToString(name.left) + "." + entityNameToString(name.right); - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: if (ts.isIdentifier(name.name) || ts.isPrivateIdentifier(name.name)) { return entityNameToString(name.expression) + "." + entityNameToString(name.name); } @@ -13843,7 +13592,7 @@ var ts; ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition; function getErrorSpanForArrowFunction(sourceFile, node) { var pos = ts.skipTrivia(sourceFile.text, node.pos); - if (node.body && node.body.kind === 223 /* Block */) { + if (node.body && node.body.kind === 227 /* Block */) { var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line; var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line; if (startLine < endLine) { @@ -13857,7 +13606,7 @@ var ts; function getErrorSpanForNode(sourceFile, node) { var errorNode = node; switch (node.kind) { - case 290 /* SourceFile */: + case 294 /* SourceFile */: var pos_1 = ts.skipTrivia(sourceFile.text, 0, /*stopAfterLineBreak*/ false); if (pos_1 === sourceFile.text.length) { // file is empty - return span for the beginning of the file @@ -13866,28 +13615,28 @@ var ts; return getSpanOfTokenAtPosition(sourceFile, pos_1); // This list is a work in progress. Add missing node kinds to improve their error // spans. - case 242 /* VariableDeclaration */: - case 191 /* BindingElement */: - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 246 /* InterfaceDeclaration */: - case 249 /* ModuleDeclaration */: - case 248 /* EnumDeclaration */: - case 284 /* EnumMember */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 247 /* TypeAliasDeclaration */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: + case 246 /* VariableDeclaration */: + case 195 /* BindingElement */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 250 /* InterfaceDeclaration */: + case 253 /* ModuleDeclaration */: + case 252 /* EnumDeclaration */: + case 288 /* EnumMember */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 251 /* TypeAliasDeclaration */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: errorNode = node.name; break; - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: return getErrorSpanForArrowFunction(sourceFile, node); - case 277 /* CaseClause */: - case 278 /* DefaultClause */: + case 281 /* CaseClause */: + case 282 /* DefaultClause */: var start = ts.skipTrivia(sourceFile.text, node.pos); var end = node.statements.length > 0 ? node.statements[0].pos : node.end; return ts.createTextSpanFromBounds(start, end); @@ -13939,16 +13688,16 @@ var ts; } ts.isLet = isLet; function isSuperCall(n) { - return n.kind === 196 /* CallExpression */ && n.expression.kind === 102 /* SuperKeyword */; + return n.kind === 200 /* CallExpression */ && n.expression.kind === 105 /* SuperKeyword */; } ts.isSuperCall = isSuperCall; function isImportCall(n) { - return n.kind === 196 /* CallExpression */ && n.expression.kind === 96 /* ImportKeyword */; + return n.kind === 200 /* CallExpression */ && n.expression.kind === 99 /* ImportKeyword */; } ts.isImportCall = isImportCall; function isImportMeta(n) { return ts.isMetaProperty(n) - && n.keywordToken === 96 /* ImportKeyword */ + && n.keywordToken === 99 /* ImportKeyword */ && n.name.escapedText === "meta"; } ts.isImportMeta = isImportMeta; @@ -13957,7 +13706,7 @@ var ts; } ts.isLiteralImportTypeNode = isLiteralImportTypeNode; function isPrologueDirective(node) { - return node.kind === 226 /* ExpressionStatement */ + return node.kind === 230 /* ExpressionStatement */ && node.expression.kind === 10 /* StringLiteral */; } ts.isPrologueDirective = isPrologueDirective; @@ -13985,11 +13734,11 @@ var ts; } ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode; function getJSDocCommentRanges(node, text) { - var commentRanges = (node.kind === 156 /* Parameter */ || - node.kind === 155 /* TypeParameter */ || - node.kind === 201 /* FunctionExpression */ || - node.kind === 202 /* ArrowFunction */ || - node.kind === 200 /* ParenthesizedExpression */) ? + var commentRanges = (node.kind === 159 /* Parameter */ || + node.kind === 158 /* TypeParameter */ || + node.kind === 205 /* FunctionExpression */ || + node.kind === 206 /* ArrowFunction */ || + node.kind === 204 /* ParenthesizedExpression */) ? ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) : ts.getLeadingCommentRanges(text, node.pos); // True if the comment starts with '/**' but not if it is '/**/' @@ -14005,48 +13754,48 @@ var ts; ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*/; var defaultLibReferenceRegEx = /^(\/\/\/\s*/; function isPartOfTypeNode(node) { - if (168 /* FirstTypeNode */ <= node.kind && node.kind <= 188 /* LastTypeNode */) { + if (171 /* FirstTypeNode */ <= node.kind && node.kind <= 192 /* LastTypeNode */) { return true; } switch (node.kind) { - case 125 /* AnyKeyword */: - case 148 /* UnknownKeyword */: - case 140 /* NumberKeyword */: - case 151 /* BigIntKeyword */: - case 143 /* StringKeyword */: - case 128 /* BooleanKeyword */: - case 144 /* SymbolKeyword */: - case 141 /* ObjectKeyword */: - case 146 /* UndefinedKeyword */: - case 137 /* NeverKeyword */: + case 128 /* AnyKeyword */: + case 151 /* UnknownKeyword */: + case 143 /* NumberKeyword */: + case 154 /* BigIntKeyword */: + case 146 /* StringKeyword */: + case 131 /* BooleanKeyword */: + case 147 /* SymbolKeyword */: + case 144 /* ObjectKeyword */: + case 149 /* UndefinedKeyword */: + case 140 /* NeverKeyword */: return true; - case 110 /* VoidKeyword */: - return node.parent.kind !== 205 /* VoidExpression */; - case 216 /* ExpressionWithTypeArguments */: + case 113 /* VoidKeyword */: + return node.parent.kind !== 209 /* VoidExpression */; + case 220 /* ExpressionWithTypeArguments */: return !isExpressionWithTypeArgumentsInClassExtendsClause(node); - case 155 /* TypeParameter */: - return node.parent.kind === 186 /* MappedType */ || node.parent.kind === 181 /* InferType */; + case 158 /* TypeParameter */: + return node.parent.kind === 189 /* MappedType */ || node.parent.kind === 184 /* InferType */; // Identifiers and qualified names may be type nodes, depending on their context. Climb // above them to find the lowest container - case 75 /* Identifier */: + case 78 /* Identifier */: // If the identifier is the RHS of a qualified name, then it's a type iff its parent is. - if (node.parent.kind === 153 /* QualifiedName */ && node.parent.right === node) { + if (node.parent.kind === 156 /* QualifiedName */ && node.parent.right === node) { node = node.parent; } - else if (node.parent.kind === 194 /* PropertyAccessExpression */ && node.parent.name === node) { + else if (node.parent.kind === 198 /* PropertyAccessExpression */ && node.parent.name === node) { node = node.parent; } // At this point, node is either a qualified name or an identifier - ts.Debug.assert(node.kind === 75 /* Identifier */ || node.kind === 153 /* QualifiedName */ || node.kind === 194 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'."); + ts.Debug.assert(node.kind === 78 /* Identifier */ || node.kind === 156 /* QualifiedName */ || node.kind === 198 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'."); // falls through - case 153 /* QualifiedName */: - case 194 /* PropertyAccessExpression */: - case 104 /* ThisKeyword */: { + case 156 /* QualifiedName */: + case 198 /* PropertyAccessExpression */: + case 107 /* ThisKeyword */: { var parent = node.parent; - if (parent.kind === 172 /* TypeQuery */) { + if (parent.kind === 175 /* TypeQuery */) { return false; } - if (parent.kind === 188 /* ImportType */) { + if (parent.kind === 192 /* ImportType */) { return !parent.isTypeOf; } // Do not recursively call isPartOfTypeNode on the parent. In the example: @@ -14055,40 +13804,40 @@ var ts; // // Calling isPartOfTypeNode would consider the qualified name A.B a type node. // Only C and A.B.C are type nodes. - if (168 /* FirstTypeNode */ <= parent.kind && parent.kind <= 188 /* LastTypeNode */) { + if (171 /* FirstTypeNode */ <= parent.kind && parent.kind <= 192 /* LastTypeNode */) { return true; } switch (parent.kind) { - case 216 /* ExpressionWithTypeArguments */: + case 220 /* ExpressionWithTypeArguments */: return !isExpressionWithTypeArgumentsInClassExtendsClause(parent); - case 155 /* TypeParameter */: + case 158 /* TypeParameter */: return node === parent.constraint; - case 321 /* JSDocTemplateTag */: + case 326 /* JSDocTemplateTag */: return node === parent.constraint; - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 156 /* Parameter */: - case 242 /* VariableDeclaration */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 159 /* Parameter */: + case 246 /* VariableDeclaration */: return node === parent.type; - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: - case 162 /* Constructor */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 165 /* Constructor */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return node === parent.type; - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 167 /* IndexSignature */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 170 /* IndexSignature */: return node === parent.type; - case 199 /* TypeAssertionExpression */: + case 203 /* TypeAssertionExpression */: return node === parent.type; - case 196 /* CallExpression */: - case 197 /* NewExpression */: + case 200 /* CallExpression */: + case 201 /* NewExpression */: return ts.contains(parent.typeArguments, node); - case 198 /* TaggedTemplateExpression */: + case 202 /* TaggedTemplateExpression */: // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments. return false; } @@ -14113,23 +13862,23 @@ var ts; return traverse(body); function traverse(node) { switch (node.kind) { - case 235 /* ReturnStatement */: + case 239 /* ReturnStatement */: return visitor(node); - case 251 /* CaseBlock */: - case 223 /* Block */: - case 227 /* IfStatement */: - case 228 /* DoStatement */: - case 229 /* WhileStatement */: - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - case 236 /* WithStatement */: - case 237 /* SwitchStatement */: - case 277 /* CaseClause */: - case 278 /* DefaultClause */: - case 238 /* LabeledStatement */: - case 240 /* TryStatement */: - case 280 /* CatchClause */: + case 255 /* CaseBlock */: + case 227 /* Block */: + case 231 /* IfStatement */: + case 232 /* DoStatement */: + case 233 /* WhileStatement */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 240 /* WithStatement */: + case 241 /* SwitchStatement */: + case 281 /* CaseClause */: + case 282 /* DefaultClause */: + case 242 /* LabeledStatement */: + case 244 /* TryStatement */: + case 284 /* CatchClause */: return ts.forEachChild(node, traverse); } } @@ -14139,23 +13888,23 @@ var ts; return traverse(body); function traverse(node) { switch (node.kind) { - case 212 /* YieldExpression */: + case 216 /* YieldExpression */: visitor(node); var operand = node.expression; if (operand) { traverse(operand); } return; - case 248 /* EnumDeclaration */: - case 246 /* InterfaceDeclaration */: - case 249 /* ModuleDeclaration */: - case 247 /* TypeAliasDeclaration */: + case 252 /* EnumDeclaration */: + case 250 /* InterfaceDeclaration */: + case 253 /* ModuleDeclaration */: + case 251 /* TypeAliasDeclaration */: // These are not allowed inside a generator now, but eventually they may be allowed // as local types. Regardless, skip them to avoid the work. return; default: if (ts.isFunctionLike(node)) { - if (node.name && node.name.kind === 154 /* ComputedPropertyName */) { + if (node.name && node.name.kind === 157 /* ComputedPropertyName */) { // Note that we will not include methods/accessors of a class because they would require // first descending into the class. This is by design. traverse(node.name.expression); @@ -14178,10 +13927,10 @@ var ts; * @param node The type node. */ function getRestParameterElementType(node) { - if (node && node.kind === 174 /* ArrayType */) { + if (node && node.kind === 177 /* ArrayType */) { return node.elementType; } - else if (node && node.kind === 169 /* TypeReference */) { + else if (node && node.kind === 172 /* TypeReference */) { return ts.singleOrUndefined(node.typeArguments); } else { @@ -14191,12 +13940,12 @@ var ts; ts.getRestParameterElementType = getRestParameterElementType; function getMembersOfDeclaration(node) { switch (node.kind) { - case 246 /* InterfaceDeclaration */: - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 173 /* TypeLiteral */: + case 250 /* InterfaceDeclaration */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 176 /* TypeLiteral */: return node.members; - case 193 /* ObjectLiteralExpression */: + case 197 /* ObjectLiteralExpression */: return node.properties; } } @@ -14204,14 +13953,14 @@ var ts; function isVariableLike(node) { if (node) { switch (node.kind) { - case 191 /* BindingElement */: - case 284 /* EnumMember */: - case 156 /* Parameter */: - case 281 /* PropertyAssignment */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 282 /* ShorthandPropertyAssignment */: - case 242 /* VariableDeclaration */: + case 195 /* BindingElement */: + case 288 /* EnumMember */: + case 159 /* Parameter */: + case 285 /* PropertyAssignment */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 286 /* ShorthandPropertyAssignment */: + case 246 /* VariableDeclaration */: return true; } } @@ -14223,25 +13972,25 @@ var ts; } ts.isVariableLikeOrAccessor = isVariableLikeOrAccessor; function isVariableDeclarationInVariableStatement(node) { - return node.parent.kind === 243 /* VariableDeclarationList */ - && node.parent.parent.kind === 225 /* VariableStatement */; + return node.parent.kind === 247 /* VariableDeclarationList */ + && node.parent.parent.kind === 229 /* VariableStatement */; } ts.isVariableDeclarationInVariableStatement = isVariableDeclarationInVariableStatement; function isValidESSymbolDeclaration(node) { return ts.isVariableDeclaration(node) ? isVarConst(node) && ts.isIdentifier(node.name) && isVariableDeclarationInVariableStatement(node) : - ts.isPropertyDeclaration(node) ? hasReadonlyModifier(node) && hasStaticModifier(node) : - ts.isPropertySignature(node) && hasReadonlyModifier(node); + ts.isPropertyDeclaration(node) ? hasEffectiveReadonlyModifier(node) && hasStaticModifier(node) : + ts.isPropertySignature(node) && hasEffectiveReadonlyModifier(node); } ts.isValidESSymbolDeclaration = isValidESSymbolDeclaration; function introducesArgumentsExoticObject(node) { switch (node.kind) { - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: return true; } return false; @@ -14252,7 +14001,7 @@ var ts; if (beforeUnwrapLabelCallback) { beforeUnwrapLabelCallback(node); } - if (node.statement.kind !== 238 /* LabeledStatement */) { + if (node.statement.kind !== 242 /* LabeledStatement */) { return node.statement; } node = node.statement; @@ -14260,17 +14009,17 @@ var ts; } ts.unwrapInnermostStatementOfLabel = unwrapInnermostStatementOfLabel; function isFunctionBlock(node) { - return node && node.kind === 223 /* Block */ && ts.isFunctionLike(node.parent); + return node && node.kind === 227 /* Block */ && ts.isFunctionLike(node.parent); } ts.isFunctionBlock = isFunctionBlock; function isObjectLiteralMethod(node) { - return node && node.kind === 161 /* MethodDeclaration */ && node.parent.kind === 193 /* ObjectLiteralExpression */; + return node && node.kind === 164 /* MethodDeclaration */ && node.parent.kind === 197 /* ObjectLiteralExpression */; } ts.isObjectLiteralMethod = isObjectLiteralMethod; function isObjectLiteralOrClassExpressionMethod(node) { - return node.kind === 161 /* MethodDeclaration */ && - (node.parent.kind === 193 /* ObjectLiteralExpression */ || - node.parent.kind === 214 /* ClassExpression */); + return node.kind === 164 /* MethodDeclaration */ && + (node.parent.kind === 197 /* ObjectLiteralExpression */ || + node.parent.kind === 218 /* ClassExpression */); } ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod; function isIdentifierTypePredicate(predicate) { @@ -14283,7 +14032,7 @@ var ts; ts.isThisTypePredicate = isThisTypePredicate; function getPropertyAssignment(objectLiteral, key, key2) { return objectLiteral.properties.filter(function (property) { - if (property.kind === 281 /* PropertyAssignment */) { + if (property.kind === 285 /* PropertyAssignment */) { var propName = getTextOfPropertyName(property.name); return key === propName || (!!key2 && key2 === propName); } @@ -14324,14 +14073,14 @@ var ts; } ts.getContainingClass = getContainingClass; function getThisContainer(node, includeArrowFunctions) { - ts.Debug.assert(node.kind !== 290 /* SourceFile */); + ts.Debug.assert(node.kind !== 294 /* SourceFile */); while (true) { node = node.parent; if (!node) { return ts.Debug.fail(); // If we never pass in a SourceFile, this should be unreachable, since we'll stop when we reach that. } switch (node.kind) { - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: // If the grandparent node is an object literal (as opposed to a class), // then the computed property is not a 'this' container. // A computed property name in a class needs to be a this container @@ -14346,9 +14095,9 @@ var ts; // the *body* of the container. node = node.parent; break; - case 157 /* Decorator */: + case 160 /* Decorator */: // Decorators are always applied outside of the body of a class or method. - if (node.parent.kind === 156 /* Parameter */ && ts.isClassElement(node.parent.parent)) { + if (node.parent.kind === 159 /* Parameter */ && ts.isClassElement(node.parent.parent)) { // If the decorator's parent is a Parameter, we resolve the this container from // the grandparent class declaration. node = node.parent.parent; @@ -14359,38 +14108,47 @@ var ts; node = node.parent; } break; - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: if (!includeArrowFunctions) { continue; } // falls through - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 249 /* ModuleDeclaration */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 167 /* IndexSignature */: - case 248 /* EnumDeclaration */: - case 290 /* SourceFile */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 253 /* ModuleDeclaration */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 170 /* IndexSignature */: + case 252 /* EnumDeclaration */: + case 294 /* SourceFile */: return node; } } } ts.getThisContainer = getThisContainer; + function isInTopLevelContext(node) { + // The name of a class or function declaration is a BindingIdentifier in its surrounding scope. + if (ts.isIdentifier(node) && (ts.isClassDeclaration(node.parent) || ts.isFunctionDeclaration(node.parent)) && node.parent.name === node) { + node = node.parent; + } + var container = getThisContainer(node, /*includeArrowFunctions*/ true); + return ts.isSourceFile(container); + } + ts.isInTopLevelContext = isInTopLevelContext; function getNewTargetContainer(node) { var container = getThisContainer(node, /*includeArrowFunctions*/ false); if (container) { switch (container.kind) { - case 162 /* Constructor */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: + case 165 /* Constructor */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: return container; } } @@ -14412,27 +14170,27 @@ var ts; return node; } switch (node.kind) { - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: node = node.parent; break; - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: if (!stopOnFunctions) { continue; } // falls through - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return node; - case 157 /* Decorator */: + case 160 /* Decorator */: // Decorators are always applied outside of the body of a class or method. - if (node.parent.kind === 156 /* Parameter */ && ts.isClassElement(node.parent.parent)) { + if (node.parent.kind === 159 /* Parameter */ && ts.isClassElement(node.parent.parent)) { // If the decorator's parent is a Parameter, we resolve the this container from // the grandparent class declaration. node = node.parent.parent; @@ -14448,21 +14206,21 @@ var ts; } ts.getSuperContainer = getSuperContainer; function getImmediatelyInvokedFunctionExpression(func) { - if (func.kind === 201 /* FunctionExpression */ || func.kind === 202 /* ArrowFunction */) { + if (func.kind === 205 /* FunctionExpression */ || func.kind === 206 /* ArrowFunction */) { var prev = func; var parent = func.parent; - while (parent.kind === 200 /* ParenthesizedExpression */) { + while (parent.kind === 204 /* ParenthesizedExpression */) { prev = parent; parent = parent.parent; } - if (parent.kind === 196 /* CallExpression */ && parent.expression === prev) { + if (parent.kind === 200 /* CallExpression */ && parent.expression === prev) { return parent; } } } ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression; function isSuperOrSuperProperty(node) { - return node.kind === 102 /* SuperKeyword */ + return node.kind === 105 /* SuperKeyword */ || isSuperProperty(node); } ts.isSuperOrSuperProperty = isSuperOrSuperProperty; @@ -14471,8 +14229,8 @@ var ts; */ function isSuperProperty(node) { var kind = node.kind; - return (kind === 194 /* PropertyAccessExpression */ || kind === 195 /* ElementAccessExpression */) - && node.expression.kind === 102 /* SuperKeyword */; + return (kind === 198 /* PropertyAccessExpression */ || kind === 199 /* ElementAccessExpression */) + && node.expression.kind === 105 /* SuperKeyword */; } ts.isSuperProperty = isSuperProperty; /** @@ -14480,20 +14238,21 @@ var ts; */ function isThisProperty(node) { var kind = node.kind; - return (kind === 194 /* PropertyAccessExpression */ || kind === 195 /* ElementAccessExpression */) - && node.expression.kind === 104 /* ThisKeyword */; + return (kind === 198 /* PropertyAccessExpression */ || kind === 199 /* ElementAccessExpression */) + && node.expression.kind === 107 /* ThisKeyword */; } ts.isThisProperty = isThisProperty; function getEntityNameFromTypeNode(node) { switch (node.kind) { - case 169 /* TypeReference */: + case 172 /* TypeReference */: return node.typeName; - case 216 /* ExpressionWithTypeArguments */: + case 220 /* ExpressionWithTypeArguments */: return isEntityNameExpression(node.expression) ? node.expression : undefined; - case 75 /* Identifier */: - case 153 /* QualifiedName */: + // TODO(rbuckton): These aren't valid TypeNodes, but we treat them as such because of `isPartOfTypeNode`, which returns `true` for things that aren't `TypeNode`s. + case 78 /* Identifier */: + case 156 /* QualifiedName */: return node; } return undefined; @@ -14501,10 +14260,10 @@ var ts; ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode; function getInvokedExpression(node) { switch (node.kind) { - case 198 /* TaggedTemplateExpression */: + case 202 /* TaggedTemplateExpression */: return node.tag; - case 268 /* JsxOpeningElement */: - case 267 /* JsxSelfClosingElement */: + case 272 /* JsxOpeningElement */: + case 271 /* JsxSelfClosingElement */: return node.tagName; default: return node.expression; @@ -14517,25 +14276,25 @@ var ts; return false; } switch (node.kind) { - case 245 /* ClassDeclaration */: + case 249 /* ClassDeclaration */: // classes are valid targets return true; - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: // property declarations are valid if their parent is a class declaration. - return parent.kind === 245 /* ClassDeclaration */; - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 161 /* MethodDeclaration */: + return parent.kind === 249 /* ClassDeclaration */; + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 164 /* MethodDeclaration */: // if this method has a body and its parent is a class declaration, this is a valid target. return node.body !== undefined - && parent.kind === 245 /* ClassDeclaration */; - case 156 /* Parameter */: + && parent.kind === 249 /* ClassDeclaration */; + case 159 /* Parameter */: // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target; return parent.body !== undefined - && (parent.kind === 162 /* Constructor */ - || parent.kind === 161 /* MethodDeclaration */ - || parent.kind === 164 /* SetAccessor */) - && grandparent.kind === 245 /* ClassDeclaration */; + && (parent.kind === 165 /* Constructor */ + || parent.kind === 164 /* MethodDeclaration */ + || parent.kind === 167 /* SetAccessor */) + && grandparent.kind === 249 /* ClassDeclaration */; } return false; } @@ -14551,10 +14310,10 @@ var ts; ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated; function childIsDecorated(node, parent) { switch (node.kind) { - case 245 /* ClassDeclaration */: + case 249 /* ClassDeclaration */: return ts.some(node.members, function (m) { return nodeOrChildIsDecorated(m, node, parent); }); // TODO: GH#18217 - case 161 /* MethodDeclaration */: - case 164 /* SetAccessor */: + case 164 /* MethodDeclaration */: + case 167 /* SetAccessor */: return ts.some(node.parameters, function (p) { return nodeIsDecorated(p, node, parent); }); // TODO: GH#18217 default: return false; @@ -14563,9 +14322,9 @@ var ts; ts.childIsDecorated = childIsDecorated; function isJSXTagName(node) { var parent = node.parent; - if (parent.kind === 268 /* JsxOpeningElement */ || - parent.kind === 267 /* JsxSelfClosingElement */ || - parent.kind === 269 /* JsxClosingElement */) { + if (parent.kind === 272 /* JsxOpeningElement */ || + parent.kind === 271 /* JsxSelfClosingElement */ || + parent.kind === 273 /* JsxClosingElement */) { return parent.tagName === node; } return false; @@ -14573,49 +14332,49 @@ var ts; ts.isJSXTagName = isJSXTagName; function isExpressionNode(node) { switch (node.kind) { - case 102 /* SuperKeyword */: - case 100 /* NullKeyword */: - case 106 /* TrueKeyword */: - case 91 /* FalseKeyword */: + case 105 /* SuperKeyword */: + case 103 /* NullKeyword */: + case 109 /* TrueKeyword */: + case 94 /* FalseKeyword */: case 13 /* RegularExpressionLiteral */: - case 192 /* ArrayLiteralExpression */: - case 193 /* ObjectLiteralExpression */: - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: - case 196 /* CallExpression */: - case 197 /* NewExpression */: - case 198 /* TaggedTemplateExpression */: - case 217 /* AsExpression */: - case 199 /* TypeAssertionExpression */: - case 218 /* NonNullExpression */: - case 200 /* ParenthesizedExpression */: - case 201 /* FunctionExpression */: - case 214 /* ClassExpression */: - case 202 /* ArrowFunction */: - case 205 /* VoidExpression */: - case 203 /* DeleteExpression */: - case 204 /* TypeOfExpression */: - case 207 /* PrefixUnaryExpression */: - case 208 /* PostfixUnaryExpression */: - case 209 /* BinaryExpression */: - case 210 /* ConditionalExpression */: - case 213 /* SpreadElement */: - case 211 /* TemplateExpression */: - case 215 /* OmittedExpression */: - case 266 /* JsxElement */: - case 267 /* JsxSelfClosingElement */: - case 270 /* JsxFragment */: - case 212 /* YieldExpression */: - case 206 /* AwaitExpression */: - case 219 /* MetaProperty */: + case 196 /* ArrayLiteralExpression */: + case 197 /* ObjectLiteralExpression */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: + case 200 /* CallExpression */: + case 201 /* NewExpression */: + case 202 /* TaggedTemplateExpression */: + case 221 /* AsExpression */: + case 203 /* TypeAssertionExpression */: + case 222 /* NonNullExpression */: + case 204 /* ParenthesizedExpression */: + case 205 /* FunctionExpression */: + case 218 /* ClassExpression */: + case 206 /* ArrowFunction */: + case 209 /* VoidExpression */: + case 207 /* DeleteExpression */: + case 208 /* TypeOfExpression */: + case 211 /* PrefixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: + case 213 /* BinaryExpression */: + case 214 /* ConditionalExpression */: + case 217 /* SpreadElement */: + case 215 /* TemplateExpression */: + case 219 /* OmittedExpression */: + case 270 /* JsxElement */: + case 271 /* JsxSelfClosingElement */: + case 274 /* JsxFragment */: + case 216 /* YieldExpression */: + case 210 /* AwaitExpression */: + case 223 /* MetaProperty */: return true; - case 153 /* QualifiedName */: - while (node.parent.kind === 153 /* QualifiedName */) { + case 156 /* QualifiedName */: + while (node.parent.kind === 156 /* QualifiedName */) { node = node.parent; } - return node.parent.kind === 172 /* TypeQuery */ || isJSXTagName(node); - case 75 /* Identifier */: - if (node.parent.kind === 172 /* TypeQuery */ || isJSXTagName(node)) { + return node.parent.kind === 175 /* TypeQuery */ || isJSXTagName(node); + case 78 /* Identifier */: + if (node.parent.kind === 175 /* TypeQuery */ || isJSXTagName(node)) { return true; } // falls through @@ -14623,7 +14382,7 @@ var ts; case 9 /* BigIntLiteral */: case 10 /* StringLiteral */: case 14 /* NoSubstitutionTemplateLiteral */: - case 104 /* ThisKeyword */: + case 107 /* ThisKeyword */: return isInExpressionContext(node); default: return false; @@ -14633,49 +14392,49 @@ var ts; function isInExpressionContext(node) { var parent = node.parent; switch (parent.kind) { - case 242 /* VariableDeclaration */: - case 156 /* Parameter */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 284 /* EnumMember */: - case 281 /* PropertyAssignment */: - case 191 /* BindingElement */: + case 246 /* VariableDeclaration */: + case 159 /* Parameter */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 288 /* EnumMember */: + case 285 /* PropertyAssignment */: + case 195 /* BindingElement */: return parent.initializer === node; - case 226 /* ExpressionStatement */: - case 227 /* IfStatement */: - case 228 /* DoStatement */: - case 229 /* WhileStatement */: - case 235 /* ReturnStatement */: - case 236 /* WithStatement */: - case 237 /* SwitchStatement */: - case 277 /* CaseClause */: - case 239 /* ThrowStatement */: + case 230 /* ExpressionStatement */: + case 231 /* IfStatement */: + case 232 /* DoStatement */: + case 233 /* WhileStatement */: + case 239 /* ReturnStatement */: + case 240 /* WithStatement */: + case 241 /* SwitchStatement */: + case 281 /* CaseClause */: + case 243 /* ThrowStatement */: return parent.expression === node; - case 230 /* ForStatement */: + case 234 /* ForStatement */: var forStatement = parent; - return (forStatement.initializer === node && forStatement.initializer.kind !== 243 /* VariableDeclarationList */) || + return (forStatement.initializer === node && forStatement.initializer.kind !== 247 /* VariableDeclarationList */) || forStatement.condition === node || forStatement.incrementor === node; - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: var forInStatement = parent; - return (forInStatement.initializer === node && forInStatement.initializer.kind !== 243 /* VariableDeclarationList */) || + return (forInStatement.initializer === node && forInStatement.initializer.kind !== 247 /* VariableDeclarationList */) || forInStatement.expression === node; - case 199 /* TypeAssertionExpression */: - case 217 /* AsExpression */: + case 203 /* TypeAssertionExpression */: + case 221 /* AsExpression */: return node === parent.expression; - case 221 /* TemplateSpan */: + case 225 /* TemplateSpan */: return node === parent.expression; - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: return node === parent.expression; - case 157 /* Decorator */: - case 276 /* JsxExpression */: - case 275 /* JsxSpreadAttribute */: - case 283 /* SpreadAssignment */: + case 160 /* Decorator */: + case 280 /* JsxExpression */: + case 279 /* JsxSpreadAttribute */: + case 287 /* SpreadAssignment */: return true; - case 216 /* ExpressionWithTypeArguments */: + case 220 /* ExpressionWithTypeArguments */: return parent.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent); - case 282 /* ShorthandPropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: return parent.objectAssignmentInitializer === node; default: return isExpressionNode(parent); @@ -14683,14 +14442,14 @@ var ts; } ts.isInExpressionContext = isInExpressionContext; function isPartOfTypeQuery(node) { - while (node.kind === 153 /* QualifiedName */ || node.kind === 75 /* Identifier */) { + while (node.kind === 156 /* QualifiedName */ || node.kind === 78 /* Identifier */) { node = node.parent; } - return node.kind === 172 /* TypeQuery */; + return node.kind === 175 /* TypeQuery */; } ts.isPartOfTypeQuery = isPartOfTypeQuery; function isExternalModuleImportEqualsDeclaration(node) { - return node.kind === 253 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 265 /* ExternalModuleReference */; + return node.kind === 257 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 269 /* ExternalModuleReference */; } ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration; function getExternalModuleImportEqualsDeclarationExpression(node) { @@ -14699,7 +14458,7 @@ var ts; } ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression; function isInternalModuleImportEqualsDeclaration(node) { - return node.kind === 253 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 265 /* ExternalModuleReference */; + return node.kind === 257 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 269 /* ExternalModuleReference */; } ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration; function isSourceFileJS(file) { @@ -14731,15 +14490,15 @@ var ts; ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object" && node.typeArguments && node.typeArguments.length === 2 && - (node.typeArguments[0].kind === 143 /* StringKeyword */ || node.typeArguments[0].kind === 140 /* NumberKeyword */); + (node.typeArguments[0].kind === 146 /* StringKeyword */ || node.typeArguments[0].kind === 143 /* NumberKeyword */); } ts.isJSDocIndexSignature = isJSDocIndexSignature; function isRequireCall(callExpression, requireStringLiteralLikeArgument) { - if (callExpression.kind !== 196 /* CallExpression */) { + if (callExpression.kind !== 200 /* CallExpression */) { return false; } var _a = callExpression, expression = _a.expression, args = _a.arguments; - if (expression.kind !== 75 /* Identifier */ || expression.escapedText !== "require") { + if (expression.kind !== 78 /* Identifier */ || expression.escapedText !== "require") { return false; } if (args.length !== 1) { @@ -14753,11 +14512,13 @@ var ts; return ts.isVariableDeclaration(node) && !!node.initializer && isRequireCall(node.initializer, requireStringLiteralLikeArgument); } ts.isRequireVariableDeclaration = isRequireVariableDeclaration; - function isRequireVariableDeclarationStatement(node, requireStringLiteralLikeArgument) { + function isRequireVariableStatement(node, requireStringLiteralLikeArgument) { if (requireStringLiteralLikeArgument === void 0) { requireStringLiteralLikeArgument = true; } - return ts.isVariableStatement(node) && ts.every(node.declarationList.declarations, function (decl) { return isRequireVariableDeclaration(decl, requireStringLiteralLikeArgument); }); + return ts.isVariableStatement(node) + && node.declarationList.declarations.length > 0 + && ts.every(node.declarationList.declarations, function (decl) { return isRequireVariableDeclaration(decl, requireStringLiteralLikeArgument); }); } - ts.isRequireVariableDeclarationStatement = isRequireVariableDeclarationStatement; + ts.isRequireVariableStatement = isRequireVariableStatement; function isSingleOrDoubleQuote(charCode) { return charCode === 39 /* singleQuote */ || charCode === 34 /* doubleQuote */; } @@ -14838,7 +14599,7 @@ var ts; } /** * Get the assignment 'initializer' -- the righthand side-- when the initializer is container-like (See getExpandoInitializer). - * We treat the right hand side of assignments with container-like initalizers as declarations. + * We treat the right hand side of assignments with container-like initializers as declarations. */ function getAssignedExpandoInitializer(node) { if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 62 /* EqualsToken */) { @@ -14867,11 +14628,11 @@ var ts; function getExpandoInitializer(initializer, isPrototypeAssignment) { if (ts.isCallExpression(initializer)) { var e = skipParentheses(initializer.expression); - return e.kind === 201 /* FunctionExpression */ || e.kind === 202 /* ArrowFunction */ ? initializer : undefined; + return e.kind === 205 /* FunctionExpression */ || e.kind === 206 /* ArrowFunction */ ? initializer : undefined; } - if (initializer.kind === 201 /* FunctionExpression */ || - initializer.kind === 214 /* ClassExpression */ || - initializer.kind === 202 /* ArrowFunction */) { + if (initializer.kind === 205 /* FunctionExpression */ || + initializer.kind === 218 /* ClassExpression */ || + initializer.kind === 206 /* ArrowFunction */) { return initializer; } if (ts.isObjectLiteralExpression(initializer) && (initializer.properties.length === 0 || isPrototypeAssignment)) { @@ -14926,10 +14687,10 @@ var ts; */ function isSameEntityName(name, initializer) { if (isPropertyNameLiteral(name) && isPropertyNameLiteral(initializer)) { - return getTextOfIdentifierOrLiteral(name) === getTextOfIdentifierOrLiteral(name); + return getTextOfIdentifierOrLiteral(name) === getTextOfIdentifierOrLiteral(initializer); } if (ts.isIdentifier(name) && isLiteralLikeAccess(initializer) && - (initializer.expression.kind === 104 /* ThisKeyword */ || + (initializer.expression.kind === 107 /* ThisKeyword */ || ts.isIdentifier(initializer.expression) && (initializer.expression.escapedText === "window" || initializer.expression.escapedText === "self" || @@ -14997,14 +14758,14 @@ var ts; ts.isLiteralLikeElementAccess = isLiteralLikeElementAccess; /** Any series of property and element accesses. */ function isBindableStaticAccessExpression(node, excludeThisKeyword) { - return ts.isPropertyAccessExpression(node) && (!excludeThisKeyword && node.expression.kind === 104 /* ThisKeyword */ || ts.isIdentifier(node.name) && isBindableStaticNameExpression(node.expression, /*excludeThisKeyword*/ true)) + return ts.isPropertyAccessExpression(node) && (!excludeThisKeyword && node.expression.kind === 107 /* ThisKeyword */ || ts.isIdentifier(node.name) && isBindableStaticNameExpression(node.expression, /*excludeThisKeyword*/ true)) || isBindableStaticElementAccessExpression(node, excludeThisKeyword); } ts.isBindableStaticAccessExpression = isBindableStaticAccessExpression; /** Any series of property and element accesses, ending in a literal element access */ function isBindableStaticElementAccessExpression(node, excludeThisKeyword) { return isLiteralLikeElementAccess(node) - && ((!excludeThisKeyword && node.expression.kind === 104 /* ThisKeyword */) || + && ((!excludeThisKeyword && node.expression.kind === 107 /* ThisKeyword */) || isEntityNameExpression(node.expression) || isBindableStaticAccessExpression(node.expression, /*excludeThisKeyword*/ true)); } @@ -15034,7 +14795,7 @@ var ts; } return 7 /* ObjectDefinePropertyValue */; } - if (expr.operatorToken.kind !== 62 /* EqualsToken */ || !isAccessExpression(expr.left)) { + if (expr.operatorToken.kind !== 62 /* EqualsToken */ || !isAccessExpression(expr.left) || isVoidZero(getRightMostAssignedExpression(expr))) { return 0 /* None */; } if (isBindableStaticNameExpression(expr.left.expression, /*excludeThisKeyword*/ true) && getElementOrPropertyAccessName(expr.left) === "prototype" && ts.isObjectLiteralExpression(getInitializerOfBinaryExpression(expr))) { @@ -15043,6 +14804,9 @@ var ts; } return getAssignmentDeclarationPropertyAccessKind(expr.left); } + function isVoidZero(node) { + return ts.isVoidExpression(node) && ts.isNumericLiteral(node.expression) && node.expression.text === "0"; + } /** * Does not handle signed numeric names like `a[+0]` - handling those would require handling prefix unary expressions * throughout late binding handling as well, which is awkward (but ultimately probably doable if there is demand) @@ -15076,7 +14840,7 @@ var ts; } ts.getElementOrPropertyAccessName = getElementOrPropertyAccessName; function getAssignmentDeclarationPropertyAccessKind(lhs) { - if (lhs.expression.kind === 104 /* ThisKeyword */) { + if (lhs.expression.kind === 107 /* ThisKeyword */) { return 4 /* ThisProperty */; } else if (isModuleExportsAccessExpression(lhs)) { @@ -15121,7 +14885,7 @@ var ts; ts.isPrototypePropertyAssignment = isPrototypePropertyAssignment; function isSpecialPropertyDeclaration(expr) { return isInJSFile(expr) && - expr.parent && expr.parent.kind === 226 /* ExpressionStatement */ && + expr.parent && expr.parent.kind === 230 /* ExpressionStatement */ && (!ts.isElementAccessExpression(expr) || isLiteralLikeElementAccess(expr)) && !!ts.getJSDocTypeTag(expr.parent); } @@ -15142,7 +14906,7 @@ var ts; return false; } var decl = symbol.valueDeclaration; - return decl.kind === 244 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer); + return decl.kind === 248 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer); } ts.isFunctionSymbol = isFunctionSymbol; function importFromModuleSpecifier(node) { @@ -15151,14 +14915,14 @@ var ts; ts.importFromModuleSpecifier = importFromModuleSpecifier; function tryGetImportFromModuleSpecifier(node) { switch (node.parent.kind) { - case 254 /* ImportDeclaration */: - case 260 /* ExportDeclaration */: + case 258 /* ImportDeclaration */: + case 264 /* ExportDeclaration */: return node.parent; - case 265 /* ExternalModuleReference */: + case 269 /* ExternalModuleReference */: return node.parent.parent; - case 196 /* CallExpression */: + case 200 /* CallExpression */: return isImportCall(node.parent) || isRequireCall(node.parent, /*checkArg*/ false) ? node.parent : undefined; - case 187 /* LiteralType */: + case 190 /* LiteralType */: ts.Debug.assert(ts.isStringLiteral(node)); return ts.tryCast(node.parent.parent, ts.isImportTypeNode); default: @@ -15168,12 +14932,12 @@ var ts; ts.tryGetImportFromModuleSpecifier = tryGetImportFromModuleSpecifier; function getExternalModuleName(node) { switch (node.kind) { - case 254 /* ImportDeclaration */: - case 260 /* ExportDeclaration */: + case 258 /* ImportDeclaration */: + case 264 /* ExportDeclaration */: return node.moduleSpecifier; - case 253 /* ImportEqualsDeclaration */: - return node.moduleReference.kind === 265 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined; - case 188 /* ImportType */: + case 257 /* ImportEqualsDeclaration */: + return node.moduleReference.kind === 269 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined; + case 192 /* ImportType */: return isLiteralImportTypeNode(node) ? node.argument.literal : undefined; default: return ts.Debug.assertNever(node); @@ -15182,11 +14946,11 @@ var ts; ts.getExternalModuleName = getExternalModuleName; function getNamespaceDeclarationNode(node) { switch (node.kind) { - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: return node.importClause && ts.tryCast(node.importClause.namedBindings, ts.isNamespaceImport); - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return node; - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: return node.exportClause && ts.tryCast(node.exportClause, ts.isNamespaceExport); default: return ts.Debug.assertNever(node); @@ -15194,7 +14958,7 @@ var ts; } ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode; function isDefaultImport(node) { - return node.kind === 254 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name; + return node.kind === 258 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name; } ts.isDefaultImport = isDefaultImport; function forEachImportClauseDeclaration(node, action) { @@ -15215,13 +14979,13 @@ var ts; function hasQuestionToken(node) { if (node) { switch (node.kind) { - case 156 /* Parameter */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 282 /* ShorthandPropertyAssignment */: - case 281 /* PropertyAssignment */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: + case 159 /* Parameter */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 286 /* ShorthandPropertyAssignment */: + case 285 /* PropertyAssignment */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: return node.questionToken !== undefined; } } @@ -15235,7 +14999,7 @@ var ts; } ts.isJSDocConstructSignature = isJSDocConstructSignature; function isJSDocTypeAlias(node) { - return node.kind === 322 /* JSDocTypedefTag */ || node.kind === 315 /* JSDocCallbackTag */ || node.kind === 316 /* JSDocEnumTag */; + return node.kind === 327 /* JSDocTypedefTag */ || node.kind === 320 /* JSDocCallbackTag */ || node.kind === 321 /* JSDocEnumTag */; } ts.isJSDocTypeAlias = isJSDocTypeAlias; function isTypeAlias(node) { @@ -15260,12 +15024,12 @@ var ts; } function getSingleInitializerOfVariableStatementOrPropertyDeclaration(node) { switch (node.kind) { - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: var v = getSingleVariableOfVariableStatement(node); return v && v.initializer; - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: return node.initializer; - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: return node.initializer; } } @@ -15273,14 +15037,15 @@ var ts; function getSingleVariableOfVariableStatement(node) { return ts.isVariableStatement(node) ? ts.firstOrUndefined(node.declarationList.declarations) : undefined; } + ts.getSingleVariableOfVariableStatement = getSingleVariableOfVariableStatement; function getNestedModuleDeclaration(node) { return ts.isModuleDeclaration(node) && node.body && - node.body.kind === 249 /* ModuleDeclaration */ + node.body.kind === 253 /* ModuleDeclaration */ ? node.body : undefined; } - function getJSDocCommentsAndTags(hostNode) { + function getJSDocCommentsAndTags(hostNode, noCache) { var result; // Pull parameter comments from declaring function as well if (isVariableLike(hostNode) && ts.hasInitializer(hostNode) && ts.hasJSDocNodes(hostNode.initializer)) { @@ -15291,12 +15056,12 @@ var ts; if (ts.hasJSDocNodes(node)) { result = ts.append(result, ts.last(node.jsDoc)); } - if (node.kind === 156 /* Parameter */) { - result = ts.addRange(result, ts.getJSDocParameterTags(node)); + if (node.kind === 159 /* Parameter */) { + result = ts.addRange(result, (noCache ? ts.getJSDocParameterTagsNoCache : ts.getJSDocParameterTags)(node)); break; } - if (node.kind === 155 /* TypeParameter */) { - result = ts.addRange(result, ts.getJSDocTypeParameterTags(node)); + if (node.kind === 158 /* TypeParameter */) { + result = ts.addRange(result, (noCache ? ts.getJSDocTypeParameterTagsNoCache : ts.getJSDocTypeParameterTags)(node)); break; } node = getNextJSDocCommentLocation(node); @@ -15306,10 +15071,10 @@ var ts; ts.getJSDocCommentsAndTags = getJSDocCommentsAndTags; function getNextJSDocCommentLocation(node) { var parent = node.parent; - if (parent.kind === 281 /* PropertyAssignment */ || - parent.kind === 259 /* ExportAssignment */ || - parent.kind === 159 /* PropertyDeclaration */ || - parent.kind === 226 /* ExpressionStatement */ && node.kind === 194 /* PropertyAccessExpression */ || + if (parent.kind === 285 /* PropertyAssignment */ || + parent.kind === 263 /* ExportAssignment */ || + parent.kind === 162 /* PropertyDeclaration */ || + parent.kind === 230 /* ExpressionStatement */ && node.kind === 198 /* PropertyAccessExpression */ || getNestedModuleDeclaration(parent) || ts.isBinaryExpression(node) && node.operatorToken.kind === 62 /* EqualsToken */) { return parent; @@ -15345,7 +15110,7 @@ var ts; if (!decl) { return undefined; } - var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 75 /* Identifier */ && p.name.escapedText === name; }); + var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 78 /* Identifier */ && p.name.escapedText === name; }); return parameter && parameter.symbol; } ts.getParameterSymbolFromJSDoc = getParameterSymbolFromJSDoc; @@ -15383,7 +15148,7 @@ var ts; ts.hasRestParameter = hasRestParameter; function isRestParameter(node) { var type = ts.isJSDocParameterTag(node) ? (node.typeExpression && node.typeExpression.type) : node.type; - return node.dotDotDotToken !== undefined || !!type && type.kind === 301 /* JSDocVariadicType */; + return node.dotDotDotToken !== undefined || !!type && type.kind === 305 /* JSDocVariadicType */; } ts.isRestParameter = isRestParameter; function hasTypeArguments(node) { @@ -15400,31 +15165,31 @@ var ts; var parent = node.parent; while (true) { switch (parent.kind) { - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: var binaryOperator = parent.operatorToken.kind; return isAssignmentOperator(binaryOperator) && parent.left === node ? - binaryOperator === 62 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ : + binaryOperator === 62 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */ : 0 /* None */; - case 207 /* PrefixUnaryExpression */: - case 208 /* PostfixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: var unaryOperator = parent.operator; return unaryOperator === 45 /* PlusPlusToken */ || unaryOperator === 46 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */; - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: return parent.initializer === node ? 1 /* Definite */ : 0 /* None */; - case 200 /* ParenthesizedExpression */: - case 192 /* ArrayLiteralExpression */: - case 213 /* SpreadElement */: - case 218 /* NonNullExpression */: + case 204 /* ParenthesizedExpression */: + case 196 /* ArrayLiteralExpression */: + case 217 /* SpreadElement */: + case 222 /* NonNullExpression */: node = parent; break; - case 282 /* ShorthandPropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: if (parent.name !== node) { return 0 /* None */; } node = parent.parent; break; - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: if (parent.name === node) { return 0 /* None */; } @@ -15451,22 +15216,22 @@ var ts; */ function isNodeWithPossibleHoistedDeclaration(node) { switch (node.kind) { - case 223 /* Block */: - case 225 /* VariableStatement */: - case 236 /* WithStatement */: - case 227 /* IfStatement */: - case 237 /* SwitchStatement */: - case 251 /* CaseBlock */: - case 277 /* CaseClause */: - case 278 /* DefaultClause */: - case 238 /* LabeledStatement */: - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - case 228 /* DoStatement */: - case 229 /* WhileStatement */: - case 240 /* TryStatement */: - case 280 /* CatchClause */: + case 227 /* Block */: + case 229 /* VariableStatement */: + case 240 /* WithStatement */: + case 231 /* IfStatement */: + case 241 /* SwitchStatement */: + case 255 /* CaseBlock */: + case 281 /* CaseClause */: + case 282 /* DefaultClause */: + case 242 /* LabeledStatement */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 232 /* DoStatement */: + case 233 /* WhileStatement */: + case 244 /* TryStatement */: + case 284 /* CatchClause */: return true; } return false; @@ -15483,11 +15248,11 @@ var ts; return node; } function walkUpParenthesizedTypes(node) { - return walkUp(node, 182 /* ParenthesizedType */); + return walkUp(node, 185 /* ParenthesizedType */); } ts.walkUpParenthesizedTypes = walkUpParenthesizedTypes; function walkUpParenthesizedExpressions(node) { - return walkUp(node, 200 /* ParenthesizedExpression */); + return walkUp(node, 204 /* ParenthesizedExpression */); } ts.walkUpParenthesizedExpressions = walkUpParenthesizedExpressions; function skipParentheses(node) { @@ -15495,18 +15260,18 @@ var ts; } ts.skipParentheses = skipParentheses; function skipParenthesesUp(node) { - while (node.kind === 200 /* ParenthesizedExpression */) { + while (node.kind === 204 /* ParenthesizedExpression */) { node = node.parent; } return node; } // a node is delete target iff. it is PropertyAccessExpression/ElementAccessExpression with parentheses skipped function isDeleteTarget(node) { - if (node.kind !== 194 /* PropertyAccessExpression */ && node.kind !== 195 /* ElementAccessExpression */) { + if (node.kind !== 198 /* PropertyAccessExpression */ && node.kind !== 199 /* ElementAccessExpression */) { return false; } node = walkUpParenthesizedExpressions(node.parent); - return node && node.kind === 203 /* DeleteExpression */; + return node && node.kind === 207 /* DeleteExpression */; } ts.isDeleteTarget = isDeleteTarget; function isNodeDescendantOf(node, ancestor) { @@ -15533,7 +15298,7 @@ var ts; if (ts.isComputedPropertyName(parent)) return parent.parent; // falls through - case 75 /* Identifier */: + case 78 /* Identifier */: if (ts.isDeclaration(parent)) { return parent.name === name ? parent : undefined; } @@ -15550,7 +15315,7 @@ var ts; ? binExp : undefined; } - case 76 /* PrivateIdentifier */: + case 79 /* PrivateIdentifier */: return ts.isDeclaration(parent) && parent.name === name ? parent : undefined; default: return undefined; @@ -15559,7 +15324,7 @@ var ts; ts.getDeclarationFromName = getDeclarationFromName; function isLiteralComputedPropertyDeclarationName(node) { return isStringOrNumericLiteralLike(node) && - node.parent.kind === 154 /* ComputedPropertyName */ && + node.parent.kind === 157 /* ComputedPropertyName */ && ts.isDeclaration(node.parent.parent); } ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName; @@ -15567,32 +15332,26 @@ var ts; function isIdentifierName(node) { var parent = node.parent; switch (parent.kind) { - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 284 /* EnumMember */: - case 281 /* PropertyAssignment */: - case 194 /* PropertyAccessExpression */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 288 /* EnumMember */: + case 285 /* PropertyAssignment */: + case 198 /* PropertyAccessExpression */: // Name in member declaration or property name in property access return parent.name === node; - case 153 /* QualifiedName */: + case 156 /* QualifiedName */: // Name on right hand side of dot in a type query or type reference - if (parent.right === node) { - while (parent.kind === 153 /* QualifiedName */) { - parent = parent.parent; - } - return parent.kind === 172 /* TypeQuery */ || parent.kind === 169 /* TypeReference */; - } - return false; - case 191 /* BindingElement */: - case 258 /* ImportSpecifier */: + return parent.right === node; + case 195 /* BindingElement */: + case 262 /* ImportSpecifier */: // Property name in binding element or import specifier return parent.propertyName === node; - case 263 /* ExportSpecifier */: - case 273 /* JsxAttribute */: + case 267 /* ExportSpecifier */: + case 277 /* JsxAttribute */: // Any name in an export specifier or JSX Attribute return true; } @@ -15612,33 +15371,33 @@ var ts; // {} // {name: } function isAliasSymbolDeclaration(node) { - return node.kind === 253 /* ImportEqualsDeclaration */ || - node.kind === 252 /* NamespaceExportDeclaration */ || - node.kind === 255 /* ImportClause */ && !!node.name || - node.kind === 256 /* NamespaceImport */ || - node.kind === 262 /* NamespaceExport */ || - node.kind === 258 /* ImportSpecifier */ || - node.kind === 263 /* ExportSpecifier */ || - node.kind === 259 /* ExportAssignment */ && exportAssignmentIsAlias(node) || + return node.kind === 257 /* ImportEqualsDeclaration */ || + node.kind === 256 /* NamespaceExportDeclaration */ || + node.kind === 259 /* ImportClause */ && !!node.name || + node.kind === 260 /* NamespaceImport */ || + node.kind === 266 /* NamespaceExport */ || + node.kind === 262 /* ImportSpecifier */ || + node.kind === 267 /* ExportSpecifier */ || + node.kind === 263 /* ExportAssignment */ && exportAssignmentIsAlias(node) || ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && exportAssignmentIsAlias(node) || ts.isPropertyAccessExpression(node) && ts.isBinaryExpression(node.parent) && node.parent.left === node && node.parent.operatorToken.kind === 62 /* EqualsToken */ && isAliasableExpression(node.parent.right) || - node.kind === 282 /* ShorthandPropertyAssignment */ || - node.kind === 281 /* PropertyAssignment */ && isAliasableExpression(node.initializer); + node.kind === 286 /* ShorthandPropertyAssignment */ || + node.kind === 285 /* PropertyAssignment */ && isAliasableExpression(node.initializer); } ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration; function getAliasDeclarationFromName(node) { switch (node.parent.kind) { - case 255 /* ImportClause */: - case 258 /* ImportSpecifier */: - case 256 /* NamespaceImport */: - case 263 /* ExportSpecifier */: - case 259 /* ExportAssignment */: - case 253 /* ImportEqualsDeclaration */: + case 259 /* ImportClause */: + case 262 /* ImportSpecifier */: + case 260 /* NamespaceImport */: + case 267 /* ExportSpecifier */: + case 263 /* ExportAssignment */: + case 257 /* ImportEqualsDeclaration */: return node.parent; - case 153 /* QualifiedName */: + case 156 /* QualifiedName */: do { node = node.parent; - } while (node.parent.kind === 153 /* QualifiedName */); + } while (node.parent.kind === 156 /* QualifiedName */); return getAliasDeclarationFromName(node); } } @@ -15657,7 +15416,7 @@ var ts; } ts.getExportAssignmentExpression = getExportAssignmentExpression; function getPropertyAssignmentAliasLikeExpression(node) { - return node.kind === 282 /* ShorthandPropertyAssignment */ ? node.name : node.kind === 281 /* PropertyAssignment */ ? node.initializer : + return node.kind === 286 /* ShorthandPropertyAssignment */ ? node.name : node.kind === 285 /* PropertyAssignment */ ? node.initializer : node.parent.right; } ts.getPropertyAssignmentAliasLikeExpression = getPropertyAssignmentAliasLikeExpression; @@ -15674,7 +15433,7 @@ var ts; } ts.getEffectiveBaseTypeNode = getEffectiveBaseTypeNode; function getClassExtendsHeritageElement(node) { - var heritageClause = getHeritageClause(node.heritageClauses, 90 /* ExtendsKeyword */); + var heritageClause = getHeritageClause(node.heritageClauses, 93 /* ExtendsKeyword */); return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined; } ts.getClassExtendsHeritageElement = getClassExtendsHeritageElement; @@ -15683,7 +15442,7 @@ var ts; return ts.getJSDocImplementsTags(node).map(function (n) { return n.class; }); } else { - var heritageClause = getHeritageClause(node.heritageClauses, 113 /* ImplementsKeyword */); + var heritageClause = getHeritageClause(node.heritageClauses, 116 /* ImplementsKeyword */); return heritageClause === null || heritageClause === void 0 ? void 0 : heritageClause.types; } } @@ -15696,7 +15455,7 @@ var ts; } ts.getAllSuperTypeNodes = getAllSuperTypeNodes; function getInterfaceBaseTypeNodes(node) { - var heritageClause = getHeritageClause(node.heritageClauses, 90 /* ExtendsKeyword */); + var heritageClause = getHeritageClause(node.heritageClauses, 93 /* ExtendsKeyword */); return heritageClause ? heritageClause.types : undefined; } ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes; @@ -15723,11 +15482,11 @@ var ts; } ts.getAncestor = getAncestor; function isKeyword(token) { - return 77 /* FirstKeyword */ <= token && token <= 152 /* LastKeyword */; + return 80 /* FirstKeyword */ <= token && token <= 155 /* LastKeyword */; } ts.isKeyword = isKeyword; function isContextualKeyword(token) { - return 122 /* FirstContextualKeyword */ <= token && token <= 152 /* LastContextualKeyword */; + return 125 /* FirstContextualKeyword */ <= token && token <= 155 /* LastContextualKeyword */; } ts.isContextualKeyword = isContextualKeyword; function isNonContextualKeyword(token) { @@ -15735,7 +15494,7 @@ var ts; } ts.isNonContextualKeyword = isNonContextualKeyword; function isFutureReservedKeyword(token) { - return 113 /* FirstFutureReservedWord */ <= token && token <= 121 /* LastFutureReservedWord */; + return 116 /* FirstFutureReservedWord */ <= token && token <= 124 /* LastFutureReservedWord */; } ts.isFutureReservedKeyword = isFutureReservedKeyword; function isStringANonContextualKeyword(name) { @@ -15771,15 +15530,15 @@ var ts; } var flags = 0 /* Normal */; switch (node.kind) { - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 161 /* MethodDeclaration */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 164 /* MethodDeclaration */: if (node.asteriskToken) { flags |= 1 /* Generator */; } // falls through - case 202 /* ArrowFunction */: - if (hasModifier(node, 256 /* Async */)) { + case 206 /* ArrowFunction */: + if (hasSyntacticModifier(node, 256 /* Async */)) { flags |= 2 /* Async */; } break; @@ -15792,13 +15551,13 @@ var ts; ts.getFunctionFlags = getFunctionFlags; function isAsyncFunction(node) { switch (node.kind) { - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: - case 161 /* MethodDeclaration */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 164 /* MethodDeclaration */: return node.body !== undefined && node.asteriskToken === undefined - && hasModifier(node, 256 /* Async */); + && hasSyntacticModifier(node, 256 /* Async */); } return false; } @@ -15828,7 +15587,7 @@ var ts; } ts.hasDynamicName = hasDynamicName; function isDynamicName(name) { - if (!(name.kind === 154 /* ComputedPropertyName */ || name.kind === 195 /* ElementAccessExpression */)) { + if (!(name.kind === 157 /* ComputedPropertyName */ || name.kind === 199 /* ElementAccessExpression */)) { return false; } var expr = ts.isElementAccessExpression(name) ? skipParentheses(name.argumentExpression) : name.expression; @@ -15848,13 +15607,13 @@ var ts; ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically; function getPropertyNameForPropertyNameNode(name) { switch (name.kind) { - case 75 /* Identifier */: - case 76 /* PrivateIdentifier */: + case 78 /* Identifier */: + case 79 /* PrivateIdentifier */: return name.escapedText; case 10 /* StringLiteral */: case 8 /* NumericLiteral */: return ts.escapeLeadingUnderscores(name.text); - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: var nameExpression = name.expression; if (isWellKnownSymbolSyntactically(nameExpression)) { return getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name)); @@ -15862,6 +15621,12 @@ var ts; else if (isStringOrNumericLiteralLike(nameExpression)) { return ts.escapeLeadingUnderscores(nameExpression.text); } + else if (isSignedNumericLiteral(nameExpression)) { + if (nameExpression.operator === 40 /* MinusToken */) { + return ts.tokenToString(nameExpression.operator) + nameExpression.operand.text; + } + return nameExpression.operand.text; + } return undefined; default: return ts.Debug.assertNever(name); @@ -15870,7 +15635,7 @@ var ts; ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode; function isPropertyNameLiteral(node) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: case 10 /* StringLiteral */: case 14 /* NoSubstitutionTemplateLiteral */: case 8 /* NumericLiteral */: @@ -15908,7 +15673,7 @@ var ts; * Includes the word "Symbol" with unicode escapes */ function isESSymbolIdentifier(node) { - return node.kind === 75 /* Identifier */ && node.escapedText === "Symbol"; + return node.kind === 78 /* Identifier */ && node.escapedText === "Symbol"; } ts.isESSymbolIdentifier = isESSymbolIdentifier; function isPushOrUnshiftIdentifier(node) { @@ -15917,11 +15682,11 @@ var ts; ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier; function isParameterDeclaration(node) { var root = getRootDeclaration(node); - return root.kind === 156 /* Parameter */; + return root.kind === 159 /* Parameter */; } ts.isParameterDeclaration = isParameterDeclaration; function getRootDeclaration(node) { - while (node.kind === 191 /* BindingElement */) { + while (node.kind === 195 /* BindingElement */) { node = node.parent.parent; } return node; @@ -15929,15 +15694,15 @@ var ts; ts.getRootDeclaration = getRootDeclaration; function nodeStartsNewLexicalEnvironment(node) { var kind = node.kind; - return kind === 162 /* Constructor */ - || kind === 201 /* FunctionExpression */ - || kind === 244 /* FunctionDeclaration */ - || kind === 202 /* ArrowFunction */ - || kind === 161 /* MethodDeclaration */ - || kind === 163 /* GetAccessor */ - || kind === 164 /* SetAccessor */ - || kind === 249 /* ModuleDeclaration */ - || kind === 290 /* SourceFile */; + return kind === 165 /* Constructor */ + || kind === 205 /* FunctionExpression */ + || kind === 248 /* FunctionDeclaration */ + || kind === 206 /* ArrowFunction */ + || kind === 164 /* MethodDeclaration */ + || kind === 166 /* GetAccessor */ + || kind === 167 /* SetAccessor */ + || kind === 253 /* ModuleDeclaration */ + || kind === 294 /* SourceFile */; } ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment; function nodeIsSynthesized(range) { @@ -15956,23 +15721,23 @@ var ts; })(Associativity = ts.Associativity || (ts.Associativity = {})); function getExpressionAssociativity(expression) { var operator = getOperator(expression); - var hasArguments = expression.kind === 197 /* NewExpression */ && expression.arguments !== undefined; + var hasArguments = expression.kind === 201 /* NewExpression */ && expression.arguments !== undefined; return getOperatorAssociativity(expression.kind, operator, hasArguments); } ts.getExpressionAssociativity = getExpressionAssociativity; function getOperatorAssociativity(kind, operator, hasArguments) { switch (kind) { - case 197 /* NewExpression */: + case 201 /* NewExpression */: return hasArguments ? 0 /* Left */ : 1 /* Right */; - case 207 /* PrefixUnaryExpression */: - case 204 /* TypeOfExpression */: - case 205 /* VoidExpression */: - case 203 /* DeleteExpression */: - case 206 /* AwaitExpression */: - case 210 /* ConditionalExpression */: - case 212 /* YieldExpression */: + case 211 /* PrefixUnaryExpression */: + case 208 /* TypeOfExpression */: + case 209 /* VoidExpression */: + case 207 /* DeleteExpression */: + case 210 /* AwaitExpression */: + case 214 /* ConditionalExpression */: + case 216 /* YieldExpression */: return 1 /* Right */; - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: switch (operator) { case 42 /* AsteriskAsteriskToken */: case 62 /* EqualsToken */: @@ -15986,8 +15751,11 @@ var ts; case 70 /* GreaterThanGreaterThanEqualsToken */: case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */: case 72 /* AmpersandEqualsToken */: - case 74 /* CaretEqualsToken */: + case 77 /* CaretEqualsToken */: case 73 /* BarEqualsToken */: + case 74 /* BarBarEqualsToken */: + case 75 /* AmpersandAmpersandEqualsToken */: + case 76 /* QuestionQuestionEqualsToken */: return 1 /* Right */; } } @@ -15996,15 +15764,15 @@ var ts; ts.getOperatorAssociativity = getOperatorAssociativity; function getExpressionPrecedence(expression) { var operator = getOperator(expression); - var hasArguments = expression.kind === 197 /* NewExpression */ && expression.arguments !== undefined; + var hasArguments = expression.kind === 201 /* NewExpression */ && expression.arguments !== undefined; return getOperatorPrecedence(expression.kind, operator, hasArguments); } ts.getExpressionPrecedence = getExpressionPrecedence; function getOperator(expression) { - if (expression.kind === 209 /* BinaryExpression */) { + if (expression.kind === 213 /* BinaryExpression */) { return expression.operatorToken.kind; } - else if (expression.kind === 207 /* PrefixUnaryExpression */ || expression.kind === 208 /* PostfixUnaryExpression */) { + else if (expression.kind === 211 /* PrefixUnaryExpression */ || expression.kind === 212 /* PostfixUnaryExpression */) { return expression.operator; } else { @@ -16012,20 +15780,189 @@ var ts; } } ts.getOperator = getOperator; + var OperatorPrecedence; + (function (OperatorPrecedence) { + // Expression: + // AssignmentExpression + // Expression `,` AssignmentExpression + OperatorPrecedence[OperatorPrecedence["Comma"] = 0] = "Comma"; + // NOTE: `Spread` is higher than `Comma` due to how it is parsed in |ElementList| + // SpreadElement: + // `...` AssignmentExpression + OperatorPrecedence[OperatorPrecedence["Spread"] = 1] = "Spread"; + // AssignmentExpression: + // ConditionalExpression + // YieldExpression + // ArrowFunction + // AsyncArrowFunction + // LeftHandSideExpression `=` AssignmentExpression + // LeftHandSideExpression AssignmentOperator AssignmentExpression + // + // NOTE: AssignmentExpression is broken down into several precedences due to the requirements + // of the parenthesizer rules. + // AssignmentExpression: YieldExpression + // YieldExpression: + // `yield` + // `yield` AssignmentExpression + // `yield` `*` AssignmentExpression + OperatorPrecedence[OperatorPrecedence["Yield"] = 2] = "Yield"; + // AssignmentExpression: LeftHandSideExpression `=` AssignmentExpression + // AssignmentExpression: LeftHandSideExpression AssignmentOperator AssignmentExpression + // AssignmentOperator: one of + // `*=` `/=` `%=` `+=` `-=` `<<=` `>>=` `>>>=` `&=` `^=` `|=` `**=` + OperatorPrecedence[OperatorPrecedence["Assignment"] = 3] = "Assignment"; + // NOTE: `Conditional` is considered higher than `Assignment` here, but in reality they have + // the same precedence. + // AssignmentExpression: ConditionalExpression + // ConditionalExpression: + // ShortCircuitExpression + // ShortCircuitExpression `?` AssignmentExpression `:` AssignmentExpression + // ShortCircuitExpression: + // LogicalORExpression + // CoalesceExpression + OperatorPrecedence[OperatorPrecedence["Conditional"] = 4] = "Conditional"; + // CoalesceExpression: + // CoalesceExpressionHead `??` BitwiseORExpression + // CoalesceExpressionHead: + // CoalesceExpression + // BitwiseORExpression + OperatorPrecedence[OperatorPrecedence["Coalesce"] = 4] = "Coalesce"; + // LogicalORExpression: + // LogicalANDExpression + // LogicalORExpression `||` LogicalANDExpression + OperatorPrecedence[OperatorPrecedence["LogicalOR"] = 5] = "LogicalOR"; + // LogicalANDExpression: + // BitwiseORExpression + // LogicalANDExprerssion `&&` BitwiseORExpression + OperatorPrecedence[OperatorPrecedence["LogicalAND"] = 6] = "LogicalAND"; + // BitwiseORExpression: + // BitwiseXORExpression + // BitwiseORExpression `^` BitwiseXORExpression + OperatorPrecedence[OperatorPrecedence["BitwiseOR"] = 7] = "BitwiseOR"; + // BitwiseXORExpression: + // BitwiseANDExpression + // BitwiseXORExpression `^` BitwiseANDExpression + OperatorPrecedence[OperatorPrecedence["BitwiseXOR"] = 8] = "BitwiseXOR"; + // BitwiseANDExpression: + // EqualityExpression + // BitwiseANDExpression `^` EqualityExpression + OperatorPrecedence[OperatorPrecedence["BitwiseAND"] = 9] = "BitwiseAND"; + // EqualityExpression: + // RelationalExpression + // EqualityExpression `==` RelationalExpression + // EqualityExpression `!=` RelationalExpression + // EqualityExpression `===` RelationalExpression + // EqualityExpression `!==` RelationalExpression + OperatorPrecedence[OperatorPrecedence["Equality"] = 10] = "Equality"; + // RelationalExpression: + // ShiftExpression + // RelationalExpression `<` ShiftExpression + // RelationalExpression `>` ShiftExpression + // RelationalExpression `<=` ShiftExpression + // RelationalExpression `>=` ShiftExpression + // RelationalExpression `instanceof` ShiftExpression + // RelationalExpression `in` ShiftExpression + // [+TypeScript] RelationalExpression `as` Type + OperatorPrecedence[OperatorPrecedence["Relational"] = 11] = "Relational"; + // ShiftExpression: + // AdditiveExpression + // ShiftExpression `<<` AdditiveExpression + // ShiftExpression `>>` AdditiveExpression + // ShiftExpression `>>>` AdditiveExpression + OperatorPrecedence[OperatorPrecedence["Shift"] = 12] = "Shift"; + // AdditiveExpression: + // MultiplicativeExpression + // AdditiveExpression `+` MultiplicativeExpression + // AdditiveExpression `-` MultiplicativeExpression + OperatorPrecedence[OperatorPrecedence["Additive"] = 13] = "Additive"; + // MultiplicativeExpression: + // ExponentiationExpression + // MultiplicativeExpression MultiplicativeOperator ExponentiationExpression + // MultiplicativeOperator: one of `*`, `/`, `%` + OperatorPrecedence[OperatorPrecedence["Multiplicative"] = 14] = "Multiplicative"; + // ExponentiationExpression: + // UnaryExpression + // UpdateExpression `**` ExponentiationExpression + OperatorPrecedence[OperatorPrecedence["Exponentiation"] = 15] = "Exponentiation"; + // UnaryExpression: + // UpdateExpression + // `delete` UnaryExpression + // `void` UnaryExpression + // `typeof` UnaryExpression + // `+` UnaryExpression + // `-` UnaryExpression + // `~` UnaryExpression + // `!` UnaryExpression + // AwaitExpression + // UpdateExpression: // TODO: Do we need to investigate the precedence here? + // `++` UnaryExpression + // `--` UnaryExpression + OperatorPrecedence[OperatorPrecedence["Unary"] = 16] = "Unary"; + // UpdateExpression: + // LeftHandSideExpression + // LeftHandSideExpression `++` + // LeftHandSideExpression `--` + OperatorPrecedence[OperatorPrecedence["Update"] = 17] = "Update"; + // LeftHandSideExpression: + // NewExpression + // CallExpression + // NewExpression: + // MemberExpression + // `new` NewExpression + OperatorPrecedence[OperatorPrecedence["LeftHandSide"] = 18] = "LeftHandSide"; + // CallExpression: + // CoverCallExpressionAndAsyncArrowHead + // SuperCall + // ImportCall + // CallExpression Arguments + // CallExpression `[` Expression `]` + // CallExpression `.` IdentifierName + // CallExpression TemplateLiteral + // MemberExpression: + // PrimaryExpression + // MemberExpression `[` Expression `]` + // MemberExpression `.` IdentifierName + // MemberExpression TemplateLiteral + // SuperProperty + // MetaProperty + // `new` MemberExpression Arguments + OperatorPrecedence[OperatorPrecedence["Member"] = 19] = "Member"; + // TODO: JSXElement? + // PrimaryExpression: + // `this` + // IdentifierReference + // Literal + // ArrayLiteral + // ObjectLiteral + // FunctionExpression + // ClassExpression + // GeneratorExpression + // AsyncFunctionExpression + // AsyncGeneratorExpression + // RegularExpressionLiteral + // TemplateLiteral + // CoverParenthesizedExpressionAndArrowParameterList + OperatorPrecedence[OperatorPrecedence["Primary"] = 20] = "Primary"; + OperatorPrecedence[OperatorPrecedence["Highest"] = 20] = "Highest"; + OperatorPrecedence[OperatorPrecedence["Lowest"] = 0] = "Lowest"; + // -1 is lower than all other precedences. Returning it will cause binary expression + // parsing to stop. + OperatorPrecedence[OperatorPrecedence["Invalid"] = -1] = "Invalid"; + })(OperatorPrecedence = ts.OperatorPrecedence || (ts.OperatorPrecedence = {})); function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) { switch (nodeKind) { - case 327 /* CommaListExpression */: - return 0; - case 213 /* SpreadElement */: - return 1; - case 212 /* YieldExpression */: - return 2; - case 210 /* ConditionalExpression */: - return 4; - case 209 /* BinaryExpression */: + case 332 /* CommaListExpression */: + return 0 /* Comma */; + case 217 /* SpreadElement */: + return 1 /* Spread */; + case 216 /* YieldExpression */: + return 2 /* Yield */; + case 214 /* ConditionalExpression */: + return 4 /* Conditional */; + case 213 /* BinaryExpression */: switch (operatorKind) { case 27 /* CommaToken */: - return 0; + return 0 /* Comma */; case 62 /* EqualsToken */: case 63 /* PlusEqualsToken */: case 64 /* MinusEqualsToken */: @@ -16037,96 +15974,101 @@ var ts; case 70 /* GreaterThanGreaterThanEqualsToken */: case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */: case 72 /* AmpersandEqualsToken */: - case 74 /* CaretEqualsToken */: + case 77 /* CaretEqualsToken */: case 73 /* BarEqualsToken */: - return 3; + case 74 /* BarBarEqualsToken */: + case 75 /* AmpersandAmpersandEqualsToken */: + case 76 /* QuestionQuestionEqualsToken */: + return 3 /* Assignment */; default: return getBinaryOperatorPrecedence(operatorKind); } - case 207 /* PrefixUnaryExpression */: - case 204 /* TypeOfExpression */: - case 205 /* VoidExpression */: - case 203 /* DeleteExpression */: - case 206 /* AwaitExpression */: - return 16; - case 208 /* PostfixUnaryExpression */: - return 17; - case 196 /* CallExpression */: - return 18; - case 197 /* NewExpression */: - return hasArguments ? 19 : 18; - case 198 /* TaggedTemplateExpression */: - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: - return 19; - case 104 /* ThisKeyword */: - case 102 /* SuperKeyword */: - case 75 /* Identifier */: - case 100 /* NullKeyword */: - case 106 /* TrueKeyword */: - case 91 /* FalseKeyword */: + // TODO: Should prefix `++` and `--` be moved to the `Update` precedence? + // TODO: We are missing `TypeAssertionExpression` + case 211 /* PrefixUnaryExpression */: + case 208 /* TypeOfExpression */: + case 209 /* VoidExpression */: + case 207 /* DeleteExpression */: + case 210 /* AwaitExpression */: + return 16 /* Unary */; + case 212 /* PostfixUnaryExpression */: + return 17 /* Update */; + case 200 /* CallExpression */: + return 18 /* LeftHandSide */; + case 201 /* NewExpression */: + return hasArguments ? 19 /* Member */ : 18 /* LeftHandSide */; + case 202 /* TaggedTemplateExpression */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: + return 19 /* Member */; + case 107 /* ThisKeyword */: + case 105 /* SuperKeyword */: + case 78 /* Identifier */: + case 103 /* NullKeyword */: + case 109 /* TrueKeyword */: + case 94 /* FalseKeyword */: case 8 /* NumericLiteral */: case 9 /* BigIntLiteral */: case 10 /* StringLiteral */: - case 192 /* ArrayLiteralExpression */: - case 193 /* ObjectLiteralExpression */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: - case 214 /* ClassExpression */: - case 266 /* JsxElement */: - case 267 /* JsxSelfClosingElement */: - case 270 /* JsxFragment */: + case 196 /* ArrayLiteralExpression */: + case 197 /* ObjectLiteralExpression */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 218 /* ClassExpression */: case 13 /* RegularExpressionLiteral */: case 14 /* NoSubstitutionTemplateLiteral */: - case 211 /* TemplateExpression */: - case 200 /* ParenthesizedExpression */: - case 215 /* OmittedExpression */: - return 20; + case 215 /* TemplateExpression */: + case 204 /* ParenthesizedExpression */: + case 219 /* OmittedExpression */: + case 270 /* JsxElement */: + case 271 /* JsxSelfClosingElement */: + case 274 /* JsxFragment */: + return 20 /* Primary */; default: - return -1; + return -1 /* Invalid */; } } ts.getOperatorPrecedence = getOperatorPrecedence; function getBinaryOperatorPrecedence(kind) { switch (kind) { case 60 /* QuestionQuestionToken */: - return 4; + return 4 /* Coalesce */; case 56 /* BarBarToken */: - return 5; + return 5 /* LogicalOR */; case 55 /* AmpersandAmpersandToken */: - return 6; + return 6 /* LogicalAND */; case 51 /* BarToken */: - return 7; + return 7 /* BitwiseOR */; case 52 /* CaretToken */: - return 8; + return 8 /* BitwiseXOR */; case 50 /* AmpersandToken */: - return 9; + return 9 /* BitwiseAND */; case 34 /* EqualsEqualsToken */: case 35 /* ExclamationEqualsToken */: case 36 /* EqualsEqualsEqualsToken */: case 37 /* ExclamationEqualsEqualsToken */: - return 10; + return 10 /* Equality */; case 29 /* LessThanToken */: case 31 /* GreaterThanToken */: case 32 /* LessThanEqualsToken */: case 33 /* GreaterThanEqualsToken */: - case 98 /* InstanceOfKeyword */: - case 97 /* InKeyword */: - case 123 /* AsKeyword */: - return 11; + case 101 /* InstanceOfKeyword */: + case 100 /* InKeyword */: + case 126 /* AsKeyword */: + return 11 /* Relational */; case 47 /* LessThanLessThanToken */: case 48 /* GreaterThanGreaterThanToken */: case 49 /* GreaterThanGreaterThanGreaterThanToken */: - return 12; + return 12 /* Shift */; case 39 /* PlusToken */: case 40 /* MinusToken */: - return 13; + return 13 /* Additive */; case 41 /* AsteriskToken */: case 43 /* SlashToken */: case 44 /* PercentToken */: - return 14; + return 14 /* Multiplicative */; case 42 /* AsteriskAsteriskToken */: - return 15; + return 15 /* Exponentiation */; } // -1 is lower than all other precedences. Returning it will cause binary expression // parsing to stop. @@ -16136,7 +16078,7 @@ var ts; function createDiagnosticCollection() { var nonFileDiagnostics = []; // See GH#19873 var filesWithDiagnostics = []; - var fileDiagnostics = ts.createMap(); + var fileDiagnostics = new ts.Map(); var hasReadNonFileDiagnostics = false; return { add: add, @@ -16222,7 +16164,7 @@ var ts; var singleQuoteEscapedCharsRegExp = /[\\\'\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g; // Template strings should be preserved as much as possible var backtickQuoteEscapedCharsRegExp = /[\\`]/g; - var escapedCharsMap = ts.createMapFromTemplate({ + var escapedCharsMap = new ts.Map(ts.getEntries({ "\t": "\\t", "\v": "\\v", "\f": "\\f", @@ -16236,7 +16178,7 @@ var ts; "\u2028": "\\u2028", "\u2029": "\\u2029", "\u0085": "\\u0085" // nextLine - }); + })); function encodeUtf16EscapeSequence(charCode) { var hexCharCode = charCode.toString(16).toUpperCase(); var paddedHexCode = ("0000" + hexCharCode).slice(-4); @@ -16282,10 +16224,10 @@ var ts; // the map below must be updated. var jsxDoubleQuoteEscapedCharsRegExp = /[\"\u0000-\u001f\u2028\u2029\u0085]/g; var jsxSingleQuoteEscapedCharsRegExp = /[\'\u0000-\u001f\u2028\u2029\u0085]/g; - var jsxEscapedCharsMap = ts.createMapFromTemplate({ + var jsxEscapedCharsMap = new ts.Map(ts.getEntries({ "\"": """, "\'": "'" - }); + })); function encodeJsxCharacterEntity(charCode) { var hexCharCode = charCode.toString(16).toUpperCase(); return "&#x" + hexCharCode + ";"; @@ -16563,6 +16505,10 @@ var ts; return removeFileExtension(path) + ".d.ts" /* Dts */; } ts.getDeclarationEmitOutputFilePathWorker = getDeclarationEmitOutputFilePathWorker; + function outFile(options) { + return options.outFile || options.out; + } + ts.outFile = outFile; /** * Gets the source files that are expected to have an emit output. * @@ -16574,7 +16520,7 @@ var ts; */ function getSourceFilesToEmit(host, targetSourceFile, forceDtsEmit) { var options = host.getCompilerOptions(); - if (options.outFile || options.out) { + if (outFile(options)) { var moduleKind = getEmitModuleKind(options); var moduleEmitEnabled_1 = options.emitDeclarationOnly || moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System; // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified @@ -16676,11 +16622,11 @@ var ts; } ts.parameterIsThisKeyword = parameterIsThisKeyword; function isThisIdentifier(node) { - return !!node && node.kind === 75 /* Identifier */ && identifierIsThisKeyword(node); + return !!node && node.kind === 78 /* Identifier */ && identifierIsThisKeyword(node); } ts.isThisIdentifier = isThisIdentifier; function identifierIsThisKeyword(id) { - return id.originalKeywordKind === 104 /* ThisKeyword */; + return id.originalKeywordKind === 107 /* ThisKeyword */; } ts.identifierIsThisKeyword = identifierIsThisKeyword; function getAllAccessorDeclarations(declarations, accessor) { @@ -16691,10 +16637,10 @@ var ts; var setAccessor; if (hasDynamicName(accessor)) { firstAccessor = accessor; - if (accessor.kind === 163 /* GetAccessor */) { + if (accessor.kind === 166 /* GetAccessor */) { getAccessor = accessor; } - else if (accessor.kind === 164 /* SetAccessor */) { + else if (accessor.kind === 167 /* SetAccessor */) { setAccessor = accessor; } else { @@ -16704,7 +16650,7 @@ var ts; else { ts.forEach(declarations, function (member) { if (ts.isAccessor(member) - && hasModifier(member, 32 /* Static */) === hasModifier(accessor, 32 /* Static */)) { + && hasSyntacticModifier(member, 32 /* Static */) === hasSyntacticModifier(accessor, 32 /* Static */)) { var memberName = getPropertyNameForPropertyNameNode(member.name); var accessorName = getPropertyNameForPropertyNameNode(accessor.name); if (memberName === accessorName) { @@ -16714,12 +16660,10 @@ var ts; else if (!secondAccessor) { secondAccessor = member; } - if (member.kind === 163 /* GetAccessor */ && !getAccessor) { - // eslint-disable-next-line + if (member.kind === 166 /* GetAccessor */ && !getAccessor) { getAccessor = member; } - if (member.kind === 164 /* SetAccessor */ && !setAccessor) { - // eslint-disable-next-line + if (member.kind === 167 /* SetAccessor */ && !setAccessor) { setAccessor = member; } } @@ -16768,7 +16712,7 @@ var ts; ts.getJSDocTypeParameterDeclarations = getJSDocTypeParameterDeclarations; /** template tags are only available when a typedef isn't already using them */ function isNonTypeAliasTemplate(tag) { - return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 303 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias)); + return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 307 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias)); } /** * Gets the effective type annotation of the value parameter of a set accessor. If the node @@ -16971,74 +16915,136 @@ var ts; } return currentLineIndent; } - function hasModifiers(node) { - return getModifierFlags(node) !== 0 /* None */; + function hasEffectiveModifiers(node) { + return getEffectiveModifierFlags(node) !== 0 /* None */; } - ts.hasModifiers = hasModifiers; - function hasModifier(node, flags) { - return !!getSelectedModifierFlags(node, flags); + ts.hasEffectiveModifiers = hasEffectiveModifiers; + function hasSyntacticModifiers(node) { + return getSyntacticModifierFlags(node) !== 0 /* None */; } - ts.hasModifier = hasModifier; + ts.hasSyntacticModifiers = hasSyntacticModifiers; + function hasEffectiveModifier(node, flags) { + return !!getSelectedEffectiveModifierFlags(node, flags); + } + ts.hasEffectiveModifier = hasEffectiveModifier; + function hasSyntacticModifier(node, flags) { + return !!getSelectedSyntacticModifierFlags(node, flags); + } + ts.hasSyntacticModifier = hasSyntacticModifier; function hasStaticModifier(node) { - return hasModifier(node, 32 /* Static */); + return hasSyntacticModifier(node, 32 /* Static */); } ts.hasStaticModifier = hasStaticModifier; - function hasReadonlyModifier(node) { - return hasModifier(node, 64 /* Readonly */); + function hasEffectiveReadonlyModifier(node) { + return hasEffectiveModifier(node, 64 /* Readonly */); } - ts.hasReadonlyModifier = hasReadonlyModifier; - function getSelectedModifierFlags(node, flags) { - return getModifierFlags(node) & flags; + ts.hasEffectiveReadonlyModifier = hasEffectiveReadonlyModifier; + function getSelectedEffectiveModifierFlags(node, flags) { + return getEffectiveModifierFlags(node) & flags; } - ts.getSelectedModifierFlags = getSelectedModifierFlags; - function getModifierFlags(node) { - if (node.kind >= 0 /* FirstToken */ && node.kind <= 152 /* LastToken */) { + ts.getSelectedEffectiveModifierFlags = getSelectedEffectiveModifierFlags; + function getSelectedSyntacticModifierFlags(node, flags) { + return getSyntacticModifierFlags(node) & flags; + } + ts.getSelectedSyntacticModifierFlags = getSelectedSyntacticModifierFlags; + function getModifierFlagsWorker(node, includeJSDoc, alwaysIncludeJSDoc) { + if (node.kind >= 0 /* FirstToken */ && node.kind <= 155 /* LastToken */) { return 0 /* None */; } - if (node.modifierFlagsCache & 536870912 /* HasComputedFlags */) { - return node.modifierFlagsCache & ~536870912 /* HasComputedFlags */; + if (!(node.modifierFlagsCache & 536870912 /* HasComputedFlags */)) { + node.modifierFlagsCache = getSyntacticModifierFlagsNoCache(node) | 536870912 /* HasComputedFlags */; + } + if (includeJSDoc && !(node.modifierFlagsCache & 4096 /* HasComputedJSDocModifiers */) && (alwaysIncludeJSDoc || isInJSFile(node)) && node.parent) { + node.modifierFlagsCache |= getJSDocModifierFlagsNoCache(node) | 4096 /* HasComputedJSDocModifiers */; + } + return node.modifierFlagsCache & ~(536870912 /* HasComputedFlags */ | 4096 /* HasComputedJSDocModifiers */); + } + /** + * Gets the effective ModifierFlags for the provided node, including JSDoc modifiers. The modifiers will be cached on the node to improve performance. + * + * NOTE: This function may use `parent` pointers. + */ + function getEffectiveModifierFlags(node) { + return getModifierFlagsWorker(node, /*includeJSDoc*/ true); + } + ts.getEffectiveModifierFlags = getEffectiveModifierFlags; + function getEffectiveModifierFlagsAlwaysIncludeJSDoc(node) { + return getModifierFlagsWorker(node, /*includeJSDOc*/ true, /*alwaysIncludeJSDOc*/ true); + } + ts.getEffectiveModifierFlagsAlwaysIncludeJSDoc = getEffectiveModifierFlagsAlwaysIncludeJSDoc; + /** + * Gets the ModifierFlags for syntactic modifiers on the provided node. The modifiers will be cached on the node to improve performance. + * + * NOTE: This function does not use `parent` pointers and will not include modifiers from JSDoc. + */ + function getSyntacticModifierFlags(node) { + return getModifierFlagsWorker(node, /*includeJSDoc*/ false); + } + ts.getSyntacticModifierFlags = getSyntacticModifierFlags; + function getJSDocModifierFlagsNoCache(node) { + var flags = 0 /* None */; + if (!!node.parent && !ts.isParameter(node)) { + if (isInJSFile(node)) { + if (ts.getJSDocPublicTagNoCache(node)) + flags |= 4 /* Public */; + if (ts.getJSDocPrivateTagNoCache(node)) + flags |= 8 /* Private */; + if (ts.getJSDocProtectedTagNoCache(node)) + flags |= 16 /* Protected */; + if (ts.getJSDocReadonlyTagNoCache(node)) + flags |= 64 /* Readonly */; + } + if (ts.getJSDocDeprecatedTagNoCache(node)) + flags |= 8192 /* Deprecated */; } - var flags = getModifierFlagsNoCache(node); - node.modifierFlagsCache = flags | 536870912 /* HasComputedFlags */; return flags; } - ts.getModifierFlags = getModifierFlags; - function getModifierFlagsNoCache(node) { - var flags = 0 /* None */; - if (node.modifiers) { - for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) { - var modifier = _a[_i]; - flags |= modifierToFlag(modifier.kind); - } - } - if (isInJSFile(node) && !!node.parent) { - // getModifierFlagsNoCache should only be called when parent pointers are set, - // or when !(node.flags & NodeFlags.Synthesized) && node.kind !== SyntaxKind.SourceFile) - var tags = (ts.getJSDocPublicTag(node) ? 4 /* Public */ : 0 /* None */) - | (ts.getJSDocPrivateTag(node) ? 8 /* Private */ : 0 /* None */) - | (ts.getJSDocProtectedTag(node) ? 16 /* Protected */ : 0 /* None */) - | (ts.getJSDocReadonlyTag(node) ? 64 /* Readonly */ : 0 /* None */); - flags |= tags; - } - if (node.flags & 4 /* NestedNamespace */ || (node.kind === 75 /* Identifier */ && node.isInJSDocNamespace)) { + /** + * Gets the effective ModifierFlags for the provided node, including JSDoc modifiers. The modifier flags cache on the node is ignored. + * + * NOTE: This function may use `parent` pointers. + */ + function getEffectiveModifierFlagsNoCache(node) { + return getSyntacticModifierFlagsNoCache(node) | getJSDocModifierFlagsNoCache(node); + } + ts.getEffectiveModifierFlagsNoCache = getEffectiveModifierFlagsNoCache; + /** + * Gets the ModifierFlags for syntactic modifiers on the provided node. The modifier flags cache on the node is ignored. + * + * NOTE: This function does not use `parent` pointers and will not include modifiers from JSDoc. + */ + function getSyntacticModifierFlagsNoCache(node) { + var flags = modifiersToFlags(node.modifiers); + if (node.flags & 4 /* NestedNamespace */ || (node.kind === 78 /* Identifier */ && node.isInJSDocNamespace)) { flags |= 1 /* Export */; } return flags; } - ts.getModifierFlagsNoCache = getModifierFlagsNoCache; + ts.getSyntacticModifierFlagsNoCache = getSyntacticModifierFlagsNoCache; + function modifiersToFlags(modifiers) { + var flags = 0 /* None */; + if (modifiers) { + for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) { + var modifier = modifiers_1[_i]; + flags |= modifierToFlag(modifier.kind); + } + } + return flags; + } + ts.modifiersToFlags = modifiersToFlags; function modifierToFlag(token) { switch (token) { - case 120 /* StaticKeyword */: return 32 /* Static */; - case 119 /* PublicKeyword */: return 4 /* Public */; - case 118 /* ProtectedKeyword */: return 16 /* Protected */; - case 117 /* PrivateKeyword */: return 8 /* Private */; - case 122 /* AbstractKeyword */: return 128 /* Abstract */; - case 89 /* ExportKeyword */: return 1 /* Export */; - case 130 /* DeclareKeyword */: return 2 /* Ambient */; - case 81 /* ConstKeyword */: return 2048 /* Const */; - case 84 /* DefaultKeyword */: return 512 /* Default */; - case 126 /* AsyncKeyword */: return 256 /* Async */; - case 138 /* ReadonlyKeyword */: return 64 /* Readonly */; + case 123 /* StaticKeyword */: return 32 /* Static */; + case 122 /* PublicKeyword */: return 4 /* Public */; + case 121 /* ProtectedKeyword */: return 16 /* Protected */; + case 120 /* PrivateKeyword */: return 8 /* Private */; + case 125 /* AbstractKeyword */: return 128 /* Abstract */; + case 92 /* ExportKeyword */: return 1 /* Export */; + case 133 /* DeclareKeyword */: return 2 /* Ambient */; + case 84 /* ConstKeyword */: return 2048 /* Const */; + case 87 /* DefaultKeyword */: return 512 /* Default */; + case 129 /* AsyncKeyword */: return 256 /* Async */; + case 141 /* ReadonlyKeyword */: return 64 /* Readonly */; } return 0 /* None */; } @@ -17049,8 +17055,18 @@ var ts; || token === 53 /* ExclamationToken */; } ts.isLogicalOperator = isLogicalOperator; + function isLogicalOrCoalescingAssignmentOperator(token) { + return token === 74 /* BarBarEqualsToken */ + || token === 75 /* AmpersandAmpersandEqualsToken */ + || token === 76 /* QuestionQuestionEqualsToken */; + } + ts.isLogicalOrCoalescingAssignmentOperator = isLogicalOrCoalescingAssignmentOperator; + function isLogicalOrCoalescingAssignmentExpression(expr) { + return isLogicalOrCoalescingAssignmentOperator(expr.operatorToken.kind); + } + ts.isLogicalOrCoalescingAssignmentExpression = isLogicalOrCoalescingAssignmentExpression; function isAssignmentOperator(token) { - return token >= 62 /* FirstAssignment */ && token <= 74 /* LastAssignment */; + return token >= 62 /* FirstAssignment */ && token <= 77 /* LastAssignment */; } ts.isAssignmentOperator = isAssignmentOperator; /** Get `C` given `N` if `N` is in the position `class C extends N` where `N` is an ExpressionWithTypeArguments. */ @@ -17063,7 +17079,7 @@ var ts; return ts.isExpressionWithTypeArguments(node) && ts.isHeritageClause(node.parent) && ts.isClassLike(node.parent.parent) - ? { class: node.parent.parent, isImplements: node.parent.token === 113 /* ImplementsKeyword */ } + ? { class: node.parent.parent, isImplements: node.parent.token === 116 /* ImplementsKeyword */ } : undefined; } ts.tryGetClassImplementingOrExtendingExpressionWithTypeArguments = tryGetClassImplementingOrExtendingExpressionWithTypeArguments; @@ -17078,8 +17094,8 @@ var ts; function isDestructuringAssignment(node) { if (isAssignmentExpression(node, /*excludeCompoundAssignment*/ true)) { var kind = node.left.kind; - return kind === 193 /* ObjectLiteralExpression */ - || kind === 192 /* ArrayLiteralExpression */; + return kind === 197 /* ObjectLiteralExpression */ + || kind === 196 /* ArrayLiteralExpression */; } return false; } @@ -17089,30 +17105,30 @@ var ts; } ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause; function isEntityNameExpression(node) { - return node.kind === 75 /* Identifier */ || isPropertyAccessEntityNameExpression(node); + return node.kind === 78 /* Identifier */ || isPropertyAccessEntityNameExpression(node); } ts.isEntityNameExpression = isEntityNameExpression; function getFirstIdentifier(node) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return node; - case 153 /* QualifiedName */: + case 156 /* QualifiedName */: do { node = node.left; - } while (node.kind !== 75 /* Identifier */); + } while (node.kind !== 78 /* Identifier */); return node; - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: do { node = node.expression; - } while (node.kind !== 75 /* Identifier */); + } while (node.kind !== 78 /* Identifier */); return node; } } ts.getFirstIdentifier = getFirstIdentifier; function isDottedName(node) { - return node.kind === 75 /* Identifier */ || node.kind === 104 /* ThisKeyword */ || node.kind === 102 /* SuperKeyword */ || - node.kind === 194 /* PropertyAccessExpression */ && isDottedName(node.expression) || - node.kind === 200 /* ParenthesizedExpression */ && isDottedName(node.expression); + return node.kind === 78 /* Identifier */ || node.kind === 107 /* ThisKeyword */ || node.kind === 105 /* SuperKeyword */ || + node.kind === 198 /* PropertyAccessExpression */ && isDottedName(node.expression) || + node.kind === 204 /* ParenthesizedExpression */ && isDottedName(node.expression); } ts.isDottedName = isDottedName; function isPropertyAccessEntityNameExpression(node) { @@ -17123,7 +17139,7 @@ var ts; if (ts.isPropertyAccessExpression(expr)) { var baseStr = tryGetPropertyAccessOrIdentifierToString(expr.expression); if (baseStr !== undefined) { - return baseStr + "." + expr.name; + return baseStr + "." + entityNameToString(expr.name); } } else if (ts.isIdentifier(expr)) { @@ -17137,26 +17153,33 @@ var ts; } ts.isPrototypeAccess = isPrototypeAccess; function isRightSideOfQualifiedNameOrPropertyAccess(node) { - return (node.parent.kind === 153 /* QualifiedName */ && node.parent.right === node) || - (node.parent.kind === 194 /* PropertyAccessExpression */ && node.parent.name === node); + return (node.parent.kind === 156 /* QualifiedName */ && node.parent.right === node) || + (node.parent.kind === 198 /* PropertyAccessExpression */ && node.parent.name === node); } ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess; function isEmptyObjectLiteral(expression) { - return expression.kind === 193 /* ObjectLiteralExpression */ && + return expression.kind === 197 /* ObjectLiteralExpression */ && expression.properties.length === 0; } ts.isEmptyObjectLiteral = isEmptyObjectLiteral; function isEmptyArrayLiteral(expression) { - return expression.kind === 192 /* ArrayLiteralExpression */ && + return expression.kind === 196 /* ArrayLiteralExpression */ && expression.elements.length === 0; } ts.isEmptyArrayLiteral = isEmptyArrayLiteral; function getLocalSymbolForExportDefault(symbol) { - return isExportDefaultSymbol(symbol) ? symbol.declarations[0].localSymbol : undefined; + if (!isExportDefaultSymbol(symbol)) + return undefined; + for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) { + var decl = _a[_i]; + if (decl.localSymbol) + return decl.localSymbol; + } + return undefined; } ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault; function isExportDefaultSymbol(symbol) { - return symbol && ts.length(symbol.declarations) > 0 && hasModifier(symbol.declarations[0], 512 /* Default */); + return symbol && ts.length(symbol.declarations) > 0 && hasSyntacticModifier(symbol.declarations[0], 512 /* Default */); } /** Return ".ts", ".d.ts", or ".tsx", if that is the extension. */ function tryExtractTSExtension(fileName) { @@ -17472,8 +17495,8 @@ var ts; var parseNode = ts.getParseTreeNode(node); if (parseNode) { switch (parseNode.parent.kind) { - case 248 /* EnumDeclaration */: - case 249 /* ModuleDeclaration */: + case 252 /* EnumDeclaration */: + case 253 /* ModuleDeclaration */: return parseNode === parseNode.parent.name; } } @@ -17550,35 +17573,35 @@ var ts; if (!parent) return 0 /* Read */; switch (parent.kind) { - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return accessKind(parent); - case 208 /* PostfixUnaryExpression */: - case 207 /* PrefixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: var operator = parent.operator; return operator === 45 /* PlusPlusToken */ || operator === 46 /* MinusMinusToken */ ? writeOrReadWrite() : 0 /* Read */; - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: var _a = parent, left = _a.left, operatorToken = _a.operatorToken; return left === node && isAssignmentOperator(operatorToken.kind) ? operatorToken.kind === 62 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite() : 0 /* Read */; - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: return parent.name !== node ? 0 /* Read */ : accessKind(parent); - case 281 /* PropertyAssignment */: { + case 285 /* PropertyAssignment */: { var parentAccess = accessKind(parent.parent); // In `({ x: varname }) = { x: 1 }`, the left `x` is a read, the right `x` is a write. return node === parent.name ? reverseAccessKind(parentAccess) : parentAccess; } - case 282 /* ShorthandPropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: // Assume it's the local variable being accessed, since we don't check public properties for --noUnusedLocals. return node === parent.objectAssignmentInitializer ? 0 /* Read */ : accessKind(parent.parent); - case 192 /* ArrayLiteralExpression */: + case 196 /* ArrayLiteralExpression */: return accessKind(parent); default: return 0 /* Read */; } function writeOrReadWrite() { // If grandparent is not an ExpressionStatement, this is used as an expression in addition to having a side effect. - return parent.parent && skipParenthesesUp(parent.parent).kind === 226 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */; + return parent.parent && skipParenthesesUp(parent.parent).kind === 230 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */; } } function reverseAccessKind(a) { @@ -17665,7 +17688,7 @@ var ts; function isAbstractConstructorSymbol(symbol) { if (symbol.flags & 32 /* Class */) { var declaration = getClassLikeDeclarationOfSymbol(symbol); - return !!declaration && hasModifier(declaration, 128 /* Abstract */); + return !!declaration && hasSyntacticModifier(declaration, 128 /* Abstract */); } return false; } @@ -17727,39 +17750,37 @@ var ts; } ts.isObjectTypeDeclaration = isObjectTypeDeclaration; function isTypeNodeKind(kind) { - return (kind >= 168 /* FirstTypeNode */ && kind <= 188 /* LastTypeNode */) - || kind === 125 /* AnyKeyword */ - || kind === 148 /* UnknownKeyword */ - || kind === 140 /* NumberKeyword */ - || kind === 151 /* BigIntKeyword */ - || kind === 141 /* ObjectKeyword */ - || kind === 128 /* BooleanKeyword */ - || kind === 143 /* StringKeyword */ - || kind === 144 /* SymbolKeyword */ - || kind === 104 /* ThisKeyword */ - || kind === 110 /* VoidKeyword */ - || kind === 146 /* UndefinedKeyword */ - || kind === 100 /* NullKeyword */ - || kind === 137 /* NeverKeyword */ - || kind === 216 /* ExpressionWithTypeArguments */ - || kind === 295 /* JSDocAllType */ - || kind === 296 /* JSDocUnknownType */ - || kind === 297 /* JSDocNullableType */ - || kind === 298 /* JSDocNonNullableType */ - || kind === 299 /* JSDocOptionalType */ - || kind === 300 /* JSDocFunctionType */ - || kind === 301 /* JSDocVariadicType */; + return (kind >= 171 /* FirstTypeNode */ && kind <= 192 /* LastTypeNode */) + || kind === 128 /* AnyKeyword */ + || kind === 151 /* UnknownKeyword */ + || kind === 143 /* NumberKeyword */ + || kind === 154 /* BigIntKeyword */ + || kind === 144 /* ObjectKeyword */ + || kind === 131 /* BooleanKeyword */ + || kind === 146 /* StringKeyword */ + || kind === 147 /* SymbolKeyword */ + || kind === 113 /* VoidKeyword */ + || kind === 149 /* UndefinedKeyword */ + || kind === 140 /* NeverKeyword */ + || kind === 220 /* ExpressionWithTypeArguments */ + || kind === 299 /* JSDocAllType */ + || kind === 300 /* JSDocUnknownType */ + || kind === 301 /* JSDocNullableType */ + || kind === 302 /* JSDocNonNullableType */ + || kind === 303 /* JSDocOptionalType */ + || kind === 304 /* JSDocFunctionType */ + || kind === 305 /* JSDocVariadicType */; } ts.isTypeNodeKind = isTypeNodeKind; function isAccessExpression(node) { - return node.kind === 194 /* PropertyAccessExpression */ || node.kind === 195 /* ElementAccessExpression */; + return node.kind === 198 /* PropertyAccessExpression */ || node.kind === 199 /* ElementAccessExpression */; } ts.isAccessExpression = isAccessExpression; function getNameOfAccessExpression(node) { - if (node.kind === 194 /* PropertyAccessExpression */) { + if (node.kind === 198 /* PropertyAccessExpression */) { return node.name; } - ts.Debug.assert(node.kind === 195 /* ElementAccessExpression */); + ts.Debug.assert(node.kind === 199 /* ElementAccessExpression */); return node.argumentExpression; } ts.getNameOfAccessExpression = getNameOfAccessExpression; @@ -17774,9 +17795,41 @@ var ts; } ts.isBundleFileTextLike = isBundleFileTextLike; function isNamedImportsOrExports(node) { - return node.kind === 257 /* NamedImports */ || node.kind === 261 /* NamedExports */; + return node.kind === 261 /* NamedImports */ || node.kind === 265 /* NamedExports */; } ts.isNamedImportsOrExports = isNamedImportsOrExports; + function getLeftmostExpression(node, stopAtCallExpressions) { + while (true) { + switch (node.kind) { + case 212 /* PostfixUnaryExpression */: + node = node.operand; + continue; + case 213 /* BinaryExpression */: + node = node.left; + continue; + case 214 /* ConditionalExpression */: + node = node.condition; + continue; + case 202 /* TaggedTemplateExpression */: + node = node.tag; + continue; + case 200 /* CallExpression */: + if (stopAtCallExpressions) { + return node; + } + // falls through + case 221 /* AsExpression */: + case 199 /* ElementAccessExpression */: + case 198 /* PropertyAccessExpression */: + case 222 /* NonNullExpression */: + case 331 /* PartiallyEmittedExpression */: + node = node.expression; + continue; + } + return node; + } + } + ts.getLeftmostExpression = getLeftmostExpression; function Symbol(flags, name) { this.flags = flags; this.escapedName = name; @@ -17864,6 +17917,71 @@ var ts; return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message.key] || message.message; } ts.getLocaleSpecificMessage = getLocaleSpecificMessage; + function createDetachedDiagnostic(fileName, start, length, message) { + ts.Debug.assertGreaterThanOrEqual(start, 0); + ts.Debug.assertGreaterThanOrEqual(length, 0); + var text = getLocaleSpecificMessage(message); + if (arguments.length > 4) { + text = formatStringFromArgs(text, arguments, 4); + } + return { + file: undefined, + start: start, + length: length, + messageText: text, + category: message.category, + code: message.code, + reportsUnnecessary: message.reportsUnnecessary, + fileName: fileName, + }; + } + ts.createDetachedDiagnostic = createDetachedDiagnostic; + function isDiagnosticWithDetachedLocation(diagnostic) { + return diagnostic.file === undefined + && diagnostic.start !== undefined + && diagnostic.length !== undefined + && typeof diagnostic.fileName === "string"; + } + function attachFileToDiagnostic(diagnostic, file) { + var fileName = file.fileName || ""; + var length = file.text.length; + ts.Debug.assertEqual(diagnostic.fileName, fileName); + ts.Debug.assertLessThanOrEqual(diagnostic.start, length); + ts.Debug.assertLessThanOrEqual(diagnostic.start + diagnostic.length, length); + var diagnosticWithLocation = { + file: file, + start: diagnostic.start, + length: diagnostic.length, + messageText: diagnostic.messageText, + category: diagnostic.category, + code: diagnostic.code, + reportsUnnecessary: diagnostic.reportsUnnecessary + }; + if (diagnostic.relatedInformation) { + diagnosticWithLocation.relatedInformation = []; + for (var _i = 0, _a = diagnostic.relatedInformation; _i < _a.length; _i++) { + var related = _a[_i]; + if (isDiagnosticWithDetachedLocation(related) && related.fileName === fileName) { + ts.Debug.assertLessThanOrEqual(related.start, length); + ts.Debug.assertLessThanOrEqual(related.start + related.length, length); + diagnosticWithLocation.relatedInformation.push(attachFileToDiagnostic(related, file)); + } + else { + diagnosticWithLocation.relatedInformation.push(related); + } + } + } + return diagnosticWithLocation; + } + function attachFileToDiagnostics(diagnostics, file) { + var diagnosticsWithLocation = []; + for (var _i = 0, diagnostics_1 = diagnostics; _i < diagnostics_1.length; _i++) { + var diagnostic = diagnostics_1[_i]; + diagnosticsWithLocation.push(attachFileToDiagnostic(diagnostic, file)); + } + return diagnosticsWithLocation; + } + ts.attachFileToDiagnostics = attachFileToDiagnostics; function createFileDiagnostic(file, start, length, message) { ts.Debug.assertGreaterThanOrEqual(start, 0); ts.Debug.assertGreaterThanOrEqual(length, 0); @@ -17883,6 +18001,7 @@ var ts; category: message.category, code: message.code, reportsUnnecessary: message.reportsUnnecessary, + reportsDeprecated: message.reportsDeprecated }; } ts.createFileDiagnostic = createFileDiagnostic; @@ -17907,6 +18026,7 @@ var ts; category: message.category, code: message.code, reportsUnnecessary: message.reportsUnnecessary, + reportsDeprecated: message.reportsDeprecated }; } ts.createCompilerDiagnostic = createCompilerDiagnostic; @@ -18010,6 +18130,11 @@ var ts; } return 0 /* EqualTo */; } + function getLanguageVariant(scriptKind) { + // .tsx and .jsx files are treated as jsx language variant. + return scriptKind === 4 /* TSX */ || scriptKind === 2 /* JSX */ || scriptKind === 1 /* JS */ || scriptKind === 6 /* JSON */ ? 1 /* JSX */ : 0 /* Standard */; + } + ts.getLanguageVariant = getLanguageVariant; function getEmitScriptTarget(compilerOptions) { return compilerOptions.target || 0 /* ES3 */; } @@ -18103,8 +18228,19 @@ var ts; return true; } ts.hasZeroOrOneAsteriskCharacter = hasZeroOrOneAsteriskCharacter; + function createSymlinkCache() { + var symlinkedDirectories; + var symlinkedFiles; + return { + getSymlinkedFiles: function () { return symlinkedFiles; }, + getSymlinkedDirectories: function () { return symlinkedDirectories; }, + setSymlinkedFile: function (path, real) { return (symlinkedFiles || (symlinkedFiles = new ts.Map())).set(path, real); }, + setSymlinkedDirectory: function (path, directory) { return (symlinkedDirectories || (symlinkedDirectories = new ts.Map())).set(path, directory); }, + }; + } + ts.createSymlinkCache = createSymlinkCache; function discoverProbableSymlinks(files, getCanonicalFileName, cwd) { - var result = ts.createMap(); + var cache = createSymlinkCache(); var symlinks = ts.flatten(ts.mapDefined(files, function (sf) { return sf.resolvedModules && ts.compact(ts.arrayFrom(ts.mapIterator(sf.resolvedModules.values(), function (res) { return res && res.originalPath && res.resolvedFileName !== res.originalPath ? [res.resolvedFileName, res.originalPath] : undefined; @@ -18112,22 +18248,26 @@ var ts; })); for (var _i = 0, symlinks_1 = symlinks; _i < symlinks_1.length; _i++) { var _a = symlinks_1[_i], resolvedPath = _a[0], originalPath = _a[1]; - var _b = guessDirectorySymlink(resolvedPath, originalPath, cwd, getCanonicalFileName), commonResolved = _b[0], commonOriginal = _b[1]; - result.set(commonOriginal, commonResolved); + var _b = guessDirectorySymlink(resolvedPath, originalPath, cwd, getCanonicalFileName) || ts.emptyArray, commonResolved = _b[0], commonOriginal = _b[1]; + if (commonResolved && commonOriginal) { + cache.setSymlinkedDirectory(ts.toPath(commonOriginal, cwd, getCanonicalFileName), { real: commonResolved, realPath: ts.toPath(commonResolved, cwd, getCanonicalFileName) }); + } } - return result; + return cache; } ts.discoverProbableSymlinks = discoverProbableSymlinks; function guessDirectorySymlink(a, b, cwd, getCanonicalFileName) { var aParts = ts.getPathComponents(ts.toPath(a, cwd, getCanonicalFileName)); var bParts = ts.getPathComponents(ts.toPath(b, cwd, getCanonicalFileName)); + var isDirectory = false; while (!isNodeModulesOrScopedPackageDirectory(aParts[aParts.length - 2], getCanonicalFileName) && !isNodeModulesOrScopedPackageDirectory(bParts[bParts.length - 2], getCanonicalFileName) && getCanonicalFileName(aParts[aParts.length - 1]) === getCanonicalFileName(bParts[bParts.length - 1])) { aParts.pop(); bParts.pop(); + isDirectory = true; } - return [ts.getPathFromPathComponents(aParts), ts.getPathFromPathComponents(bParts)]; + return isDirectory ? [ts.getPathFromPathComponents(aParts), ts.getPathFromPathComponents(bParts)] : undefined; } // KLUDGE: Don't assume one 'node_modules' links to another. More likely a single directory inside the node_modules is the symlink. // ALso, don't assume that an `@foo` directory is linked. More likely the contents of that are linked. @@ -18316,7 +18456,7 @@ var ts; // Associate an array of results with each include regex. This keeps results in order of the "include" order. // If there are no "includes", then just put everything in results[0]. var results = includeFileRegexes ? includeFileRegexes.map(function () { return []; }) : [[]]; - var visited = ts.createMap(); + var visited = new ts.Map(); var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames); for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) { var basePath = _a[_i]; @@ -18682,62 +18822,6 @@ var ts; return { min: min, max: max }; } ts.minAndMax = minAndMax; - var NodeSet = /** @class */ (function () { - function NodeSet() { - this.map = ts.createMap(); - } - NodeSet.prototype.add = function (node) { - this.map.set(String(ts.getNodeId(node)), node); - }; - NodeSet.prototype.tryAdd = function (node) { - if (this.has(node)) - return false; - this.add(node); - return true; - }; - NodeSet.prototype.has = function (node) { - return this.map.has(String(ts.getNodeId(node))); - }; - NodeSet.prototype.forEach = function (cb) { - this.map.forEach(cb); - }; - NodeSet.prototype.some = function (pred) { - return forEachEntry(this.map, pred) || false; - }; - return NodeSet; - }()); - ts.NodeSet = NodeSet; - var NodeMap = /** @class */ (function () { - function NodeMap() { - this.map = ts.createMap(); - } - NodeMap.prototype.get = function (node) { - var res = this.map.get(String(ts.getNodeId(node))); - return res && res.value; - }; - NodeMap.prototype.getOrUpdate = function (node, setValue) { - var res = this.get(node); - if (res) - return res; - var value = setValue(); - this.set(node, value); - return value; - }; - NodeMap.prototype.set = function (node, value) { - this.map.set(String(ts.getNodeId(node)), { node: node, value: value }); - }; - NodeMap.prototype.has = function (node) { - return this.map.has(String(ts.getNodeId(node))); - }; - NodeMap.prototype.forEach = function (cb) { - this.map.forEach(function (_a) { - var node = _a.node, value = _a.value; - return cb(value, node); - }); - }; - return NodeMap; - }()); - ts.NodeMap = NodeMap; function rangeOfNode(node) { return { pos: getTokenPosOfNode(node), end: node.end }; } @@ -18761,18 +18845,6 @@ var ts; return a === b || typeof a === "object" && a !== null && typeof b === "object" && b !== null && ts.equalOwnProperties(a, b, isJsonEqual); } ts.isJsonEqual = isJsonEqual; - function getOrUpdate(map, key, getDefault) { - var got = map.get(key); - if (got === undefined) { - var value = getDefault(); - map.set(key, value); - return value; - } - else { - return got; - } - } - ts.getOrUpdate = getOrUpdate; /** * Converts a bigint literal string, e.g. `0x1234n`, * to its decimal string representation, e.g. `4660`. @@ -18858,38 +18930,38 @@ var ts; } ts.isValidTypeOnlyAliasUseSite = isValidTypeOnlyAliasUseSite; function typeOnlyDeclarationIsExport(typeOnlyDeclaration) { - return typeOnlyDeclaration.kind === 263 /* ExportSpecifier */; + return typeOnlyDeclaration.kind === 267 /* ExportSpecifier */; } ts.typeOnlyDeclarationIsExport = typeOnlyDeclarationIsExport; function isPartOfPossiblyValidTypeOrAbstractComputedPropertyName(node) { - while (node.kind === 75 /* Identifier */ || node.kind === 194 /* PropertyAccessExpression */) { + while (node.kind === 78 /* Identifier */ || node.kind === 198 /* PropertyAccessExpression */) { node = node.parent; } - if (node.kind !== 154 /* ComputedPropertyName */) { + if (node.kind !== 157 /* ComputedPropertyName */) { return false; } - if (hasModifier(node.parent, 128 /* Abstract */)) { + if (hasSyntacticModifier(node.parent, 128 /* Abstract */)) { return true; } var containerKind = node.parent.parent.kind; - return containerKind === 246 /* InterfaceDeclaration */ || containerKind === 173 /* TypeLiteral */; + return containerKind === 250 /* InterfaceDeclaration */ || containerKind === 176 /* TypeLiteral */; } /** Returns true for an identifier in 1) an `implements` clause, and 2) an `extends` clause of an interface. */ function isIdentifierInNonEmittingHeritageClause(node) { - if (node.kind !== 75 /* Identifier */) + if (node.kind !== 78 /* Identifier */) return false; var heritageClause = findAncestor(node.parent, function (parent) { switch (parent.kind) { - case 279 /* HeritageClause */: + case 283 /* HeritageClause */: return true; - case 194 /* PropertyAccessExpression */: - case 216 /* ExpressionWithTypeArguments */: + case 198 /* PropertyAccessExpression */: + case 220 /* ExpressionWithTypeArguments */: return false; default: return "quit"; } }); - return (heritageClause === null || heritageClause === void 0 ? void 0 : heritageClause.token) === 113 /* ImplementsKeyword */ || (heritageClause === null || heritageClause === void 0 ? void 0 : heritageClause.parent.kind) === 246 /* InterfaceDeclaration */; + return (heritageClause === null || heritageClause === void 0 ? void 0 : heritageClause.token) === 116 /* ImplementsKeyword */ || (heritageClause === null || heritageClause === void 0 ? void 0 : heritageClause.parent.kind) === 250 /* InterfaceDeclaration */; } function isIdentifierTypeReference(node) { return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName); @@ -18908,6 +18980,8007 @@ var ts; return true; } ts.arrayIsHomogeneous = arrayIsHomogeneous; + /** + * Bypasses immutability and directly sets the `pos` property of a `TextRange` or `Node`. + */ + /* @internal */ + function setTextRangePos(range, pos) { + range.pos = pos; + return range; + } + ts.setTextRangePos = setTextRangePos; + /** + * Bypasses immutability and directly sets the `end` property of a `TextRange` or `Node`. + */ + /* @internal */ + function setTextRangeEnd(range, end) { + range.end = end; + return range; + } + ts.setTextRangeEnd = setTextRangeEnd; + /** + * Bypasses immutability and directly sets the `pos` and `end` properties of a `TextRange` or `Node`. + */ + /* @internal */ + function setTextRangePosEnd(range, pos, end) { + return setTextRangeEnd(setTextRangePos(range, pos), end); + } + ts.setTextRangePosEnd = setTextRangePosEnd; + /** + * Bypasses immutability and directly sets the `pos` and `end` properties of a `TextRange` or `Node` from the + * provided position and width. + */ + /* @internal */ + function setTextRangePosWidth(range, pos, width) { + return setTextRangePosEnd(range, pos, pos + width); + } + ts.setTextRangePosWidth = setTextRangePosWidth; + function setNodeFlags(node, newFlags) { + if (node) { + node.flags = newFlags; + } + return node; + } + ts.setNodeFlags = setNodeFlags; + function setParent(child, parent) { + if (child && parent) { + child.parent = parent; + } + return child; + } + ts.setParent = setParent; + function setEachParent(children, parent) { + if (children) { + for (var _i = 0, children_1 = children; _i < children_1.length; _i++) { + var child = children_1[_i]; + setParent(child, parent); + } + } + return children; + } + ts.setEachParent = setEachParent; + function setParentRecursive(rootNode, incremental) { + if (!rootNode) + return rootNode; + ts.forEachChildRecursively(rootNode, ts.isJSDocNode(rootNode) ? bindParentToChildIgnoringJSDoc : bindParentToChild); + return rootNode; + function bindParentToChildIgnoringJSDoc(child, parent) { + if (incremental && child.parent === parent) { + return "skip"; + } + setParent(child, parent); + } + function bindJSDoc(child) { + if (ts.hasJSDocNodes(child)) { + for (var _i = 0, _a = child.jsDoc; _i < _a.length; _i++) { + var doc = _a[_i]; + bindParentToChildIgnoringJSDoc(doc, child); + ts.forEachChildRecursively(doc, bindParentToChildIgnoringJSDoc); + } + } + } + function bindParentToChild(child, parent) { + return bindParentToChildIgnoringJSDoc(child, parent) || bindJSDoc(child); + } + } + ts.setParentRecursive = setParentRecursive; +})(ts || (ts = {})); +/* @internal */ +var ts; +(function (ts) { + /** + * Creates a `BaseNodeFactory` which can be used to create `Node` instances from the constructors provided by the object allocator. + */ + function createBaseNodeFactory() { + // tslint:disable variable-name + var NodeConstructor; + var TokenConstructor; + var IdentifierConstructor; + var PrivateIdentifierConstructor; + var SourceFileConstructor; + // tslint:enable variable-name + return { + createBaseSourceFileNode: createBaseSourceFileNode, + createBaseIdentifierNode: createBaseIdentifierNode, + createBasePrivateIdentifierNode: createBasePrivateIdentifierNode, + createBaseTokenNode: createBaseTokenNode, + createBaseNode: createBaseNode + }; + function createBaseSourceFileNode(kind) { + return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, /*pos*/ -1, /*end*/ -1); + } + function createBaseIdentifierNode(kind) { + return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, /*pos*/ -1, /*end*/ -1); + } + function createBasePrivateIdentifierNode(kind) { + return new (PrivateIdentifierConstructor || (PrivateIdentifierConstructor = ts.objectAllocator.getPrivateIdentifierConstructor()))(kind, /*pos*/ -1, /*end*/ -1); + } + function createBaseTokenNode(kind) { + return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, /*pos*/ -1, /*end*/ -1); + } + function createBaseNode(kind) { + return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, /*pos*/ -1, /*end*/ -1); + } + } + ts.createBaseNodeFactory = createBaseNodeFactory; +})(ts || (ts = {})); +/* @internal */ +var ts; +(function (ts) { + function createParenthesizerRules(factory) { + return { + parenthesizeLeftSideOfBinary: parenthesizeLeftSideOfBinary, + parenthesizeRightSideOfBinary: parenthesizeRightSideOfBinary, + parenthesizeExpressionOfComputedPropertyName: parenthesizeExpressionOfComputedPropertyName, + parenthesizeConditionOfConditionalExpression: parenthesizeConditionOfConditionalExpression, + parenthesizeBranchOfConditionalExpression: parenthesizeBranchOfConditionalExpression, + parenthesizeExpressionOfExportDefault: parenthesizeExpressionOfExportDefault, + parenthesizeExpressionOfNew: parenthesizeExpressionOfNew, + parenthesizeLeftSideOfAccess: parenthesizeLeftSideOfAccess, + parenthesizeOperandOfPostfixUnary: parenthesizeOperandOfPostfixUnary, + parenthesizeOperandOfPrefixUnary: parenthesizeOperandOfPrefixUnary, + parenthesizeExpressionsOfCommaDelimitedList: parenthesizeExpressionsOfCommaDelimitedList, + parenthesizeExpressionForDisallowedComma: parenthesizeExpressionForDisallowedComma, + parenthesizeExpressionOfExpressionStatement: parenthesizeExpressionOfExpressionStatement, + parenthesizeConciseBodyOfArrowFunction: parenthesizeConciseBodyOfArrowFunction, + parenthesizeMemberOfConditionalType: parenthesizeMemberOfConditionalType, + parenthesizeMemberOfElementType: parenthesizeMemberOfElementType, + parenthesizeElementTypeOfArrayType: parenthesizeElementTypeOfArrayType, + parenthesizeConstituentTypesOfUnionOrIntersectionType: parenthesizeConstituentTypesOfUnionOrIntersectionType, + parenthesizeTypeArguments: parenthesizeTypeArguments, + }; + /** + * Determines whether the operand to a BinaryExpression needs to be parenthesized. + * + * @param binaryOperator The operator for the BinaryExpression. + * @param operand The operand for the BinaryExpression. + * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the + * BinaryExpression. + */ + function binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand) { + // If the operand has lower precedence, then it needs to be parenthesized to preserve the + // intent of the expression. For example, if the operand is `a + b` and the operator is + // `*`, then we need to parenthesize the operand to preserve the intended order of + // operations: `(a + b) * x`. + // + // If the operand has higher precedence, then it does not need to be parenthesized. For + // example, if the operand is `a * b` and the operator is `+`, then we do not need to + // parenthesize to preserve the intended order of operations: `a * b + x`. + // + // If the operand has the same precedence, then we need to check the associativity of + // the operator based on whether this is the left or right operand of the expression. + // + // For example, if `a / d` is on the right of operator `*`, we need to parenthesize + // to preserve the intended order of operations: `x * (a / d)` + // + // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve + // the intended order of operations: `(a ** b) ** c` + var binaryOperatorPrecedence = ts.getOperatorPrecedence(213 /* BinaryExpression */, binaryOperator); + var binaryOperatorAssociativity = ts.getOperatorAssociativity(213 /* BinaryExpression */, binaryOperator); + var emittedOperand = ts.skipPartiallyEmittedExpressions(operand); + if (!isLeftSideOfBinary && operand.kind === 206 /* ArrowFunction */ && binaryOperatorPrecedence > 3 /* Assignment */) { + // We need to parenthesize arrow functions on the right side to avoid it being + // parsed as parenthesized expression: `a && (() => {})` + return true; + } + var operandPrecedence = ts.getExpressionPrecedence(emittedOperand); + switch (ts.compareValues(operandPrecedence, binaryOperatorPrecedence)) { + case -1 /* LessThan */: + // If the operand is the right side of a right-associative binary operation + // and is a yield expression, then we do not need parentheses. + if (!isLeftSideOfBinary + && binaryOperatorAssociativity === 1 /* Right */ + && operand.kind === 216 /* YieldExpression */) { + return false; + } + return true; + case 1 /* GreaterThan */: + return false; + case 0 /* EqualTo */: + if (isLeftSideOfBinary) { + // No need to parenthesize the left operand when the binary operator is + // left associative: + // (a*b)/x -> a*b/x + // (a**b)/x -> a**b/x + // + // Parentheses are needed for the left operand when the binary operator is + // right associative: + // (a/b)**x -> (a/b)**x + // (a**b)**x -> (a**b)**x + return binaryOperatorAssociativity === 1 /* Right */; + } + else { + if (ts.isBinaryExpression(emittedOperand) + && emittedOperand.operatorToken.kind === binaryOperator) { + // No need to parenthesize the right operand when the binary operator and + // operand are the same and one of the following: + // x*(a*b) => x*a*b + // x|(a|b) => x|a|b + // x&(a&b) => x&a&b + // x^(a^b) => x^a^b + if (operatorHasAssociativeProperty(binaryOperator)) { + return false; + } + // No need to parenthesize the right operand when the binary operator + // is plus (+) if both the left and right operands consist solely of either + // literals of the same kind or binary plus (+) expressions for literals of + // the same kind (recursively). + // "a"+(1+2) => "a"+(1+2) + // "a"+("b"+"c") => "a"+"b"+"c" + if (binaryOperator === 39 /* PlusToken */) { + var leftKind = leftOperand ? getLiteralKindOfBinaryPlusOperand(leftOperand) : 0 /* Unknown */; + if (ts.isLiteralKind(leftKind) && leftKind === getLiteralKindOfBinaryPlusOperand(emittedOperand)) { + return false; + } + } + } + // No need to parenthesize the right operand when the operand is right + // associative: + // x/(a**b) -> x/a**b + // x**(a**b) -> x**a**b + // + // Parentheses are needed for the right operand when the operand is left + // associative: + // x/(a*b) -> x/(a*b) + // x**(a/b) -> x**(a/b) + var operandAssociativity = ts.getExpressionAssociativity(emittedOperand); + return operandAssociativity === 0 /* Left */; + } + } + } + /** + * Determines whether a binary operator is mathematically associative. + * + * @param binaryOperator The binary operator. + */ + function operatorHasAssociativeProperty(binaryOperator) { + // The following operators are associative in JavaScript: + // (a*b)*c -> a*(b*c) -> a*b*c + // (a|b)|c -> a|(b|c) -> a|b|c + // (a&b)&c -> a&(b&c) -> a&b&c + // (a^b)^c -> a^(b^c) -> a^b^c + // + // While addition is associative in mathematics, JavaScript's `+` is not + // guaranteed to be associative as it is overloaded with string concatenation. + return binaryOperator === 41 /* AsteriskToken */ + || binaryOperator === 51 /* BarToken */ + || binaryOperator === 50 /* AmpersandToken */ + || binaryOperator === 52 /* CaretToken */; + } + /** + * This function determines whether an expression consists of a homogeneous set of + * literal expressions or binary plus expressions that all share the same literal kind. + * It is used to determine whether the right-hand operand of a binary plus expression can be + * emitted without parentheses. + */ + function getLiteralKindOfBinaryPlusOperand(node) { + node = ts.skipPartiallyEmittedExpressions(node); + if (ts.isLiteralKind(node.kind)) { + return node.kind; + } + if (node.kind === 213 /* BinaryExpression */ && node.operatorToken.kind === 39 /* PlusToken */) { + if (node.cachedLiteralKind !== undefined) { + return node.cachedLiteralKind; + } + var leftKind = getLiteralKindOfBinaryPlusOperand(node.left); + var literalKind = ts.isLiteralKind(leftKind) + && leftKind === getLiteralKindOfBinaryPlusOperand(node.right) + ? leftKind + : 0 /* Unknown */; + node.cachedLiteralKind = literalKind; + return literalKind; + } + return 0 /* Unknown */; + } + /** + * Wraps the operand to a BinaryExpression in parentheses if they are needed to preserve the intended + * order of operations. + * + * @param binaryOperator The operator for the BinaryExpression. + * @param operand The operand for the BinaryExpression. + * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the + * BinaryExpression. + */ + function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) { + var skipped = ts.skipPartiallyEmittedExpressions(operand); + // If the resulting expression is already parenthesized, we do not need to do any further processing. + if (skipped.kind === 204 /* ParenthesizedExpression */) { + return operand; + } + return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand) + ? factory.createParenthesizedExpression(operand) + : operand; + } + function parenthesizeLeftSideOfBinary(binaryOperator, leftSide) { + return parenthesizeBinaryOperand(binaryOperator, leftSide, /*isLeftSideOfBinary*/ true); + } + function parenthesizeRightSideOfBinary(binaryOperator, leftSide, rightSide) { + return parenthesizeBinaryOperand(binaryOperator, rightSide, /*isLeftSideOfBinary*/ false, leftSide); + } + function parenthesizeExpressionOfComputedPropertyName(expression) { + return ts.isCommaSequence(expression) ? factory.createParenthesizedExpression(expression) : expression; + } + function parenthesizeConditionOfConditionalExpression(condition) { + var conditionalPrecedence = ts.getOperatorPrecedence(214 /* ConditionalExpression */, 57 /* QuestionToken */); + var emittedCondition = ts.skipPartiallyEmittedExpressions(condition); + var conditionPrecedence = ts.getExpressionPrecedence(emittedCondition); + if (ts.compareValues(conditionPrecedence, conditionalPrecedence) !== 1 /* GreaterThan */) { + return factory.createParenthesizedExpression(condition); + } + return condition; + } + function parenthesizeBranchOfConditionalExpression(branch) { + // per ES grammar both 'whenTrue' and 'whenFalse' parts of conditional expression are assignment expressions + // so in case when comma expression is introduced as a part of previous transformations + // if should be wrapped in parens since comma operator has the lowest precedence + var emittedExpression = ts.skipPartiallyEmittedExpressions(branch); + return ts.isCommaSequence(emittedExpression) + ? factory.createParenthesizedExpression(branch) + : branch; + } + /** + * [Per the spec](https://tc39.github.io/ecma262/#prod-ExportDeclaration), `export default` accepts _AssigmentExpression_ but + * has a lookahead restriction for `function`, `async function`, and `class`. + * + * Basically, that means we need to parenthesize in the following cases: + * + * - BinaryExpression of CommaToken + * - CommaList (synthetic list of multiple comma expressions) + * - FunctionExpression + * - ClassExpression + */ + function parenthesizeExpressionOfExportDefault(expression) { + var check = ts.skipPartiallyEmittedExpressions(expression); + var needsParens = ts.isCommaSequence(check); + if (!needsParens) { + switch (ts.getLeftmostExpression(check, /*stopAtCallExpression*/ false).kind) { + case 218 /* ClassExpression */: + case 205 /* FunctionExpression */: + needsParens = true; + } + } + return needsParens ? factory.createParenthesizedExpression(expression) : expression; + } + /** + * Wraps an expression in parentheses if it is needed in order to use the expression + * as the expression of a `NewExpression` node. + */ + function parenthesizeExpressionOfNew(expression) { + var leftmostExpr = ts.getLeftmostExpression(expression, /*stopAtCallExpressions*/ true); + switch (leftmostExpr.kind) { + case 200 /* CallExpression */: + return factory.createParenthesizedExpression(expression); + case 201 /* NewExpression */: + return !leftmostExpr.arguments + ? factory.createParenthesizedExpression(expression) + : expression; // TODO(rbuckton): Verify this assertion holds + } + return parenthesizeLeftSideOfAccess(expression); + } + /** + * Wraps an expression in parentheses if it is needed in order to use the expression for + * property or element access. + */ + function parenthesizeLeftSideOfAccess(expression) { + // isLeftHandSideExpression is almost the correct criterion for when it is not necessary + // to parenthesize the expression before a dot. The known exception is: + // + // NewExpression: + // new C.x -> not the same as (new C).x + // + var emittedExpression = ts.skipPartiallyEmittedExpressions(expression); + if (ts.isLeftHandSideExpression(emittedExpression) + && (emittedExpression.kind !== 201 /* NewExpression */ || emittedExpression.arguments)) { + // TODO(rbuckton): Verify whether this assertion holds. + return expression; + } + // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + return ts.setTextRange(factory.createParenthesizedExpression(expression), expression); + } + function parenthesizeOperandOfPostfixUnary(operand) { + // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + return ts.isLeftHandSideExpression(operand) ? operand : ts.setTextRange(factory.createParenthesizedExpression(operand), operand); + } + function parenthesizeOperandOfPrefixUnary(operand) { + // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + return ts.isUnaryExpression(operand) ? operand : ts.setTextRange(factory.createParenthesizedExpression(operand), operand); + } + function parenthesizeExpressionsOfCommaDelimitedList(elements) { + var result = ts.sameMap(elements, parenthesizeExpressionForDisallowedComma); + return ts.setTextRange(factory.createNodeArray(result, elements.hasTrailingComma), elements); + } + function parenthesizeExpressionForDisallowedComma(expression) { + var emittedExpression = ts.skipPartiallyEmittedExpressions(expression); + var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression); + var commaPrecedence = ts.getOperatorPrecedence(213 /* BinaryExpression */, 27 /* CommaToken */); + // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + return expressionPrecedence > commaPrecedence ? expression : ts.setTextRange(factory.createParenthesizedExpression(expression), expression); + } + function parenthesizeExpressionOfExpressionStatement(expression) { + var emittedExpression = ts.skipPartiallyEmittedExpressions(expression); + if (ts.isCallExpression(emittedExpression)) { + var callee = emittedExpression.expression; + var kind = ts.skipPartiallyEmittedExpressions(callee).kind; + if (kind === 205 /* FunctionExpression */ || kind === 206 /* ArrowFunction */) { + // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + var updated = factory.updateCallExpression(emittedExpression, ts.setTextRange(factory.createParenthesizedExpression(callee), callee), emittedExpression.typeArguments, emittedExpression.arguments); + return factory.restoreOuterExpressions(expression, updated, 8 /* PartiallyEmittedExpressions */); + } + } + var leftmostExpressionKind = ts.getLeftmostExpression(emittedExpression, /*stopAtCallExpressions*/ false).kind; + if (leftmostExpressionKind === 197 /* ObjectLiteralExpression */ || leftmostExpressionKind === 205 /* FunctionExpression */) { + // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + return ts.setTextRange(factory.createParenthesizedExpression(expression), expression); + } + return expression; + } + function parenthesizeConciseBodyOfArrowFunction(body) { + if (!ts.isBlock(body) && (ts.isCommaSequence(body) || ts.getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 197 /* ObjectLiteralExpression */)) { + // TODO(rbuckton): Verifiy whether `setTextRange` is needed. + return ts.setTextRange(factory.createParenthesizedExpression(body), body); + } + return body; + } + function parenthesizeMemberOfConditionalType(member) { + return member.kind === 183 /* ConditionalType */ ? factory.createParenthesizedType(member) : member; + } + function parenthesizeMemberOfElementType(member) { + switch (member.kind) { + case 181 /* UnionType */: + case 182 /* IntersectionType */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: + return factory.createParenthesizedType(member); + } + return parenthesizeMemberOfConditionalType(member); + } + function parenthesizeElementTypeOfArrayType(member) { + switch (member.kind) { + case 175 /* TypeQuery */: + case 187 /* TypeOperator */: + case 184 /* InferType */: + return factory.createParenthesizedType(member); + } + return parenthesizeMemberOfElementType(member); + } + function parenthesizeConstituentTypesOfUnionOrIntersectionType(members) { + return factory.createNodeArray(ts.sameMap(members, parenthesizeMemberOfElementType)); + } + function parenthesizeOrdinalTypeArgument(node, i) { + return i === 0 && ts.isFunctionOrConstructorTypeNode(node) && node.typeParameters ? factory.createParenthesizedType(node) : node; + } + function parenthesizeTypeArguments(typeArguments) { + if (ts.some(typeArguments)) { + return factory.createNodeArray(ts.sameMap(typeArguments, parenthesizeOrdinalTypeArgument)); + } + } + } + ts.createParenthesizerRules = createParenthesizerRules; + ts.nullParenthesizerRules = { + parenthesizeLeftSideOfBinary: function (_binaryOperator, leftSide) { return leftSide; }, + parenthesizeRightSideOfBinary: function (_binaryOperator, _leftSide, rightSide) { return rightSide; }, + parenthesizeExpressionOfComputedPropertyName: ts.identity, + parenthesizeConditionOfConditionalExpression: ts.identity, + parenthesizeBranchOfConditionalExpression: ts.identity, + parenthesizeExpressionOfExportDefault: ts.identity, + parenthesizeExpressionOfNew: function (expression) { return ts.cast(expression, ts.isLeftHandSideExpression); }, + parenthesizeLeftSideOfAccess: function (expression) { return ts.cast(expression, ts.isLeftHandSideExpression); }, + parenthesizeOperandOfPostfixUnary: function (operand) { return ts.cast(operand, ts.isLeftHandSideExpression); }, + parenthesizeOperandOfPrefixUnary: function (operand) { return ts.cast(operand, ts.isUnaryExpression); }, + parenthesizeExpressionsOfCommaDelimitedList: function (nodes) { return ts.cast(nodes, ts.isNodeArray); }, + parenthesizeExpressionForDisallowedComma: ts.identity, + parenthesizeExpressionOfExpressionStatement: ts.identity, + parenthesizeConciseBodyOfArrowFunction: ts.identity, + parenthesizeMemberOfConditionalType: ts.identity, + parenthesizeMemberOfElementType: ts.identity, + parenthesizeElementTypeOfArrayType: ts.identity, + parenthesizeConstituentTypesOfUnionOrIntersectionType: function (nodes) { return ts.cast(nodes, ts.isNodeArray); }, + parenthesizeTypeArguments: function (nodes) { return nodes && ts.cast(nodes, ts.isNodeArray); }, + }; +})(ts || (ts = {})); +/* @internal */ +var ts; +(function (ts) { + function createNodeConverters(factory) { + return { + convertToFunctionBlock: convertToFunctionBlock, + convertToFunctionExpression: convertToFunctionExpression, + convertToArrayAssignmentElement: convertToArrayAssignmentElement, + convertToObjectAssignmentElement: convertToObjectAssignmentElement, + convertToAssignmentPattern: convertToAssignmentPattern, + convertToObjectAssignmentPattern: convertToObjectAssignmentPattern, + convertToArrayAssignmentPattern: convertToArrayAssignmentPattern, + convertToAssignmentElementTarget: convertToAssignmentElementTarget, + }; + function convertToFunctionBlock(node, multiLine) { + if (ts.isBlock(node)) + return node; + var returnStatement = factory.createReturnStatement(node); + ts.setTextRange(returnStatement, node); + var body = factory.createBlock([returnStatement], multiLine); + ts.setTextRange(body, node); + return body; + } + function convertToFunctionExpression(node) { + if (!node.body) + return ts.Debug.fail("Cannot convert a FunctionDeclaration without a body"); + var updated = factory.createFunctionExpression(node.modifiers, node.asteriskToken, node.name, node.typeParameters, node.parameters, node.type, node.body); + ts.setOriginalNode(updated, node); + ts.setTextRange(updated, node); + if (ts.getStartsOnNewLine(node)) { + ts.setStartsOnNewLine(updated, /*newLine*/ true); + } + return updated; + } + function convertToArrayAssignmentElement(element) { + if (ts.isBindingElement(element)) { + if (element.dotDotDotToken) { + ts.Debug.assertNode(element.name, ts.isIdentifier); + return ts.setOriginalNode(ts.setTextRange(factory.createSpreadElement(element.name), element), element); + } + var expression = convertToAssignmentElementTarget(element.name); + return element.initializer + ? ts.setOriginalNode(ts.setTextRange(factory.createAssignment(expression, element.initializer), element), element) + : expression; + } + return ts.cast(element, ts.isExpression); + } + function convertToObjectAssignmentElement(element) { + if (ts.isBindingElement(element)) { + if (element.dotDotDotToken) { + ts.Debug.assertNode(element.name, ts.isIdentifier); + return ts.setOriginalNode(ts.setTextRange(factory.createSpreadAssignment(element.name), element), element); + } + if (element.propertyName) { + var expression = convertToAssignmentElementTarget(element.name); + return ts.setOriginalNode(ts.setTextRange(factory.createPropertyAssignment(element.propertyName, element.initializer ? factory.createAssignment(expression, element.initializer) : expression), element), element); + } + ts.Debug.assertNode(element.name, ts.isIdentifier); + return ts.setOriginalNode(ts.setTextRange(factory.createShorthandPropertyAssignment(element.name, element.initializer), element), element); + } + return ts.cast(element, ts.isObjectLiteralElementLike); + } + function convertToAssignmentPattern(node) { + switch (node.kind) { + case 194 /* ArrayBindingPattern */: + case 196 /* ArrayLiteralExpression */: + return convertToArrayAssignmentPattern(node); + case 193 /* ObjectBindingPattern */: + case 197 /* ObjectLiteralExpression */: + return convertToObjectAssignmentPattern(node); + } + } + function convertToObjectAssignmentPattern(node) { + if (ts.isObjectBindingPattern(node)) { + return ts.setOriginalNode(ts.setTextRange(factory.createObjectLiteralExpression(ts.map(node.elements, convertToObjectAssignmentElement)), node), node); + } + return ts.cast(node, ts.isObjectLiteralExpression); + } + function convertToArrayAssignmentPattern(node) { + if (ts.isArrayBindingPattern(node)) { + return ts.setOriginalNode(ts.setTextRange(factory.createArrayLiteralExpression(ts.map(node.elements, convertToArrayAssignmentElement)), node), node); + } + return ts.cast(node, ts.isArrayLiteralExpression); + } + function convertToAssignmentElementTarget(node) { + if (ts.isBindingPattern(node)) { + return convertToAssignmentPattern(node); + } + return ts.cast(node, ts.isExpression); + } + } + ts.createNodeConverters = createNodeConverters; + ts.nullNodeConverters = { + convertToFunctionBlock: ts.notImplemented, + convertToFunctionExpression: ts.notImplemented, + convertToArrayAssignmentElement: ts.notImplemented, + convertToObjectAssignmentElement: ts.notImplemented, + convertToAssignmentPattern: ts.notImplemented, + convertToObjectAssignmentPattern: ts.notImplemented, + convertToArrayAssignmentPattern: ts.notImplemented, + convertToAssignmentElementTarget: ts.notImplemented, + }; +})(ts || (ts = {})); +var ts; +(function (ts) { + var nextAutoGenerateId = 0; + /* @internal */ + var NodeFactoryFlags; + (function (NodeFactoryFlags) { + NodeFactoryFlags[NodeFactoryFlags["None"] = 0] = "None"; + // Disables the parenthesizer rules for the factory. + NodeFactoryFlags[NodeFactoryFlags["NoParenthesizerRules"] = 1] = "NoParenthesizerRules"; + // Disables the node converters for the factory. + NodeFactoryFlags[NodeFactoryFlags["NoNodeConverters"] = 2] = "NoNodeConverters"; + // Ensures new `PropertyAccessExpression` nodes are created with the `NoIndentation` emit flag set. + NodeFactoryFlags[NodeFactoryFlags["NoIndentationOnFreshPropertyAccess"] = 4] = "NoIndentationOnFreshPropertyAccess"; + // Do not set an `original` pointer when updating a node. + NodeFactoryFlags[NodeFactoryFlags["NoOriginalNode"] = 8] = "NoOriginalNode"; + })(NodeFactoryFlags = ts.NodeFactoryFlags || (ts.NodeFactoryFlags = {})); + /** + * Creates a `NodeFactory` that can be used to create and update a syntax tree. + * @param flags Flags that control factory behavior. + * @param baseFactory A `BaseNodeFactory` used to create the base `Node` objects. + */ + /* @internal */ + function createNodeFactory(flags, baseFactory) { + var update = flags & 8 /* NoOriginalNode */ ? updateWithoutOriginal : updateWithOriginal; + // Lazily load the parenthesizer, node converters, and some factory methods until they are used. + var parenthesizerRules = ts.memoize(function () { return flags & 1 /* NoParenthesizerRules */ ? ts.nullParenthesizerRules : ts.createParenthesizerRules(factory); }); + var converters = ts.memoize(function () { return flags & 2 /* NoNodeConverters */ ? ts.nullNodeConverters : ts.createNodeConverters(factory); }); + // lazy initializaton of common operator factories + var getBinaryCreateFunction = ts.memoizeOne(function (operator) { return function (left, right) { return createBinaryExpression(left, operator, right); }; }); + var getPrefixUnaryCreateFunction = ts.memoizeOne(function (operator) { return function (operand) { return createPrefixUnaryExpression(operator, operand); }; }); + var getPostfixUnaryCreateFunction = ts.memoizeOne(function (operator) { return function (operand) { return createPostfixUnaryExpression(operand, operator); }; }); + var getJSDocPrimaryTypeCreateFunction = ts.memoizeOne(function (kind) { return function () { return createJSDocPrimaryTypeWorker(kind); }; }); + var getJSDocUnaryTypeCreateFunction = ts.memoizeOne(function (kind) { return function (type) { return createJSDocUnaryTypeWorker(kind, type); }; }); + var getJSDocUnaryTypeUpdateFunction = ts.memoizeOne(function (kind) { return function (node, type) { return updateJSDocUnaryTypeWorker(kind, node, type); }; }); + var getJSDocSimpleTagCreateFunction = ts.memoizeOne(function (kind) { return function (tagName, comment) { return createJSDocSimpleTagWorker(kind, tagName, comment); }; }); + var getJSDocSimpleTagUpdateFunction = ts.memoizeOne(function (kind) { return function (node, tagName, comment) { return updateJSDocSimpleTagWorker(kind, node, tagName, comment); }; }); + var getJSDocTypeLikeTagCreateFunction = ts.memoizeOne(function (kind) { return function (tagName, typeExpression, comment) { return createJSDocTypeLikeTagWorker(kind, tagName, typeExpression, comment); }; }); + var getJSDocTypeLikeTagUpdateFunction = ts.memoizeOne(function (kind) { return function (node, tagName, typeExpression, comment) { return updateJSDocTypeLikeTagWorker(kind, node, tagName, typeExpression, comment); }; }); + var factory = { + get parenthesizer() { return parenthesizerRules(); }, + get converters() { return converters(); }, + createNodeArray: createNodeArray, + createNumericLiteral: createNumericLiteral, + createBigIntLiteral: createBigIntLiteral, + createStringLiteral: createStringLiteral, + createStringLiteralFromNode: createStringLiteralFromNode, + createRegularExpressionLiteral: createRegularExpressionLiteral, + createLiteralLikeNode: createLiteralLikeNode, + createIdentifier: createIdentifier, + updateIdentifier: updateIdentifier, + createTempVariable: createTempVariable, + createLoopVariable: createLoopVariable, + createUniqueName: createUniqueName, + getGeneratedNameForNode: getGeneratedNameForNode, + createPrivateIdentifier: createPrivateIdentifier, + createToken: createToken, + createSuper: createSuper, + createThis: createThis, + createNull: createNull, + createTrue: createTrue, + createFalse: createFalse, + createModifier: createModifier, + createModifiersFromModifierFlags: createModifiersFromModifierFlags, + createQualifiedName: createQualifiedName, + updateQualifiedName: updateQualifiedName, + createComputedPropertyName: createComputedPropertyName, + updateComputedPropertyName: updateComputedPropertyName, + createTypeParameterDeclaration: createTypeParameterDeclaration, + updateTypeParameterDeclaration: updateTypeParameterDeclaration, + createParameterDeclaration: createParameterDeclaration, + updateParameterDeclaration: updateParameterDeclaration, + createDecorator: createDecorator, + updateDecorator: updateDecorator, + createPropertySignature: createPropertySignature, + updatePropertySignature: updatePropertySignature, + createPropertyDeclaration: createPropertyDeclaration, + updatePropertyDeclaration: updatePropertyDeclaration, + createMethodSignature: createMethodSignature, + updateMethodSignature: updateMethodSignature, + createMethodDeclaration: createMethodDeclaration, + updateMethodDeclaration: updateMethodDeclaration, + createConstructorDeclaration: createConstructorDeclaration, + updateConstructorDeclaration: updateConstructorDeclaration, + createGetAccessorDeclaration: createGetAccessorDeclaration, + updateGetAccessorDeclaration: updateGetAccessorDeclaration, + createSetAccessorDeclaration: createSetAccessorDeclaration, + updateSetAccessorDeclaration: updateSetAccessorDeclaration, + createCallSignature: createCallSignature, + updateCallSignature: updateCallSignature, + createConstructSignature: createConstructSignature, + updateConstructSignature: updateConstructSignature, + createIndexSignature: createIndexSignature, + updateIndexSignature: updateIndexSignature, + createKeywordTypeNode: createKeywordTypeNode, + createTypePredicateNode: createTypePredicateNode, + updateTypePredicateNode: updateTypePredicateNode, + createTypeReferenceNode: createTypeReferenceNode, + updateTypeReferenceNode: updateTypeReferenceNode, + createFunctionTypeNode: createFunctionTypeNode, + updateFunctionTypeNode: updateFunctionTypeNode, + createConstructorTypeNode: createConstructorTypeNode, + updateConstructorTypeNode: updateConstructorTypeNode, + createTypeQueryNode: createTypeQueryNode, + updateTypeQueryNode: updateTypeQueryNode, + createTypeLiteralNode: createTypeLiteralNode, + updateTypeLiteralNode: updateTypeLiteralNode, + createArrayTypeNode: createArrayTypeNode, + updateArrayTypeNode: updateArrayTypeNode, + createTupleTypeNode: createTupleTypeNode, + updateTupleTypeNode: updateTupleTypeNode, + createNamedTupleMember: createNamedTupleMember, + updateNamedTupleMember: updateNamedTupleMember, + createOptionalTypeNode: createOptionalTypeNode, + updateOptionalTypeNode: updateOptionalTypeNode, + createRestTypeNode: createRestTypeNode, + updateRestTypeNode: updateRestTypeNode, + createUnionTypeNode: createUnionTypeNode, + updateUnionTypeNode: updateUnionTypeNode, + createIntersectionTypeNode: createIntersectionTypeNode, + updateIntersectionTypeNode: updateIntersectionTypeNode, + createConditionalTypeNode: createConditionalTypeNode, + updateConditionalTypeNode: updateConditionalTypeNode, + createInferTypeNode: createInferTypeNode, + updateInferTypeNode: updateInferTypeNode, + createImportTypeNode: createImportTypeNode, + updateImportTypeNode: updateImportTypeNode, + createParenthesizedType: createParenthesizedType, + updateParenthesizedType: updateParenthesizedType, + createThisTypeNode: createThisTypeNode, + createTypeOperatorNode: createTypeOperatorNode, + updateTypeOperatorNode: updateTypeOperatorNode, + createIndexedAccessTypeNode: createIndexedAccessTypeNode, + updateIndexedAccessTypeNode: updateIndexedAccessTypeNode, + createMappedTypeNode: createMappedTypeNode, + updateMappedTypeNode: updateMappedTypeNode, + createLiteralTypeNode: createLiteralTypeNode, + updateLiteralTypeNode: updateLiteralTypeNode, + createObjectBindingPattern: createObjectBindingPattern, + updateObjectBindingPattern: updateObjectBindingPattern, + createArrayBindingPattern: createArrayBindingPattern, + updateArrayBindingPattern: updateArrayBindingPattern, + createBindingElement: createBindingElement, + updateBindingElement: updateBindingElement, + createArrayLiteralExpression: createArrayLiteralExpression, + updateArrayLiteralExpression: updateArrayLiteralExpression, + createObjectLiteralExpression: createObjectLiteralExpression, + updateObjectLiteralExpression: updateObjectLiteralExpression, + createPropertyAccessExpression: flags & 4 /* NoIndentationOnFreshPropertyAccess */ ? + function (expression, name) { return ts.setEmitFlags(createPropertyAccessExpression(expression, name), 131072 /* NoIndentation */); } : + createPropertyAccessExpression, + updatePropertyAccessExpression: updatePropertyAccessExpression, + createPropertyAccessChain: flags & 4 /* NoIndentationOnFreshPropertyAccess */ ? + function (expression, questionDotToken, name) { return ts.setEmitFlags(createPropertyAccessChain(expression, questionDotToken, name), 131072 /* NoIndentation */); } : + createPropertyAccessChain, + updatePropertyAccessChain: updatePropertyAccessChain, + createElementAccessExpression: createElementAccessExpression, + updateElementAccessExpression: updateElementAccessExpression, + createElementAccessChain: createElementAccessChain, + updateElementAccessChain: updateElementAccessChain, + createCallExpression: createCallExpression, + updateCallExpression: updateCallExpression, + createCallChain: createCallChain, + updateCallChain: updateCallChain, + createNewExpression: createNewExpression, + updateNewExpression: updateNewExpression, + createTaggedTemplateExpression: createTaggedTemplateExpression, + updateTaggedTemplateExpression: updateTaggedTemplateExpression, + createTypeAssertion: createTypeAssertion, + updateTypeAssertion: updateTypeAssertion, + createParenthesizedExpression: createParenthesizedExpression, + updateParenthesizedExpression: updateParenthesizedExpression, + createFunctionExpression: createFunctionExpression, + updateFunctionExpression: updateFunctionExpression, + createArrowFunction: createArrowFunction, + updateArrowFunction: updateArrowFunction, + createDeleteExpression: createDeleteExpression, + updateDeleteExpression: updateDeleteExpression, + createTypeOfExpression: createTypeOfExpression, + updateTypeOfExpression: updateTypeOfExpression, + createVoidExpression: createVoidExpression, + updateVoidExpression: updateVoidExpression, + createAwaitExpression: createAwaitExpression, + updateAwaitExpression: updateAwaitExpression, + createPrefixUnaryExpression: createPrefixUnaryExpression, + updatePrefixUnaryExpression: updatePrefixUnaryExpression, + createPostfixUnaryExpression: createPostfixUnaryExpression, + updatePostfixUnaryExpression: updatePostfixUnaryExpression, + createBinaryExpression: createBinaryExpression, + updateBinaryExpression: updateBinaryExpression, + createConditionalExpression: createConditionalExpression, + updateConditionalExpression: updateConditionalExpression, + createTemplateExpression: createTemplateExpression, + updateTemplateExpression: updateTemplateExpression, + createTemplateHead: createTemplateHead, + createTemplateMiddle: createTemplateMiddle, + createTemplateTail: createTemplateTail, + createNoSubstitutionTemplateLiteral: createNoSubstitutionTemplateLiteral, + createTemplateLiteralLikeNode: createTemplateLiteralLikeNode, + createYieldExpression: createYieldExpression, + updateYieldExpression: updateYieldExpression, + createSpreadElement: createSpreadElement, + updateSpreadElement: updateSpreadElement, + createClassExpression: createClassExpression, + updateClassExpression: updateClassExpression, + createOmittedExpression: createOmittedExpression, + createExpressionWithTypeArguments: createExpressionWithTypeArguments, + updateExpressionWithTypeArguments: updateExpressionWithTypeArguments, + createAsExpression: createAsExpression, + updateAsExpression: updateAsExpression, + createNonNullExpression: createNonNullExpression, + updateNonNullExpression: updateNonNullExpression, + createNonNullChain: createNonNullChain, + updateNonNullChain: updateNonNullChain, + createMetaProperty: createMetaProperty, + updateMetaProperty: updateMetaProperty, + createTemplateSpan: createTemplateSpan, + updateTemplateSpan: updateTemplateSpan, + createSemicolonClassElement: createSemicolonClassElement, + createBlock: createBlock, + updateBlock: updateBlock, + createVariableStatement: createVariableStatement, + updateVariableStatement: updateVariableStatement, + createEmptyStatement: createEmptyStatement, + createExpressionStatement: createExpressionStatement, + updateExpressionStatement: updateExpressionStatement, + createIfStatement: createIfStatement, + updateIfStatement: updateIfStatement, + createDoStatement: createDoStatement, + updateDoStatement: updateDoStatement, + createWhileStatement: createWhileStatement, + updateWhileStatement: updateWhileStatement, + createForStatement: createForStatement, + updateForStatement: updateForStatement, + createForInStatement: createForInStatement, + updateForInStatement: updateForInStatement, + createForOfStatement: createForOfStatement, + updateForOfStatement: updateForOfStatement, + createContinueStatement: createContinueStatement, + updateContinueStatement: updateContinueStatement, + createBreakStatement: createBreakStatement, + updateBreakStatement: updateBreakStatement, + createReturnStatement: createReturnStatement, + updateReturnStatement: updateReturnStatement, + createWithStatement: createWithStatement, + updateWithStatement: updateWithStatement, + createSwitchStatement: createSwitchStatement, + updateSwitchStatement: updateSwitchStatement, + createLabeledStatement: createLabeledStatement, + updateLabeledStatement: updateLabeledStatement, + createThrowStatement: createThrowStatement, + updateThrowStatement: updateThrowStatement, + createTryStatement: createTryStatement, + updateTryStatement: updateTryStatement, + createDebuggerStatement: createDebuggerStatement, + createVariableDeclaration: createVariableDeclaration, + updateVariableDeclaration: updateVariableDeclaration, + createVariableDeclarationList: createVariableDeclarationList, + updateVariableDeclarationList: updateVariableDeclarationList, + createFunctionDeclaration: createFunctionDeclaration, + updateFunctionDeclaration: updateFunctionDeclaration, + createClassDeclaration: createClassDeclaration, + updateClassDeclaration: updateClassDeclaration, + createInterfaceDeclaration: createInterfaceDeclaration, + updateInterfaceDeclaration: updateInterfaceDeclaration, + createTypeAliasDeclaration: createTypeAliasDeclaration, + updateTypeAliasDeclaration: updateTypeAliasDeclaration, + createEnumDeclaration: createEnumDeclaration, + updateEnumDeclaration: updateEnumDeclaration, + createModuleDeclaration: createModuleDeclaration, + updateModuleDeclaration: updateModuleDeclaration, + createModuleBlock: createModuleBlock, + updateModuleBlock: updateModuleBlock, + createCaseBlock: createCaseBlock, + updateCaseBlock: updateCaseBlock, + createNamespaceExportDeclaration: createNamespaceExportDeclaration, + updateNamespaceExportDeclaration: updateNamespaceExportDeclaration, + createImportEqualsDeclaration: createImportEqualsDeclaration, + updateImportEqualsDeclaration: updateImportEqualsDeclaration, + createImportDeclaration: createImportDeclaration, + updateImportDeclaration: updateImportDeclaration, + createImportClause: createImportClause, + updateImportClause: updateImportClause, + createNamespaceImport: createNamespaceImport, + updateNamespaceImport: updateNamespaceImport, + createNamespaceExport: createNamespaceExport, + updateNamespaceExport: updateNamespaceExport, + createNamedImports: createNamedImports, + updateNamedImports: updateNamedImports, + createImportSpecifier: createImportSpecifier, + updateImportSpecifier: updateImportSpecifier, + createExportAssignment: createExportAssignment, + updateExportAssignment: updateExportAssignment, + createExportDeclaration: createExportDeclaration, + updateExportDeclaration: updateExportDeclaration, + createNamedExports: createNamedExports, + updateNamedExports: updateNamedExports, + createExportSpecifier: createExportSpecifier, + updateExportSpecifier: updateExportSpecifier, + createMissingDeclaration: createMissingDeclaration, + createExternalModuleReference: createExternalModuleReference, + updateExternalModuleReference: updateExternalModuleReference, + // lazily load factory members for JSDoc types with similar structure + get createJSDocAllType() { return getJSDocPrimaryTypeCreateFunction(299 /* JSDocAllType */); }, + get createJSDocUnknownType() { return getJSDocPrimaryTypeCreateFunction(300 /* JSDocUnknownType */); }, + get createJSDocNonNullableType() { return getJSDocUnaryTypeCreateFunction(302 /* JSDocNonNullableType */); }, + get updateJSDocNonNullableType() { return getJSDocUnaryTypeUpdateFunction(302 /* JSDocNonNullableType */); }, + get createJSDocNullableType() { return getJSDocUnaryTypeCreateFunction(301 /* JSDocNullableType */); }, + get updateJSDocNullableType() { return getJSDocUnaryTypeUpdateFunction(301 /* JSDocNullableType */); }, + get createJSDocOptionalType() { return getJSDocUnaryTypeCreateFunction(303 /* JSDocOptionalType */); }, + get updateJSDocOptionalType() { return getJSDocUnaryTypeUpdateFunction(303 /* JSDocOptionalType */); }, + get createJSDocVariadicType() { return getJSDocUnaryTypeCreateFunction(305 /* JSDocVariadicType */); }, + get updateJSDocVariadicType() { return getJSDocUnaryTypeUpdateFunction(305 /* JSDocVariadicType */); }, + get createJSDocNamepathType() { return getJSDocUnaryTypeCreateFunction(306 /* JSDocNamepathType */); }, + get updateJSDocNamepathType() { return getJSDocUnaryTypeUpdateFunction(306 /* JSDocNamepathType */); }, + createJSDocFunctionType: createJSDocFunctionType, + updateJSDocFunctionType: updateJSDocFunctionType, + createJSDocTypeLiteral: createJSDocTypeLiteral, + updateJSDocTypeLiteral: updateJSDocTypeLiteral, + createJSDocTypeExpression: createJSDocTypeExpression, + updateJSDocTypeExpression: updateJSDocTypeExpression, + createJSDocSignature: createJSDocSignature, + updateJSDocSignature: updateJSDocSignature, + createJSDocTemplateTag: createJSDocTemplateTag, + updateJSDocTemplateTag: updateJSDocTemplateTag, + createJSDocTypedefTag: createJSDocTypedefTag, + updateJSDocTypedefTag: updateJSDocTypedefTag, + createJSDocParameterTag: createJSDocParameterTag, + updateJSDocParameterTag: updateJSDocParameterTag, + createJSDocPropertyTag: createJSDocPropertyTag, + updateJSDocPropertyTag: updateJSDocPropertyTag, + createJSDocCallbackTag: createJSDocCallbackTag, + updateJSDocCallbackTag: updateJSDocCallbackTag, + createJSDocAugmentsTag: createJSDocAugmentsTag, + updateJSDocAugmentsTag: updateJSDocAugmentsTag, + createJSDocImplementsTag: createJSDocImplementsTag, + updateJSDocImplementsTag: updateJSDocImplementsTag, + // lazily load factory members for JSDoc tags with similar structure + get createJSDocTypeTag() { return getJSDocTypeLikeTagCreateFunction(325 /* JSDocTypeTag */); }, + get updateJSDocTypeTag() { return getJSDocTypeLikeTagUpdateFunction(325 /* JSDocTypeTag */); }, + get createJSDocReturnTag() { return getJSDocTypeLikeTagCreateFunction(323 /* JSDocReturnTag */); }, + get updateJSDocReturnTag() { return getJSDocTypeLikeTagUpdateFunction(323 /* JSDocReturnTag */); }, + get createJSDocThisTag() { return getJSDocTypeLikeTagCreateFunction(324 /* JSDocThisTag */); }, + get updateJSDocThisTag() { return getJSDocTypeLikeTagUpdateFunction(324 /* JSDocThisTag */); }, + get createJSDocEnumTag() { return getJSDocTypeLikeTagCreateFunction(321 /* JSDocEnumTag */); }, + get updateJSDocEnumTag() { return getJSDocTypeLikeTagUpdateFunction(321 /* JSDocEnumTag */); }, + get createJSDocAuthorTag() { return getJSDocSimpleTagCreateFunction(313 /* JSDocAuthorTag */); }, + get updateJSDocAuthorTag() { return getJSDocSimpleTagUpdateFunction(313 /* JSDocAuthorTag */); }, + get createJSDocClassTag() { return getJSDocSimpleTagCreateFunction(315 /* JSDocClassTag */); }, + get updateJSDocClassTag() { return getJSDocSimpleTagUpdateFunction(315 /* JSDocClassTag */); }, + get createJSDocPublicTag() { return getJSDocSimpleTagCreateFunction(316 /* JSDocPublicTag */); }, + get updateJSDocPublicTag() { return getJSDocSimpleTagUpdateFunction(316 /* JSDocPublicTag */); }, + get createJSDocPrivateTag() { return getJSDocSimpleTagCreateFunction(317 /* JSDocPrivateTag */); }, + get updateJSDocPrivateTag() { return getJSDocSimpleTagUpdateFunction(317 /* JSDocPrivateTag */); }, + get createJSDocProtectedTag() { return getJSDocSimpleTagCreateFunction(318 /* JSDocProtectedTag */); }, + get updateJSDocProtectedTag() { return getJSDocSimpleTagUpdateFunction(318 /* JSDocProtectedTag */); }, + get createJSDocReadonlyTag() { return getJSDocSimpleTagCreateFunction(319 /* JSDocReadonlyTag */); }, + get updateJSDocReadonlyTag() { return getJSDocSimpleTagUpdateFunction(319 /* JSDocReadonlyTag */); }, + get createJSDocDeprecatedTag() { return getJSDocSimpleTagCreateFunction(314 /* JSDocDeprecatedTag */); }, + get updateJSDocDeprecatedTag() { return getJSDocSimpleTagUpdateFunction(314 /* JSDocDeprecatedTag */); }, + createJSDocUnknownTag: createJSDocUnknownTag, + updateJSDocUnknownTag: updateJSDocUnknownTag, + createJSDocComment: createJSDocComment, + updateJSDocComment: updateJSDocComment, + createJsxElement: createJsxElement, + updateJsxElement: updateJsxElement, + createJsxSelfClosingElement: createJsxSelfClosingElement, + updateJsxSelfClosingElement: updateJsxSelfClosingElement, + createJsxOpeningElement: createJsxOpeningElement, + updateJsxOpeningElement: updateJsxOpeningElement, + createJsxClosingElement: createJsxClosingElement, + updateJsxClosingElement: updateJsxClosingElement, + createJsxFragment: createJsxFragment, + createJsxText: createJsxText, + updateJsxText: updateJsxText, + createJsxOpeningFragment: createJsxOpeningFragment, + createJsxJsxClosingFragment: createJsxJsxClosingFragment, + updateJsxFragment: updateJsxFragment, + createJsxAttribute: createJsxAttribute, + updateJsxAttribute: updateJsxAttribute, + createJsxAttributes: createJsxAttributes, + updateJsxAttributes: updateJsxAttributes, + createJsxSpreadAttribute: createJsxSpreadAttribute, + updateJsxSpreadAttribute: updateJsxSpreadAttribute, + createJsxExpression: createJsxExpression, + updateJsxExpression: updateJsxExpression, + createCaseClause: createCaseClause, + updateCaseClause: updateCaseClause, + createDefaultClause: createDefaultClause, + updateDefaultClause: updateDefaultClause, + createHeritageClause: createHeritageClause, + updateHeritageClause: updateHeritageClause, + createCatchClause: createCatchClause, + updateCatchClause: updateCatchClause, + createPropertyAssignment: createPropertyAssignment, + updatePropertyAssignment: updatePropertyAssignment, + createShorthandPropertyAssignment: createShorthandPropertyAssignment, + updateShorthandPropertyAssignment: updateShorthandPropertyAssignment, + createSpreadAssignment: createSpreadAssignment, + updateSpreadAssignment: updateSpreadAssignment, + createEnumMember: createEnumMember, + updateEnumMember: updateEnumMember, + createSourceFile: createSourceFile, + updateSourceFile: updateSourceFile, + createBundle: createBundle, + updateBundle: updateBundle, + createUnparsedSource: createUnparsedSource, + createUnparsedPrologue: createUnparsedPrologue, + createUnparsedPrepend: createUnparsedPrepend, + createUnparsedTextLike: createUnparsedTextLike, + createUnparsedSyntheticReference: createUnparsedSyntheticReference, + createInputFiles: createInputFiles, + createSyntheticExpression: createSyntheticExpression, + createSyntaxList: createSyntaxList, + createNotEmittedStatement: createNotEmittedStatement, + createPartiallyEmittedExpression: createPartiallyEmittedExpression, + updatePartiallyEmittedExpression: updatePartiallyEmittedExpression, + createCommaListExpression: createCommaListExpression, + updateCommaListExpression: updateCommaListExpression, + createEndOfDeclarationMarker: createEndOfDeclarationMarker, + createMergeDeclarationMarker: createMergeDeclarationMarker, + createSyntheticReferenceExpression: createSyntheticReferenceExpression, + updateSyntheticReferenceExpression: updateSyntheticReferenceExpression, + cloneNode: cloneNode, + // Lazily load factory methods for common operator factories and utilities + get createComma() { return getBinaryCreateFunction(27 /* CommaToken */); }, + get createAssignment() { return getBinaryCreateFunction(62 /* EqualsToken */); }, + get createLogicalOr() { return getBinaryCreateFunction(56 /* BarBarToken */); }, + get createLogicalAnd() { return getBinaryCreateFunction(55 /* AmpersandAmpersandToken */); }, + get createBitwiseOr() { return getBinaryCreateFunction(51 /* BarToken */); }, + get createBitwiseXor() { return getBinaryCreateFunction(52 /* CaretToken */); }, + get createBitwiseAnd() { return getBinaryCreateFunction(50 /* AmpersandToken */); }, + get createStrictEquality() { return getBinaryCreateFunction(36 /* EqualsEqualsEqualsToken */); }, + get createStrictInequality() { return getBinaryCreateFunction(37 /* ExclamationEqualsEqualsToken */); }, + get createEquality() { return getBinaryCreateFunction(34 /* EqualsEqualsToken */); }, + get createInequality() { return getBinaryCreateFunction(35 /* ExclamationEqualsToken */); }, + get createLessThan() { return getBinaryCreateFunction(29 /* LessThanToken */); }, + get createLessThanEquals() { return getBinaryCreateFunction(32 /* LessThanEqualsToken */); }, + get createGreaterThan() { return getBinaryCreateFunction(31 /* GreaterThanToken */); }, + get createGreaterThanEquals() { return getBinaryCreateFunction(33 /* GreaterThanEqualsToken */); }, + get createLeftShift() { return getBinaryCreateFunction(47 /* LessThanLessThanToken */); }, + get createRightShift() { return getBinaryCreateFunction(48 /* GreaterThanGreaterThanToken */); }, + get createUnsignedRightShift() { return getBinaryCreateFunction(49 /* GreaterThanGreaterThanGreaterThanToken */); }, + get createAdd() { return getBinaryCreateFunction(39 /* PlusToken */); }, + get createSubtract() { return getBinaryCreateFunction(40 /* MinusToken */); }, + get createMultiply() { return getBinaryCreateFunction(41 /* AsteriskToken */); }, + get createDivide() { return getBinaryCreateFunction(43 /* SlashToken */); }, + get createModulo() { return getBinaryCreateFunction(44 /* PercentToken */); }, + get createExponent() { return getBinaryCreateFunction(42 /* AsteriskAsteriskToken */); }, + get createPrefixPlus() { return getPrefixUnaryCreateFunction(39 /* PlusToken */); }, + get createPrefixMinus() { return getPrefixUnaryCreateFunction(40 /* MinusToken */); }, + get createPrefixIncrement() { return getPrefixUnaryCreateFunction(45 /* PlusPlusToken */); }, + get createPrefixDecrement() { return getPrefixUnaryCreateFunction(46 /* MinusMinusToken */); }, + get createBitwiseNot() { return getPrefixUnaryCreateFunction(54 /* TildeToken */); }, + get createLogicalNot() { return getPrefixUnaryCreateFunction(53 /* ExclamationToken */); }, + get createPostfixIncrement() { return getPostfixUnaryCreateFunction(45 /* PlusPlusToken */); }, + get createPostfixDecrement() { return getPostfixUnaryCreateFunction(46 /* MinusMinusToken */); }, + // Compound nodes + createImmediatelyInvokedFunctionExpression: createImmediatelyInvokedFunctionExpression, + createImmediatelyInvokedArrowFunction: createImmediatelyInvokedArrowFunction, + createVoidZero: createVoidZero, + createExportDefault: createExportDefault, + createExternalModuleExport: createExternalModuleExport, + createTypeCheck: createTypeCheck, + createMethodCall: createMethodCall, + createGlobalMethodCall: createGlobalMethodCall, + createFunctionBindCall: createFunctionBindCall, + createFunctionCallCall: createFunctionCallCall, + createFunctionApplyCall: createFunctionApplyCall, + createArraySliceCall: createArraySliceCall, + createArrayConcatCall: createArrayConcatCall, + createObjectDefinePropertyCall: createObjectDefinePropertyCall, + createPropertyDescriptor: createPropertyDescriptor, + createCallBinding: createCallBinding, + // Utilities + inlineExpressions: inlineExpressions, + getInternalName: getInternalName, + getLocalName: getLocalName, + getExportName: getExportName, + getDeclarationName: getDeclarationName, + getNamespaceMemberName: getNamespaceMemberName, + getExternalModuleOrNamespaceExportName: getExternalModuleOrNamespaceExportName, + restoreOuterExpressions: restoreOuterExpressions, + restoreEnclosingLabel: restoreEnclosingLabel, + createUseStrictPrologue: createUseStrictPrologue, + copyPrologue: copyPrologue, + copyStandardPrologue: copyStandardPrologue, + copyCustomPrologue: copyCustomPrologue, + ensureUseStrict: ensureUseStrict, + liftToBlock: liftToBlock, + mergeLexicalEnvironment: mergeLexicalEnvironment, + updateModifiers: updateModifiers, + }; + return factory; + // @api + function createNodeArray(elements, hasTrailingComma) { + if (elements === undefined || elements === ts.emptyArray) { + elements = []; + } + else if (ts.isNodeArray(elements)) { + // Ensure the transform flags have been aggregated for this NodeArray + if (elements.transformFlags === undefined) { + aggregateChildrenFlags(elements); + } + return elements; + } + // Since the element list of a node array is typically created by starting with an empty array and + // repeatedly calling push(), the list may not have the optimal memory layout. We invoke slice() for + // small arrays (1 to 4 elements) to give the VM a chance to allocate an optimal representation. + var length = elements.length; + var array = (length >= 1 && length <= 4 ? elements.slice() : elements); + ts.setTextRangePosEnd(array, -1, -1); + array.hasTrailingComma = !!hasTrailingComma; + aggregateChildrenFlags(array); + return array; + } + function createBaseNode(kind) { + return baseFactory.createBaseNode(kind); + } + function createBaseDeclaration(kind, decorators, modifiers) { + var node = createBaseNode(kind); + node.decorators = asNodeArray(decorators); + node.modifiers = asNodeArray(modifiers); + node.transformFlags |= + propagateChildrenFlags(node.decorators) | + propagateChildrenFlags(node.modifiers); + // NOTE: The following properties are commonly set by the binder and are added here to + // ensure declarations have a stable shape. + node.symbol = undefined; // initialized by binder + node.localSymbol = undefined; // initialized by binder + node.locals = undefined; // initialized by binder + node.nextContainer = undefined; // initialized by binder + return node; + } + function createBaseNamedDeclaration(kind, decorators, modifiers, name) { + var node = createBaseDeclaration(kind, decorators, modifiers); + name = asName(name); + node.name = name; + // The PropertyName of a member is allowed to be `await`. + // We don't need to exclude `await` for type signatures since types + // don't propagate child flags. + if (name) { + switch (node.kind) { + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 162 /* PropertyDeclaration */: + case 285 /* PropertyAssignment */: + if (ts.isIdentifier(name)) { + node.transformFlags |= propagateIdentifierNameFlags(name); + break; + } + // fall through + default: + node.transformFlags |= propagateChildFlags(name); + break; + } + } + return node; + } + function createBaseGenericNamedDeclaration(kind, decorators, modifiers, name, typeParameters) { + var node = createBaseNamedDeclaration(kind, decorators, modifiers, name); + node.typeParameters = asNodeArray(typeParameters); + node.transformFlags |= propagateChildrenFlags(node.typeParameters); + if (typeParameters) + node.transformFlags |= 1 /* ContainsTypeScript */; + return node; + } + function createBaseSignatureDeclaration(kind, decorators, modifiers, name, typeParameters, parameters, type) { + var node = createBaseGenericNamedDeclaration(kind, decorators, modifiers, name, typeParameters); + node.parameters = createNodeArray(parameters); + node.type = type; + node.transformFlags |= + propagateChildrenFlags(node.parameters) | + propagateChildFlags(node.type); + if (type) + node.transformFlags |= 1 /* ContainsTypeScript */; + return node; + } + function updateBaseSignatureDeclaration(updated, original) { + // copy children used only for error reporting + if (original.typeArguments) + updated.typeArguments = original.typeArguments; + return update(updated, original); + } + function createBaseFunctionLikeDeclaration(kind, decorators, modifiers, name, typeParameters, parameters, type, body) { + var node = createBaseSignatureDeclaration(kind, decorators, modifiers, name, typeParameters, parameters, type); + node.body = body; + node.transformFlags |= propagateChildFlags(node.body) & ~8388608 /* ContainsPossibleTopLevelAwait */; + if (!body) + node.transformFlags |= 1 /* ContainsTypeScript */; + return node; + } + function updateBaseFunctionLikeDeclaration(updated, original) { + // copy children used only for error reporting + if (original.exclamationToken) + updated.exclamationToken = original.exclamationToken; + if (original.typeArguments) + updated.typeArguments = original.typeArguments; + return updateBaseSignatureDeclaration(updated, original); + } + function createBaseInterfaceOrClassLikeDeclaration(kind, decorators, modifiers, name, typeParameters, heritageClauses) { + var node = createBaseGenericNamedDeclaration(kind, decorators, modifiers, name, typeParameters); + node.heritageClauses = asNodeArray(heritageClauses); + node.transformFlags |= propagateChildrenFlags(node.heritageClauses); + return node; + } + function createBaseClassLikeDeclaration(kind, decorators, modifiers, name, typeParameters, heritageClauses, members) { + var node = createBaseInterfaceOrClassLikeDeclaration(kind, decorators, modifiers, name, typeParameters, heritageClauses); + node.members = createNodeArray(members); + node.transformFlags |= propagateChildrenFlags(node.members); + return node; + } + function createBaseBindingLikeDeclaration(kind, decorators, modifiers, name, initializer) { + var node = createBaseNamedDeclaration(kind, decorators, modifiers, name); + node.initializer = initializer; + node.transformFlags |= propagateChildFlags(node.initializer); + return node; + } + function createBaseVariableLikeDeclaration(kind, decorators, modifiers, name, type, initializer) { + var node = createBaseBindingLikeDeclaration(kind, decorators, modifiers, name, initializer); + node.type = type; + node.transformFlags |= propagateChildFlags(type); + if (type) + node.transformFlags |= 1 /* ContainsTypeScript */; + return node; + } + // + // Literals + // + function createBaseLiteral(kind, text) { + var node = createBaseToken(kind); + node.text = text; + return node; + } + // @api + function createNumericLiteral(value, numericLiteralFlags) { + if (numericLiteralFlags === void 0) { numericLiteralFlags = 0 /* None */; } + var node = createBaseLiteral(8 /* NumericLiteral */, typeof value === "number" ? value + "" : value); + node.numericLiteralFlags = numericLiteralFlags; + if (numericLiteralFlags & 384 /* BinaryOrOctalSpecifier */) + node.transformFlags |= 256 /* ContainsES2015 */; + return node; + } + // @api + function createBigIntLiteral(value) { + var node = createBaseLiteral(9 /* BigIntLiteral */, typeof value === "string" ? value : ts.pseudoBigIntToString(value) + "n"); + node.transformFlags |= 4 /* ContainsESNext */; + return node; + } + function createBaseStringLiteral(text, isSingleQuote) { + var node = createBaseLiteral(10 /* StringLiteral */, text); + node.singleQuote = isSingleQuote; + return node; + } + // @api + function createStringLiteral(text, isSingleQuote, hasExtendedUnicodeEscape) { + var node = createBaseStringLiteral(text, isSingleQuote); + node.hasExtendedUnicodeEscape = hasExtendedUnicodeEscape; + if (hasExtendedUnicodeEscape) + node.transformFlags |= 256 /* ContainsES2015 */; + return node; + } + // @api + function createStringLiteralFromNode(sourceNode) { + var node = createBaseStringLiteral(ts.getTextOfIdentifierOrLiteral(sourceNode), /*isSingleQuote*/ undefined); + node.textSourceNode = sourceNode; + return node; + } + // @api + function createRegularExpressionLiteral(text) { + var node = createBaseLiteral(13 /* RegularExpressionLiteral */, text); + return node; + } + // @api + function createLiteralLikeNode(kind, text) { + switch (kind) { + case 8 /* NumericLiteral */: return createNumericLiteral(text, /*numericLiteralFlags*/ 0); + case 9 /* BigIntLiteral */: return createBigIntLiteral(text); + case 10 /* StringLiteral */: return createStringLiteral(text, /*isSingleQuote*/ undefined); + case 11 /* JsxText */: return createJsxText(text, /*containsOnlyTriviaWhiteSpaces*/ false); + case 12 /* JsxTextAllWhiteSpaces */: return createJsxText(text, /*containsOnlyTriviaWhiteSpaces*/ true); + case 13 /* RegularExpressionLiteral */: return createRegularExpressionLiteral(text); + case 14 /* NoSubstitutionTemplateLiteral */: return createTemplateLiteralLikeNode(kind, text, /*rawText*/ undefined, /*templateFlags*/ 0); + } + } + // + // Identifiers + // + function createBaseIdentifier(text, originalKeywordKind) { + if (originalKeywordKind === undefined && text) { + originalKeywordKind = ts.stringToToken(text); + } + if (originalKeywordKind === 78 /* Identifier */) { + originalKeywordKind = undefined; + } + var node = baseFactory.createBaseIdentifierNode(78 /* Identifier */); + node.originalKeywordKind = originalKeywordKind; + node.escapedText = ts.escapeLeadingUnderscores(text); + return node; + } + function createBaseGeneratedIdentifier(text, autoGenerateFlags) { + var node = createBaseIdentifier(text, /*originalKeywordKind*/ undefined); + node.autoGenerateFlags = autoGenerateFlags; + node.autoGenerateId = nextAutoGenerateId; + nextAutoGenerateId++; + return node; + } + // @api + function createIdentifier(text, typeArguments, originalKeywordKind) { + var node = createBaseIdentifier(text, originalKeywordKind); + if (typeArguments) { + // NOTE: we do not use `setChildren` here because typeArguments in an identifier do not contribute to transformations + node.typeArguments = createNodeArray(typeArguments); + } + if (node.originalKeywordKind === 130 /* AwaitKeyword */) { + node.transformFlags |= 8388608 /* ContainsPossibleTopLevelAwait */; + } + return node; + } + // @api + function updateIdentifier(node, typeArguments) { + return node.typeArguments !== typeArguments + ? update(createIdentifier(ts.idText(node), typeArguments), node) + : node; + } + // @api + function createTempVariable(recordTempVariable, reservedInNestedScopes) { + var flags = 1 /* Auto */; + if (reservedInNestedScopes) + flags |= 8 /* ReservedInNestedScopes */; + var name = createBaseGeneratedIdentifier("", flags); + if (recordTempVariable) { + recordTempVariable(name); + } + return name; + } + /** Create a unique temporary variable for use in a loop. */ + // @api + function createLoopVariable() { + return createBaseGeneratedIdentifier("", 2 /* Loop */); + } + /** Create a unique name based on the supplied text. */ + // @api + function createUniqueName(text, flags) { + if (flags === void 0) { flags = 0 /* None */; } + ts.Debug.assert(!(flags & 7 /* KindMask */), "Argument out of range: flags"); + ts.Debug.assert((flags & (16 /* Optimistic */ | 32 /* FileLevel */)) !== 32 /* FileLevel */, "GeneratedIdentifierFlags.FileLevel cannot be set without also setting GeneratedIdentifierFlags.Optimistic"); + return createBaseGeneratedIdentifier(text, 3 /* Unique */ | flags); + } + /** Create a unique name generated for a node. */ + // @api + function getGeneratedNameForNode(node, flags) { + if (flags === void 0) { flags = 0; } + ts.Debug.assert(!(flags & 7 /* KindMask */), "Argument out of range: flags"); + var name = createBaseGeneratedIdentifier(node && ts.isIdentifier(node) ? ts.idText(node) : "", 4 /* Node */ | flags); + name.original = node; + return name; + } + // @api + function createPrivateIdentifier(text) { + if (!ts.startsWith(text, "#")) + ts.Debug.fail("First character of private identifier must be #: " + text); + var node = baseFactory.createBasePrivateIdentifierNode(79 /* PrivateIdentifier */); + node.escapedText = ts.escapeLeadingUnderscores(text); + node.transformFlags |= 4194304 /* ContainsClassFields */; + return node; + } + // + // Punctuation + // + function createBaseToken(kind) { + return baseFactory.createBaseTokenNode(kind); + } + function createToken(token) { + ts.Debug.assert(token >= 0 /* FirstToken */ && token <= 155 /* LastToken */, "Invalid token"); + ts.Debug.assert(token <= 14 /* FirstTemplateToken */ || token >= 17 /* LastTemplateToken */, "Invalid token. Use 'createTemplateLiteralLikeNode' to create template literals."); + ts.Debug.assert(token <= 8 /* FirstLiteralToken */ || token >= 14 /* LastLiteralToken */, "Invalid token. Use 'createLiteralLikeNode' to create literals."); + ts.Debug.assert(token !== 78 /* Identifier */, "Invalid token. Use 'createIdentifier' to create identifiers"); + var node = createBaseToken(token); + var transformFlags = 0 /* None */; + switch (token) { + case 129 /* AsyncKeyword */: + // 'async' modifier is ES2017 (async functions) or ES2018 (async generators) + transformFlags = + 64 /* ContainsES2017 */ | + 32 /* ContainsES2018 */; + break; + case 122 /* PublicKeyword */: + case 120 /* PrivateKeyword */: + case 121 /* ProtectedKeyword */: + case 141 /* ReadonlyKeyword */: + case 125 /* AbstractKeyword */: + case 133 /* DeclareKeyword */: + case 84 /* ConstKeyword */: + case 128 /* AnyKeyword */: + case 143 /* NumberKeyword */: + case 154 /* BigIntKeyword */: + case 140 /* NeverKeyword */: + case 144 /* ObjectKeyword */: + case 146 /* StringKeyword */: + case 131 /* BooleanKeyword */: + case 147 /* SymbolKeyword */: + case 113 /* VoidKeyword */: + case 151 /* UnknownKeyword */: + case 149 /* UndefinedKeyword */: // `undefined` is an Identifier in the expression case. + transformFlags = 1 /* ContainsTypeScript */; + break; + case 123 /* StaticKeyword */: + case 105 /* SuperKeyword */: + transformFlags = 256 /* ContainsES2015 */; + break; + case 107 /* ThisKeyword */: + // 'this' indicates a lexical 'this' + transformFlags = 4096 /* ContainsLexicalThis */; + break; + } + if (transformFlags) { + node.transformFlags |= transformFlags; + } + return node; + } + // + // Reserved words + // + // @api + function createSuper() { + return createToken(105 /* SuperKeyword */); + } + // @api + function createThis() { + return createToken(107 /* ThisKeyword */); + } + // @api + function createNull() { + return createToken(103 /* NullKeyword */); + } + // @api + function createTrue() { + return createToken(109 /* TrueKeyword */); + } + // @api + function createFalse() { + return createToken(94 /* FalseKeyword */); + } + // + // Modifiers + // + // @api + function createModifier(kind) { + return createToken(kind); + } + // @api + function createModifiersFromModifierFlags(flags) { + var result = []; + if (flags & 1 /* Export */) { + result.push(createModifier(92 /* ExportKeyword */)); + } + if (flags & 2 /* Ambient */) { + result.push(createModifier(133 /* DeclareKeyword */)); + } + if (flags & 512 /* Default */) { + result.push(createModifier(87 /* DefaultKeyword */)); + } + if (flags & 2048 /* Const */) { + result.push(createModifier(84 /* ConstKeyword */)); + } + if (flags & 4 /* Public */) { + result.push(createModifier(122 /* PublicKeyword */)); + } + if (flags & 8 /* Private */) { + result.push(createModifier(120 /* PrivateKeyword */)); + } + if (flags & 16 /* Protected */) { + result.push(createModifier(121 /* ProtectedKeyword */)); + } + if (flags & 128 /* Abstract */) { + result.push(createModifier(125 /* AbstractKeyword */)); + } + if (flags & 32 /* Static */) { + result.push(createModifier(123 /* StaticKeyword */)); + } + if (flags & 64 /* Readonly */) { + result.push(createModifier(141 /* ReadonlyKeyword */)); + } + if (flags & 256 /* Async */) { + result.push(createModifier(129 /* AsyncKeyword */)); + } + return result; + } + // + // Names + // + // @api + function createQualifiedName(left, right) { + var node = createBaseNode(156 /* QualifiedName */); + node.left = left; + node.right = asName(right); + node.transformFlags |= + propagateChildFlags(node.left) | + propagateIdentifierNameFlags(node.right); + return node; + } + // @api + function updateQualifiedName(node, left, right) { + return node.left !== left + || node.right !== right + ? update(createQualifiedName(left, right), node) + : node; + } + // @api + function createComputedPropertyName(expression) { + var node = createBaseNode(157 /* ComputedPropertyName */); + node.expression = parenthesizerRules().parenthesizeExpressionOfComputedPropertyName(expression); + node.transformFlags |= + propagateChildFlags(node.expression) | + 256 /* ContainsES2015 */ | + 32768 /* ContainsComputedPropertyName */; + return node; + } + // @api + function updateComputedPropertyName(node, expression) { + return node.expression !== expression + ? update(createComputedPropertyName(expression), node) + : node; + } + // + // Signature elements + // + // @api + function createTypeParameterDeclaration(name, constraint, defaultType) { + var node = createBaseNamedDeclaration(158 /* TypeParameter */, + /*decorators*/ undefined, + /*modifiers*/ undefined, name); + node.constraint = constraint; + node.default = defaultType; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateTypeParameterDeclaration(node, name, constraint, defaultType) { + return node.name !== name + || node.constraint !== constraint + || node.default !== defaultType + ? update(createTypeParameterDeclaration(name, constraint, defaultType), node) + : node; + } + // @api + function createParameterDeclaration(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) { + var node = createBaseVariableLikeDeclaration(159 /* Parameter */, decorators, modifiers, name, type, initializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer)); + node.dotDotDotToken = dotDotDotToken; + node.questionToken = questionToken; + if (ts.isThisIdentifier(node.name)) { + node.transformFlags = 1 /* ContainsTypeScript */; + } + else { + node.transformFlags |= + propagateChildFlags(node.dotDotDotToken) | + propagateChildFlags(node.questionToken); + if (questionToken) + node.transformFlags |= 1 /* ContainsTypeScript */; + if (ts.modifiersToFlags(node.modifiers) & 92 /* ParameterPropertyModifier */) + node.transformFlags |= 2048 /* ContainsTypeScriptClassSyntax */; + if (initializer || dotDotDotToken) + node.transformFlags |= 256 /* ContainsES2015 */; + } + return node; + } + // @api + function updateParameterDeclaration(node, decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.dotDotDotToken !== dotDotDotToken + || node.name !== name + || node.questionToken !== questionToken + || node.type !== type + || node.initializer !== initializer + ? update(createParameterDeclaration(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer), node) + : node; + } + // @api + function createDecorator(expression) { + var node = createBaseNode(160 /* Decorator */); + node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression); + node.transformFlags |= + propagateChildFlags(node.expression) | + 1 /* ContainsTypeScript */ | + 2048 /* ContainsTypeScriptClassSyntax */; + return node; + } + // @api + function updateDecorator(node, expression) { + return node.expression !== expression + ? update(createDecorator(expression), node) + : node; + } + // + // Type Elements + // + // @api + function createPropertySignature(modifiers, name, questionToken, type) { + var node = createBaseNamedDeclaration(161 /* PropertySignature */, + /*decorators*/ undefined, modifiers, name); + node.type = type; + node.questionToken = questionToken; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updatePropertySignature(node, modifiers, name, questionToken, type) { + return node.modifiers !== modifiers + || node.name !== name + || node.questionToken !== questionToken + || node.type !== type + ? update(createPropertySignature(modifiers, name, questionToken, type), node) + : node; + } + // @api + function createPropertyDeclaration(decorators, modifiers, name, questionOrExclamationToken, type, initializer) { + var node = createBaseVariableLikeDeclaration(162 /* PropertyDeclaration */, decorators, modifiers, name, type, initializer); + node.questionToken = questionOrExclamationToken && ts.isQuestionToken(questionOrExclamationToken) ? questionOrExclamationToken : undefined; + node.exclamationToken = questionOrExclamationToken && ts.isExclamationToken(questionOrExclamationToken) ? questionOrExclamationToken : undefined; + node.transformFlags |= + propagateChildFlags(node.questionToken) | + propagateChildFlags(node.exclamationToken) | + 4194304 /* ContainsClassFields */; + if (ts.isComputedPropertyName(node.name) || (ts.hasStaticModifier(node) && node.initializer)) { + node.transformFlags |= 2048 /* ContainsTypeScriptClassSyntax */; + } + if (questionOrExclamationToken || ts.modifiersToFlags(node.modifiers) & 2 /* Ambient */) { + node.transformFlags |= 1 /* ContainsTypeScript */; + } + return node; + } + // @api + function updatePropertyDeclaration(node, decorators, modifiers, name, questionOrExclamationToken, type, initializer) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.questionToken !== (questionOrExclamationToken !== undefined && ts.isQuestionToken(questionOrExclamationToken) ? questionOrExclamationToken : undefined) + || node.exclamationToken !== (questionOrExclamationToken !== undefined && ts.isExclamationToken(questionOrExclamationToken) ? questionOrExclamationToken : undefined) + || node.type !== type + || node.initializer !== initializer + ? update(createPropertyDeclaration(decorators, modifiers, name, questionOrExclamationToken, type, initializer), node) + : node; + } + // @api + function createMethodSignature(modifiers, name, questionToken, typeParameters, parameters, type) { + var node = createBaseSignatureDeclaration(163 /* MethodSignature */, + /*decorators*/ undefined, modifiers, name, typeParameters, parameters, type); + node.questionToken = questionToken; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateMethodSignature(node, modifiers, name, questionToken, typeParameters, parameters, type) { + return node.modifiers !== modifiers + || node.name !== name + || node.questionToken !== questionToken + || node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + ? updateBaseSignatureDeclaration(createMethodSignature(modifiers, name, questionToken, typeParameters, parameters, type), node) + : node; + } + // @api + function createMethodDeclaration(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) { + var node = createBaseFunctionLikeDeclaration(164 /* MethodDeclaration */, decorators, modifiers, name, typeParameters, parameters, type, body); + node.asteriskToken = asteriskToken; + node.questionToken = questionToken; + node.transformFlags |= + propagateChildFlags(node.asteriskToken) | + propagateChildFlags(node.questionToken) | + 256 /* ContainsES2015 */; + if (questionToken) { + node.transformFlags |= 1 /* ContainsTypeScript */; + } + if (ts.modifiersToFlags(node.modifiers) & 256 /* Async */) { + if (asteriskToken) { + node.transformFlags |= 32 /* ContainsES2018 */; + } + else { + node.transformFlags |= 64 /* ContainsES2017 */; + } + } + else if (asteriskToken) { + node.transformFlags |= 512 /* ContainsGenerator */; + } + return node; + } + // @api + function updateMethodDeclaration(node, decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.asteriskToken !== asteriskToken + || node.name !== name + || node.questionToken !== questionToken + || node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + || node.body !== body + ? updateBaseFunctionLikeDeclaration(createMethodDeclaration(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body), node) + : node; + } + // @api + function createConstructorDeclaration(decorators, modifiers, parameters, body) { + var node = createBaseFunctionLikeDeclaration(165 /* Constructor */, decorators, modifiers, + /*name*/ undefined, + /*typeParameters*/ undefined, parameters, + /*type*/ undefined, body); + node.transformFlags |= 256 /* ContainsES2015 */; + return node; + } + // @api + function updateConstructorDeclaration(node, decorators, modifiers, parameters, body) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.parameters !== parameters + || node.body !== body + ? updateBaseFunctionLikeDeclaration(createConstructorDeclaration(decorators, modifiers, parameters, body), node) + : node; + } + // @api + function createGetAccessorDeclaration(decorators, modifiers, name, parameters, type, body) { + return createBaseFunctionLikeDeclaration(166 /* GetAccessor */, decorators, modifiers, name, + /*typeParameters*/ undefined, parameters, type, body); + } + // @api + function updateGetAccessorDeclaration(node, decorators, modifiers, name, parameters, type, body) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.parameters !== parameters + || node.type !== type + || node.body !== body + ? updateBaseFunctionLikeDeclaration(createGetAccessorDeclaration(decorators, modifiers, name, parameters, type, body), node) + : node; + } + // @api + function createSetAccessorDeclaration(decorators, modifiers, name, parameters, body) { + return createBaseFunctionLikeDeclaration(167 /* SetAccessor */, decorators, modifiers, name, + /*typeParameters*/ undefined, parameters, + /*type*/ undefined, body); + } + // @api + function updateSetAccessorDeclaration(node, decorators, modifiers, name, parameters, body) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.parameters !== parameters + || node.body !== body + ? updateBaseFunctionLikeDeclaration(createSetAccessorDeclaration(decorators, modifiers, name, parameters, body), node) + : node; + } + // @api + function createCallSignature(typeParameters, parameters, type) { + var node = createBaseSignatureDeclaration(168 /* CallSignature */, + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*name*/ undefined, typeParameters, parameters, type); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateCallSignature(node, typeParameters, parameters, type) { + return node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + ? updateBaseSignatureDeclaration(createCallSignature(typeParameters, parameters, type), node) + : node; + } + // @api + function createConstructSignature(typeParameters, parameters, type) { + var node = createBaseSignatureDeclaration(169 /* ConstructSignature */, + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*name*/ undefined, typeParameters, parameters, type); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateConstructSignature(node, typeParameters, parameters, type) { + return node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + ? updateBaseSignatureDeclaration(createConstructSignature(typeParameters, parameters, type), node) + : node; + } + // @api + function createIndexSignature(decorators, modifiers, parameters, type) { + var node = createBaseSignatureDeclaration(170 /* IndexSignature */, decorators, modifiers, + /*name*/ undefined, + /*typeParameters*/ undefined, parameters, type); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateIndexSignature(node, decorators, modifiers, parameters, type) { + return node.parameters !== parameters + || node.type !== type + || node.decorators !== decorators + || node.modifiers !== modifiers + ? updateBaseSignatureDeclaration(createIndexSignature(decorators, modifiers, parameters, type), node) + : node; + } + // + // Types + // + // @api + function createKeywordTypeNode(kind) { + return createToken(kind); + } + // @api + function createTypePredicateNode(assertsModifier, parameterName, type) { + var node = createBaseNode(171 /* TypePredicate */); + node.assertsModifier = assertsModifier; + node.parameterName = asName(parameterName); + node.type = type; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateTypePredicateNode(node, assertsModifier, parameterName, type) { + return node.assertsModifier !== assertsModifier + || node.parameterName !== parameterName + || node.type !== type + ? update(createTypePredicateNode(assertsModifier, parameterName, type), node) + : node; + } + // @api + function createTypeReferenceNode(typeName, typeArguments) { + var node = createBaseNode(172 /* TypeReference */); + node.typeName = asName(typeName); + node.typeArguments = typeArguments && parenthesizerRules().parenthesizeTypeArguments(createNodeArray(typeArguments)); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateTypeReferenceNode(node, typeName, typeArguments) { + return node.typeName !== typeName + || node.typeArguments !== typeArguments + ? update(createTypeReferenceNode(typeName, typeArguments), node) + : node; + } + // @api + function createFunctionTypeNode(typeParameters, parameters, type) { + var node = createBaseSignatureDeclaration(173 /* FunctionType */, + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*name*/ undefined, typeParameters, parameters, type); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateFunctionTypeNode(node, typeParameters, parameters, type) { + return node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + ? updateBaseSignatureDeclaration(createFunctionTypeNode(typeParameters, parameters, type), node) + : node; + } + // @api + function createConstructorTypeNode(typeParameters, parameters, type) { + var node = createBaseSignatureDeclaration(174 /* ConstructorType */, + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*name*/ undefined, typeParameters, parameters, type); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateConstructorTypeNode(node, typeParameters, parameters, type) { + return node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + ? updateBaseSignatureDeclaration(createConstructorTypeNode(typeParameters, parameters, type), node) + : node; + } + // @api + function createTypeQueryNode(exprName) { + var node = createBaseNode(175 /* TypeQuery */); + node.exprName = exprName; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateTypeQueryNode(node, exprName) { + return node.exprName !== exprName + ? update(createTypeQueryNode(exprName), node) + : node; + } + // @api + function createTypeLiteralNode(members) { + var node = createBaseNode(176 /* TypeLiteral */); + node.members = createNodeArray(members); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateTypeLiteralNode(node, members) { + return node.members !== members + ? update(createTypeLiteralNode(members), node) + : node; + } + // @api + function createArrayTypeNode(elementType) { + var node = createBaseNode(177 /* ArrayType */); + node.elementType = parenthesizerRules().parenthesizeElementTypeOfArrayType(elementType); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateArrayTypeNode(node, elementType) { + return node.elementType !== elementType + ? update(createArrayTypeNode(elementType), node) + : node; + } + // @api + function createTupleTypeNode(elements) { + var node = createBaseNode(178 /* TupleType */); + node.elements = createNodeArray(elements); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateTupleTypeNode(node, elements) { + return node.elements !== elements + ? update(createTupleTypeNode(elements), node) + : node; + } + // @api + function createNamedTupleMember(dotDotDotToken, name, questionToken, type) { + var node = createBaseNode(191 /* NamedTupleMember */); + node.dotDotDotToken = dotDotDotToken; + node.name = name; + node.questionToken = questionToken; + node.type = type; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateNamedTupleMember(node, dotDotDotToken, name, questionToken, type) { + return node.dotDotDotToken !== dotDotDotToken + || node.name !== name + || node.questionToken !== questionToken + || node.type !== type + ? update(createNamedTupleMember(dotDotDotToken, name, questionToken, type), node) + : node; + } + // @api + function createOptionalTypeNode(type) { + var node = createBaseNode(179 /* OptionalType */); + node.type = parenthesizerRules().parenthesizeElementTypeOfArrayType(type); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateOptionalTypeNode(node, type) { + return node.type !== type + ? update(createOptionalTypeNode(type), node) + : node; + } + // @api + function createRestTypeNode(type) { + var node = createBaseNode(180 /* RestType */); + node.type = type; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateRestTypeNode(node, type) { + return node.type !== type + ? update(createRestTypeNode(type), node) + : node; + } + function createUnionOrIntersectionTypeNode(kind, types) { + var node = createBaseNode(kind); + node.types = parenthesizerRules().parenthesizeConstituentTypesOfUnionOrIntersectionType(types); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + function updateUnionOrIntersectionTypeNode(node, types) { + return node.types !== types + ? update(createUnionOrIntersectionTypeNode(node.kind, types), node) + : node; + } + // @api + function createUnionTypeNode(types) { + return createUnionOrIntersectionTypeNode(181 /* UnionType */, types); + } + // @api + function updateUnionTypeNode(node, types) { + return updateUnionOrIntersectionTypeNode(node, types); + } + // @api + function createIntersectionTypeNode(types) { + return createUnionOrIntersectionTypeNode(182 /* IntersectionType */, types); + } + // @api + function updateIntersectionTypeNode(node, types) { + return updateUnionOrIntersectionTypeNode(node, types); + } + // @api + function createConditionalTypeNode(checkType, extendsType, trueType, falseType) { + var node = createBaseNode(183 /* ConditionalType */); + node.checkType = parenthesizerRules().parenthesizeMemberOfConditionalType(checkType); + node.extendsType = parenthesizerRules().parenthesizeMemberOfConditionalType(extendsType); + node.trueType = trueType; + node.falseType = falseType; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateConditionalTypeNode(node, checkType, extendsType, trueType, falseType) { + return node.checkType !== checkType + || node.extendsType !== extendsType + || node.trueType !== trueType + || node.falseType !== falseType + ? update(createConditionalTypeNode(checkType, extendsType, trueType, falseType), node) + : node; + } + // @api + function createInferTypeNode(typeParameter) { + var node = createBaseNode(184 /* InferType */); + node.typeParameter = typeParameter; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateInferTypeNode(node, typeParameter) { + return node.typeParameter !== typeParameter + ? update(createInferTypeNode(typeParameter), node) + : node; + } + // @api + function createImportTypeNode(argument, qualifier, typeArguments, isTypeOf) { + if (isTypeOf === void 0) { isTypeOf = false; } + var node = createBaseNode(192 /* ImportType */); + node.argument = argument; + node.qualifier = qualifier; + node.typeArguments = typeArguments && parenthesizerRules().parenthesizeTypeArguments(typeArguments); + node.isTypeOf = isTypeOf; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateImportTypeNode(node, argument, qualifier, typeArguments, isTypeOf) { + if (isTypeOf === void 0) { isTypeOf = node.isTypeOf; } + return node.argument !== argument + || node.qualifier !== qualifier + || node.typeArguments !== typeArguments + || node.isTypeOf !== isTypeOf + ? update(createImportTypeNode(argument, qualifier, typeArguments, isTypeOf), node) + : node; + } + // @api + function createParenthesizedType(type) { + var node = createBaseNode(185 /* ParenthesizedType */); + node.type = type; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateParenthesizedType(node, type) { + return node.type !== type + ? update(createParenthesizedType(type), node) + : node; + } + // @api + function createThisTypeNode() { + var node = createBaseNode(186 /* ThisType */); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function createTypeOperatorNode(operator, type) { + var node = createBaseNode(187 /* TypeOperator */); + node.operator = operator; + node.type = parenthesizerRules().parenthesizeMemberOfElementType(type); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateTypeOperatorNode(node, type) { + return node.type !== type + ? update(createTypeOperatorNode(node.operator, type), node) + : node; + } + // @api + function createIndexedAccessTypeNode(objectType, indexType) { + var node = createBaseNode(188 /* IndexedAccessType */); + node.objectType = parenthesizerRules().parenthesizeMemberOfElementType(objectType); + node.indexType = indexType; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateIndexedAccessTypeNode(node, objectType, indexType) { + return node.objectType !== objectType + || node.indexType !== indexType + ? update(createIndexedAccessTypeNode(objectType, indexType), node) + : node; + } + // @api + function createMappedTypeNode(readonlyToken, typeParameter, questionToken, type) { + var node = createBaseNode(189 /* MappedType */); + node.readonlyToken = readonlyToken; + node.typeParameter = typeParameter; + node.questionToken = questionToken; + node.type = type; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateMappedTypeNode(node, readonlyToken, typeParameter, questionToken, type) { + return node.readonlyToken !== readonlyToken + || node.typeParameter !== typeParameter + || node.questionToken !== questionToken + || node.type !== type + ? update(createMappedTypeNode(readonlyToken, typeParameter, questionToken, type), node) + : node; + } + // @api + function createLiteralTypeNode(literal) { + var node = createBaseNode(190 /* LiteralType */); + node.literal = literal; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateLiteralTypeNode(node, literal) { + return node.literal !== literal + ? update(createLiteralTypeNode(literal), node) + : node; + } + // + // Binding Patterns + // + // @api + function createObjectBindingPattern(elements) { + var node = createBaseNode(193 /* ObjectBindingPattern */); + node.elements = createNodeArray(elements); + node.transformFlags |= + propagateChildrenFlags(node.elements) | + 256 /* ContainsES2015 */ | + 131072 /* ContainsBindingPattern */; + if (node.transformFlags & 8192 /* ContainsRestOrSpread */) { + node.transformFlags |= + 32 /* ContainsES2018 */ | + 16384 /* ContainsObjectRestOrSpread */; + } + return node; + } + // @api + function updateObjectBindingPattern(node, elements) { + return node.elements !== elements + ? update(createObjectBindingPattern(elements), node) + : node; + } + // @api + function createArrayBindingPattern(elements) { + var node = createBaseNode(194 /* ArrayBindingPattern */); + node.elements = createNodeArray(elements); + node.transformFlags |= + propagateChildrenFlags(node.elements) | + 256 /* ContainsES2015 */ | + 131072 /* ContainsBindingPattern */; + return node; + } + // @api + function updateArrayBindingPattern(node, elements) { + return node.elements !== elements + ? update(createArrayBindingPattern(elements), node) + : node; + } + // @api + function createBindingElement(dotDotDotToken, propertyName, name, initializer) { + var node = createBaseBindingLikeDeclaration(195 /* BindingElement */, + /*decorators*/ undefined, + /*modifiers*/ undefined, name, initializer); + node.propertyName = asName(propertyName); + node.dotDotDotToken = dotDotDotToken; + node.transformFlags |= + propagateChildFlags(node.dotDotDotToken) | + 256 /* ContainsES2015 */; + if (node.propertyName) { + node.transformFlags |= ts.isIdentifier(node.propertyName) ? + propagateIdentifierNameFlags(node.propertyName) : + propagateChildFlags(node.propertyName); + } + if (dotDotDotToken) + node.transformFlags |= 8192 /* ContainsRestOrSpread */; + return node; + } + // @api + function updateBindingElement(node, dotDotDotToken, propertyName, name, initializer) { + return node.propertyName !== propertyName + || node.dotDotDotToken !== dotDotDotToken + || node.name !== name + || node.initializer !== initializer + ? update(createBindingElement(dotDotDotToken, propertyName, name, initializer), node) + : node; + } + // + // Expression + // + function createBaseExpression(kind) { + var node = createBaseNode(kind); + // the following properties are commonly set by the checker/binder + return node; + } + // @api + function createArrayLiteralExpression(elements, multiLine) { + var node = createBaseExpression(196 /* ArrayLiteralExpression */); + node.elements = parenthesizerRules().parenthesizeExpressionsOfCommaDelimitedList(createNodeArray(elements)); + node.multiLine = multiLine; + node.transformFlags |= propagateChildrenFlags(node.elements); + return node; + } + // @api + function updateArrayLiteralExpression(node, elements) { + return node.elements !== elements + ? update(createArrayLiteralExpression(elements, node.multiLine), node) + : node; + } + // @api + function createObjectLiteralExpression(properties, multiLine) { + var node = createBaseExpression(197 /* ObjectLiteralExpression */); + node.properties = createNodeArray(properties); + node.multiLine = multiLine; + node.transformFlags |= propagateChildrenFlags(node.properties); + return node; + } + // @api + function updateObjectLiteralExpression(node, properties) { + return node.properties !== properties + ? update(createObjectLiteralExpression(properties, node.multiLine), node) + : node; + } + // @api + function createPropertyAccessExpression(expression, name) { + var node = createBaseExpression(198 /* PropertyAccessExpression */); + node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression); + node.name = asName(name); + node.transformFlags = + propagateChildFlags(node.expression) | + (ts.isIdentifier(node.name) ? + propagateIdentifierNameFlags(node.name) : + propagateChildFlags(node.name)); + if (ts.isSuperKeyword(expression)) { + // super method calls require a lexical 'this' + // super method calls require 'super' hoisting in ES2017 and ES2018 async functions and async generators + node.transformFlags |= + 64 /* ContainsES2017 */ | + 32 /* ContainsES2018 */; + } + return node; + } + // @api + function updatePropertyAccessExpression(node, expression, name) { + if (ts.isPropertyAccessChain(node)) { + return updatePropertyAccessChain(node, expression, node.questionDotToken, ts.cast(name, ts.isIdentifier)); + } + return node.expression !== expression + || node.name !== name + ? update(createPropertyAccessExpression(expression, name), node) + : node; + } + // @api + function createPropertyAccessChain(expression, questionDotToken, name) { + var node = createBaseExpression(198 /* PropertyAccessExpression */); + node.flags |= 32 /* OptionalChain */; + node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression); + node.questionDotToken = questionDotToken; + node.name = asName(name); + node.transformFlags |= + 8 /* ContainsES2020 */ | + propagateChildFlags(node.expression) | + propagateChildFlags(node.questionDotToken) | + (ts.isIdentifier(node.name) ? + propagateIdentifierNameFlags(node.name) : + propagateChildFlags(node.name)); + return node; + } + // @api + function updatePropertyAccessChain(node, expression, questionDotToken, name) { + ts.Debug.assert(!!(node.flags & 32 /* OptionalChain */), "Cannot update a PropertyAccessExpression using updatePropertyAccessChain. Use updatePropertyAccess instead."); + // Because we are updating an existing PropertyAccessChain we want to inherit its emitFlags + // instead of using the default from createPropertyAccess + return node.expression !== expression + || node.questionDotToken !== questionDotToken + || node.name !== name + ? update(createPropertyAccessChain(expression, questionDotToken, name), node) + : node; + } + // @api + function createElementAccessExpression(expression, index) { + var node = createBaseExpression(199 /* ElementAccessExpression */); + node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression); + node.argumentExpression = asExpression(index); + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildFlags(node.argumentExpression); + if (ts.isSuperKeyword(expression)) { + // super method calls require a lexical 'this' + // super method calls require 'super' hoisting in ES2017 and ES2018 async functions and async generators + node.transformFlags |= + 64 /* ContainsES2017 */ | + 32 /* ContainsES2018 */; + } + return node; + } + // @api + function updateElementAccessExpression(node, expression, argumentExpression) { + if (ts.isElementAccessChain(node)) { + return updateElementAccessChain(node, expression, node.questionDotToken, argumentExpression); + } + return node.expression !== expression + || node.argumentExpression !== argumentExpression + ? update(createElementAccessExpression(expression, argumentExpression), node) + : node; + } + // @api + function createElementAccessChain(expression, questionDotToken, index) { + var node = createBaseExpression(199 /* ElementAccessExpression */); + node.flags |= 32 /* OptionalChain */; + node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression); + node.questionDotToken = questionDotToken; + node.argumentExpression = asExpression(index); + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildFlags(node.questionDotToken) | + propagateChildFlags(node.argumentExpression) | + 8 /* ContainsES2020 */; + return node; + } + // @api + function updateElementAccessChain(node, expression, questionDotToken, argumentExpression) { + ts.Debug.assert(!!(node.flags & 32 /* OptionalChain */), "Cannot update a ElementAccessExpression using updateElementAccessChain. Use updateElementAccess instead."); + // Because we are updating an existing ElementAccessChain we want to inherit its emitFlags + // instead of using the default from createElementAccess + return node.expression !== expression + || node.questionDotToken !== questionDotToken + || node.argumentExpression !== argumentExpression + ? update(createElementAccessChain(expression, questionDotToken, argumentExpression), node) + : node; + } + // @api + function createCallExpression(expression, typeArguments, argumentsArray) { + var node = createBaseExpression(200 /* CallExpression */); + node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression); + node.typeArguments = asNodeArray(typeArguments); + node.arguments = parenthesizerRules().parenthesizeExpressionsOfCommaDelimitedList(createNodeArray(argumentsArray)); + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildrenFlags(node.typeArguments) | + propagateChildrenFlags(node.arguments); + if (node.typeArguments) { + node.transformFlags |= 1 /* ContainsTypeScript */; + } + if (ts.isImportKeyword(node.expression)) { + node.transformFlags |= 2097152 /* ContainsDynamicImport */; + } + else if (ts.isSuperProperty(node.expression)) { + node.transformFlags |= 4096 /* ContainsLexicalThis */; + } + return node; + } + // @api + function updateCallExpression(node, expression, typeArguments, argumentsArray) { + if (ts.isCallChain(node)) { + return updateCallChain(node, expression, node.questionDotToken, typeArguments, argumentsArray); + } + return node.expression !== expression + || node.typeArguments !== typeArguments + || node.arguments !== argumentsArray + ? update(createCallExpression(expression, typeArguments, argumentsArray), node) + : node; + } + // @api + function createCallChain(expression, questionDotToken, typeArguments, argumentsArray) { + var node = createBaseExpression(200 /* CallExpression */); + node.flags |= 32 /* OptionalChain */; + node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression); + node.questionDotToken = questionDotToken; + node.typeArguments = asNodeArray(typeArguments); + node.arguments = parenthesizerRules().parenthesizeExpressionsOfCommaDelimitedList(createNodeArray(argumentsArray)); + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildFlags(node.questionDotToken) | + propagateChildrenFlags(node.typeArguments) | + propagateChildrenFlags(node.arguments) | + 8 /* ContainsES2020 */; + if (node.typeArguments) { + node.transformFlags |= 1 /* ContainsTypeScript */; + } + if (ts.isSuperProperty(node.expression)) { + node.transformFlags |= 4096 /* ContainsLexicalThis */; + } + return node; + } + // @api + function updateCallChain(node, expression, questionDotToken, typeArguments, argumentsArray) { + ts.Debug.assert(!!(node.flags & 32 /* OptionalChain */), "Cannot update a CallExpression using updateCallChain. Use updateCall instead."); + return node.expression !== expression + || node.questionDotToken !== questionDotToken + || node.typeArguments !== typeArguments + || node.arguments !== argumentsArray + ? update(createCallChain(expression, questionDotToken, typeArguments, argumentsArray), node) + : node; + } + // @api + function createNewExpression(expression, typeArguments, argumentsArray) { + var node = createBaseExpression(201 /* NewExpression */); + node.expression = parenthesizerRules().parenthesizeExpressionOfNew(expression); + node.typeArguments = asNodeArray(typeArguments); + node.arguments = argumentsArray ? parenthesizerRules().parenthesizeExpressionsOfCommaDelimitedList(argumentsArray) : undefined; + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildrenFlags(node.typeArguments) | + propagateChildrenFlags(node.arguments) | + 8 /* ContainsES2020 */; + if (node.typeArguments) { + node.transformFlags |= 1 /* ContainsTypeScript */; + } + return node; + } + // @api + function updateNewExpression(node, expression, typeArguments, argumentsArray) { + return node.expression !== expression + || node.typeArguments !== typeArguments + || node.arguments !== argumentsArray + ? update(createNewExpression(expression, typeArguments, argumentsArray), node) + : node; + } + // @api + function createTaggedTemplateExpression(tag, typeArguments, template) { + var node = createBaseExpression(202 /* TaggedTemplateExpression */); + node.tag = parenthesizerRules().parenthesizeLeftSideOfAccess(tag); + node.typeArguments = asNodeArray(typeArguments); + node.template = template; + node.transformFlags |= + propagateChildFlags(node.tag) | + propagateChildrenFlags(node.typeArguments) | + propagateChildFlags(node.template) | + 256 /* ContainsES2015 */; + if (node.typeArguments) { + node.transformFlags |= 1 /* ContainsTypeScript */; + } + if (ts.hasInvalidEscape(node.template)) { + node.transformFlags |= 32 /* ContainsES2018 */; + } + return node; + } + // @api + function updateTaggedTemplateExpression(node, tag, typeArguments, template) { + return node.tag !== tag + || node.typeArguments !== typeArguments + || node.template !== template + ? update(createTaggedTemplateExpression(tag, typeArguments, template), node) + : node; + } + // @api + function createTypeAssertion(type, expression) { + var node = createBaseExpression(203 /* TypeAssertionExpression */); + node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression); + node.type = type; + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildFlags(node.type) | + 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateTypeAssertion(node, type, expression) { + return node.type !== type + || node.expression !== expression + ? update(createTypeAssertion(type, expression), node) + : node; + } + // @api + function createParenthesizedExpression(expression) { + var node = createBaseExpression(204 /* ParenthesizedExpression */); + node.expression = expression; + node.transformFlags = propagateChildFlags(node.expression); + return node; + } + // @api + function updateParenthesizedExpression(node, expression) { + return node.expression !== expression + ? update(createParenthesizedExpression(expression), node) + : node; + } + // @api + function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body) { + var node = createBaseFunctionLikeDeclaration(205 /* FunctionExpression */, + /*decorators*/ undefined, modifiers, name, typeParameters, parameters, type, body); + node.asteriskToken = asteriskToken; + node.transformFlags |= propagateChildFlags(node.asteriskToken); + if (node.typeParameters) { + node.transformFlags |= 1 /* ContainsTypeScript */; + } + if (ts.modifiersToFlags(node.modifiers) & 256 /* Async */) { + if (node.asteriskToken) { + node.transformFlags |= 32 /* ContainsES2018 */; + } + else { + node.transformFlags |= 64 /* ContainsES2017 */; + } + } + else if (node.asteriskToken) { + node.transformFlags |= 512 /* ContainsGenerator */; + } + return node; + } + // @api + function updateFunctionExpression(node, modifiers, asteriskToken, name, typeParameters, parameters, type, body) { + return node.name !== name + || node.modifiers !== modifiers + || node.asteriskToken !== asteriskToken + || node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + || node.body !== body + ? updateBaseFunctionLikeDeclaration(createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body), node) + : node; + } + // @api + function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) { + var node = createBaseFunctionLikeDeclaration(206 /* ArrowFunction */, + /*decorators*/ undefined, modifiers, + /*name*/ undefined, typeParameters, parameters, type, parenthesizerRules().parenthesizeConciseBodyOfArrowFunction(body)); + node.equalsGreaterThanToken = equalsGreaterThanToken !== null && equalsGreaterThanToken !== void 0 ? equalsGreaterThanToken : createToken(38 /* EqualsGreaterThanToken */); + node.transformFlags |= + propagateChildFlags(node.equalsGreaterThanToken) | + 256 /* ContainsES2015 */; + if (ts.modifiersToFlags(node.modifiers) & 256 /* Async */) { + node.transformFlags |= 64 /* ContainsES2017 */; + } + return node; + } + // @api + function updateArrowFunction(node, modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) { + return node.modifiers !== modifiers + || node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + || node.equalsGreaterThanToken !== equalsGreaterThanToken + || node.body !== body + ? updateBaseFunctionLikeDeclaration(createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body), node) + : node; + } + // @api + function createDeleteExpression(expression) { + var node = createBaseExpression(207 /* DeleteExpression */); + node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression); + node.transformFlags |= propagateChildFlags(node.expression); + return node; + } + // @api + function updateDeleteExpression(node, expression) { + return node.expression !== expression + ? update(createDeleteExpression(expression), node) + : node; + } + // @api + function createTypeOfExpression(expression) { + var node = createBaseExpression(208 /* TypeOfExpression */); + node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression); + node.transformFlags |= propagateChildFlags(node.expression); + return node; + } + // @api + function updateTypeOfExpression(node, expression) { + return node.expression !== expression + ? update(createTypeOfExpression(expression), node) + : node; + } + // @api + function createVoidExpression(expression) { + var node = createBaseExpression(209 /* VoidExpression */); + node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression); + node.transformFlags |= propagateChildFlags(node.expression); + return node; + } + // @api + function updateVoidExpression(node, expression) { + return node.expression !== expression + ? update(createVoidExpression(expression), node) + : node; + } + // @api + function createAwaitExpression(expression) { + var node = createBaseExpression(210 /* AwaitExpression */); + node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression); + node.transformFlags |= + propagateChildFlags(node.expression) | + 64 /* ContainsES2017 */ | + 32 /* ContainsES2018 */ | + 524288 /* ContainsAwait */; + return node; + } + // @api + function updateAwaitExpression(node, expression) { + return node.expression !== expression + ? update(createAwaitExpression(expression), node) + : node; + } + // @api + function createPrefixUnaryExpression(operator, operand) { + var node = createBaseExpression(211 /* PrefixUnaryExpression */); + node.operator = operator; + node.operand = parenthesizerRules().parenthesizeOperandOfPrefixUnary(operand); + node.transformFlags |= propagateChildFlags(node.operand); + return node; + } + // @api + function updatePrefixUnaryExpression(node, operand) { + return node.operand !== operand + ? update(createPrefixUnaryExpression(node.operator, operand), node) + : node; + } + // @api + function createPostfixUnaryExpression(operand, operator) { + var node = createBaseExpression(212 /* PostfixUnaryExpression */); + node.operator = operator; + node.operand = parenthesizerRules().parenthesizeOperandOfPostfixUnary(operand); + node.transformFlags = propagateChildFlags(node.operand); + return node; + } + // @api + function updatePostfixUnaryExpression(node, operand) { + return node.operand !== operand + ? update(createPostfixUnaryExpression(operand, node.operator), node) + : node; + } + // @api + function createBinaryExpression(left, operator, right) { + var node = createBaseExpression(213 /* BinaryExpression */); + var operatorToken = asToken(operator); + var operatorKind = operatorToken.kind; + node.left = parenthesizerRules().parenthesizeLeftSideOfBinary(operatorKind, left); + node.operatorToken = operatorToken; + node.right = parenthesizerRules().parenthesizeRightSideOfBinary(operatorKind, node.left, right); + node.transformFlags |= + propagateChildFlags(node.left) | + propagateChildFlags(node.operatorToken) | + propagateChildFlags(node.right); + if (operatorKind === 60 /* QuestionQuestionToken */) { + node.transformFlags |= 8 /* ContainsES2020 */; + } + else if (operatorKind === 62 /* EqualsToken */) { + if (ts.isObjectLiteralExpression(node.left)) { + node.transformFlags |= + 256 /* ContainsES2015 */ | + 32 /* ContainsES2018 */ | + 1024 /* ContainsDestructuringAssignment */; + } + else if (ts.isArrayLiteralExpression(node.left)) { + node.transformFlags |= + 256 /* ContainsES2015 */ | + 1024 /* ContainsDestructuringAssignment */; + } + } + else if (operatorKind === 42 /* AsteriskAsteriskToken */ || operatorKind === 66 /* AsteriskAsteriskEqualsToken */) { + node.transformFlags |= 128 /* ContainsES2016 */; + } + else if (ts.isLogicalOrCoalescingAssignmentOperator(operatorKind)) { + node.transformFlags |= 4 /* ContainsESNext */; + } + return node; + } + // @api + function updateBinaryExpression(node, left, operator, right) { + return node.left !== left + || node.operatorToken !== operator + || node.right !== right + ? update(createBinaryExpression(left, operator, right), node) + : node; + } + // @api + function createConditionalExpression(condition, questionToken, whenTrue, colonToken, whenFalse) { + var node = createBaseExpression(214 /* ConditionalExpression */); + node.condition = parenthesizerRules().parenthesizeConditionOfConditionalExpression(condition); + node.questionToken = questionToken !== null && questionToken !== void 0 ? questionToken : createToken(57 /* QuestionToken */); + node.whenTrue = parenthesizerRules().parenthesizeBranchOfConditionalExpression(whenTrue); + node.colonToken = colonToken !== null && colonToken !== void 0 ? colonToken : createToken(58 /* ColonToken */); + node.whenFalse = parenthesizerRules().parenthesizeBranchOfConditionalExpression(whenFalse); + node.transformFlags |= + propagateChildFlags(node.condition) | + propagateChildFlags(node.questionToken) | + propagateChildFlags(node.whenTrue) | + propagateChildFlags(node.colonToken) | + propagateChildFlags(node.whenFalse); + return node; + } + // @api + function updateConditionalExpression(node, condition, questionToken, whenTrue, colonToken, whenFalse) { + return node.condition !== condition + || node.questionToken !== questionToken + || node.whenTrue !== whenTrue + || node.colonToken !== colonToken + || node.whenFalse !== whenFalse + ? update(createConditionalExpression(condition, questionToken, whenTrue, colonToken, whenFalse), node) + : node; + } + // @api + function createTemplateExpression(head, templateSpans) { + var node = createBaseExpression(215 /* TemplateExpression */); + node.head = head; + node.templateSpans = createNodeArray(templateSpans); + node.transformFlags |= + propagateChildFlags(node.head) | + propagateChildrenFlags(node.templateSpans) | + 256 /* ContainsES2015 */; + return node; + } + // @api + function updateTemplateExpression(node, head, templateSpans) { + return node.head !== head + || node.templateSpans !== templateSpans + ? update(createTemplateExpression(head, templateSpans), node) + : node; + } + function createTemplateLiteralLikeNodeChecked(kind, text, rawText, templateFlags) { + if (templateFlags === void 0) { templateFlags = 0 /* None */; } + ts.Debug.assert(!(templateFlags & ~2048 /* TemplateLiteralLikeFlags */), "Unsupported template flags."); + // NOTE: without the assignment to `undefined`, we don't narrow the initial type of `cooked`. + // eslint-disable-next-line no-undef-init + var cooked = undefined; + if (rawText !== undefined && rawText !== text) { + cooked = getCookedText(kind, rawText); + if (typeof cooked === "object") { + return ts.Debug.fail("Invalid raw text"); + } + } + if (text === undefined) { + if (cooked === undefined) { + return ts.Debug.fail("Arguments 'text' and 'rawText' may not both be undefined."); + } + text = cooked; + } + else if (cooked !== undefined) { + ts.Debug.assert(text === cooked, "Expected argument 'text' to be the normalized (i.e. 'cooked') version of argument 'rawText'."); + } + return createTemplateLiteralLikeNode(kind, text, rawText, templateFlags); + } + // @api + function createTemplateLiteralLikeNode(kind, text, rawText, templateFlags) { + var node = createBaseToken(kind); + node.text = text; + node.rawText = rawText; + node.templateFlags = templateFlags & 2048 /* TemplateLiteralLikeFlags */; + node.transformFlags |= 256 /* ContainsES2015 */; + if (node.templateFlags) { + node.transformFlags |= 32 /* ContainsES2018 */; + } + return node; + } + // @api + function createTemplateHead(text, rawText, templateFlags) { + return createTemplateLiteralLikeNodeChecked(15 /* TemplateHead */, text, rawText, templateFlags); + } + // @api + function createTemplateMiddle(text, rawText, templateFlags) { + return createTemplateLiteralLikeNodeChecked(16 /* TemplateMiddle */, text, rawText, templateFlags); + } + // @api + function createTemplateTail(text, rawText, templateFlags) { + return createTemplateLiteralLikeNodeChecked(17 /* TemplateTail */, text, rawText, templateFlags); + } + // @api + function createNoSubstitutionTemplateLiteral(text, rawText, templateFlags) { + return createTemplateLiteralLikeNodeChecked(14 /* NoSubstitutionTemplateLiteral */, text, rawText, templateFlags); + } + // @api + function createYieldExpression(asteriskToken, expression) { + ts.Debug.assert(!asteriskToken || !!expression, "A `YieldExpression` with an asteriskToken must have an expression."); + var node = createBaseExpression(216 /* YieldExpression */); + node.expression = expression && parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression); + node.asteriskToken = asteriskToken; + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildFlags(node.asteriskToken) | + 256 /* ContainsES2015 */ | + 32 /* ContainsES2018 */ | + 262144 /* ContainsYield */; + return node; + } + // @api + function updateYieldExpression(node, asteriskToken, expression) { + return node.expression !== expression + || node.asteriskToken !== asteriskToken + ? update(createYieldExpression(asteriskToken, expression), node) + : node; + } + // @api + function createSpreadElement(expression) { + var node = createBaseExpression(217 /* SpreadElement */); + node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression); + node.transformFlags |= + propagateChildFlags(node.expression) | + 256 /* ContainsES2015 */ | + 8192 /* ContainsRestOrSpread */; + return node; + } + // @api + function updateSpreadElement(node, expression) { + return node.expression !== expression + ? update(createSpreadElement(expression), node) + : node; + } + // @api + function createClassExpression(decorators, modifiers, name, typeParameters, heritageClauses, members) { + var node = createBaseClassLikeDeclaration(218 /* ClassExpression */, decorators, modifiers, name, typeParameters, heritageClauses, members); + node.transformFlags |= 256 /* ContainsES2015 */; + return node; + } + // @api + function updateClassExpression(node, decorators, modifiers, name, typeParameters, heritageClauses, members) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.typeParameters !== typeParameters + || node.heritageClauses !== heritageClauses + || node.members !== members + ? update(createClassExpression(decorators, modifiers, name, typeParameters, heritageClauses, members), node) + : node; + } + // @api + function createOmittedExpression() { + return createBaseExpression(219 /* OmittedExpression */); + } + // @api + function createExpressionWithTypeArguments(expression, typeArguments) { + var node = createBaseNode(220 /* ExpressionWithTypeArguments */); + node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression); + node.typeArguments = typeArguments && parenthesizerRules().parenthesizeTypeArguments(typeArguments); + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildrenFlags(node.typeArguments) | + 256 /* ContainsES2015 */; + return node; + } + // @api + function updateExpressionWithTypeArguments(node, expression, typeArguments) { + return node.expression !== expression + || node.typeArguments !== typeArguments + ? update(createExpressionWithTypeArguments(expression, typeArguments), node) + : node; + } + // @api + function createAsExpression(expression, type) { + var node = createBaseExpression(221 /* AsExpression */); + node.expression = expression; + node.type = type; + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildFlags(node.type) | + 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateAsExpression(node, expression, type) { + return node.expression !== expression + || node.type !== type + ? update(createAsExpression(expression, type), node) + : node; + } + // @api + function createNonNullExpression(expression) { + var node = createBaseExpression(222 /* NonNullExpression */); + node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression); + node.transformFlags |= + propagateChildFlags(node.expression) | + 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateNonNullExpression(node, expression) { + if (ts.isNonNullChain(node)) { + return updateNonNullChain(node, expression); + } + return node.expression !== expression + ? update(createNonNullExpression(expression), node) + : node; + } + // @api + function createNonNullChain(expression) { + var node = createBaseExpression(222 /* NonNullExpression */); + node.flags |= 32 /* OptionalChain */; + node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression); + node.transformFlags |= + propagateChildFlags(node.expression) | + 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateNonNullChain(node, expression) { + ts.Debug.assert(!!(node.flags & 32 /* OptionalChain */), "Cannot update a NonNullExpression using updateNonNullChain. Use updateNonNullExpression instead."); + return node.expression !== expression + ? update(createNonNullChain(expression), node) + : node; + } + // @api + function createMetaProperty(keywordToken, name) { + var node = createBaseExpression(223 /* MetaProperty */); + node.keywordToken = keywordToken; + node.name = name; + node.transformFlags |= propagateChildFlags(node.name); + switch (keywordToken) { + case 102 /* NewKeyword */: + node.transformFlags |= 256 /* ContainsES2015 */; + break; + case 99 /* ImportKeyword */: + node.transformFlags |= 4 /* ContainsESNext */; + break; + default: + return ts.Debug.assertNever(keywordToken); + } + return node; + } + // @api + function updateMetaProperty(node, name) { + return node.name !== name + ? update(createMetaProperty(node.keywordToken, name), node) + : node; + } + // + // Misc + // + // @api + function createTemplateSpan(expression, literal) { + var node = createBaseNode(225 /* TemplateSpan */); + node.expression = expression; + node.literal = literal; + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildFlags(node.literal) | + 256 /* ContainsES2015 */; + return node; + } + // @api + function updateTemplateSpan(node, expression, literal) { + return node.expression !== expression + || node.literal !== literal + ? update(createTemplateSpan(expression, literal), node) + : node; + } + // @api + function createSemicolonClassElement() { + var node = createBaseNode(226 /* SemicolonClassElement */); + node.transformFlags |= 256 /* ContainsES2015 */; + return node; + } + // + // Element + // + // @api + function createBlock(statements, multiLine) { + var node = createBaseNode(227 /* Block */); + node.statements = createNodeArray(statements); + node.multiLine = multiLine; + node.transformFlags |= propagateChildrenFlags(node.statements); + return node; + } + // @api + function updateBlock(node, statements) { + return node.statements !== statements + ? update(createBlock(statements, node.multiLine), node) + : node; + } + // @api + function createVariableStatement(modifiers, declarationList) { + var node = createBaseDeclaration(229 /* VariableStatement */, /*decorators*/ undefined, modifiers); + node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList; + node.transformFlags |= + propagateChildFlags(node.declarationList); + if (ts.modifiersToFlags(node.modifiers) & 2 /* Ambient */) { + node.transformFlags = 1 /* ContainsTypeScript */; + } + return node; + } + // @api + function updateVariableStatement(node, modifiers, declarationList) { + return node.modifiers !== modifiers + || node.declarationList !== declarationList + ? update(createVariableStatement(modifiers, declarationList), node) + : node; + } + // @api + function createEmptyStatement() { + return createBaseNode(228 /* EmptyStatement */); + } + // @api + function createExpressionStatement(expression) { + var node = createBaseNode(230 /* ExpressionStatement */); + node.expression = parenthesizerRules().parenthesizeExpressionOfExpressionStatement(expression); + node.transformFlags |= propagateChildFlags(node.expression); + return node; + } + // @api + function updateExpressionStatement(node, expression) { + return node.expression !== expression + ? update(createExpressionStatement(expression), node) + : node; + } + // @api + function createIfStatement(expression, thenStatement, elseStatement) { + var node = createBaseNode(231 /* IfStatement */); + node.expression = expression; + node.thenStatement = asEmbeddedStatement(thenStatement); + node.elseStatement = asEmbeddedStatement(elseStatement); + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildFlags(node.thenStatement) | + propagateChildFlags(node.elseStatement); + return node; + } + // @api + function updateIfStatement(node, expression, thenStatement, elseStatement) { + return node.expression !== expression + || node.thenStatement !== thenStatement + || node.elseStatement !== elseStatement + ? update(createIfStatement(expression, thenStatement, elseStatement), node) + : node; + } + // @api + function createDoStatement(statement, expression) { + var node = createBaseNode(232 /* DoStatement */); + node.statement = asEmbeddedStatement(statement); + node.expression = expression; + node.transformFlags |= + propagateChildFlags(node.statement) | + propagateChildFlags(node.expression); + return node; + } + // @api + function updateDoStatement(node, statement, expression) { + return node.statement !== statement + || node.expression !== expression + ? update(createDoStatement(statement, expression), node) + : node; + } + // @api + function createWhileStatement(expression, statement) { + var node = createBaseNode(233 /* WhileStatement */); + node.expression = expression; + node.statement = asEmbeddedStatement(statement); + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildFlags(node.statement); + return node; + } + // @api + function updateWhileStatement(node, expression, statement) { + return node.expression !== expression + || node.statement !== statement + ? update(createWhileStatement(expression, statement), node) + : node; + } + // @api + function createForStatement(initializer, condition, incrementor, statement) { + var node = createBaseNode(234 /* ForStatement */); + node.initializer = initializer; + node.condition = condition; + node.incrementor = incrementor; + node.statement = asEmbeddedStatement(statement); + node.transformFlags |= + propagateChildFlags(node.initializer) | + propagateChildFlags(node.condition) | + propagateChildFlags(node.incrementor) | + propagateChildFlags(node.statement); + return node; + } + // @api + function updateForStatement(node, initializer, condition, incrementor, statement) { + return node.initializer !== initializer + || node.condition !== condition + || node.incrementor !== incrementor + || node.statement !== statement + ? update(createForStatement(initializer, condition, incrementor, statement), node) + : node; + } + // @api + function createForInStatement(initializer, expression, statement) { + var node = createBaseNode(235 /* ForInStatement */); + node.initializer = initializer; + node.expression = expression; + node.statement = asEmbeddedStatement(statement); + node.transformFlags |= + propagateChildFlags(node.initializer) | + propagateChildFlags(node.expression) | + propagateChildFlags(node.statement); + return node; + } + // @api + function updateForInStatement(node, initializer, expression, statement) { + return node.initializer !== initializer + || node.expression !== expression + || node.statement !== statement + ? update(createForInStatement(initializer, expression, statement), node) + : node; + } + // @api + function createForOfStatement(awaitModifier, initializer, expression, statement) { + var node = createBaseNode(236 /* ForOfStatement */); + node.awaitModifier = awaitModifier; + node.initializer = initializer; + node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression); + node.statement = asEmbeddedStatement(statement); + node.transformFlags |= + propagateChildFlags(node.awaitModifier) | + propagateChildFlags(node.initializer) | + propagateChildFlags(node.expression) | + propagateChildFlags(node.statement) | + 256 /* ContainsES2015 */; + if (awaitModifier) + node.transformFlags |= 32 /* ContainsES2018 */; + return node; + } + // @api + function updateForOfStatement(node, awaitModifier, initializer, expression, statement) { + return node.awaitModifier !== awaitModifier + || node.initializer !== initializer + || node.expression !== expression + || node.statement !== statement + ? update(createForOfStatement(awaitModifier, initializer, expression, statement), node) + : node; + } + // @api + function createContinueStatement(label) { + var node = createBaseNode(237 /* ContinueStatement */); + node.label = asName(label); + node.transformFlags |= + propagateChildFlags(node.label) | + 1048576 /* ContainsHoistedDeclarationOrCompletion */; + return node; + } + // @api + function updateContinueStatement(node, label) { + return node.label !== label + ? update(createContinueStatement(label), node) + : node; + } + // @api + function createBreakStatement(label) { + var node = createBaseNode(238 /* BreakStatement */); + node.label = asName(label); + node.transformFlags |= + propagateChildFlags(node.label) | + 1048576 /* ContainsHoistedDeclarationOrCompletion */; + return node; + } + // @api + function updateBreakStatement(node, label) { + return node.label !== label + ? update(createBreakStatement(label), node) + : node; + } + // @api + function createReturnStatement(expression) { + var node = createBaseNode(239 /* ReturnStatement */); + node.expression = expression; + // return in an ES2018 async generator must be awaited + node.transformFlags |= + propagateChildFlags(node.expression) | + 32 /* ContainsES2018 */ | + 1048576 /* ContainsHoistedDeclarationOrCompletion */; + return node; + } + // @api + function updateReturnStatement(node, expression) { + return node.expression !== expression + ? update(createReturnStatement(expression), node) + : node; + } + // @api + function createWithStatement(expression, statement) { + var node = createBaseNode(240 /* WithStatement */); + node.expression = expression; + node.statement = asEmbeddedStatement(statement); + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildFlags(node.statement); + return node; + } + // @api + function updateWithStatement(node, expression, statement) { + return node.expression !== expression + || node.statement !== statement + ? update(createWithStatement(expression, statement), node) + : node; + } + // @api + function createSwitchStatement(expression, caseBlock) { + var node = createBaseNode(241 /* SwitchStatement */); + node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression); + node.caseBlock = caseBlock; + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildFlags(node.caseBlock); + return node; + } + // @api + function updateSwitchStatement(node, expression, caseBlock) { + return node.expression !== expression + || node.caseBlock !== caseBlock + ? update(createSwitchStatement(expression, caseBlock), node) + : node; + } + // @api + function createLabeledStatement(label, statement) { + var node = createBaseNode(242 /* LabeledStatement */); + node.label = asName(label); + node.statement = asEmbeddedStatement(statement); + node.transformFlags |= + propagateChildFlags(node.label) | + propagateChildFlags(node.statement); + return node; + } + // @api + function updateLabeledStatement(node, label, statement) { + return node.label !== label + || node.statement !== statement + ? update(createLabeledStatement(label, statement), node) + : node; + } + // @api + function createThrowStatement(expression) { + var node = createBaseNode(243 /* ThrowStatement */); + node.expression = expression; + node.transformFlags |= propagateChildFlags(node.expression); + return node; + } + // @api + function updateThrowStatement(node, expression) { + return node.expression !== expression + ? update(createThrowStatement(expression), node) + : node; + } + // @api + function createTryStatement(tryBlock, catchClause, finallyBlock) { + var node = createBaseNode(244 /* TryStatement */); + node.tryBlock = tryBlock; + node.catchClause = catchClause; + node.finallyBlock = finallyBlock; + node.transformFlags |= + propagateChildFlags(node.tryBlock) | + propagateChildFlags(node.catchClause) | + propagateChildFlags(node.finallyBlock); + return node; + } + // @api + function updateTryStatement(node, tryBlock, catchClause, finallyBlock) { + return node.tryBlock !== tryBlock + || node.catchClause !== catchClause + || node.finallyBlock !== finallyBlock + ? update(createTryStatement(tryBlock, catchClause, finallyBlock), node) + : node; + } + // @api + function createDebuggerStatement() { + return createBaseNode(245 /* DebuggerStatement */); + } + // @api + function createVariableDeclaration(name, exclamationToken, type, initializer) { + var node = createBaseVariableLikeDeclaration(246 /* VariableDeclaration */, + /*decorators*/ undefined, + /*modifiers*/ undefined, name, type, initializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer)); + node.exclamationToken = exclamationToken; + node.transformFlags |= propagateChildFlags(node.exclamationToken); + if (exclamationToken) { + node.transformFlags |= 1 /* ContainsTypeScript */; + } + return node; + } + // @api + function updateVariableDeclaration(node, name, exclamationToken, type, initializer) { + return node.name !== name + || node.type !== type + || node.exclamationToken !== exclamationToken + || node.initializer !== initializer + ? update(createVariableDeclaration(name, exclamationToken, type, initializer), node) + : node; + } + // @api + function createVariableDeclarationList(declarations, flags) { + if (flags === void 0) { flags = 0 /* None */; } + var node = createBaseNode(247 /* VariableDeclarationList */); + node.flags |= flags & 3 /* BlockScoped */; + node.declarations = createNodeArray(declarations); + node.transformFlags |= + propagateChildrenFlags(node.declarations) | + 1048576 /* ContainsHoistedDeclarationOrCompletion */; + if (flags & 3 /* BlockScoped */) { + node.transformFlags |= + 256 /* ContainsES2015 */ | + 65536 /* ContainsBlockScopedBinding */; + } + return node; + } + // @api + function updateVariableDeclarationList(node, declarations) { + return node.declarations !== declarations + ? update(createVariableDeclarationList(declarations, node.flags), node) + : node; + } + // @api + function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) { + var node = createBaseFunctionLikeDeclaration(248 /* FunctionDeclaration */, decorators, modifiers, name, typeParameters, parameters, type, body); + node.asteriskToken = asteriskToken; + if (!node.body || ts.modifiersToFlags(node.modifiers) & 2 /* Ambient */) { + node.transformFlags = 1 /* ContainsTypeScript */; + } + else { + node.transformFlags |= + propagateChildFlags(node.asteriskToken) | + 1048576 /* ContainsHoistedDeclarationOrCompletion */; + if (ts.modifiersToFlags(node.modifiers) & 256 /* Async */) { + if (node.asteriskToken) { + node.transformFlags |= 32 /* ContainsES2018 */; + } + else { + node.transformFlags |= 64 /* ContainsES2017 */; + } + } + else if (node.asteriskToken) { + node.transformFlags |= 512 /* ContainsGenerator */; + } + } + return node; + } + // @api + function updateFunctionDeclaration(node, decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.asteriskToken !== asteriskToken + || node.name !== name + || node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + || node.body !== body + ? updateBaseFunctionLikeDeclaration(createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body), node) + : node; + } + // @api + function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) { + var node = createBaseClassLikeDeclaration(249 /* ClassDeclaration */, decorators, modifiers, name, typeParameters, heritageClauses, members); + if (ts.modifiersToFlags(node.modifiers) & 2 /* Ambient */) { + node.transformFlags = 1 /* ContainsTypeScript */; + } + else { + node.transformFlags |= 256 /* ContainsES2015 */; + if (node.transformFlags & 2048 /* ContainsTypeScriptClassSyntax */) { + node.transformFlags |= 1 /* ContainsTypeScript */; + } + } + return node; + } + // @api + function updateClassDeclaration(node, decorators, modifiers, name, typeParameters, heritageClauses, members) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.typeParameters !== typeParameters + || node.heritageClauses !== heritageClauses + || node.members !== members + ? update(createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members), node) + : node; + } + // @api + function createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) { + var node = createBaseInterfaceOrClassLikeDeclaration(250 /* InterfaceDeclaration */, decorators, modifiers, name, typeParameters, heritageClauses); + node.members = createNodeArray(members); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateInterfaceDeclaration(node, decorators, modifiers, name, typeParameters, heritageClauses, members) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.typeParameters !== typeParameters + || node.heritageClauses !== heritageClauses + || node.members !== members + ? update(createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members), node) + : node; + } + // @api + function createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type) { + var node = createBaseGenericNamedDeclaration(251 /* TypeAliasDeclaration */, decorators, modifiers, name, typeParameters); + node.type = type; + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateTypeAliasDeclaration(node, decorators, modifiers, name, typeParameters, type) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.typeParameters !== typeParameters + || node.type !== type + ? update(createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type), node) + : node; + } + // @api + function createEnumDeclaration(decorators, modifiers, name, members) { + var node = createBaseNamedDeclaration(252 /* EnumDeclaration */, decorators, modifiers, name); + node.members = createNodeArray(members); + node.transformFlags |= + propagateChildrenFlags(node.members) | + 1 /* ContainsTypeScript */; + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // Enum declarations cannot contain `await` + return node; + } + // @api + function updateEnumDeclaration(node, decorators, modifiers, name, members) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.members !== members + ? update(createEnumDeclaration(decorators, modifiers, name, members), node) + : node; + } + // @api + function createModuleDeclaration(decorators, modifiers, name, body, flags) { + if (flags === void 0) { flags = 0 /* None */; } + var node = createBaseDeclaration(253 /* ModuleDeclaration */, decorators, modifiers); + node.flags |= flags & (16 /* Namespace */ | 4 /* NestedNamespace */ | 1024 /* GlobalAugmentation */); + node.name = name; + node.body = body; + if (ts.modifiersToFlags(node.modifiers) & 2 /* Ambient */) { + node.transformFlags = 1 /* ContainsTypeScript */; + } + else { + node.transformFlags |= + propagateChildFlags(node.name) | + propagateChildFlags(node.body) | + 1 /* ContainsTypeScript */; + } + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // Module declarations cannot contain `await`. + return node; + } + // @api + function updateModuleDeclaration(node, decorators, modifiers, name, body) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.body !== body + ? update(createModuleDeclaration(decorators, modifiers, name, body, node.flags), node) + : node; + } + // @api + function createModuleBlock(statements) { + var node = createBaseNode(254 /* ModuleBlock */); + node.statements = createNodeArray(statements); + node.transformFlags |= propagateChildrenFlags(node.statements); + return node; + } + // @api + function updateModuleBlock(node, statements) { + return node.statements !== statements + ? update(createModuleBlock(statements), node) + : node; + } + // @api + function createCaseBlock(clauses) { + var node = createBaseNode(255 /* CaseBlock */); + node.clauses = createNodeArray(clauses); + node.transformFlags |= propagateChildrenFlags(node.clauses); + return node; + } + // @api + function updateCaseBlock(node, clauses) { + return node.clauses !== clauses + ? update(createCaseBlock(clauses), node) + : node; + } + // @api + function createNamespaceExportDeclaration(name) { + var node = createBaseNamedDeclaration(256 /* NamespaceExportDeclaration */, + /*decorators*/ undefined, + /*modifiers*/ undefined, name); + node.transformFlags = 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateNamespaceExportDeclaration(node, name) { + return node.name !== name + ? update(createNamespaceExportDeclaration(name), node) + : node; + } + // @api + function createImportEqualsDeclaration(decorators, modifiers, name, moduleReference) { + var node = createBaseNamedDeclaration(257 /* ImportEqualsDeclaration */, decorators, modifiers, name); + node.moduleReference = moduleReference; + node.transformFlags |= propagateChildFlags(node.moduleReference); + if (!ts.isExternalModuleReference(node.moduleReference)) + node.transformFlags |= 1 /* ContainsTypeScript */; + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // Import= declaration is always parsed in an Await context + return node; + } + // @api + function updateImportEqualsDeclaration(node, decorators, modifiers, name, moduleReference) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.name !== name + || node.moduleReference !== moduleReference + ? update(createImportEqualsDeclaration(decorators, modifiers, name, moduleReference), node) + : node; + } + // @api + function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier) { + var node = createBaseDeclaration(258 /* ImportDeclaration */, decorators, modifiers); + node.importClause = importClause; + node.moduleSpecifier = moduleSpecifier; + node.transformFlags |= + propagateChildFlags(node.importClause) | + propagateChildFlags(node.moduleSpecifier); + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context + return node; + } + // @api + function updateImportDeclaration(node, decorators, modifiers, importClause, moduleSpecifier) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.importClause !== importClause + || node.moduleSpecifier !== moduleSpecifier + ? update(createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier), node) + : node; + } + // @api + function createImportClause(isTypeOnly, name, namedBindings) { + var node = createBaseNode(259 /* ImportClause */); + node.isTypeOnly = isTypeOnly; + node.name = name; + node.namedBindings = namedBindings; + node.transformFlags |= + propagateChildFlags(node.name) | + propagateChildFlags(node.namedBindings); + if (isTypeOnly) { + node.transformFlags |= 1 /* ContainsTypeScript */; + } + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context + return node; + } + // @api + function updateImportClause(node, isTypeOnly, name, namedBindings) { + return node.isTypeOnly !== isTypeOnly + || node.name !== name + || node.namedBindings !== namedBindings + ? update(createImportClause(isTypeOnly, name, namedBindings), node) + : node; + } + // @api + function createNamespaceImport(name) { + var node = createBaseNode(260 /* NamespaceImport */); + node.name = name; + node.transformFlags |= propagateChildFlags(node.name); + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context + return node; + } + // @api + function updateNamespaceImport(node, name) { + return node.name !== name + ? update(createNamespaceImport(name), node) + : node; + } + // @api + function createNamespaceExport(name) { + var node = createBaseNode(266 /* NamespaceExport */); + node.name = name; + node.transformFlags |= + propagateChildFlags(node.name) | + 4 /* ContainsESNext */; + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context + return node; + } + // @api + function updateNamespaceExport(node, name) { + return node.name !== name + ? update(createNamespaceExport(name), node) + : node; + } + // @api + function createNamedImports(elements) { + var node = createBaseNode(261 /* NamedImports */); + node.elements = createNodeArray(elements); + node.transformFlags |= propagateChildrenFlags(node.elements); + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context + return node; + } + // @api + function updateNamedImports(node, elements) { + return node.elements !== elements + ? update(createNamedImports(elements), node) + : node; + } + // @api + function createImportSpecifier(propertyName, name) { + var node = createBaseNode(262 /* ImportSpecifier */); + node.propertyName = propertyName; + node.name = name; + node.transformFlags |= + propagateChildFlags(node.propertyName) | + propagateChildFlags(node.name); + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context + return node; + } + // @api + function updateImportSpecifier(node, propertyName, name) { + return node.propertyName !== propertyName + || node.name !== name + ? update(createImportSpecifier(propertyName, name), node) + : node; + } + // @api + function createExportAssignment(decorators, modifiers, isExportEquals, expression) { + var node = createBaseDeclaration(263 /* ExportAssignment */, decorators, modifiers); + node.isExportEquals = isExportEquals; + node.expression = isExportEquals + ? parenthesizerRules().parenthesizeRightSideOfBinary(62 /* EqualsToken */, /*leftSide*/ undefined, expression) + : parenthesizerRules().parenthesizeExpressionOfExportDefault(expression); + node.transformFlags |= propagateChildFlags(node.expression); + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context + return node; + } + // @api + function updateExportAssignment(node, decorators, modifiers, expression) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.expression !== expression + ? update(createExportAssignment(decorators, modifiers, node.isExportEquals, expression), node) + : node; + } + // @api + function createExportDeclaration(decorators, modifiers, isTypeOnly, exportClause, moduleSpecifier) { + var node = createBaseDeclaration(264 /* ExportDeclaration */, decorators, modifiers); + node.isTypeOnly = isTypeOnly; + node.exportClause = exportClause; + node.moduleSpecifier = moduleSpecifier; + node.transformFlags |= + propagateChildFlags(node.exportClause) | + propagateChildFlags(node.moduleSpecifier); + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context + return node; + } + // @api + function updateExportDeclaration(node, decorators, modifiers, isTypeOnly, exportClause, moduleSpecifier) { + return node.decorators !== decorators + || node.modifiers !== modifiers + || node.isTypeOnly !== isTypeOnly + || node.exportClause !== exportClause + || node.moduleSpecifier !== moduleSpecifier + ? update(createExportDeclaration(decorators, modifiers, isTypeOnly, exportClause, moduleSpecifier), node) + : node; + } + // @api + function createNamedExports(elements) { + var node = createBaseNode(265 /* NamedExports */); + node.elements = createNodeArray(elements); + node.transformFlags |= propagateChildrenFlags(node.elements); + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context + return node; + } + // @api + function updateNamedExports(node, elements) { + return node.elements !== elements + ? update(createNamedExports(elements), node) + : node; + } + // @api + function createExportSpecifier(propertyName, name) { + var node = createBaseNode(267 /* ExportSpecifier */); + node.propertyName = asName(propertyName); + node.name = asName(name); + node.transformFlags |= + propagateChildFlags(node.propertyName) | + propagateChildFlags(node.name); + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context + return node; + } + // @api + function updateExportSpecifier(node, propertyName, name) { + return node.propertyName !== propertyName + || node.name !== name + ? update(createExportSpecifier(propertyName, name), node) + : node; + } + // @api + function createMissingDeclaration() { + var node = createBaseDeclaration(268 /* MissingDeclaration */, + /*decorators*/ undefined, + /*modifiers*/ undefined); + return node; + } + // + // Module references + // + // @api + function createExternalModuleReference(expression) { + var node = createBaseNode(269 /* ExternalModuleReference */); + node.expression = expression; + node.transformFlags |= propagateChildFlags(node.expression); + node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context + return node; + } + // @api + function updateExternalModuleReference(node, expression) { + return node.expression !== expression + ? update(createExternalModuleReference(expression), node) + : node; + } + // + // JSDoc + // + // @api + // createJSDocAllType + // createJSDocUnknownType + function createJSDocPrimaryTypeWorker(kind) { + return createBaseNode(kind); + } + // @api + // createJSDocNonNullableType + // createJSDocNullableType + // createJSDocOptionalType + // createJSDocVariadicType + // createJSDocNamepathType + function createJSDocUnaryTypeWorker(kind, type) { + var node = createBaseNode(kind); + node.type = type; + return node; + } + // @api + // updateJSDocNonNullableType + // updateJSDocNullableType + // updateJSDocOptionalType + // updateJSDocVariadicType + // updateJSDocNamepathType + function updateJSDocUnaryTypeWorker(kind, node, type) { + return node.type !== type + ? update(createJSDocUnaryTypeWorker(kind, type), node) + : node; + } + // @api + function createJSDocFunctionType(parameters, type) { + var node = createBaseSignatureDeclaration(304 /* JSDocFunctionType */, + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*name*/ undefined, + /*typeParameters*/ undefined, parameters, type); + return node; + } + // @api + function updateJSDocFunctionType(node, parameters, type) { + return node.parameters !== parameters + || node.type !== type + ? update(createJSDocFunctionType(parameters, type), node) + : node; + } + // @api + function createJSDocTypeLiteral(propertyTags, isArrayType) { + if (isArrayType === void 0) { isArrayType = false; } + var node = createBaseNode(308 /* JSDocTypeLiteral */); + node.jsDocPropertyTags = asNodeArray(propertyTags); + node.isArrayType = isArrayType; + return node; + } + // @api + function updateJSDocTypeLiteral(node, propertyTags, isArrayType) { + return node.jsDocPropertyTags !== propertyTags + || node.isArrayType !== isArrayType + ? update(createJSDocTypeLiteral(propertyTags, isArrayType), node) + : node; + } + // @api + function createJSDocTypeExpression(type) { + var node = createBaseNode(298 /* JSDocTypeExpression */); + node.type = type; + return node; + } + // @api + function updateJSDocTypeExpression(node, type) { + return node.type !== type + ? update(createJSDocTypeExpression(type), node) + : node; + } + // @api + function createJSDocSignature(typeParameters, parameters, type) { + var node = createBaseNode(309 /* JSDocSignature */); + node.typeParameters = asNodeArray(typeParameters); + node.parameters = createNodeArray(parameters); + node.type = type; + return node; + } + // @api + function updateJSDocSignature(node, typeParameters, parameters, type) { + return node.typeParameters !== typeParameters + || node.parameters !== parameters + || node.type !== type + ? update(createJSDocSignature(typeParameters, parameters, type), node) + : node; + } + function getDefaultTagName(node) { + var defaultTagName = getDefaultTagNameForKind(node.kind); + return node.tagName.escapedText === ts.escapeLeadingUnderscores(defaultTagName) + ? node.tagName + : createIdentifier(defaultTagName); + } + // @api + function createBaseJSDocTag(kind, tagName, comment) { + var node = createBaseNode(kind); + node.tagName = tagName; + node.comment = comment; + return node; + } + // @api + function createJSDocTemplateTag(tagName, constraint, typeParameters, comment) { + var node = createBaseJSDocTag(326 /* JSDocTemplateTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("template"), comment); + node.constraint = constraint; + node.typeParameters = createNodeArray(typeParameters); + return node; + } + // @api + function updateJSDocTemplateTag(node, tagName, constraint, typeParameters, comment) { + if (tagName === void 0) { tagName = getDefaultTagName(node); } + return node.tagName !== tagName + || node.constraint !== constraint + || node.typeParameters !== typeParameters + || node.comment !== comment + ? update(createJSDocTemplateTag(tagName, constraint, typeParameters, comment), node) + : node; + } + // @api + function createJSDocTypedefTag(tagName, typeExpression, fullName, comment) { + var node = createBaseJSDocTag(327 /* JSDocTypedefTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("typedef"), comment); + node.typeExpression = typeExpression; + node.fullName = fullName; + node.name = ts.getJSDocTypeAliasName(fullName); + return node; + } + // @api + function updateJSDocTypedefTag(node, tagName, typeExpression, fullName, comment) { + if (tagName === void 0) { tagName = getDefaultTagName(node); } + return node.tagName !== tagName + || node.typeExpression !== typeExpression + || node.fullName !== fullName + || node.comment !== comment + ? update(createJSDocTypedefTag(tagName, typeExpression, fullName, comment), node) + : node; + } + // @api + function createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) { + var node = createBaseJSDocTag(322 /* JSDocParameterTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("param"), comment); + node.typeExpression = typeExpression; + node.name = name; + node.isNameFirst = !!isNameFirst; + node.isBracketed = isBracketed; + return node; + } + // @api + function updateJSDocParameterTag(node, tagName, name, isBracketed, typeExpression, isNameFirst, comment) { + if (tagName === void 0) { tagName = getDefaultTagName(node); } + return node.tagName !== tagName + || node.name !== name + || node.isBracketed !== isBracketed + || node.typeExpression !== typeExpression + || node.isNameFirst !== isNameFirst + || node.comment !== comment + ? update(createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment), node) + : node; + } + // @api + function createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) { + var node = createBaseJSDocTag(328 /* JSDocPropertyTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("prop"), comment); + node.typeExpression = typeExpression; + node.name = name; + node.isNameFirst = !!isNameFirst; + node.isBracketed = isBracketed; + return node; + } + // @api + function updateJSDocPropertyTag(node, tagName, name, isBracketed, typeExpression, isNameFirst, comment) { + if (tagName === void 0) { tagName = getDefaultTagName(node); } + return node.tagName !== tagName + || node.name !== name + || node.isBracketed !== isBracketed + || node.typeExpression !== typeExpression + || node.isNameFirst !== isNameFirst + || node.comment !== comment + ? update(createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment), node) + : node; + } + // @api + function createJSDocCallbackTag(tagName, typeExpression, fullName, comment) { + var node = createBaseJSDocTag(320 /* JSDocCallbackTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("callback"), comment); + node.typeExpression = typeExpression; + node.fullName = fullName; + node.name = ts.getJSDocTypeAliasName(fullName); + return node; + } + // @api + function updateJSDocCallbackTag(node, tagName, typeExpression, fullName, comment) { + if (tagName === void 0) { tagName = getDefaultTagName(node); } + return node.tagName !== tagName + || node.typeExpression !== typeExpression + || node.fullName !== fullName + || node.comment !== comment + ? update(createJSDocCallbackTag(tagName, typeExpression, fullName, comment), node) + : node; + } + // @api + function createJSDocAugmentsTag(tagName, className, comment) { + var node = createBaseJSDocTag(311 /* JSDocAugmentsTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("augments"), comment); + node.class = className; + return node; + } + // @api + function updateJSDocAugmentsTag(node, tagName, className, comment) { + if (tagName === void 0) { tagName = getDefaultTagName(node); } + return node.tagName !== tagName + || node.class !== className + || node.comment !== comment + ? update(createJSDocAugmentsTag(tagName, className, comment), node) + : node; + } + // @api + function createJSDocImplementsTag(tagName, className, comment) { + var node = createBaseJSDocTag(312 /* JSDocImplementsTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("implements"), comment); + node.class = className; + return node; + } + // @api + function updateJSDocImplementsTag(node, tagName, className, comment) { + if (tagName === void 0) { tagName = getDefaultTagName(node); } + return node.tagName !== tagName + || node.class !== className + || node.comment !== comment + ? update(createJSDocImplementsTag(tagName, className, comment), node) + : node; + } + // @api + // createJSDocAuthorTag + // createJSDocClassTag + // createJSDocPublicTag + // createJSDocPrivateTag + // createJSDocProtectedTag + // createJSDocReadonlyTag + // createJSDocDeprecatedTag + function createJSDocSimpleTagWorker(kind, tagName, comment) { + var node = createBaseJSDocTag(kind, tagName !== null && tagName !== void 0 ? tagName : createIdentifier(getDefaultTagNameForKind(kind)), comment); + return node; + } + // @api + // updateJSDocAuthorTag + // updateJSDocClassTag + // updateJSDocPublicTag + // updateJSDocPrivateTag + // updateJSDocProtectedTag + // updateJSDocReadonlyTag + // updateJSDocDeprecatedTag + function updateJSDocSimpleTagWorker(kind, node, tagName, comment) { + if (tagName === void 0) { tagName = getDefaultTagName(node); } + return node.tagName !== tagName + || node.comment !== comment + ? update(createJSDocSimpleTagWorker(kind, tagName, comment), node) : + node; + } + // @api + // createJSDocTypeTag + // createJSDocReturnTag + // createJSDocThisTag + // createJSDocEnumTag + function createJSDocTypeLikeTagWorker(kind, tagName, typeExpression, comment) { + var node = createBaseJSDocTag(kind, tagName !== null && tagName !== void 0 ? tagName : createIdentifier(getDefaultTagNameForKind(kind)), comment); + node.typeExpression = typeExpression; + return node; + } + // @api + // updateJSDocTypeTag + // updateJSDocReturnTag + // updateJSDocThisTag + // updateJSDocEnumTag + function updateJSDocTypeLikeTagWorker(kind, node, tagName, typeExpression, comment) { + if (tagName === void 0) { tagName = getDefaultTagName(node); } + return node.tagName !== tagName + || node.typeExpression !== typeExpression + || node.comment !== comment + ? update(createJSDocTypeLikeTagWorker(kind, tagName, typeExpression, comment), node) + : node; + } + // @api + function createJSDocUnknownTag(tagName, comment) { + var node = createBaseJSDocTag(310 /* JSDocTag */, tagName, comment); + return node; + } + // @api + function updateJSDocUnknownTag(node, tagName, comment) { + return node.tagName !== tagName + || node.comment !== comment + ? update(createJSDocUnknownTag(tagName, comment), node) + : node; + } + // @api + function createJSDocComment(comment, tags) { + var node = createBaseNode(307 /* JSDocComment */); + node.comment = comment; + node.tags = asNodeArray(tags); + return node; + } + // @api + function updateJSDocComment(node, comment, tags) { + return node.comment !== comment + || node.tags !== tags + ? update(createJSDocComment(comment, tags), node) + : node; + } + // + // JSX + // + // @api + function createJsxElement(openingElement, children, closingElement) { + var node = createBaseNode(270 /* JsxElement */); + node.openingElement = openingElement; + node.children = createNodeArray(children); + node.closingElement = closingElement; + node.transformFlags |= + propagateChildFlags(node.openingElement) | + propagateChildrenFlags(node.children) | + propagateChildFlags(node.closingElement) | + 2 /* ContainsJsx */; + return node; + } + // @api + function updateJsxElement(node, openingElement, children, closingElement) { + return node.openingElement !== openingElement + || node.children !== children + || node.closingElement !== closingElement + ? update(createJsxElement(openingElement, children, closingElement), node) + : node; + } + // @api + function createJsxSelfClosingElement(tagName, typeArguments, attributes) { + var node = createBaseNode(271 /* JsxSelfClosingElement */); + node.tagName = tagName; + node.typeArguments = asNodeArray(typeArguments); + node.attributes = attributes; + node.transformFlags |= + propagateChildFlags(node.tagName) | + propagateChildrenFlags(node.typeArguments) | + propagateChildFlags(node.attributes) | + 2 /* ContainsJsx */; + if (node.typeArguments) { + node.transformFlags |= 1 /* ContainsTypeScript */; + } + return node; + } + // @api + function updateJsxSelfClosingElement(node, tagName, typeArguments, attributes) { + return node.tagName !== tagName + || node.typeArguments !== typeArguments + || node.attributes !== attributes + ? update(createJsxSelfClosingElement(tagName, typeArguments, attributes), node) + : node; + } + // @api + function createJsxOpeningElement(tagName, typeArguments, attributes) { + var node = createBaseNode(272 /* JsxOpeningElement */); + node.tagName = tagName; + node.typeArguments = asNodeArray(typeArguments); + node.attributes = attributes; + node.transformFlags |= + propagateChildFlags(node.tagName) | + propagateChildrenFlags(node.typeArguments) | + propagateChildFlags(node.attributes) | + 2 /* ContainsJsx */; + if (typeArguments) { + node.transformFlags |= 1 /* ContainsTypeScript */; + } + return node; + } + // @api + function updateJsxOpeningElement(node, tagName, typeArguments, attributes) { + return node.tagName !== tagName + || node.typeArguments !== typeArguments + || node.attributes !== attributes + ? update(createJsxOpeningElement(tagName, typeArguments, attributes), node) + : node; + } + // @api + function createJsxClosingElement(tagName) { + var node = createBaseNode(273 /* JsxClosingElement */); + node.tagName = tagName; + node.transformFlags |= + propagateChildFlags(node.tagName) | + 2 /* ContainsJsx */; + return node; + } + // @api + function updateJsxClosingElement(node, tagName) { + return node.tagName !== tagName + ? update(createJsxClosingElement(tagName), node) + : node; + } + // @api + function createJsxFragment(openingFragment, children, closingFragment) { + var node = createBaseNode(274 /* JsxFragment */); + node.openingFragment = openingFragment; + node.children = createNodeArray(children); + node.closingFragment = closingFragment; + node.transformFlags |= + propagateChildFlags(node.openingFragment) | + propagateChildrenFlags(node.children) | + propagateChildFlags(node.closingFragment) | + 2 /* ContainsJsx */; + return node; + } + // @api + function updateJsxFragment(node, openingFragment, children, closingFragment) { + return node.openingFragment !== openingFragment + || node.children !== children + || node.closingFragment !== closingFragment + ? update(createJsxFragment(openingFragment, children, closingFragment), node) + : node; + } + // @api + function createJsxText(text, containsOnlyTriviaWhiteSpaces) { + var node = createBaseNode(11 /* JsxText */); + node.text = text; + node.containsOnlyTriviaWhiteSpaces = !!containsOnlyTriviaWhiteSpaces; + node.transformFlags |= 2 /* ContainsJsx */; + return node; + } + // @api + function updateJsxText(node, text, containsOnlyTriviaWhiteSpaces) { + return node.text !== text + || node.containsOnlyTriviaWhiteSpaces !== containsOnlyTriviaWhiteSpaces + ? update(createJsxText(text, containsOnlyTriviaWhiteSpaces), node) + : node; + } + // @api + function createJsxOpeningFragment() { + var node = createBaseNode(275 /* JsxOpeningFragment */); + node.transformFlags |= 2 /* ContainsJsx */; + return node; + } + // @api + function createJsxJsxClosingFragment() { + var node = createBaseNode(276 /* JsxClosingFragment */); + node.transformFlags |= 2 /* ContainsJsx */; + return node; + } + // @api + function createJsxAttribute(name, initializer) { + var node = createBaseNode(277 /* JsxAttribute */); + node.name = name; + node.initializer = initializer; + node.transformFlags |= + propagateChildFlags(node.name) | + propagateChildFlags(node.initializer) | + 2 /* ContainsJsx */; + return node; + } + // @api + function updateJsxAttribute(node, name, initializer) { + return node.name !== name + || node.initializer !== initializer + ? update(createJsxAttribute(name, initializer), node) + : node; + } + // @api + function createJsxAttributes(properties) { + var node = createBaseNode(278 /* JsxAttributes */); + node.properties = createNodeArray(properties); + node.transformFlags |= + propagateChildrenFlags(node.properties) | + 2 /* ContainsJsx */; + return node; + } + // @api + function updateJsxAttributes(node, properties) { + return node.properties !== properties + ? update(createJsxAttributes(properties), node) + : node; + } + // @api + function createJsxSpreadAttribute(expression) { + var node = createBaseNode(279 /* JsxSpreadAttribute */); + node.expression = expression; + node.transformFlags |= + propagateChildFlags(node.expression) | + 2 /* ContainsJsx */; + return node; + } + // @api + function updateJsxSpreadAttribute(node, expression) { + return node.expression !== expression + ? update(createJsxSpreadAttribute(expression), node) + : node; + } + // @api + function createJsxExpression(dotDotDotToken, expression) { + var node = createBaseNode(280 /* JsxExpression */); + node.dotDotDotToken = dotDotDotToken; + node.expression = expression; + node.transformFlags |= + propagateChildFlags(node.dotDotDotToken) | + propagateChildFlags(node.expression) | + 2 /* ContainsJsx */; + return node; + } + // @api + function updateJsxExpression(node, expression) { + return node.expression !== expression + ? update(createJsxExpression(node.dotDotDotToken, expression), node) + : node; + } + // + // Clauses + // + // @api + function createCaseClause(expression, statements) { + var node = createBaseNode(281 /* CaseClause */); + node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression); + node.statements = createNodeArray(statements); + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildrenFlags(node.statements); + return node; + } + // @api + function updateCaseClause(node, expression, statements) { + return node.expression !== expression + || node.statements !== statements + ? update(createCaseClause(expression, statements), node) + : node; + } + // @api + function createDefaultClause(statements) { + var node = createBaseNode(282 /* DefaultClause */); + node.statements = createNodeArray(statements); + node.transformFlags = propagateChildrenFlags(node.statements); + return node; + } + // @api + function updateDefaultClause(node, statements) { + return node.statements !== statements + ? update(createDefaultClause(statements), node) + : node; + } + // @api + function createHeritageClause(token, types) { + var node = createBaseNode(283 /* HeritageClause */); + node.token = token; + node.types = createNodeArray(types); + node.transformFlags |= propagateChildrenFlags(node.types); + switch (token) { + case 93 /* ExtendsKeyword */: + node.transformFlags |= 256 /* ContainsES2015 */; + break; + case 116 /* ImplementsKeyword */: + node.transformFlags |= 1 /* ContainsTypeScript */; + break; + default: + return ts.Debug.assertNever(token); + } + return node; + } + // @api + function updateHeritageClause(node, types) { + return node.types !== types + ? update(createHeritageClause(node.token, types), node) + : node; + } + // @api + function createCatchClause(variableDeclaration, block) { + var node = createBaseNode(284 /* CatchClause */); + variableDeclaration = !ts.isString(variableDeclaration) ? variableDeclaration : createVariableDeclaration(variableDeclaration, + /*exclamationToken*/ undefined, + /*type*/ undefined, + /*initializer*/ undefined); + node.variableDeclaration = variableDeclaration; + node.block = block; + node.transformFlags |= + propagateChildFlags(node.variableDeclaration) | + propagateChildFlags(node.block); + if (!variableDeclaration) + node.transformFlags |= 16 /* ContainsES2019 */; + return node; + } + // @api + function updateCatchClause(node, variableDeclaration, block) { + return node.variableDeclaration !== variableDeclaration + || node.block !== block + ? update(createCatchClause(variableDeclaration, block), node) + : node; + } + // + // Property assignments + // + // @api + function createPropertyAssignment(name, initializer) { + var node = createBaseNamedDeclaration(285 /* PropertyAssignment */, + /*decorators*/ undefined, + /*modifiers*/ undefined, name); + node.initializer = parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer); + node.transformFlags |= + propagateChildFlags(node.name) | + propagateChildFlags(node.initializer); + return node; + } + function finishUpdatePropertyAssignment(updated, original) { + // copy children used only for error reporting + if (original.decorators) + updated.decorators = original.decorators; + if (original.modifiers) + updated.modifiers = original.modifiers; + if (original.questionToken) + updated.questionToken = original.questionToken; + if (original.exclamationToken) + updated.exclamationToken = original.exclamationToken; + return update(updated, original); + } + // @api + function updatePropertyAssignment(node, name, initializer) { + return node.name !== name + || node.initializer !== initializer + ? finishUpdatePropertyAssignment(createPropertyAssignment(name, initializer), node) + : node; + } + // @api + function createShorthandPropertyAssignment(name, objectAssignmentInitializer) { + var node = createBaseNamedDeclaration(286 /* ShorthandPropertyAssignment */, + /*decorators*/ undefined, + /*modifiers*/ undefined, name); + node.objectAssignmentInitializer = objectAssignmentInitializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(objectAssignmentInitializer); + node.transformFlags |= + propagateChildFlags(node.objectAssignmentInitializer) | + 256 /* ContainsES2015 */; + return node; + } + function finishUpdateShorthandPropertyAssignment(updated, original) { + // copy children used only for error reporting + if (original.decorators) + updated.decorators = original.decorators; + if (original.modifiers) + updated.modifiers = original.modifiers; + if (original.equalsToken) + updated.equalsToken = original.equalsToken; + if (original.questionToken) + updated.questionToken = original.questionToken; + if (original.exclamationToken) + updated.exclamationToken = original.exclamationToken; + return update(updated, original); + } + // @api + function updateShorthandPropertyAssignment(node, name, objectAssignmentInitializer) { + return node.name !== name + || node.objectAssignmentInitializer !== objectAssignmentInitializer + ? finishUpdateShorthandPropertyAssignment(createShorthandPropertyAssignment(name, objectAssignmentInitializer), node) + : node; + } + // @api + function createSpreadAssignment(expression) { + var node = createBaseNode(287 /* SpreadAssignment */); + node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression); + node.transformFlags |= + propagateChildFlags(node.expression) | + 32 /* ContainsES2018 */ | + 16384 /* ContainsObjectRestOrSpread */; + return node; + } + // @api + function updateSpreadAssignment(node, expression) { + return node.expression !== expression + ? update(createSpreadAssignment(expression), node) + : node; + } + // + // Enum + // + // @api + function createEnumMember(name, initializer) { + var node = createBaseNode(288 /* EnumMember */); + node.name = asName(name); + node.initializer = initializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer); + node.transformFlags |= + propagateChildFlags(node.name) | + propagateChildFlags(node.initializer) | + 1 /* ContainsTypeScript */; + return node; + } + // @api + function updateEnumMember(node, name, initializer) { + return node.name !== name + || node.initializer !== initializer + ? update(createEnumMember(name, initializer), node) + : node; + } + // + // Top-level nodes + // + // @api + function createSourceFile(statements, endOfFileToken, flags) { + var node = baseFactory.createBaseSourceFileNode(294 /* SourceFile */); + node.statements = createNodeArray(statements); + node.endOfFileToken = endOfFileToken; + node.flags |= flags; + node.fileName = ""; + node.text = ""; + node.languageVersion = 0; + node.languageVariant = 0; + node.scriptKind = 0; + node.isDeclarationFile = false; + node.hasNoDefaultLib = false; + node.transformFlags |= + propagateChildrenFlags(node.statements) | + propagateChildFlags(node.endOfFileToken); + return node; + } + function cloneSourceFileWithChanges(source, statements, isDeclarationFile, referencedFiles, typeReferences, hasNoDefaultLib, libReferences) { + var node = baseFactory.createBaseSourceFileNode(294 /* SourceFile */); + for (var p in source) { + if (p === "emitNode" || ts.hasProperty(node, p) || !ts.hasProperty(source, p)) + continue; + node[p] = source[p]; + } + node.flags |= source.flags; + node.statements = createNodeArray(statements); + node.endOfFileToken = source.endOfFileToken; + node.isDeclarationFile = isDeclarationFile; + node.referencedFiles = referencedFiles; + node.typeReferenceDirectives = typeReferences; + node.hasNoDefaultLib = hasNoDefaultLib; + node.libReferenceDirectives = libReferences; + node.transformFlags = + propagateChildrenFlags(node.statements) | + propagateChildFlags(node.endOfFileToken); + return node; + } + // @api + function updateSourceFile(node, statements, isDeclarationFile, referencedFiles, typeReferenceDirectives, hasNoDefaultLib, libReferenceDirectives) { + if (isDeclarationFile === void 0) { isDeclarationFile = node.isDeclarationFile; } + if (referencedFiles === void 0) { referencedFiles = node.referencedFiles; } + if (typeReferenceDirectives === void 0) { typeReferenceDirectives = node.typeReferenceDirectives; } + if (hasNoDefaultLib === void 0) { hasNoDefaultLib = node.hasNoDefaultLib; } + if (libReferenceDirectives === void 0) { libReferenceDirectives = node.libReferenceDirectives; } + return node.statements !== statements + || node.isDeclarationFile !== isDeclarationFile + || node.referencedFiles !== referencedFiles + || node.typeReferenceDirectives !== typeReferenceDirectives + || node.hasNoDefaultLib !== hasNoDefaultLib + || node.libReferenceDirectives !== libReferenceDirectives + ? update(cloneSourceFileWithChanges(node, statements, isDeclarationFile, referencedFiles, typeReferenceDirectives, hasNoDefaultLib, libReferenceDirectives), node) + : node; + } + // @api + function createBundle(sourceFiles, prepends) { + if (prepends === void 0) { prepends = ts.emptyArray; } + var node = createBaseNode(295 /* Bundle */); + node.prepends = prepends; + node.sourceFiles = sourceFiles; + return node; + } + // @api + function updateBundle(node, sourceFiles, prepends) { + if (prepends === void 0) { prepends = ts.emptyArray; } + return node.sourceFiles !== sourceFiles + || node.prepends !== prepends + ? update(createBundle(sourceFiles, prepends), node) + : node; + } + // @api + function createUnparsedSource(prologues, syntheticReferences, texts) { + var node = createBaseNode(296 /* UnparsedSource */); + node.prologues = prologues; + node.syntheticReferences = syntheticReferences; + node.texts = texts; + node.fileName = ""; + node.text = ""; + node.referencedFiles = ts.emptyArray; + node.libReferenceDirectives = ts.emptyArray; + node.getLineAndCharacterOfPosition = function (pos) { return ts.getLineAndCharacterOfPosition(node, pos); }; + return node; + } + function createBaseUnparsedNode(kind, data) { + var node = createBaseNode(kind); + node.data = data; + return node; + } + // @api + function createUnparsedPrologue(data) { + return createBaseUnparsedNode(289 /* UnparsedPrologue */, data); + } + // @api + function createUnparsedPrepend(data, texts) { + var node = createBaseUnparsedNode(290 /* UnparsedPrepend */, data); + node.texts = texts; + return node; + } + // @api + function createUnparsedTextLike(data, internal) { + return createBaseUnparsedNode(internal ? 292 /* UnparsedInternalText */ : 291 /* UnparsedText */, data); + } + // @api + function createUnparsedSyntheticReference(section) { + var node = createBaseNode(293 /* UnparsedSyntheticReference */); + node.data = section.data; + node.section = section; + return node; + } + // @api + function createInputFiles() { + var node = createBaseNode(297 /* InputFiles */); + node.javascriptText = ""; + node.declarationText = ""; + return node; + } + // + // Synthetic Nodes (used by checker) + // + // @api + function createSyntheticExpression(type, isSpread, tupleNameSource) { + if (isSpread === void 0) { isSpread = false; } + var node = createBaseNode(224 /* SyntheticExpression */); + node.type = type; + node.isSpread = isSpread; + node.tupleNameSource = tupleNameSource; + return node; + } + // @api + function createSyntaxList(children) { + var node = createBaseNode(329 /* SyntaxList */); + node._children = children; + return node; + } + // + // Transformation nodes + // + /** + * Creates a synthetic statement to act as a placeholder for a not-emitted statement in + * order to preserve comments. + * + * @param original The original statement. + */ + // @api + function createNotEmittedStatement(original) { + var node = createBaseNode(330 /* NotEmittedStatement */); + node.original = original; + ts.setTextRange(node, original); + return node; + } + /** + * Creates a synthetic expression to act as a placeholder for a not-emitted expression in + * order to preserve comments or sourcemap positions. + * + * @param expression The inner expression to emit. + * @param original The original outer expression. + */ + // @api + function createPartiallyEmittedExpression(expression, original) { + var node = createBaseNode(331 /* PartiallyEmittedExpression */); + node.expression = expression; + node.original = original; + node.transformFlags |= + propagateChildFlags(node.expression) | + 1 /* ContainsTypeScript */; + ts.setTextRange(node, original); + return node; + } + // @api + function updatePartiallyEmittedExpression(node, expression) { + return node.expression !== expression + ? update(createPartiallyEmittedExpression(expression, node.original), node) + : node; + } + function flattenCommaElements(node) { + if (ts.nodeIsSynthesized(node) && !ts.isParseTreeNode(node) && !node.original && !node.emitNode && !node.id) { + if (ts.isCommaListExpression(node)) { + return node.elements; + } + if (ts.isBinaryExpression(node) && ts.isCommaToken(node.operatorToken)) { + return [node.left, node.right]; + } + } + return node; + } + // @api + function createCommaListExpression(elements) { + var node = createBaseNode(332 /* CommaListExpression */); + node.elements = createNodeArray(ts.sameFlatMap(elements, flattenCommaElements)); + node.transformFlags |= propagateChildrenFlags(node.elements); + return node; + } + // @api + function updateCommaListExpression(node, elements) { + return node.elements !== elements + ? update(createCommaListExpression(elements), node) + : node; + } + /** + * Creates a synthetic element to act as a placeholder for the end of an emitted declaration in + * order to properly emit exports. + */ + // @api + function createEndOfDeclarationMarker(original) { + var node = createBaseNode(334 /* EndOfDeclarationMarker */); + node.emitNode = {}; + node.original = original; + return node; + } + /** + * Creates a synthetic element to act as a placeholder for the beginning of a merged declaration in + * order to properly emit exports. + */ + // @api + function createMergeDeclarationMarker(original) { + var node = createBaseNode(333 /* MergeDeclarationMarker */); + node.emitNode = {}; + node.original = original; + return node; + } + // @api + function createSyntheticReferenceExpression(expression, thisArg) { + var node = createBaseNode(335 /* SyntheticReferenceExpression */); + node.expression = expression; + node.thisArg = thisArg; + node.transformFlags |= + propagateChildFlags(node.expression) | + propagateChildFlags(node.thisArg); + return node; + } + // @api + function updateSyntheticReferenceExpression(node, expression, thisArg) { + return node.expression !== expression + || node.thisArg !== thisArg + ? update(createSyntheticReferenceExpression(expression, thisArg), node) + : node; + } + function cloneNode(node) { + // We don't use "clone" from core.ts here, as we need to preserve the prototype chain of + // the original node. We also need to exclude specific properties and only include own- + // properties (to skip members already defined on the shared prototype). + if (node === undefined) { + return node; + } + var clone = ts.isSourceFile(node) ? baseFactory.createBaseSourceFileNode(294 /* SourceFile */) : + ts.isIdentifier(node) ? baseFactory.createBaseIdentifierNode(78 /* Identifier */) : + ts.isPrivateIdentifier(node) ? baseFactory.createBasePrivateIdentifierNode(79 /* PrivateIdentifier */) : + !ts.isNodeKind(node.kind) ? baseFactory.createBaseTokenNode(node.kind) : + baseFactory.createBaseNode(node.kind); + clone.flags |= (node.flags & ~8 /* Synthesized */); + clone.transformFlags = node.transformFlags; + setOriginalNode(clone, node); + for (var key in node) { + if (clone.hasOwnProperty(key) || !node.hasOwnProperty(key)) { + continue; + } + clone[key] = node[key]; + } + return clone; + } + function createImmediatelyInvokedFunctionExpression(statements, param, paramValue) { + return createCallExpression(createFunctionExpression( + /*modifiers*/ undefined, + /*asteriskToken*/ undefined, + /*name*/ undefined, + /*typeParameters*/ undefined, + /*parameters*/ param ? [param] : [], + /*type*/ undefined, createBlock(statements, /*multiLine*/ true)), + /*typeArguments*/ undefined, + /*argumentsArray*/ paramValue ? [paramValue] : []); + } + function createImmediatelyInvokedArrowFunction(statements, param, paramValue) { + return createCallExpression(createArrowFunction( + /*modifiers*/ undefined, + /*typeParameters*/ undefined, + /*parameters*/ param ? [param] : [], + /*type*/ undefined, + /*equalsGreaterThanToken*/ undefined, createBlock(statements, /*multiLine*/ true)), + /*typeArguments*/ undefined, + /*argumentsArray*/ paramValue ? [paramValue] : []); + } + function createVoidZero() { + return createVoidExpression(createNumericLiteral("0")); + } + function createExportDefault(expression) { + return createExportAssignment( + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*isExportEquals*/ false, expression); + } + function createExternalModuleExport(exportName) { + return createExportDeclaration( + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*isTypeOnly*/ false, createNamedExports([ + createExportSpecifier(/*propertyName*/ undefined, exportName) + ])); + } + // + // Utilities + // + function createTypeCheck(value, tag) { + return tag === "undefined" + ? factory.createStrictEquality(value, createVoidZero()) + : factory.createStrictEquality(createTypeOfExpression(value), createStringLiteral(tag)); + } + function createMethodCall(object, methodName, argumentsList) { + return createCallExpression(createPropertyAccessExpression(object, methodName), + /*typeArguments*/ undefined, argumentsList); + } + function createFunctionBindCall(target, thisArg, argumentsList) { + return createMethodCall(target, "bind", __spreadArrays([thisArg], argumentsList)); + } + function createFunctionCallCall(target, thisArg, argumentsList) { + return createMethodCall(target, "call", __spreadArrays([thisArg], argumentsList)); + } + function createFunctionApplyCall(target, thisArg, argumentsExpression) { + return createMethodCall(target, "apply", [thisArg, argumentsExpression]); + } + function createGlobalMethodCall(globalObjectName, methodName, argumentsList) { + return createMethodCall(createIdentifier(globalObjectName), methodName, argumentsList); + } + function createArraySliceCall(array, start) { + return createMethodCall(array, "slice", start === undefined ? [] : [asExpression(start)]); + } + function createArrayConcatCall(array, argumentsList) { + return createMethodCall(array, "concat", argumentsList); + } + function createObjectDefinePropertyCall(target, propertyName, attributes) { + return createGlobalMethodCall("Object", "defineProperty", [target, asExpression(propertyName), attributes]); + } + function tryAddPropertyAssignment(properties, propertyName, expression) { + if (expression) { + properties.push(createPropertyAssignment(propertyName, expression)); + return true; + } + return false; + } + function createPropertyDescriptor(attributes, singleLine) { + var properties = []; + tryAddPropertyAssignment(properties, "enumerable", asExpression(attributes.enumerable)); + tryAddPropertyAssignment(properties, "configurable", asExpression(attributes.configurable)); + var isData = tryAddPropertyAssignment(properties, "writable", asExpression(attributes.writable)); + isData = tryAddPropertyAssignment(properties, "value", attributes.value) || isData; + var isAccessor = tryAddPropertyAssignment(properties, "get", attributes.get); + isAccessor = tryAddPropertyAssignment(properties, "set", attributes.set) || isAccessor; + ts.Debug.assert(!(isData && isAccessor), "A PropertyDescriptor may not be both an accessor descriptor and a data descriptor."); + return createObjectLiteralExpression(properties, !singleLine); + } + function updateOuterExpression(outerExpression, expression) { + switch (outerExpression.kind) { + case 204 /* ParenthesizedExpression */: return updateParenthesizedExpression(outerExpression, expression); + case 203 /* TypeAssertionExpression */: return updateTypeAssertion(outerExpression, outerExpression.type, expression); + case 221 /* AsExpression */: return updateAsExpression(outerExpression, expression, outerExpression.type); + case 222 /* NonNullExpression */: return updateNonNullExpression(outerExpression, expression); + case 331 /* PartiallyEmittedExpression */: return updatePartiallyEmittedExpression(outerExpression, expression); + } + } + /** + * Determines whether a node is a parenthesized expression that can be ignored when recreating outer expressions. + * + * A parenthesized expression can be ignored when all of the following are true: + * + * - It's `pos` and `end` are not -1 + * - It does not have a custom source map range + * - It does not have a custom comment range + * - It does not have synthetic leading or trailing comments + * + * If an outermost parenthesized expression is ignored, but the containing expression requires a parentheses around + * the expression to maintain precedence, a new parenthesized expression should be created automatically when + * the containing expression is created/updated. + */ + function isIgnorableParen(node) { + return ts.isParenthesizedExpression(node) + && ts.nodeIsSynthesized(node) + && ts.nodeIsSynthesized(ts.getSourceMapRange(node)) + && ts.nodeIsSynthesized(ts.getCommentRange(node)) + && !ts.some(ts.getSyntheticLeadingComments(node)) + && !ts.some(ts.getSyntheticTrailingComments(node)); + } + function restoreOuterExpressions(outerExpression, innerExpression, kinds) { + if (kinds === void 0) { kinds = 15 /* All */; } + if (outerExpression && ts.isOuterExpression(outerExpression, kinds) && !isIgnorableParen(outerExpression)) { + return updateOuterExpression(outerExpression, restoreOuterExpressions(outerExpression.expression, innerExpression)); + } + return innerExpression; + } + function restoreEnclosingLabel(node, outermostLabeledStatement, afterRestoreLabelCallback) { + if (!outermostLabeledStatement) { + return node; + } + var updated = updateLabeledStatement(outermostLabeledStatement, outermostLabeledStatement.label, ts.isLabeledStatement(outermostLabeledStatement.statement) + ? restoreEnclosingLabel(node, outermostLabeledStatement.statement) + : node); + if (afterRestoreLabelCallback) { + afterRestoreLabelCallback(outermostLabeledStatement); + } + return updated; + } + function shouldBeCapturedInTempVariable(node, cacheIdentifiers) { + var target = ts.skipParentheses(node); + switch (target.kind) { + case 78 /* Identifier */: + return cacheIdentifiers; + case 107 /* ThisKeyword */: + case 8 /* NumericLiteral */: + case 9 /* BigIntLiteral */: + case 10 /* StringLiteral */: + return false; + case 196 /* ArrayLiteralExpression */: + var elements = target.elements; + if (elements.length === 0) { + return false; + } + return true; + case 197 /* ObjectLiteralExpression */: + return target.properties.length > 0; + default: + return true; + } + } + function createCallBinding(expression, recordTempVariable, languageVersion, cacheIdentifiers) { + if (cacheIdentifiers === void 0) { cacheIdentifiers = false; } + var callee = ts.skipOuterExpressions(expression, 15 /* All */); + var thisArg; + var target; + if (ts.isSuperProperty(callee)) { + thisArg = createThis(); + target = callee; + } + else if (ts.isSuperKeyword(callee)) { + thisArg = createThis(); + target = languageVersion !== undefined && languageVersion < 2 /* ES2015 */ + ? ts.setTextRange(createIdentifier("_super"), callee) + : callee; + } + else if (ts.getEmitFlags(callee) & 4096 /* HelperName */) { + thisArg = createVoidZero(); + target = parenthesizerRules().parenthesizeLeftSideOfAccess(callee); + } + else if (ts.isPropertyAccessExpression(callee)) { + if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) { + // for `a.b()` target is `(_a = a).b` and thisArg is `_a` + thisArg = createTempVariable(recordTempVariable); + target = createPropertyAccessExpression(ts.setTextRange(factory.createAssignment(thisArg, callee.expression), callee.expression), callee.name); + ts.setTextRange(target, callee); + } + else { + thisArg = callee.expression; + target = callee; + } + } + else if (ts.isElementAccessExpression(callee)) { + if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) { + // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a` + thisArg = createTempVariable(recordTempVariable); + target = createElementAccessExpression(ts.setTextRange(factory.createAssignment(thisArg, callee.expression), callee.expression), callee.argumentExpression); + ts.setTextRange(target, callee); + } + else { + thisArg = callee.expression; + target = callee; + } + } + else { + // for `a()` target is `a` and thisArg is `void 0` + thisArg = createVoidZero(); + target = parenthesizerRules().parenthesizeLeftSideOfAccess(expression); + } + return { target: target, thisArg: thisArg }; + } + function inlineExpressions(expressions) { + // Avoid deeply nested comma expressions as traversing them during emit can result in "Maximum call + // stack size exceeded" errors. + return expressions.length > 10 + ? createCommaListExpression(expressions) + : ts.reduceLeft(expressions, factory.createComma); + } + function getName(node, allowComments, allowSourceMaps, emitFlags) { + if (emitFlags === void 0) { emitFlags = 0; } + var nodeName = ts.getNameOfDeclaration(node); + if (nodeName && ts.isIdentifier(nodeName) && !ts.isGeneratedIdentifier(nodeName)) { + // TODO(rbuckton): Does this need to be parented? + var name = ts.setParent(ts.setTextRange(cloneNode(nodeName), nodeName), nodeName.parent); + emitFlags |= ts.getEmitFlags(nodeName); + if (!allowSourceMaps) + emitFlags |= 48 /* NoSourceMap */; + if (!allowComments) + emitFlags |= 1536 /* NoComments */; + if (emitFlags) + ts.setEmitFlags(name, emitFlags); + return name; + } + return getGeneratedNameForNode(node); + } + /** + * Gets the internal name of a declaration. This is primarily used for declarations that can be + * referred to by name in the body of an ES5 class function body. An internal name will *never* + * be prefixed with an module or namespace export modifier like "exports." when emitted as an + * expression. An internal name will also *never* be renamed due to a collision with a block + * scoped variable. + * + * @param node The declaration. + * @param allowComments A value indicating whether comments may be emitted for the name. + * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. + */ + function getInternalName(node, allowComments, allowSourceMaps) { + return getName(node, allowComments, allowSourceMaps, 16384 /* LocalName */ | 32768 /* InternalName */); + } + /** + * Gets the local name of a declaration. This is primarily used for declarations that can be + * referred to by name in the declaration's immediate scope (classes, enums, namespaces). A + * local name will *never* be prefixed with an module or namespace export modifier like + * "exports." when emitted as an expression. + * + * @param node The declaration. + * @param allowComments A value indicating whether comments may be emitted for the name. + * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. + */ + function getLocalName(node, allowComments, allowSourceMaps) { + return getName(node, allowComments, allowSourceMaps, 16384 /* LocalName */); + } + /** + * Gets the export name of a declaration. This is primarily used for declarations that can be + * referred to by name in the declaration's immediate scope (classes, enums, namespaces). An + * export name will *always* be prefixed with an module or namespace export modifier like + * `"exports."` when emitted as an expression if the name points to an exported symbol. + * + * @param node The declaration. + * @param allowComments A value indicating whether comments may be emitted for the name. + * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. + */ + function getExportName(node, allowComments, allowSourceMaps) { + return getName(node, allowComments, allowSourceMaps, 8192 /* ExportName */); + } + /** + * Gets the name of a declaration for use in declarations. + * + * @param node The declaration. + * @param allowComments A value indicating whether comments may be emitted for the name. + * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. + */ + function getDeclarationName(node, allowComments, allowSourceMaps) { + return getName(node, allowComments, allowSourceMaps); + } + /** + * Gets a namespace-qualified name for use in expressions. + * + * @param ns The namespace identifier. + * @param name The name. + * @param allowComments A value indicating whether comments may be emitted for the name. + * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. + */ + function getNamespaceMemberName(ns, name, allowComments, allowSourceMaps) { + var qualifiedName = createPropertyAccessExpression(ns, ts.nodeIsSynthesized(name) ? name : cloneNode(name)); + ts.setTextRange(qualifiedName, name); + var emitFlags = 0; + if (!allowSourceMaps) + emitFlags |= 48 /* NoSourceMap */; + if (!allowComments) + emitFlags |= 1536 /* NoComments */; + if (emitFlags) + ts.setEmitFlags(qualifiedName, emitFlags); + return qualifiedName; + } + /** + * Gets the exported name of a declaration for use in expressions. + * + * An exported name will *always* be prefixed with an module or namespace export modifier like + * "exports." if the name points to an exported symbol. + * + * @param ns The namespace identifier. + * @param node The declaration. + * @param allowComments A value indicating whether comments may be emitted for the name. + * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. + */ + function getExternalModuleOrNamespaceExportName(ns, node, allowComments, allowSourceMaps) { + if (ns && ts.hasSyntacticModifier(node, 1 /* Export */)) { + return getNamespaceMemberName(ns, getName(node), allowComments, allowSourceMaps); + } + return getExportName(node, allowComments, allowSourceMaps); + } + /** + * Copies any necessary standard and custom prologue-directives into target array. + * @param source origin statements array + * @param target result statements array + * @param ensureUseStrict boolean determining whether the function need to add prologue-directives + * @param visitor Optional callback used to visit any custom prologue directives. + */ + function copyPrologue(source, target, ensureUseStrict, visitor) { + var offset = copyStandardPrologue(source, target, ensureUseStrict); + return copyCustomPrologue(source, target, offset, visitor); + } + function isUseStrictPrologue(node) { + return ts.isStringLiteral(node.expression) && node.expression.text === "use strict"; + } + function createUseStrictPrologue() { + return ts.startOnNewLine(createExpressionStatement(createStringLiteral("use strict"))); + } + /** + * Copies only the standard (string-expression) prologue-directives into the target statement-array. + * @param source origin statements array + * @param target result statements array + * @param ensureUseStrict boolean determining whether the function need to add prologue-directives + */ + function copyStandardPrologue(source, target, ensureUseStrict) { + ts.Debug.assert(target.length === 0, "Prologue directives should be at the first statement in the target statements array"); + var foundUseStrict = false; + var statementOffset = 0; + var numStatements = source.length; + while (statementOffset < numStatements) { + var statement = source[statementOffset]; + if (ts.isPrologueDirective(statement)) { + if (isUseStrictPrologue(statement)) { + foundUseStrict = true; + } + target.push(statement); + } + else { + break; + } + statementOffset++; + } + if (ensureUseStrict && !foundUseStrict) { + target.push(createUseStrictPrologue()); + } + return statementOffset; + } + function copyCustomPrologue(source, target, statementOffset, visitor, filter) { + if (filter === void 0) { filter = ts.returnTrue; } + var numStatements = source.length; + while (statementOffset !== undefined && statementOffset < numStatements) { + var statement = source[statementOffset]; + if (ts.getEmitFlags(statement) & 1048576 /* CustomPrologue */ && filter(statement)) { + ts.append(target, visitor ? ts.visitNode(statement, visitor, ts.isStatement) : statement); + } + else { + break; + } + statementOffset++; + } + return statementOffset; + } + /** + * Ensures "use strict" directive is added + * + * @param statements An array of statements + */ + function ensureUseStrict(statements) { + var foundUseStrict = ts.findUseStrictPrologue(statements); + if (!foundUseStrict) { + return ts.setTextRange(createNodeArray(__spreadArrays([createUseStrictPrologue()], statements)), statements); + } + return statements; + } + /** + * Lifts a NodeArray containing only Statement nodes to a block. + * + * @param nodes The NodeArray. + */ + function liftToBlock(nodes) { + ts.Debug.assert(ts.every(nodes, ts.isStatementOrBlock), "Cannot lift nodes to a Block."); + return ts.singleOrUndefined(nodes) || createBlock(nodes); + } + function findSpanEnd(array, test, start) { + var i = start; + while (i < array.length && test(array[i])) { + i++; + } + return i; + } + function mergeLexicalEnvironment(statements, declarations) { + if (!ts.some(declarations)) { + return statements; + } + // When we merge new lexical statements into an existing statement list, we merge them in the following manner: + // + // Given: + // + // | Left | Right | + // |------------------------------------|-------------------------------------| + // | [standard prologues (left)] | [standard prologues (right)] | + // | [hoisted functions (left)] | [hoisted functions (right)] | + // | [hoisted variables (left)] | [hoisted variables (right)] | + // | [lexical init statements (left)] | [lexical init statements (right)] | + // | [other statements (left)] | | + // + // The resulting statement list will be: + // + // | Result | + // |-------------------------------------| + // | [standard prologues (right)] | + // | [standard prologues (left)] | + // | [hoisted functions (right)] | + // | [hoisted functions (left)] | + // | [hoisted variables (right)] | + // | [hoisted variables (left)] | + // | [lexical init statements (right)] | + // | [lexical init statements (left)] | + // | [other statements (left)] | + // + // NOTE: It is expected that new lexical init statements must be evaluated before existing lexical init statements, + // as the prior transformation may depend on the evaluation of the lexical init statements to be in the correct state. + // find standard prologues on left in the following order: standard directives, hoisted functions, hoisted variables, other custom + var leftStandardPrologueEnd = findSpanEnd(statements, ts.isPrologueDirective, 0); + var leftHoistedFunctionsEnd = findSpanEnd(statements, ts.isHoistedFunction, leftStandardPrologueEnd); + var leftHoistedVariablesEnd = findSpanEnd(statements, ts.isHoistedVariableStatement, leftHoistedFunctionsEnd); + // find standard prologues on right in the following order: standard directives, hoisted functions, hoisted variables, other custom + var rightStandardPrologueEnd = findSpanEnd(declarations, ts.isPrologueDirective, 0); + var rightHoistedFunctionsEnd = findSpanEnd(declarations, ts.isHoistedFunction, rightStandardPrologueEnd); + var rightHoistedVariablesEnd = findSpanEnd(declarations, ts.isHoistedVariableStatement, rightHoistedFunctionsEnd); + var rightCustomPrologueEnd = findSpanEnd(declarations, ts.isCustomPrologue, rightHoistedVariablesEnd); + ts.Debug.assert(rightCustomPrologueEnd === declarations.length, "Expected declarations to be valid standard or custom prologues"); + // splice prologues from the right into the left. We do this in reverse order + // so that we don't need to recompute the index on the left when we insert items. + var left = ts.isNodeArray(statements) ? statements.slice() : statements; + // splice other custom prologues from right into left + if (rightCustomPrologueEnd > rightHoistedVariablesEnd) { + left.splice.apply(left, __spreadArrays([leftHoistedVariablesEnd, 0], declarations.slice(rightHoistedVariablesEnd, rightCustomPrologueEnd))); + } + // splice hoisted variables from right into left + if (rightHoistedVariablesEnd > rightHoistedFunctionsEnd) { + left.splice.apply(left, __spreadArrays([leftHoistedFunctionsEnd, 0], declarations.slice(rightHoistedFunctionsEnd, rightHoistedVariablesEnd))); + } + // splice hoisted functions from right into left + if (rightHoistedFunctionsEnd > rightStandardPrologueEnd) { + left.splice.apply(left, __spreadArrays([leftStandardPrologueEnd, 0], declarations.slice(rightStandardPrologueEnd, rightHoistedFunctionsEnd))); + } + // splice standard prologues from right into left (that are not already in left) + if (rightStandardPrologueEnd > 0) { + if (leftStandardPrologueEnd === 0) { + left.splice.apply(left, __spreadArrays([0, 0], declarations.slice(0, rightStandardPrologueEnd))); + } + else { + var leftPrologues = new ts.Map(); + for (var i = 0; i < leftStandardPrologueEnd; i++) { + var leftPrologue = statements[i]; + leftPrologues.set(leftPrologue.expression.text, true); + } + for (var i = rightStandardPrologueEnd - 1; i >= 0; i--) { + var rightPrologue = declarations[i]; + if (!leftPrologues.has(rightPrologue.expression.text)) { + left.unshift(rightPrologue); + } + } + } + } + if (ts.isNodeArray(statements)) { + return ts.setTextRange(createNodeArray(left, statements.hasTrailingComma), statements); + } + return statements; + } + function updateModifiers(node, modifiers) { + var _a; + if (typeof modifiers === "number") { + modifiers = createModifiersFromModifierFlags(modifiers); + } + return ts.isParameter(node) ? updateParameterDeclaration(node, node.decorators, modifiers, node.dotDotDotToken, node.name, node.questionToken, node.type, node.initializer) : + ts.isPropertySignature(node) ? updatePropertySignature(node, modifiers, node.name, node.questionToken, node.type) : + ts.isPropertyDeclaration(node) ? updatePropertyDeclaration(node, node.decorators, modifiers, node.name, (_a = node.questionToken) !== null && _a !== void 0 ? _a : node.exclamationToken, node.type, node.initializer) : + ts.isMethodSignature(node) ? updateMethodSignature(node, modifiers, node.name, node.questionToken, node.typeParameters, node.parameters, node.type) : + ts.isMethodDeclaration(node) ? updateMethodDeclaration(node, node.decorators, modifiers, node.asteriskToken, node.name, node.questionToken, node.typeParameters, node.parameters, node.type, node.body) : + ts.isConstructorDeclaration(node) ? updateConstructorDeclaration(node, node.decorators, modifiers, node.parameters, node.body) : + ts.isGetAccessorDeclaration(node) ? updateGetAccessorDeclaration(node, node.decorators, modifiers, node.name, node.parameters, node.type, node.body) : + ts.isSetAccessorDeclaration(node) ? updateSetAccessorDeclaration(node, node.decorators, modifiers, node.name, node.parameters, node.body) : + ts.isIndexSignatureDeclaration(node) ? updateIndexSignature(node, node.decorators, modifiers, node.parameters, node.type) : + ts.isFunctionExpression(node) ? updateFunctionExpression(node, modifiers, node.asteriskToken, node.name, node.typeParameters, node.parameters, node.type, node.body) : + ts.isArrowFunction(node) ? updateArrowFunction(node, modifiers, node.typeParameters, node.parameters, node.type, node.equalsGreaterThanToken, node.body) : + ts.isClassExpression(node) ? updateClassExpression(node, node.decorators, modifiers, node.name, node.typeParameters, node.heritageClauses, node.members) : + ts.isVariableStatement(node) ? updateVariableStatement(node, modifiers, node.declarationList) : + ts.isFunctionDeclaration(node) ? updateFunctionDeclaration(node, node.decorators, modifiers, node.asteriskToken, node.name, node.typeParameters, node.parameters, node.type, node.body) : + ts.isClassDeclaration(node) ? updateClassDeclaration(node, node.decorators, modifiers, node.name, node.typeParameters, node.heritageClauses, node.members) : + ts.isInterfaceDeclaration(node) ? updateInterfaceDeclaration(node, node.decorators, modifiers, node.name, node.typeParameters, node.heritageClauses, node.members) : + ts.isTypeAliasDeclaration(node) ? updateTypeAliasDeclaration(node, node.decorators, modifiers, node.name, node.typeParameters, node.type) : + ts.isEnumDeclaration(node) ? updateEnumDeclaration(node, node.decorators, modifiers, node.name, node.members) : + ts.isModuleDeclaration(node) ? updateModuleDeclaration(node, node.decorators, modifiers, node.name, node.body) : + ts.isImportEqualsDeclaration(node) ? updateImportEqualsDeclaration(node, node.decorators, modifiers, node.name, node.moduleReference) : + ts.isImportDeclaration(node) ? updateImportDeclaration(node, node.decorators, modifiers, node.importClause, node.moduleSpecifier) : + ts.isExportAssignment(node) ? updateExportAssignment(node, node.decorators, modifiers, node.expression) : + ts.isExportDeclaration(node) ? updateExportDeclaration(node, node.decorators, modifiers, node.isTypeOnly, node.exportClause, node.moduleSpecifier) : + ts.Debug.assertNever(node); + } + function asNodeArray(array) { + return array ? createNodeArray(array) : undefined; + } + function asName(name) { + return typeof name === "string" ? createIdentifier(name) : + name; + } + function asExpression(value) { + return typeof value === "string" ? createStringLiteral(value) : + typeof value === "number" ? createNumericLiteral(value) : + typeof value === "boolean" ? value ? createTrue() : createFalse() : + value; + } + function asToken(value) { + return typeof value === "number" ? createToken(value) : value; + } + function asEmbeddedStatement(statement) { + return statement && ts.isNotEmittedStatement(statement) ? ts.setTextRange(setOriginalNode(createEmptyStatement(), statement), statement) : statement; + } + } + ts.createNodeFactory = createNodeFactory; + function updateWithoutOriginal(updated, original) { + if (updated !== original) { + ts.setTextRange(updated, original); + } + return updated; + } + function updateWithOriginal(updated, original) { + if (updated !== original) { + setOriginalNode(updated, original); + ts.setTextRange(updated, original); + } + return updated; + } + function getDefaultTagNameForKind(kind) { + switch (kind) { + case 325 /* JSDocTypeTag */: return "type"; + case 323 /* JSDocReturnTag */: return "returns"; + case 324 /* JSDocThisTag */: return "this"; + case 321 /* JSDocEnumTag */: return "enum"; + case 313 /* JSDocAuthorTag */: return "author"; + case 315 /* JSDocClassTag */: return "class"; + case 316 /* JSDocPublicTag */: return "public"; + case 317 /* JSDocPrivateTag */: return "private"; + case 318 /* JSDocProtectedTag */: return "protected"; + case 319 /* JSDocReadonlyTag */: return "readonly"; + case 326 /* JSDocTemplateTag */: return "template"; + case 327 /* JSDocTypedefTag */: return "typedef"; + case 322 /* JSDocParameterTag */: return "param"; + case 328 /* JSDocPropertyTag */: return "prop"; + case 320 /* JSDocCallbackTag */: return "callback"; + case 311 /* JSDocAugmentsTag */: return "augments"; + case 312 /* JSDocImplementsTag */: return "implements"; + default: + return ts.Debug.fail("Unsupported kind: " + ts.Debug.formatSyntaxKind(kind)); + } + } + var rawTextScanner; + var invalidValueSentinel = {}; + function getCookedText(kind, rawText) { + if (!rawTextScanner) { + rawTextScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */); + } + switch (kind) { + case 14 /* NoSubstitutionTemplateLiteral */: + rawTextScanner.setText("`" + rawText + "`"); + break; + case 15 /* TemplateHead */: + // tslint:disable-next-line no-invalid-template-strings + rawTextScanner.setText("`" + rawText + "${"); + break; + case 16 /* TemplateMiddle */: + // tslint:disable-next-line no-invalid-template-strings + rawTextScanner.setText("}" + rawText + "${"); + break; + case 17 /* TemplateTail */: + rawTextScanner.setText("}" + rawText + "`"); + break; + } + var token = rawTextScanner.scan(); + if (token === 23 /* CloseBracketToken */) { + token = rawTextScanner.reScanTemplateToken(/*isTaggedTemplate*/ false); + } + if (rawTextScanner.isUnterminated()) { + rawTextScanner.setText(undefined); + return invalidValueSentinel; + } + var tokenValue; + switch (token) { + case 14 /* NoSubstitutionTemplateLiteral */: + case 15 /* TemplateHead */: + case 16 /* TemplateMiddle */: + case 17 /* TemplateTail */: + tokenValue = rawTextScanner.getTokenValue(); + break; + } + if (tokenValue === undefined || rawTextScanner.scan() !== 1 /* EndOfFileToken */) { + rawTextScanner.setText(undefined); + return invalidValueSentinel; + } + rawTextScanner.setText(undefined); + return tokenValue; + } + function propagateIdentifierNameFlags(node) { + // An IdentifierName is allowed to be `await` + return propagateChildFlags(node) & ~8388608 /* ContainsPossibleTopLevelAwait */; + } + function propagatePropertyNameFlagsOfChild(node, transformFlags) { + return transformFlags | (node.transformFlags & 4096 /* PropertyNamePropagatingFlags */); + } + function propagateChildFlags(child) { + if (!child) + return 0 /* None */; + var childFlags = child.transformFlags & ~getTransformFlagsSubtreeExclusions(child.kind); + return ts.isNamedDeclaration(child) && ts.isPropertyName(child.name) ? propagatePropertyNameFlagsOfChild(child.name, childFlags) : childFlags; + } + function propagateChildrenFlags(children) { + return children ? children.transformFlags : 0 /* None */; + } + function aggregateChildrenFlags(children) { + var subtreeFlags = 0 /* None */; + for (var _i = 0, children_2 = children; _i < children_2.length; _i++) { + var child = children_2[_i]; + subtreeFlags |= propagateChildFlags(child); + } + children.transformFlags = subtreeFlags; + } + /** + * Gets the transform flags to exclude when unioning the transform flags of a subtree. + */ + /* @internal */ + function getTransformFlagsSubtreeExclusions(kind) { + if (kind >= 171 /* FirstTypeNode */ && kind <= 192 /* LastTypeNode */) { + return -2 /* TypeExcludes */; + } + switch (kind) { + case 200 /* CallExpression */: + case 201 /* NewExpression */: + case 196 /* ArrayLiteralExpression */: + return 536879104 /* ArrayLiteralOrCallOrNewExcludes */; + case 253 /* ModuleDeclaration */: + return 546379776 /* ModuleExcludes */; + case 159 /* Parameter */: + return 536870912 /* ParameterExcludes */; + case 206 /* ArrowFunction */: + return 547309568 /* ArrowFunctionExcludes */; + case 205 /* FunctionExpression */: + case 248 /* FunctionDeclaration */: + return 547313664 /* FunctionExcludes */; + case 247 /* VariableDeclarationList */: + return 537018368 /* VariableDeclarationListExcludes */; + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + return 536905728 /* ClassExcludes */; + case 165 /* Constructor */: + return 547311616 /* ConstructorExcludes */; + case 162 /* PropertyDeclaration */: + return 536875008 /* PropertyExcludes */; + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + return 538923008 /* MethodOrAccessorExcludes */; + case 128 /* AnyKeyword */: + case 143 /* NumberKeyword */: + case 154 /* BigIntKeyword */: + case 140 /* NeverKeyword */: + case 146 /* StringKeyword */: + case 144 /* ObjectKeyword */: + case 131 /* BooleanKeyword */: + case 147 /* SymbolKeyword */: + case 113 /* VoidKeyword */: + case 158 /* TypeParameter */: + case 161 /* PropertySignature */: + case 163 /* MethodSignature */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 170 /* IndexSignature */: + case 250 /* InterfaceDeclaration */: + case 251 /* TypeAliasDeclaration */: + return -2 /* TypeExcludes */; + case 197 /* ObjectLiteralExpression */: + return 536922112 /* ObjectLiteralExcludes */; + case 284 /* CatchClause */: + return 536887296 /* CatchClauseExcludes */; + case 193 /* ObjectBindingPattern */: + case 194 /* ArrayBindingPattern */: + return 536879104 /* BindingPatternExcludes */; + case 203 /* TypeAssertionExpression */: + case 221 /* AsExpression */: + case 331 /* PartiallyEmittedExpression */: + case 204 /* ParenthesizedExpression */: + case 105 /* SuperKeyword */: + return 536870912 /* OuterExpressionExcludes */; + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: + return 536870912 /* PropertyAccessExcludes */; + default: + return 536870912 /* NodeExcludes */; + } + } + ts.getTransformFlagsSubtreeExclusions = getTransformFlagsSubtreeExclusions; + var baseFactory = ts.createBaseNodeFactory(); + function makeSynthetic(node) { + node.flags |= 8 /* Synthesized */; + return node; + } + var syntheticFactory = { + createBaseSourceFileNode: function (kind) { return makeSynthetic(baseFactory.createBaseSourceFileNode(kind)); }, + createBaseIdentifierNode: function (kind) { return makeSynthetic(baseFactory.createBaseIdentifierNode(kind)); }, + createBasePrivateIdentifierNode: function (kind) { return makeSynthetic(baseFactory.createBasePrivateIdentifierNode(kind)); }, + createBaseTokenNode: function (kind) { return makeSynthetic(baseFactory.createBaseTokenNode(kind)); }, + createBaseNode: function (kind) { return makeSynthetic(baseFactory.createBaseNode(kind)); }, + }; + ts.factory = createNodeFactory(4 /* NoIndentationOnFreshPropertyAccess */, syntheticFactory); + function createUnparsedSourceFile(textOrInputFiles, mapPathOrType, mapTextOrStripInternal) { + var stripInternal; + var bundleFileInfo; + var fileName; + var text; + var length; + var sourceMapPath; + var sourceMapText; + var getText; + var getSourceMapText; + var oldFileOfCurrentEmit; + if (!ts.isString(textOrInputFiles)) { + ts.Debug.assert(mapPathOrType === "js" || mapPathOrType === "dts"); + fileName = (mapPathOrType === "js" ? textOrInputFiles.javascriptPath : textOrInputFiles.declarationPath) || ""; + sourceMapPath = mapPathOrType === "js" ? textOrInputFiles.javascriptMapPath : textOrInputFiles.declarationMapPath; + getText = function () { return mapPathOrType === "js" ? textOrInputFiles.javascriptText : textOrInputFiles.declarationText; }; + getSourceMapText = function () { return mapPathOrType === "js" ? textOrInputFiles.javascriptMapText : textOrInputFiles.declarationMapText; }; + length = function () { return getText().length; }; + if (textOrInputFiles.buildInfo && textOrInputFiles.buildInfo.bundle) { + ts.Debug.assert(mapTextOrStripInternal === undefined || typeof mapTextOrStripInternal === "boolean"); + stripInternal = mapTextOrStripInternal; + bundleFileInfo = mapPathOrType === "js" ? textOrInputFiles.buildInfo.bundle.js : textOrInputFiles.buildInfo.bundle.dts; + oldFileOfCurrentEmit = textOrInputFiles.oldFileOfCurrentEmit; + } + } + else { + fileName = ""; + text = textOrInputFiles; + length = textOrInputFiles.length; + sourceMapPath = mapPathOrType; + sourceMapText = mapTextOrStripInternal; + } + var node = oldFileOfCurrentEmit ? + parseOldFileOfCurrentEmit(ts.Debug.assertDefined(bundleFileInfo)) : + parseUnparsedSourceFile(bundleFileInfo, stripInternal, length); + node.fileName = fileName; + node.sourceMapPath = sourceMapPath; + node.oldFileOfCurrentEmit = oldFileOfCurrentEmit; + if (getText && getSourceMapText) { + Object.defineProperty(node, "text", { get: getText }); + Object.defineProperty(node, "sourceMapText", { get: getSourceMapText }); + } + else { + ts.Debug.assert(!oldFileOfCurrentEmit); + node.text = text !== null && text !== void 0 ? text : ""; + node.sourceMapText = sourceMapText; + } + return node; + } + ts.createUnparsedSourceFile = createUnparsedSourceFile; + function parseUnparsedSourceFile(bundleFileInfo, stripInternal, length) { + var prologues; + var helpers; + var referencedFiles; + var typeReferenceDirectives; + var libReferenceDirectives; + var prependChildren; + var texts; + var hasNoDefaultLib; + for (var _i = 0, _a = bundleFileInfo ? bundleFileInfo.sections : ts.emptyArray; _i < _a.length; _i++) { + var section = _a[_i]; + switch (section.kind) { + case "prologue" /* Prologue */: + prologues = ts.append(prologues, ts.setTextRange(ts.factory.createUnparsedPrologue(section.data), section)); + break; + case "emitHelpers" /* EmitHelpers */: + helpers = ts.append(helpers, ts.getAllUnscopedEmitHelpers().get(section.data)); + break; + case "no-default-lib" /* NoDefaultLib */: + hasNoDefaultLib = true; + break; + case "reference" /* Reference */: + referencedFiles = ts.append(referencedFiles, { pos: -1, end: -1, fileName: section.data }); + break; + case "type" /* Type */: + typeReferenceDirectives = ts.append(typeReferenceDirectives, section.data); + break; + case "lib" /* Lib */: + libReferenceDirectives = ts.append(libReferenceDirectives, { pos: -1, end: -1, fileName: section.data }); + break; + case "prepend" /* Prepend */: + var prependTexts = void 0; + for (var _b = 0, _c = section.texts; _b < _c.length; _b++) { + var text = _c[_b]; + if (!stripInternal || text.kind !== "internal" /* Internal */) { + prependTexts = ts.append(prependTexts, ts.setTextRange(ts.factory.createUnparsedTextLike(text.data, text.kind === "internal" /* Internal */), text)); + } + } + prependChildren = ts.addRange(prependChildren, prependTexts); + texts = ts.append(texts, ts.factory.createUnparsedPrepend(section.data, prependTexts !== null && prependTexts !== void 0 ? prependTexts : ts.emptyArray)); + break; + case "internal" /* Internal */: + if (stripInternal) { + if (!texts) + texts = []; + break; + } + // falls through + case "text" /* Text */: + texts = ts.append(texts, ts.setTextRange(ts.factory.createUnparsedTextLike(section.data, section.kind === "internal" /* Internal */), section)); + break; + default: + ts.Debug.assertNever(section); + } + } + if (!texts) { + var textNode = ts.factory.createUnparsedTextLike(/*data*/ undefined, /*internal*/ false); + ts.setTextRangePosWidth(textNode, 0, typeof length === "function" ? length() : length); + texts = [textNode]; + } + var node = ts.parseNodeFactory.createUnparsedSource(prologues !== null && prologues !== void 0 ? prologues : ts.emptyArray, /*syntheticReferences*/ undefined, texts); + ts.setEachParent(prologues, node); + ts.setEachParent(texts, node); + ts.setEachParent(prependChildren, node); + node.hasNoDefaultLib = hasNoDefaultLib; + node.helpers = helpers; + node.referencedFiles = referencedFiles || ts.emptyArray; + node.typeReferenceDirectives = typeReferenceDirectives; + node.libReferenceDirectives = libReferenceDirectives || ts.emptyArray; + return node; + } + function parseOldFileOfCurrentEmit(bundleFileInfo) { + var texts; + var syntheticReferences; + for (var _i = 0, _a = bundleFileInfo.sections; _i < _a.length; _i++) { + var section = _a[_i]; + switch (section.kind) { + case "internal" /* Internal */: + case "text" /* Text */: + texts = ts.append(texts, ts.setTextRange(ts.factory.createUnparsedTextLike(section.data, section.kind === "internal" /* Internal */), section)); + break; + case "no-default-lib" /* NoDefaultLib */: + case "reference" /* Reference */: + case "type" /* Type */: + case "lib" /* Lib */: + syntheticReferences = ts.append(syntheticReferences, ts.setTextRange(ts.factory.createUnparsedSyntheticReference(section), section)); + break; + // Ignore + case "prologue" /* Prologue */: + case "emitHelpers" /* EmitHelpers */: + case "prepend" /* Prepend */: + break; + default: + ts.Debug.assertNever(section); + } + } + var node = ts.factory.createUnparsedSource(ts.emptyArray, syntheticReferences, texts !== null && texts !== void 0 ? texts : ts.emptyArray); + ts.setEachParent(syntheticReferences, node); + ts.setEachParent(texts, node); + node.helpers = ts.map(bundleFileInfo.sources && bundleFileInfo.sources.helpers, function (name) { return ts.getAllUnscopedEmitHelpers().get(name); }); + return node; + } + function createInputFiles(javascriptTextOrReadFileText, declarationTextOrJavascriptPath, javascriptMapPath, javascriptMapTextOrDeclarationPath, declarationMapPath, declarationMapTextOrBuildInfoPath, javascriptPath, declarationPath, buildInfoPath, buildInfo, oldFileOfCurrentEmit) { + var node = ts.parseNodeFactory.createInputFiles(); + if (!ts.isString(javascriptTextOrReadFileText)) { + var cache_1 = new ts.Map(); + var textGetter_1 = function (path) { + if (path === undefined) + return undefined; + var value = cache_1.get(path); + if (value === undefined) { + value = javascriptTextOrReadFileText(path); + cache_1.set(path, value !== undefined ? value : false); + } + return value !== false ? value : undefined; + }; + var definedTextGetter_1 = function (path) { + var result = textGetter_1(path); + return result !== undefined ? result : "/* Input file " + path + " was missing */\r\n"; + }; + var buildInfo_1; + var getAndCacheBuildInfo_1 = function (getText) { + if (buildInfo_1 === undefined) { + var result = getText(); + buildInfo_1 = result !== undefined ? ts.getBuildInfo(result) : false; + } + return buildInfo_1 || undefined; + }; + node.javascriptPath = declarationTextOrJavascriptPath; + node.javascriptMapPath = javascriptMapPath; + node.declarationPath = ts.Debug.assertDefined(javascriptMapTextOrDeclarationPath); + node.declarationMapPath = declarationMapPath; + node.buildInfoPath = declarationMapTextOrBuildInfoPath; + Object.defineProperties(node, { + javascriptText: { get: function () { return definedTextGetter_1(declarationTextOrJavascriptPath); } }, + javascriptMapText: { get: function () { return textGetter_1(javascriptMapPath); } }, + declarationText: { get: function () { return definedTextGetter_1(ts.Debug.assertDefined(javascriptMapTextOrDeclarationPath)); } }, + declarationMapText: { get: function () { return textGetter_1(declarationMapPath); } }, + buildInfo: { get: function () { return getAndCacheBuildInfo_1(function () { return textGetter_1(declarationMapTextOrBuildInfoPath); }); } } + }); + } + else { + node.javascriptText = javascriptTextOrReadFileText; + node.javascriptMapPath = javascriptMapPath; + node.javascriptMapText = javascriptMapTextOrDeclarationPath; + node.declarationText = declarationTextOrJavascriptPath; + node.declarationMapPath = declarationMapPath; + node.declarationMapText = declarationMapTextOrBuildInfoPath; + node.javascriptPath = javascriptPath; + node.declarationPath = declarationPath; + node.buildInfoPath = buildInfoPath; + node.buildInfo = buildInfo; + node.oldFileOfCurrentEmit = oldFileOfCurrentEmit; + } + return node; + } + ts.createInputFiles = createInputFiles; + // tslint:disable-next-line variable-name + var SourceMapSource; + /** + * Create an external source map source file reference + */ + function createSourceMapSource(fileName, text, skipTrivia) { + return new (SourceMapSource || (SourceMapSource = ts.objectAllocator.getSourceMapSourceConstructor()))(fileName, text, skipTrivia); + } + ts.createSourceMapSource = createSourceMapSource; + // Utilities + function setOriginalNode(node, original) { + node.original = original; + if (original) { + var emitNode = original.emitNode; + if (emitNode) + node.emitNode = mergeEmitNode(emitNode, node.emitNode); + } + return node; + } + ts.setOriginalNode = setOriginalNode; + function mergeEmitNode(sourceEmitNode, destEmitNode) { + var flags = sourceEmitNode.flags, leadingComments = sourceEmitNode.leadingComments, trailingComments = sourceEmitNode.trailingComments, commentRange = sourceEmitNode.commentRange, sourceMapRange = sourceEmitNode.sourceMapRange, tokenSourceMapRanges = sourceEmitNode.tokenSourceMapRanges, constantValue = sourceEmitNode.constantValue, helpers = sourceEmitNode.helpers, startsOnNewLine = sourceEmitNode.startsOnNewLine; + if (!destEmitNode) + destEmitNode = {}; + // We are using `.slice()` here in case `destEmitNode.leadingComments` is pushed to later. + if (leadingComments) + destEmitNode.leadingComments = ts.addRange(leadingComments.slice(), destEmitNode.leadingComments); + if (trailingComments) + destEmitNode.trailingComments = ts.addRange(trailingComments.slice(), destEmitNode.trailingComments); + if (flags) + destEmitNode.flags = flags; + if (commentRange) + destEmitNode.commentRange = commentRange; + if (sourceMapRange) + destEmitNode.sourceMapRange = sourceMapRange; + if (tokenSourceMapRanges) + destEmitNode.tokenSourceMapRanges = mergeTokenSourceMapRanges(tokenSourceMapRanges, destEmitNode.tokenSourceMapRanges); + if (constantValue !== undefined) + destEmitNode.constantValue = constantValue; + if (helpers) { + for (var _i = 0, helpers_1 = helpers; _i < helpers_1.length; _i++) { + var helper = helpers_1[_i]; + destEmitNode.helpers = ts.appendIfUnique(destEmitNode.helpers, helper); + } + } + if (startsOnNewLine !== undefined) + destEmitNode.startsOnNewLine = startsOnNewLine; + return destEmitNode; + } + function mergeTokenSourceMapRanges(sourceRanges, destRanges) { + if (!destRanges) + destRanges = []; + for (var key in sourceRanges) { + destRanges[key] = sourceRanges[key]; + } + return destRanges; + } +})(ts || (ts = {})); +var ts; +(function (ts) { + /** + * Associates a node with the current transformation, initializing + * various transient transformation properties. + * @internal + */ + function getOrCreateEmitNode(node) { + var _a; + if (!node.emitNode) { + if (ts.isParseTreeNode(node)) { + // To avoid holding onto transformation artifacts, we keep track of any + // parse tree node we are annotating. This allows us to clean them up after + // all transformations have completed. + if (node.kind === 294 /* SourceFile */) { + return node.emitNode = { annotatedNodes: [node] }; + } + var sourceFile = (_a = ts.getSourceFileOfNode(ts.getParseTreeNode(ts.getSourceFileOfNode(node)))) !== null && _a !== void 0 ? _a : ts.Debug.fail("Could not determine parsed source file."); + getOrCreateEmitNode(sourceFile).annotatedNodes.push(node); + } + node.emitNode = {}; + } + return node.emitNode; + } + ts.getOrCreateEmitNode = getOrCreateEmitNode; + /** + * Clears any `EmitNode` entries from parse-tree nodes. + * @param sourceFile A source file. + */ + function disposeEmitNodes(sourceFile) { + var _a, _b; + // During transformation we may need to annotate a parse tree node with transient + // transformation properties. As parse tree nodes live longer than transformation + // nodes, we need to make sure we reclaim any memory allocated for custom ranges + // from these nodes to ensure we do not hold onto entire subtrees just for position + // information. We also need to reset these nodes to a pre-transformation state + // for incremental parsing scenarios so that we do not impact later emit. + var annotatedNodes = (_b = (_a = ts.getSourceFileOfNode(ts.getParseTreeNode(sourceFile))) === null || _a === void 0 ? void 0 : _a.emitNode) === null || _b === void 0 ? void 0 : _b.annotatedNodes; + if (annotatedNodes) { + for (var _i = 0, annotatedNodes_1 = annotatedNodes; _i < annotatedNodes_1.length; _i++) { + var node = annotatedNodes_1[_i]; + node.emitNode = undefined; + } + } + } + ts.disposeEmitNodes = disposeEmitNodes; + /** + * Sets `EmitFlags.NoComments` on a node and removes any leading and trailing synthetic comments. + * @internal + */ + function removeAllComments(node) { + var emitNode = getOrCreateEmitNode(node); + emitNode.flags |= 1536 /* NoComments */; + emitNode.leadingComments = undefined; + emitNode.trailingComments = undefined; + return node; + } + ts.removeAllComments = removeAllComments; + /** + * Sets flags that control emit behavior of a node. + */ + function setEmitFlags(node, emitFlags) { + getOrCreateEmitNode(node).flags = emitFlags; + return node; + } + ts.setEmitFlags = setEmitFlags; + /** + * Sets flags that control emit behavior of a node. + */ + /* @internal */ + function addEmitFlags(node, emitFlags) { + var emitNode = getOrCreateEmitNode(node); + emitNode.flags = emitNode.flags | emitFlags; + return node; + } + ts.addEmitFlags = addEmitFlags; + /** + * Gets a custom text range to use when emitting source maps. + */ + function getSourceMapRange(node) { + var _a, _b; + return (_b = (_a = node.emitNode) === null || _a === void 0 ? void 0 : _a.sourceMapRange) !== null && _b !== void 0 ? _b : node; + } + ts.getSourceMapRange = getSourceMapRange; + /** + * Sets a custom text range to use when emitting source maps. + */ + function setSourceMapRange(node, range) { + getOrCreateEmitNode(node).sourceMapRange = range; + return node; + } + ts.setSourceMapRange = setSourceMapRange; + /** + * Gets the TextRange to use for source maps for a token of a node. + */ + function getTokenSourceMapRange(node, token) { + var _a, _b; + return (_b = (_a = node.emitNode) === null || _a === void 0 ? void 0 : _a.tokenSourceMapRanges) === null || _b === void 0 ? void 0 : _b[token]; + } + ts.getTokenSourceMapRange = getTokenSourceMapRange; + /** + * Sets the TextRange to use for source maps for a token of a node. + */ + function setTokenSourceMapRange(node, token, range) { + var _a; + var emitNode = getOrCreateEmitNode(node); + var tokenSourceMapRanges = (_a = emitNode.tokenSourceMapRanges) !== null && _a !== void 0 ? _a : (emitNode.tokenSourceMapRanges = []); + tokenSourceMapRanges[token] = range; + return node; + } + ts.setTokenSourceMapRange = setTokenSourceMapRange; + /** + * Gets a custom text range to use when emitting comments. + */ + /*@internal*/ + function getStartsOnNewLine(node) { + var _a; + return (_a = node.emitNode) === null || _a === void 0 ? void 0 : _a.startsOnNewLine; + } + ts.getStartsOnNewLine = getStartsOnNewLine; + /** + * Sets a custom text range to use when emitting comments. + */ + /*@internal*/ + function setStartsOnNewLine(node, newLine) { + getOrCreateEmitNode(node).startsOnNewLine = newLine; + return node; + } + ts.setStartsOnNewLine = setStartsOnNewLine; + /** + * Gets a custom text range to use when emitting comments. + */ + function getCommentRange(node) { + var _a, _b; + return (_b = (_a = node.emitNode) === null || _a === void 0 ? void 0 : _a.commentRange) !== null && _b !== void 0 ? _b : node; + } + ts.getCommentRange = getCommentRange; + /** + * Sets a custom text range to use when emitting comments. + */ + function setCommentRange(node, range) { + getOrCreateEmitNode(node).commentRange = range; + return node; + } + ts.setCommentRange = setCommentRange; + function getSyntheticLeadingComments(node) { + var _a; + return (_a = node.emitNode) === null || _a === void 0 ? void 0 : _a.leadingComments; + } + ts.getSyntheticLeadingComments = getSyntheticLeadingComments; + function setSyntheticLeadingComments(node, comments) { + getOrCreateEmitNode(node).leadingComments = comments; + return node; + } + ts.setSyntheticLeadingComments = setSyntheticLeadingComments; + function addSyntheticLeadingComment(node, kind, text, hasTrailingNewLine) { + return setSyntheticLeadingComments(node, ts.append(getSyntheticLeadingComments(node), { kind: kind, pos: -1, end: -1, hasTrailingNewLine: hasTrailingNewLine, text: text })); + } + ts.addSyntheticLeadingComment = addSyntheticLeadingComment; + function getSyntheticTrailingComments(node) { + var _a; + return (_a = node.emitNode) === null || _a === void 0 ? void 0 : _a.trailingComments; + } + ts.getSyntheticTrailingComments = getSyntheticTrailingComments; + function setSyntheticTrailingComments(node, comments) { + getOrCreateEmitNode(node).trailingComments = comments; + return node; + } + ts.setSyntheticTrailingComments = setSyntheticTrailingComments; + function addSyntheticTrailingComment(node, kind, text, hasTrailingNewLine) { + return setSyntheticTrailingComments(node, ts.append(getSyntheticTrailingComments(node), { kind: kind, pos: -1, end: -1, hasTrailingNewLine: hasTrailingNewLine, text: text })); + } + ts.addSyntheticTrailingComment = addSyntheticTrailingComment; + function moveSyntheticComments(node, original) { + setSyntheticLeadingComments(node, getSyntheticLeadingComments(original)); + setSyntheticTrailingComments(node, getSyntheticTrailingComments(original)); + var emit = getOrCreateEmitNode(original); + emit.leadingComments = undefined; + emit.trailingComments = undefined; + return node; + } + ts.moveSyntheticComments = moveSyntheticComments; + /** + * Gets the constant value to emit for an expression representing an enum. + */ + function getConstantValue(node) { + var _a; + return (_a = node.emitNode) === null || _a === void 0 ? void 0 : _a.constantValue; + } + ts.getConstantValue = getConstantValue; + /** + * Sets the constant value to emit for an expression. + */ + function setConstantValue(node, value) { + var emitNode = getOrCreateEmitNode(node); + emitNode.constantValue = value; + return node; + } + ts.setConstantValue = setConstantValue; + /** + * Adds an EmitHelper to a node. + */ + function addEmitHelper(node, helper) { + var emitNode = getOrCreateEmitNode(node); + emitNode.helpers = ts.append(emitNode.helpers, helper); + return node; + } + ts.addEmitHelper = addEmitHelper; + /** + * Add EmitHelpers to a node. + */ + function addEmitHelpers(node, helpers) { + if (ts.some(helpers)) { + var emitNode = getOrCreateEmitNode(node); + for (var _i = 0, helpers_2 = helpers; _i < helpers_2.length; _i++) { + var helper = helpers_2[_i]; + emitNode.helpers = ts.appendIfUnique(emitNode.helpers, helper); + } + } + return node; + } + ts.addEmitHelpers = addEmitHelpers; + /** + * Removes an EmitHelper from a node. + */ + function removeEmitHelper(node, helper) { + var _a; + var helpers = (_a = node.emitNode) === null || _a === void 0 ? void 0 : _a.helpers; + if (helpers) { + return ts.orderedRemoveItem(helpers, helper); + } + return false; + } + ts.removeEmitHelper = removeEmitHelper; + /** + * Gets the EmitHelpers of a node. + */ + function getEmitHelpers(node) { + var _a; + return (_a = node.emitNode) === null || _a === void 0 ? void 0 : _a.helpers; + } + ts.getEmitHelpers = getEmitHelpers; + /** + * Moves matching emit helpers from a source node to a target node. + */ + function moveEmitHelpers(source, target, predicate) { + var sourceEmitNode = source.emitNode; + var sourceEmitHelpers = sourceEmitNode && sourceEmitNode.helpers; + if (!ts.some(sourceEmitHelpers)) + return; + var targetEmitNode = getOrCreateEmitNode(target); + var helpersRemoved = 0; + for (var i = 0; i < sourceEmitHelpers.length; i++) { + var helper = sourceEmitHelpers[i]; + if (predicate(helper)) { + helpersRemoved++; + targetEmitNode.helpers = ts.appendIfUnique(targetEmitNode.helpers, helper); + } + else if (helpersRemoved > 0) { + sourceEmitHelpers[i - helpersRemoved] = helper; + } + } + if (helpersRemoved > 0) { + sourceEmitHelpers.length -= helpersRemoved; + } + } + ts.moveEmitHelpers = moveEmitHelpers; + /* @internal */ + function ignoreSourceNewlines(node) { + getOrCreateEmitNode(node).flags |= 134217728 /* IgnoreSourceNewlines */; + return node; + } + ts.ignoreSourceNewlines = ignoreSourceNewlines; +})(ts || (ts = {})); +/* @internal */ +var ts; +(function (ts) { + function createEmitHelperFactory(context) { + var factory = context.factory; + return { + getUnscopedHelperName: getUnscopedHelperName, + // TypeScript Helpers + createDecorateHelper: createDecorateHelper, + createMetadataHelper: createMetadataHelper, + createParamHelper: createParamHelper, + // ES2018 Helpers + createAssignHelper: createAssignHelper, + createAwaitHelper: createAwaitHelper, + createAsyncGeneratorHelper: createAsyncGeneratorHelper, + createAsyncDelegatorHelper: createAsyncDelegatorHelper, + createAsyncValuesHelper: createAsyncValuesHelper, + // ES2018 Destructuring Helpers + createRestHelper: createRestHelper, + // ES2017 Helpers + createAwaiterHelper: createAwaiterHelper, + // ES2015 Helpers + createExtendsHelper: createExtendsHelper, + createTemplateObjectHelper: createTemplateObjectHelper, + createSpreadHelper: createSpreadHelper, + createSpreadArraysHelper: createSpreadArraysHelper, + // ES2015 Destructuring Helpers + createValuesHelper: createValuesHelper, + createReadHelper: createReadHelper, + // ES2015 Generator Helpers + createGeneratorHelper: createGeneratorHelper, + // ES Module Helpers + createCreateBindingHelper: createCreateBindingHelper, + createImportStarHelper: createImportStarHelper, + createImportStarCallbackHelper: createImportStarCallbackHelper, + createImportDefaultHelper: createImportDefaultHelper, + createExportStarHelper: createExportStarHelper, + // Class Fields Helpers + createClassPrivateFieldGetHelper: createClassPrivateFieldGetHelper, + createClassPrivateFieldSetHelper: createClassPrivateFieldSetHelper, + }; + /** + * Gets an identifier for the name of an *unscoped* emit helper. + */ + function getUnscopedHelperName(name) { + return ts.setEmitFlags(factory.createIdentifier(name), 4096 /* HelperName */ | 2 /* AdviseOnEmitNode */); + } + // TypeScript Helpers + function createDecorateHelper(decoratorExpressions, target, memberName, descriptor) { + context.requestEmitHelper(ts.decorateHelper); + var argumentsArray = []; + argumentsArray.push(factory.createArrayLiteralExpression(decoratorExpressions, /*multiLine*/ true)); + argumentsArray.push(target); + if (memberName) { + argumentsArray.push(memberName); + if (descriptor) { + argumentsArray.push(descriptor); + } + } + return factory.createCallExpression(getUnscopedHelperName("__decorate"), + /*typeArguments*/ undefined, argumentsArray); + } + function createMetadataHelper(metadataKey, metadataValue) { + context.requestEmitHelper(ts.metadataHelper); + return factory.createCallExpression(getUnscopedHelperName("__metadata"), + /*typeArguments*/ undefined, [ + factory.createStringLiteral(metadataKey), + metadataValue + ]); + } + function createParamHelper(expression, parameterOffset, location) { + context.requestEmitHelper(ts.paramHelper); + return ts.setTextRange(factory.createCallExpression(getUnscopedHelperName("__param"), + /*typeArguments*/ undefined, [ + factory.createNumericLiteral(parameterOffset + ""), + expression + ]), location); + } + // ES2018 Helpers + function createAssignHelper(attributesSegments) { + if (context.getCompilerOptions().target >= 2 /* ES2015 */) { + return factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Object"), "assign"), + /*typeArguments*/ undefined, attributesSegments); + } + context.requestEmitHelper(ts.assignHelper); + return factory.createCallExpression(getUnscopedHelperName("__assign"), + /*typeArguments*/ undefined, attributesSegments); + } + function createAwaitHelper(expression) { + context.requestEmitHelper(ts.awaitHelper); + return factory.createCallExpression(getUnscopedHelperName("__await"), /*typeArguments*/ undefined, [expression]); + } + function createAsyncGeneratorHelper(generatorFunc, hasLexicalThis) { + context.requestEmitHelper(ts.awaitHelper); + context.requestEmitHelper(ts.asyncGeneratorHelper); + // Mark this node as originally an async function + (generatorFunc.emitNode || (generatorFunc.emitNode = {})).flags |= 262144 /* AsyncFunctionBody */ | 524288 /* ReuseTempVariableScope */; + return factory.createCallExpression(getUnscopedHelperName("__asyncGenerator"), + /*typeArguments*/ undefined, [ + hasLexicalThis ? factory.createThis() : factory.createVoidZero(), + factory.createIdentifier("arguments"), + generatorFunc + ]); + } + function createAsyncDelegatorHelper(expression) { + context.requestEmitHelper(ts.awaitHelper); + context.requestEmitHelper(ts.asyncDelegator); + return factory.createCallExpression(getUnscopedHelperName("__asyncDelegator"), + /*typeArguments*/ undefined, [expression]); + } + function createAsyncValuesHelper(expression) { + context.requestEmitHelper(ts.asyncValues); + return factory.createCallExpression(getUnscopedHelperName("__asyncValues"), + /*typeArguments*/ undefined, [expression]); + } + // ES2018 Destructuring Helpers + /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement + * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);` + */ + function createRestHelper(value, elements, computedTempVariables, location) { + context.requestEmitHelper(ts.restHelper); + var propertyNames = []; + var computedTempVariableOffset = 0; + for (var i = 0; i < elements.length - 1; i++) { + var propertyName = ts.getPropertyNameOfBindingOrAssignmentElement(elements[i]); + if (propertyName) { + if (ts.isComputedPropertyName(propertyName)) { + ts.Debug.assertIsDefined(computedTempVariables, "Encountered computed property name but 'computedTempVariables' argument was not provided."); + var temp = computedTempVariables[computedTempVariableOffset]; + computedTempVariableOffset++; + // typeof _tmp === "symbol" ? _tmp : _tmp + "" + propertyNames.push(factory.createConditionalExpression(factory.createTypeCheck(temp, "symbol"), + /*questionToken*/ undefined, temp, + /*colonToken*/ undefined, factory.createAdd(temp, factory.createStringLiteral("")))); + } + else { + propertyNames.push(factory.createStringLiteralFromNode(propertyName)); + } + } + } + return factory.createCallExpression(getUnscopedHelperName("__rest"), + /*typeArguments*/ undefined, [ + value, + ts.setTextRange(factory.createArrayLiteralExpression(propertyNames), location) + ]); + } + // ES2017 Helpers + function createAwaiterHelper(hasLexicalThis, hasLexicalArguments, promiseConstructor, body) { + context.requestEmitHelper(ts.awaiterHelper); + var generatorFunc = factory.createFunctionExpression( + /*modifiers*/ undefined, factory.createToken(41 /* AsteriskToken */), + /*name*/ undefined, + /*typeParameters*/ undefined, + /*parameters*/ [], + /*type*/ undefined, body); + // Mark this node as originally an async function + (generatorFunc.emitNode || (generatorFunc.emitNode = {})).flags |= 262144 /* AsyncFunctionBody */ | 524288 /* ReuseTempVariableScope */; + return factory.createCallExpression(getUnscopedHelperName("__awaiter"), + /*typeArguments*/ undefined, [ + hasLexicalThis ? factory.createThis() : factory.createVoidZero(), + hasLexicalArguments ? factory.createIdentifier("arguments") : factory.createVoidZero(), + promiseConstructor ? ts.createExpressionFromEntityName(factory, promiseConstructor) : factory.createVoidZero(), + generatorFunc + ]); + } + // ES2015 Helpers + function createExtendsHelper(name) { + context.requestEmitHelper(ts.extendsHelper); + return factory.createCallExpression(getUnscopedHelperName("__extends"), + /*typeArguments*/ undefined, [name, factory.createUniqueName("_super", 16 /* Optimistic */ | 32 /* FileLevel */)]); + } + function createTemplateObjectHelper(cooked, raw) { + context.requestEmitHelper(ts.templateObjectHelper); + return factory.createCallExpression(getUnscopedHelperName("__makeTemplateObject"), + /*typeArguments*/ undefined, [cooked, raw]); + } + function createSpreadHelper(argumentList) { + context.requestEmitHelper(ts.readHelper); + context.requestEmitHelper(ts.spreadHelper); + return factory.createCallExpression(getUnscopedHelperName("__spread"), + /*typeArguments*/ undefined, argumentList); + } + function createSpreadArraysHelper(argumentList) { + context.requestEmitHelper(ts.spreadArraysHelper); + return factory.createCallExpression(getUnscopedHelperName("__spreadArrays"), + /*typeArguments*/ undefined, argumentList); + } + // ES2015 Destructuring Helpers + function createValuesHelper(expression) { + context.requestEmitHelper(ts.valuesHelper); + return factory.createCallExpression(getUnscopedHelperName("__values"), + /*typeArguments*/ undefined, [expression]); + } + function createReadHelper(iteratorRecord, count) { + context.requestEmitHelper(ts.readHelper); + return factory.createCallExpression(getUnscopedHelperName("__read"), + /*typeArguments*/ undefined, count !== undefined + ? [iteratorRecord, factory.createNumericLiteral(count + "")] + : [iteratorRecord]); + } + // ES2015 Generator Helpers + function createGeneratorHelper(body) { + context.requestEmitHelper(ts.generatorHelper); + return factory.createCallExpression(getUnscopedHelperName("__generator"), + /*typeArguments*/ undefined, [factory.createThis(), body]); + } + // ES Module Helpers + function createCreateBindingHelper(module, inputName, outputName) { + context.requestEmitHelper(ts.createBindingHelper); + return factory.createCallExpression(getUnscopedHelperName("__createBinding"), + /*typeArguments*/ undefined, __spreadArrays([factory.createIdentifier("exports"), module, inputName], (outputName ? [outputName] : []))); + } + function createImportStarHelper(expression) { + context.requestEmitHelper(ts.importStarHelper); + return factory.createCallExpression(getUnscopedHelperName("__importStar"), + /*typeArguments*/ undefined, [expression]); + } + function createImportStarCallbackHelper() { + context.requestEmitHelper(ts.importStarHelper); + return getUnscopedHelperName("__importStar"); + } + function createImportDefaultHelper(expression) { + context.requestEmitHelper(ts.importDefaultHelper); + return factory.createCallExpression(getUnscopedHelperName("__importDefault"), + /*typeArguments*/ undefined, [expression]); + } + function createExportStarHelper(moduleExpression, exportsExpression) { + if (exportsExpression === void 0) { exportsExpression = factory.createIdentifier("exports"); } + context.requestEmitHelper(ts.exportStarHelper); + context.requestEmitHelper(ts.createBindingHelper); + return factory.createCallExpression(getUnscopedHelperName("__exportStar"), + /*typeArguments*/ undefined, [moduleExpression, exportsExpression]); + } + // Class Fields Helpers + function createClassPrivateFieldGetHelper(receiver, privateField) { + context.requestEmitHelper(ts.classPrivateFieldGetHelper); + return factory.createCallExpression(getUnscopedHelperName("__classPrivateFieldGet"), /*typeArguments*/ undefined, [receiver, privateField]); + } + function createClassPrivateFieldSetHelper(receiver, privateField, value) { + context.requestEmitHelper(ts.classPrivateFieldSetHelper); + return factory.createCallExpression(getUnscopedHelperName("__classPrivateFieldSet"), /*typeArguments*/ undefined, [receiver, privateField, value]); + } + } + ts.createEmitHelperFactory = createEmitHelperFactory; + /* @internal */ + function compareEmitHelpers(x, y) { + if (x === y) + return 0 /* EqualTo */; + if (x.priority === y.priority) + return 0 /* EqualTo */; + if (x.priority === undefined) + return 1 /* GreaterThan */; + if (y.priority === undefined) + return -1 /* LessThan */; + return ts.compareValues(x.priority, y.priority); + } + ts.compareEmitHelpers = compareEmitHelpers; + /** + * @param input Template string input strings + * @param args Names which need to be made file-level unique + */ + function helperString(input) { + var args = []; + for (var _i = 1; _i < arguments.length; _i++) { + args[_i - 1] = arguments[_i]; + } + return function (uniqueName) { + var result = ""; + for (var i = 0; i < args.length; i++) { + result += input[i]; + result += uniqueName(args[i]); + } + result += input[input.length - 1]; + return result; + }; + } + ts.helperString = helperString; + // TypeScript Helpers + ts.decorateHelper = { + name: "typescript:decorate", + importName: "__decorate", + scoped: false, + priority: 2, + text: "\n var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n return c > 3 && r && Object.defineProperty(target, key, r), r;\n };" + }; + ts.metadataHelper = { + name: "typescript:metadata", + importName: "__metadata", + scoped: false, + priority: 3, + text: "\n var __metadata = (this && this.__metadata) || function (k, v) {\n if (typeof Reflect === \"object\" && typeof Reflect.metadata === \"function\") return Reflect.metadata(k, v);\n };" + }; + ts.paramHelper = { + name: "typescript:param", + importName: "__param", + scoped: false, + priority: 4, + text: "\n var __param = (this && this.__param) || function (paramIndex, decorator) {\n return function (target, key) { decorator(target, key, paramIndex); }\n };" + }; + // ES2018 Helpers + ts.assignHelper = { + name: "typescript:assign", + importName: "__assign", + scoped: false, + priority: 1, + text: "\n var __assign = (this && this.__assign) || function () {\n __assign = Object.assign || function(t) {\n for (var s, i = 1, n = arguments.length; i < n; i++) {\n s = arguments[i];\n for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))\n t[p] = s[p];\n }\n return t;\n };\n return __assign.apply(this, arguments);\n };" + }; + ts.awaitHelper = { + name: "typescript:await", + importName: "__await", + scoped: false, + text: "\n var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }" + }; + ts.asyncGeneratorHelper = { + name: "typescript:asyncGenerator", + importName: "__asyncGenerator", + scoped: false, + dependencies: [ts.awaitHelper], + text: "\n var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {\n if (!Symbol.asyncIterator) throw new TypeError(\"Symbol.asyncIterator is not defined.\");\n var g = generator.apply(thisArg, _arguments || []), i, q = [];\n return i = {}, verb(\"next\"), verb(\"throw\"), verb(\"return\"), i[Symbol.asyncIterator] = function () { return this; }, i;\n function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }\n function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }\n function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }\n function fulfill(value) { resume(\"next\", value); }\n function reject(value) { resume(\"throw\", value); }\n function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }\n };" + }; + ts.asyncDelegator = { + name: "typescript:asyncDelegator", + importName: "__asyncDelegator", + scoped: false, + dependencies: [ts.awaitHelper], + text: "\n var __asyncDelegator = (this && this.__asyncDelegator) || function (o) {\n var i, p;\n return i = {}, verb(\"next\"), verb(\"throw\", function (e) { throw e; }), verb(\"return\"), i[Symbol.iterator] = function () { return this; }, i;\n function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === \"return\" } : f ? f(v) : v; } : f; }\n };" + }; + ts.asyncValues = { + name: "typescript:asyncValues", + importName: "__asyncValues", + scoped: false, + text: "\n var __asyncValues = (this && this.__asyncValues) || function (o) {\n if (!Symbol.asyncIterator) throw new TypeError(\"Symbol.asyncIterator is not defined.\");\n var m = o[Symbol.asyncIterator], i;\n return m ? m.call(o) : (o = typeof __values === \"function\" ? __values(o) : o[Symbol.iterator](), i = {}, verb(\"next\"), verb(\"throw\"), verb(\"return\"), i[Symbol.asyncIterator] = function () { return this; }, i);\n function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }\n function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }\n };" + }; + // ES2018 Destructuring Helpers + ts.restHelper = { + name: "typescript:rest", + importName: "__rest", + scoped: false, + text: "\n var __rest = (this && this.__rest) || function (s, e) {\n var t = {};\n for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n t[p] = s[p];\n if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {\n if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))\n t[p[i]] = s[p[i]];\n }\n return t;\n };" + }; + // ES2017 Helpers + ts.awaiterHelper = { + name: "typescript:awaiter", + importName: "__awaiter", + scoped: false, + priority: 5, + text: "\n var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n return new (P || (P = Promise))(function (resolve, reject) {\n function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n step((generator = generator.apply(thisArg, _arguments || [])).next());\n });\n };" + }; + // ES2015 Helpers + ts.extendsHelper = { + name: "typescript:extends", + importName: "__extends", + scoped: false, + priority: 0, + text: "\n var __extends = (this && this.__extends) || (function () {\n var extendStatics = function (d, b) {\n extendStatics = Object.setPrototypeOf ||\n ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||\n function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };\n return extendStatics(d, b);\n };\n\n return function (d, b) {\n extendStatics(d, b);\n function __() { this.constructor = d; }\n d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n };\n })();" + }; + ts.templateObjectHelper = { + name: "typescript:makeTemplateObject", + importName: "__makeTemplateObject", + scoped: false, + priority: 0, + text: "\n var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {\n if (Object.defineProperty) { Object.defineProperty(cooked, \"raw\", { value: raw }); } else { cooked.raw = raw; }\n return cooked;\n };" + }; + ts.readHelper = { + name: "typescript:read", + importName: "__read", + scoped: false, + text: "\n var __read = (this && this.__read) || function (o, n) {\n var m = typeof Symbol === \"function\" && o[Symbol.iterator];\n if (!m) return o;\n var i = m.call(o), r, ar = [], e;\n try {\n while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);\n }\n catch (error) { e = { error: error }; }\n finally {\n try {\n if (r && !r.done && (m = i[\"return\"])) m.call(i);\n }\n finally { if (e) throw e.error; }\n }\n return ar;\n };" + }; + ts.spreadHelper = { + name: "typescript:spread", + importName: "__spread", + scoped: false, + dependencies: [ts.readHelper], + text: "\n var __spread = (this && this.__spread) || function () {\n for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));\n return ar;\n };" + }; + ts.spreadArraysHelper = { + name: "typescript:spreadArrays", + importName: "__spreadArrays", + scoped: false, + text: "\n var __spreadArrays = (this && this.__spreadArrays) || function () {\n for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;\n for (var r = Array(s), k = 0, i = 0; i < il; i++)\n for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)\n r[k] = a[j];\n return r;\n };" + }; + // ES2015 Destructuring Helpers + ts.valuesHelper = { + name: "typescript:values", + importName: "__values", + scoped: false, + text: "\n var __values = (this && this.__values) || function(o) {\n var s = typeof Symbol === \"function\" && Symbol.iterator, m = s && o[s], i = 0;\n if (m) return m.call(o);\n if (o && typeof o.length === \"number\") return {\n next: function () {\n if (o && i >= o.length) o = void 0;\n return { value: o && o[i++], done: !o };\n }\n };\n throw new TypeError(s ? \"Object is not iterable.\" : \"Symbol.iterator is not defined.\");\n };" + }; + // ES2015 Generator Helpers + // The __generator helper is used by down-level transformations to emulate the runtime + // semantics of an ES2015 generator function. When called, this helper returns an + // object that implements the Iterator protocol, in that it has `next`, `return`, and + // `throw` methods that step through the generator when invoked. + // + // parameters: + // @param thisArg The value to use as the `this` binding for the transformed generator body. + // @param body A function that acts as the transformed generator body. + // + // variables: + // _ Persistent state for the generator that is shared between the helper and the + // generator body. The state object has the following members: + // sent() - A method that returns or throws the current completion value. + // label - The next point at which to resume evaluation of the generator body. + // trys - A stack of protected regions (try/catch/finally blocks). + // ops - A stack of pending instructions when inside of a finally block. + // f A value indicating whether the generator is executing. + // y An iterator to delegate for a yield*. + // t A temporary variable that holds one of the following values (note that these + // cases do not overlap): + // - The completion value when resuming from a `yield` or `yield*`. + // - The error value for a catch block. + // - The current protected region (array of try/catch/finally/end labels). + // - The verb (`next`, `throw`, or `return` method) to delegate to the expression + // of a `yield*`. + // - The result of evaluating the verb delegated to the expression of a `yield*`. + // + // functions: + // verb(n) Creates a bound callback to the `step` function for opcode `n`. + // step(op) Evaluates opcodes in a generator body until execution is suspended or + // completed. + // + // The __generator helper understands a limited set of instructions: + // 0: next(value?) - Start or resume the generator with the specified value. + // 1: throw(error) - Resume the generator with an exception. If the generator is + // suspended inside of one or more protected regions, evaluates + // any intervening finally blocks between the current label and + // the nearest catch block or function boundary. If uncaught, the + // exception is thrown to the caller. + // 2: return(value?) - Resume the generator as if with a return. If the generator is + // suspended inside of one or more protected regions, evaluates any + // intervening finally blocks. + // 3: break(label) - Jump to the specified label. If the label is outside of the + // current protected region, evaluates any intervening finally + // blocks. + // 4: yield(value?) - Yield execution to the caller with an optional value. When + // resumed, the generator will continue at the next label. + // 5: yield*(value) - Delegates evaluation to the supplied iterator. When + // delegation completes, the generator will continue at the next + // label. + // 6: catch(error) - Handles an exception thrown from within the generator body. If + // the current label is inside of one or more protected regions, + // evaluates any intervening finally blocks between the current + // label and the nearest catch block or function boundary. If + // uncaught, the exception is thrown to the caller. + // 7: endfinally - Ends a finally block, resuming the last instruction prior to + // entering a finally block. + // + // For examples of how these are used, see the comments in ./transformers/generators.ts + ts.generatorHelper = { + name: "typescript:generator", + importName: "__generator", + scoped: false, + priority: 6, + text: "\n var __generator = (this && this.__generator) || function (thisArg, body) {\n var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;\n return g = { next: verb(0), \"throw\": verb(1), \"return\": verb(2) }, typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\n function verb(n) { return function (v) { return step([n, v]); }; }\n function step(op) {\n if (f) throw new TypeError(\"Generator is already executing.\");\n while (_) try {\n if (f = 1, y && (t = op[0] & 2 ? y[\"return\"] : op[0] ? y[\"throw\"] || ((t = y[\"return\"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;\n if (y = 0, t) op = [op[0] & 2, t.value];\n switch (op[0]) {\n case 0: case 1: t = op; break;\n case 4: _.label++; return { value: op[1], done: false };\n case 5: _.label++; y = op[1]; op = [0]; continue;\n case 7: op = _.ops.pop(); _.trys.pop(); continue;\n default:\n if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\n if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\n if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\n if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\n if (t[2]) _.ops.pop();\n _.trys.pop(); continue;\n }\n op = body.call(thisArg, _);\n } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\n if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\n }\n };" + }; + // ES Module Helpers + ts.createBindingHelper = { + name: "typescript:commonjscreatebinding", + importName: "__createBinding", + scoped: false, + priority: 1, + text: "\n var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {\n if (k2 === undefined) k2 = k;\n Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });\n }) : (function(o, m, k, k2) {\n if (k2 === undefined) k2 = k;\n o[k2] = m[k];\n }));" + }; + ts.setModuleDefaultHelper = { + name: "typescript:commonjscreatevalue", + importName: "__setModuleDefault", + scoped: false, + priority: 1, + text: "\n var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {\n Object.defineProperty(o, \"default\", { enumerable: true, value: v });\n }) : function(o, v) {\n o[\"default\"] = v;\n });" + }; + // emit helper for `import * as Name from "foo"` + ts.importStarHelper = { + name: "typescript:commonjsimportstar", + importName: "__importStar", + scoped: false, + dependencies: [ts.createBindingHelper, ts.setModuleDefaultHelper], + priority: 2, + text: "\n var __importStar = (this && this.__importStar) || function (mod) {\n if (mod && mod.__esModule) return mod;\n var result = {};\n if (mod != null) for (var k in mod) if (k !== \"default\" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);\n __setModuleDefault(result, mod);\n return result;\n };" + }; + // emit helper for `import Name from "foo"` + ts.importDefaultHelper = { + name: "typescript:commonjsimportdefault", + importName: "__importDefault", + scoped: false, + text: "\n var __importDefault = (this && this.__importDefault) || function (mod) {\n return (mod && mod.__esModule) ? mod : { \"default\": mod };\n };" + }; + // emit output for the __export helper function + ts.exportStarHelper = { + name: "typescript:export-star", + importName: "__exportStar", + scoped: false, + dependencies: [ts.createBindingHelper], + priority: 2, + text: "\n var __exportStar = (this && this.__exportStar) || function(m, exports) {\n for (var p in m) if (p !== \"default\" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);\n };" + }; + // Class fields helpers + ts.classPrivateFieldGetHelper = { + name: "typescript:classPrivateFieldGet", + importName: "__classPrivateFieldGet", + scoped: false, + text: "\n var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, privateMap) {\n if (!privateMap.has(receiver)) {\n throw new TypeError(\"attempted to get private field on non-instance\");\n }\n return privateMap.get(receiver);\n };" + }; + ts.classPrivateFieldSetHelper = { + name: "typescript:classPrivateFieldSet", + importName: "__classPrivateFieldSet", + scoped: false, + text: "\n var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, privateMap, value) {\n if (!privateMap.has(receiver)) {\n throw new TypeError(\"attempted to set private field on non-instance\");\n }\n privateMap.set(receiver, value);\n return value;\n };" + }; + var allUnscopedEmitHelpers; + function getAllUnscopedEmitHelpers() { + return allUnscopedEmitHelpers || (allUnscopedEmitHelpers = ts.arrayToMap([ + ts.decorateHelper, + ts.metadataHelper, + ts.paramHelper, + ts.assignHelper, + ts.awaitHelper, + ts.asyncGeneratorHelper, + ts.asyncDelegator, + ts.asyncValues, + ts.restHelper, + ts.awaiterHelper, + ts.extendsHelper, + ts.templateObjectHelper, + ts.spreadHelper, + ts.spreadArraysHelper, + ts.valuesHelper, + ts.readHelper, + ts.generatorHelper, + ts.importStarHelper, + ts.importDefaultHelper, + ts.exportStarHelper, + ts.classPrivateFieldGetHelper, + ts.classPrivateFieldSetHelper, + ts.createBindingHelper, + ts.setModuleDefaultHelper + ], function (helper) { return helper.name; })); + } + ts.getAllUnscopedEmitHelpers = getAllUnscopedEmitHelpers; + ts.asyncSuperHelper = { + name: "typescript:async-super", + scoped: true, + text: helperString(__makeTemplateObject(["\n const ", " = name => super[name];"], ["\n const ", " = name => super[name];"]), "_superIndex") + }; + ts.advancedAsyncSuperHelper = { + name: "typescript:advanced-async-super", + scoped: true, + text: helperString(__makeTemplateObject(["\n const ", " = (function (geti, seti) {\n const cache = Object.create(null);\n return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });\n })(name => super[name], (name, value) => super[name] = value);"], ["\n const ", " = (function (geti, seti) {\n const cache = Object.create(null);\n return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });\n })(name => super[name], (name, value) => super[name] = value);"]), "_superIndex") + }; +})(ts || (ts = {})); +var ts; +(function (ts) { + // Literals + function isNumericLiteral(node) { + return node.kind === 8 /* NumericLiteral */; + } + ts.isNumericLiteral = isNumericLiteral; + function isBigIntLiteral(node) { + return node.kind === 9 /* BigIntLiteral */; + } + ts.isBigIntLiteral = isBigIntLiteral; + function isStringLiteral(node) { + return node.kind === 10 /* StringLiteral */; + } + ts.isStringLiteral = isStringLiteral; + function isJsxText(node) { + return node.kind === 11 /* JsxText */; + } + ts.isJsxText = isJsxText; + function isRegularExpressionLiteral(node) { + return node.kind === 13 /* RegularExpressionLiteral */; + } + ts.isRegularExpressionLiteral = isRegularExpressionLiteral; + function isNoSubstitutionTemplateLiteral(node) { + return node.kind === 14 /* NoSubstitutionTemplateLiteral */; + } + ts.isNoSubstitutionTemplateLiteral = isNoSubstitutionTemplateLiteral; + // Pseudo-literals + function isTemplateHead(node) { + return node.kind === 15 /* TemplateHead */; + } + ts.isTemplateHead = isTemplateHead; + function isTemplateMiddle(node) { + return node.kind === 16 /* TemplateMiddle */; + } + ts.isTemplateMiddle = isTemplateMiddle; + function isTemplateTail(node) { + return node.kind === 17 /* TemplateTail */; + } + ts.isTemplateTail = isTemplateTail; + // Identifiers + function isIdentifier(node) { + return node.kind === 78 /* Identifier */; + } + ts.isIdentifier = isIdentifier; + // Names + function isQualifiedName(node) { + return node.kind === 156 /* QualifiedName */; + } + ts.isQualifiedName = isQualifiedName; + function isComputedPropertyName(node) { + return node.kind === 157 /* ComputedPropertyName */; + } + ts.isComputedPropertyName = isComputedPropertyName; + function isPrivateIdentifier(node) { + return node.kind === 79 /* PrivateIdentifier */; + } + ts.isPrivateIdentifier = isPrivateIdentifier; + // Tokens + /*@internal*/ + function isSuperKeyword(node) { + return node.kind === 105 /* SuperKeyword */; + } + ts.isSuperKeyword = isSuperKeyword; + /*@internal*/ + function isImportKeyword(node) { + return node.kind === 99 /* ImportKeyword */; + } + ts.isImportKeyword = isImportKeyword; + /*@internal*/ + function isCommaToken(node) { + return node.kind === 27 /* CommaToken */; + } + ts.isCommaToken = isCommaToken; + /*@internal*/ + function isQuestionToken(node) { + return node.kind === 57 /* QuestionToken */; + } + ts.isQuestionToken = isQuestionToken; + /*@internal*/ + function isExclamationToken(node) { + return node.kind === 53 /* ExclamationToken */; + } + ts.isExclamationToken = isExclamationToken; + // Signature elements + function isTypeParameterDeclaration(node) { + return node.kind === 158 /* TypeParameter */; + } + ts.isTypeParameterDeclaration = isTypeParameterDeclaration; + // TODO(rbuckton): Rename to 'isParameterDeclaration' + function isParameter(node) { + return node.kind === 159 /* Parameter */; + } + ts.isParameter = isParameter; + function isDecorator(node) { + return node.kind === 160 /* Decorator */; + } + ts.isDecorator = isDecorator; + // TypeMember + function isPropertySignature(node) { + return node.kind === 161 /* PropertySignature */; + } + ts.isPropertySignature = isPropertySignature; + function isPropertyDeclaration(node) { + return node.kind === 162 /* PropertyDeclaration */; + } + ts.isPropertyDeclaration = isPropertyDeclaration; + function isMethodSignature(node) { + return node.kind === 163 /* MethodSignature */; + } + ts.isMethodSignature = isMethodSignature; + function isMethodDeclaration(node) { + return node.kind === 164 /* MethodDeclaration */; + } + ts.isMethodDeclaration = isMethodDeclaration; + function isConstructorDeclaration(node) { + return node.kind === 165 /* Constructor */; + } + ts.isConstructorDeclaration = isConstructorDeclaration; + function isGetAccessorDeclaration(node) { + return node.kind === 166 /* GetAccessor */; + } + ts.isGetAccessorDeclaration = isGetAccessorDeclaration; + function isSetAccessorDeclaration(node) { + return node.kind === 167 /* SetAccessor */; + } + ts.isSetAccessorDeclaration = isSetAccessorDeclaration; + function isCallSignatureDeclaration(node) { + return node.kind === 168 /* CallSignature */; + } + ts.isCallSignatureDeclaration = isCallSignatureDeclaration; + function isConstructSignatureDeclaration(node) { + return node.kind === 169 /* ConstructSignature */; + } + ts.isConstructSignatureDeclaration = isConstructSignatureDeclaration; + function isIndexSignatureDeclaration(node) { + return node.kind === 170 /* IndexSignature */; + } + ts.isIndexSignatureDeclaration = isIndexSignatureDeclaration; + // Type + function isTypePredicateNode(node) { + return node.kind === 171 /* TypePredicate */; + } + ts.isTypePredicateNode = isTypePredicateNode; + function isTypeReferenceNode(node) { + return node.kind === 172 /* TypeReference */; + } + ts.isTypeReferenceNode = isTypeReferenceNode; + function isFunctionTypeNode(node) { + return node.kind === 173 /* FunctionType */; + } + ts.isFunctionTypeNode = isFunctionTypeNode; + function isConstructorTypeNode(node) { + return node.kind === 174 /* ConstructorType */; + } + ts.isConstructorTypeNode = isConstructorTypeNode; + function isTypeQueryNode(node) { + return node.kind === 175 /* TypeQuery */; + } + ts.isTypeQueryNode = isTypeQueryNode; + function isTypeLiteralNode(node) { + return node.kind === 176 /* TypeLiteral */; + } + ts.isTypeLiteralNode = isTypeLiteralNode; + function isArrayTypeNode(node) { + return node.kind === 177 /* ArrayType */; + } + ts.isArrayTypeNode = isArrayTypeNode; + function isTupleTypeNode(node) { + return node.kind === 178 /* TupleType */; + } + ts.isTupleTypeNode = isTupleTypeNode; + function isNamedTupleMember(node) { + return node.kind === 191 /* NamedTupleMember */; + } + ts.isNamedTupleMember = isNamedTupleMember; + function isOptionalTypeNode(node) { + return node.kind === 179 /* OptionalType */; + } + ts.isOptionalTypeNode = isOptionalTypeNode; + function isRestTypeNode(node) { + return node.kind === 180 /* RestType */; + } + ts.isRestTypeNode = isRestTypeNode; + function isUnionTypeNode(node) { + return node.kind === 181 /* UnionType */; + } + ts.isUnionTypeNode = isUnionTypeNode; + function isIntersectionTypeNode(node) { + return node.kind === 182 /* IntersectionType */; + } + ts.isIntersectionTypeNode = isIntersectionTypeNode; + function isConditionalTypeNode(node) { + return node.kind === 183 /* ConditionalType */; + } + ts.isConditionalTypeNode = isConditionalTypeNode; + function isInferTypeNode(node) { + return node.kind === 184 /* InferType */; + } + ts.isInferTypeNode = isInferTypeNode; + function isParenthesizedTypeNode(node) { + return node.kind === 185 /* ParenthesizedType */; + } + ts.isParenthesizedTypeNode = isParenthesizedTypeNode; + function isThisTypeNode(node) { + return node.kind === 186 /* ThisType */; + } + ts.isThisTypeNode = isThisTypeNode; + function isTypeOperatorNode(node) { + return node.kind === 187 /* TypeOperator */; + } + ts.isTypeOperatorNode = isTypeOperatorNode; + function isIndexedAccessTypeNode(node) { + return node.kind === 188 /* IndexedAccessType */; + } + ts.isIndexedAccessTypeNode = isIndexedAccessTypeNode; + function isMappedTypeNode(node) { + return node.kind === 189 /* MappedType */; + } + ts.isMappedTypeNode = isMappedTypeNode; + function isLiteralTypeNode(node) { + return node.kind === 190 /* LiteralType */; + } + ts.isLiteralTypeNode = isLiteralTypeNode; + function isImportTypeNode(node) { + return node.kind === 192 /* ImportType */; + } + ts.isImportTypeNode = isImportTypeNode; + // Binding patterns + function isObjectBindingPattern(node) { + return node.kind === 193 /* ObjectBindingPattern */; + } + ts.isObjectBindingPattern = isObjectBindingPattern; + function isArrayBindingPattern(node) { + return node.kind === 194 /* ArrayBindingPattern */; + } + ts.isArrayBindingPattern = isArrayBindingPattern; + function isBindingElement(node) { + return node.kind === 195 /* BindingElement */; + } + ts.isBindingElement = isBindingElement; + // Expression + function isArrayLiteralExpression(node) { + return node.kind === 196 /* ArrayLiteralExpression */; + } + ts.isArrayLiteralExpression = isArrayLiteralExpression; + function isObjectLiteralExpression(node) { + return node.kind === 197 /* ObjectLiteralExpression */; + } + ts.isObjectLiteralExpression = isObjectLiteralExpression; + function isPropertyAccessExpression(node) { + return node.kind === 198 /* PropertyAccessExpression */; + } + ts.isPropertyAccessExpression = isPropertyAccessExpression; + function isElementAccessExpression(node) { + return node.kind === 199 /* ElementAccessExpression */; + } + ts.isElementAccessExpression = isElementAccessExpression; + function isCallExpression(node) { + return node.kind === 200 /* CallExpression */; + } + ts.isCallExpression = isCallExpression; + function isNewExpression(node) { + return node.kind === 201 /* NewExpression */; + } + ts.isNewExpression = isNewExpression; + function isTaggedTemplateExpression(node) { + return node.kind === 202 /* TaggedTemplateExpression */; + } + ts.isTaggedTemplateExpression = isTaggedTemplateExpression; + function isTypeAssertionExpression(node) { + return node.kind === 203 /* TypeAssertionExpression */; + } + ts.isTypeAssertionExpression = isTypeAssertionExpression; + function isParenthesizedExpression(node) { + return node.kind === 204 /* ParenthesizedExpression */; + } + ts.isParenthesizedExpression = isParenthesizedExpression; + function isFunctionExpression(node) { + return node.kind === 205 /* FunctionExpression */; + } + ts.isFunctionExpression = isFunctionExpression; + function isArrowFunction(node) { + return node.kind === 206 /* ArrowFunction */; + } + ts.isArrowFunction = isArrowFunction; + function isDeleteExpression(node) { + return node.kind === 207 /* DeleteExpression */; + } + ts.isDeleteExpression = isDeleteExpression; + function isTypeOfExpression(node) { + return node.kind === 208 /* TypeOfExpression */; + } + ts.isTypeOfExpression = isTypeOfExpression; + function isVoidExpression(node) { + return node.kind === 209 /* VoidExpression */; + } + ts.isVoidExpression = isVoidExpression; + function isAwaitExpression(node) { + return node.kind === 210 /* AwaitExpression */; + } + ts.isAwaitExpression = isAwaitExpression; + function isPrefixUnaryExpression(node) { + return node.kind === 211 /* PrefixUnaryExpression */; + } + ts.isPrefixUnaryExpression = isPrefixUnaryExpression; + function isPostfixUnaryExpression(node) { + return node.kind === 212 /* PostfixUnaryExpression */; + } + ts.isPostfixUnaryExpression = isPostfixUnaryExpression; + function isBinaryExpression(node) { + return node.kind === 213 /* BinaryExpression */; + } + ts.isBinaryExpression = isBinaryExpression; + function isConditionalExpression(node) { + return node.kind === 214 /* ConditionalExpression */; + } + ts.isConditionalExpression = isConditionalExpression; + function isTemplateExpression(node) { + return node.kind === 215 /* TemplateExpression */; + } + ts.isTemplateExpression = isTemplateExpression; + function isYieldExpression(node) { + return node.kind === 216 /* YieldExpression */; + } + ts.isYieldExpression = isYieldExpression; + function isSpreadElement(node) { + return node.kind === 217 /* SpreadElement */; + } + ts.isSpreadElement = isSpreadElement; + function isClassExpression(node) { + return node.kind === 218 /* ClassExpression */; + } + ts.isClassExpression = isClassExpression; + function isOmittedExpression(node) { + return node.kind === 219 /* OmittedExpression */; + } + ts.isOmittedExpression = isOmittedExpression; + function isExpressionWithTypeArguments(node) { + return node.kind === 220 /* ExpressionWithTypeArguments */; + } + ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments; + function isAsExpression(node) { + return node.kind === 221 /* AsExpression */; + } + ts.isAsExpression = isAsExpression; + function isNonNullExpression(node) { + return node.kind === 222 /* NonNullExpression */; + } + ts.isNonNullExpression = isNonNullExpression; + function isMetaProperty(node) { + return node.kind === 223 /* MetaProperty */; + } + ts.isMetaProperty = isMetaProperty; + function isSyntheticExpression(node) { + return node.kind === 224 /* SyntheticExpression */; + } + ts.isSyntheticExpression = isSyntheticExpression; + function isPartiallyEmittedExpression(node) { + return node.kind === 331 /* PartiallyEmittedExpression */; + } + ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression; + function isCommaListExpression(node) { + return node.kind === 332 /* CommaListExpression */; + } + ts.isCommaListExpression = isCommaListExpression; + // Misc + function isTemplateSpan(node) { + return node.kind === 225 /* TemplateSpan */; + } + ts.isTemplateSpan = isTemplateSpan; + function isSemicolonClassElement(node) { + return node.kind === 226 /* SemicolonClassElement */; + } + ts.isSemicolonClassElement = isSemicolonClassElement; + // Elements + function isBlock(node) { + return node.kind === 227 /* Block */; + } + ts.isBlock = isBlock; + function isVariableStatement(node) { + return node.kind === 229 /* VariableStatement */; + } + ts.isVariableStatement = isVariableStatement; + function isEmptyStatement(node) { + return node.kind === 228 /* EmptyStatement */; + } + ts.isEmptyStatement = isEmptyStatement; + function isExpressionStatement(node) { + return node.kind === 230 /* ExpressionStatement */; + } + ts.isExpressionStatement = isExpressionStatement; + function isIfStatement(node) { + return node.kind === 231 /* IfStatement */; + } + ts.isIfStatement = isIfStatement; + function isDoStatement(node) { + return node.kind === 232 /* DoStatement */; + } + ts.isDoStatement = isDoStatement; + function isWhileStatement(node) { + return node.kind === 233 /* WhileStatement */; + } + ts.isWhileStatement = isWhileStatement; + function isForStatement(node) { + return node.kind === 234 /* ForStatement */; + } + ts.isForStatement = isForStatement; + function isForInStatement(node) { + return node.kind === 235 /* ForInStatement */; + } + ts.isForInStatement = isForInStatement; + function isForOfStatement(node) { + return node.kind === 236 /* ForOfStatement */; + } + ts.isForOfStatement = isForOfStatement; + function isContinueStatement(node) { + return node.kind === 237 /* ContinueStatement */; + } + ts.isContinueStatement = isContinueStatement; + function isBreakStatement(node) { + return node.kind === 238 /* BreakStatement */; + } + ts.isBreakStatement = isBreakStatement; + function isReturnStatement(node) { + return node.kind === 239 /* ReturnStatement */; + } + ts.isReturnStatement = isReturnStatement; + function isWithStatement(node) { + return node.kind === 240 /* WithStatement */; + } + ts.isWithStatement = isWithStatement; + function isSwitchStatement(node) { + return node.kind === 241 /* SwitchStatement */; + } + ts.isSwitchStatement = isSwitchStatement; + function isLabeledStatement(node) { + return node.kind === 242 /* LabeledStatement */; + } + ts.isLabeledStatement = isLabeledStatement; + function isThrowStatement(node) { + return node.kind === 243 /* ThrowStatement */; + } + ts.isThrowStatement = isThrowStatement; + function isTryStatement(node) { + return node.kind === 244 /* TryStatement */; + } + ts.isTryStatement = isTryStatement; + function isDebuggerStatement(node) { + return node.kind === 245 /* DebuggerStatement */; + } + ts.isDebuggerStatement = isDebuggerStatement; + function isVariableDeclaration(node) { + return node.kind === 246 /* VariableDeclaration */; + } + ts.isVariableDeclaration = isVariableDeclaration; + function isVariableDeclarationList(node) { + return node.kind === 247 /* VariableDeclarationList */; + } + ts.isVariableDeclarationList = isVariableDeclarationList; + function isFunctionDeclaration(node) { + return node.kind === 248 /* FunctionDeclaration */; + } + ts.isFunctionDeclaration = isFunctionDeclaration; + function isClassDeclaration(node) { + return node.kind === 249 /* ClassDeclaration */; + } + ts.isClassDeclaration = isClassDeclaration; + function isInterfaceDeclaration(node) { + return node.kind === 250 /* InterfaceDeclaration */; + } + ts.isInterfaceDeclaration = isInterfaceDeclaration; + function isTypeAliasDeclaration(node) { + return node.kind === 251 /* TypeAliasDeclaration */; + } + ts.isTypeAliasDeclaration = isTypeAliasDeclaration; + function isEnumDeclaration(node) { + return node.kind === 252 /* EnumDeclaration */; + } + ts.isEnumDeclaration = isEnumDeclaration; + function isModuleDeclaration(node) { + return node.kind === 253 /* ModuleDeclaration */; + } + ts.isModuleDeclaration = isModuleDeclaration; + function isModuleBlock(node) { + return node.kind === 254 /* ModuleBlock */; + } + ts.isModuleBlock = isModuleBlock; + function isCaseBlock(node) { + return node.kind === 255 /* CaseBlock */; + } + ts.isCaseBlock = isCaseBlock; + function isNamespaceExportDeclaration(node) { + return node.kind === 256 /* NamespaceExportDeclaration */; + } + ts.isNamespaceExportDeclaration = isNamespaceExportDeclaration; + function isImportEqualsDeclaration(node) { + return node.kind === 257 /* ImportEqualsDeclaration */; + } + ts.isImportEqualsDeclaration = isImportEqualsDeclaration; + function isImportDeclaration(node) { + return node.kind === 258 /* ImportDeclaration */; + } + ts.isImportDeclaration = isImportDeclaration; + function isImportClause(node) { + return node.kind === 259 /* ImportClause */; + } + ts.isImportClause = isImportClause; + function isNamespaceImport(node) { + return node.kind === 260 /* NamespaceImport */; + } + ts.isNamespaceImport = isNamespaceImport; + function isNamespaceExport(node) { + return node.kind === 266 /* NamespaceExport */; + } + ts.isNamespaceExport = isNamespaceExport; + function isNamedImports(node) { + return node.kind === 261 /* NamedImports */; + } + ts.isNamedImports = isNamedImports; + function isImportSpecifier(node) { + return node.kind === 262 /* ImportSpecifier */; + } + ts.isImportSpecifier = isImportSpecifier; + function isExportAssignment(node) { + return node.kind === 263 /* ExportAssignment */; + } + ts.isExportAssignment = isExportAssignment; + function isExportDeclaration(node) { + return node.kind === 264 /* ExportDeclaration */; + } + ts.isExportDeclaration = isExportDeclaration; + function isNamedExports(node) { + return node.kind === 265 /* NamedExports */; + } + ts.isNamedExports = isNamedExports; + function isExportSpecifier(node) { + return node.kind === 267 /* ExportSpecifier */; + } + ts.isExportSpecifier = isExportSpecifier; + function isMissingDeclaration(node) { + return node.kind === 268 /* MissingDeclaration */; + } + ts.isMissingDeclaration = isMissingDeclaration; + function isNotEmittedStatement(node) { + return node.kind === 330 /* NotEmittedStatement */; + } + ts.isNotEmittedStatement = isNotEmittedStatement; + /* @internal */ + function isSyntheticReference(node) { + return node.kind === 335 /* SyntheticReferenceExpression */; + } + ts.isSyntheticReference = isSyntheticReference; + /* @internal */ + function isMergeDeclarationMarker(node) { + return node.kind === 333 /* MergeDeclarationMarker */; + } + ts.isMergeDeclarationMarker = isMergeDeclarationMarker; + /* @internal */ + function isEndOfDeclarationMarker(node) { + return node.kind === 334 /* EndOfDeclarationMarker */; + } + ts.isEndOfDeclarationMarker = isEndOfDeclarationMarker; + // Module References + function isExternalModuleReference(node) { + return node.kind === 269 /* ExternalModuleReference */; + } + ts.isExternalModuleReference = isExternalModuleReference; + // JSX + function isJsxElement(node) { + return node.kind === 270 /* JsxElement */; + } + ts.isJsxElement = isJsxElement; + function isJsxSelfClosingElement(node) { + return node.kind === 271 /* JsxSelfClosingElement */; + } + ts.isJsxSelfClosingElement = isJsxSelfClosingElement; + function isJsxOpeningElement(node) { + return node.kind === 272 /* JsxOpeningElement */; + } + ts.isJsxOpeningElement = isJsxOpeningElement; + function isJsxClosingElement(node) { + return node.kind === 273 /* JsxClosingElement */; + } + ts.isJsxClosingElement = isJsxClosingElement; + function isJsxFragment(node) { + return node.kind === 274 /* JsxFragment */; + } + ts.isJsxFragment = isJsxFragment; + function isJsxOpeningFragment(node) { + return node.kind === 275 /* JsxOpeningFragment */; + } + ts.isJsxOpeningFragment = isJsxOpeningFragment; + function isJsxClosingFragment(node) { + return node.kind === 276 /* JsxClosingFragment */; + } + ts.isJsxClosingFragment = isJsxClosingFragment; + function isJsxAttribute(node) { + return node.kind === 277 /* JsxAttribute */; + } + ts.isJsxAttribute = isJsxAttribute; + function isJsxAttributes(node) { + return node.kind === 278 /* JsxAttributes */; + } + ts.isJsxAttributes = isJsxAttributes; + function isJsxSpreadAttribute(node) { + return node.kind === 279 /* JsxSpreadAttribute */; + } + ts.isJsxSpreadAttribute = isJsxSpreadAttribute; + function isJsxExpression(node) { + return node.kind === 280 /* JsxExpression */; + } + ts.isJsxExpression = isJsxExpression; + // Clauses + function isCaseClause(node) { + return node.kind === 281 /* CaseClause */; + } + ts.isCaseClause = isCaseClause; + function isDefaultClause(node) { + return node.kind === 282 /* DefaultClause */; + } + ts.isDefaultClause = isDefaultClause; + function isHeritageClause(node) { + return node.kind === 283 /* HeritageClause */; + } + ts.isHeritageClause = isHeritageClause; + function isCatchClause(node) { + return node.kind === 284 /* CatchClause */; + } + ts.isCatchClause = isCatchClause; + // Property assignments + function isPropertyAssignment(node) { + return node.kind === 285 /* PropertyAssignment */; + } + ts.isPropertyAssignment = isPropertyAssignment; + function isShorthandPropertyAssignment(node) { + return node.kind === 286 /* ShorthandPropertyAssignment */; + } + ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment; + function isSpreadAssignment(node) { + return node.kind === 287 /* SpreadAssignment */; + } + ts.isSpreadAssignment = isSpreadAssignment; + // Enum + function isEnumMember(node) { + return node.kind === 288 /* EnumMember */; + } + ts.isEnumMember = isEnumMember; + // Unparsed + // TODO(rbuckton): isUnparsedPrologue + function isUnparsedPrepend(node) { + return node.kind === 290 /* UnparsedPrepend */; + } + ts.isUnparsedPrepend = isUnparsedPrepend; + // TODO(rbuckton): isUnparsedText + // TODO(rbuckton): isUnparsedInternalText + // TODO(rbuckton): isUnparsedSyntheticReference + // Top-level nodes + function isSourceFile(node) { + return node.kind === 294 /* SourceFile */; + } + ts.isSourceFile = isSourceFile; + function isBundle(node) { + return node.kind === 295 /* Bundle */; + } + ts.isBundle = isBundle; + function isUnparsedSource(node) { + return node.kind === 296 /* UnparsedSource */; + } + ts.isUnparsedSource = isUnparsedSource; + // TODO(rbuckton): isInputFiles + // JSDoc Elements + function isJSDocTypeExpression(node) { + return node.kind === 298 /* JSDocTypeExpression */; + } + ts.isJSDocTypeExpression = isJSDocTypeExpression; + function isJSDocAllType(node) { + return node.kind === 299 /* JSDocAllType */; + } + ts.isJSDocAllType = isJSDocAllType; + function isJSDocUnknownType(node) { + return node.kind === 300 /* JSDocUnknownType */; + } + ts.isJSDocUnknownType = isJSDocUnknownType; + function isJSDocNullableType(node) { + return node.kind === 301 /* JSDocNullableType */; + } + ts.isJSDocNullableType = isJSDocNullableType; + function isJSDocNonNullableType(node) { + return node.kind === 302 /* JSDocNonNullableType */; + } + ts.isJSDocNonNullableType = isJSDocNonNullableType; + function isJSDocOptionalType(node) { + return node.kind === 303 /* JSDocOptionalType */; + } + ts.isJSDocOptionalType = isJSDocOptionalType; + function isJSDocFunctionType(node) { + return node.kind === 304 /* JSDocFunctionType */; + } + ts.isJSDocFunctionType = isJSDocFunctionType; + function isJSDocVariadicType(node) { + return node.kind === 305 /* JSDocVariadicType */; + } + ts.isJSDocVariadicType = isJSDocVariadicType; + function isJSDocNamepathType(node) { + return node.kind === 306 /* JSDocNamepathType */; + } + ts.isJSDocNamepathType = isJSDocNamepathType; + function isJSDoc(node) { + return node.kind === 307 /* JSDocComment */; + } + ts.isJSDoc = isJSDoc; + function isJSDocTypeLiteral(node) { + return node.kind === 308 /* JSDocTypeLiteral */; + } + ts.isJSDocTypeLiteral = isJSDocTypeLiteral; + function isJSDocSignature(node) { + return node.kind === 309 /* JSDocSignature */; + } + ts.isJSDocSignature = isJSDocSignature; + // JSDoc Tags + function isJSDocAugmentsTag(node) { + return node.kind === 311 /* JSDocAugmentsTag */; + } + ts.isJSDocAugmentsTag = isJSDocAugmentsTag; + function isJSDocAuthorTag(node) { + return node.kind === 313 /* JSDocAuthorTag */; + } + ts.isJSDocAuthorTag = isJSDocAuthorTag; + function isJSDocClassTag(node) { + return node.kind === 315 /* JSDocClassTag */; + } + ts.isJSDocClassTag = isJSDocClassTag; + function isJSDocCallbackTag(node) { + return node.kind === 320 /* JSDocCallbackTag */; + } + ts.isJSDocCallbackTag = isJSDocCallbackTag; + function isJSDocPublicTag(node) { + return node.kind === 316 /* JSDocPublicTag */; + } + ts.isJSDocPublicTag = isJSDocPublicTag; + function isJSDocPrivateTag(node) { + return node.kind === 317 /* JSDocPrivateTag */; + } + ts.isJSDocPrivateTag = isJSDocPrivateTag; + function isJSDocProtectedTag(node) { + return node.kind === 318 /* JSDocProtectedTag */; + } + ts.isJSDocProtectedTag = isJSDocProtectedTag; + function isJSDocReadonlyTag(node) { + return node.kind === 319 /* JSDocReadonlyTag */; + } + ts.isJSDocReadonlyTag = isJSDocReadonlyTag; + function isJSDocDeprecatedTag(node) { + return node.kind === 314 /* JSDocDeprecatedTag */; + } + ts.isJSDocDeprecatedTag = isJSDocDeprecatedTag; + function isJSDocEnumTag(node) { + return node.kind === 321 /* JSDocEnumTag */; + } + ts.isJSDocEnumTag = isJSDocEnumTag; + function isJSDocParameterTag(node) { + return node.kind === 322 /* JSDocParameterTag */; + } + ts.isJSDocParameterTag = isJSDocParameterTag; + function isJSDocReturnTag(node) { + return node.kind === 323 /* JSDocReturnTag */; + } + ts.isJSDocReturnTag = isJSDocReturnTag; + function isJSDocThisTag(node) { + return node.kind === 324 /* JSDocThisTag */; + } + ts.isJSDocThisTag = isJSDocThisTag; + function isJSDocTypeTag(node) { + return node.kind === 325 /* JSDocTypeTag */; + } + ts.isJSDocTypeTag = isJSDocTypeTag; + function isJSDocTemplateTag(node) { + return node.kind === 326 /* JSDocTemplateTag */; + } + ts.isJSDocTemplateTag = isJSDocTemplateTag; + function isJSDocTypedefTag(node) { + return node.kind === 327 /* JSDocTypedefTag */; + } + ts.isJSDocTypedefTag = isJSDocTypedefTag; + function isJSDocUnknownTag(node) { + return node.kind === 310 /* JSDocTag */; + } + ts.isJSDocUnknownTag = isJSDocUnknownTag; + function isJSDocPropertyTag(node) { + return node.kind === 328 /* JSDocPropertyTag */; + } + ts.isJSDocPropertyTag = isJSDocPropertyTag; + function isJSDocImplementsTag(node) { + return node.kind === 312 /* JSDocImplementsTag */; + } + ts.isJSDocImplementsTag = isJSDocImplementsTag; + // Synthesized list + /* @internal */ + function isSyntaxList(n) { + return n.kind === 329 /* SyntaxList */; + } + ts.isSyntaxList = isSyntaxList; +})(ts || (ts = {})); +/* @internal */ +var ts; +(function (ts) { + // Compound nodes + function createEmptyExports(factory) { + return factory.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*isTypeOnly*/ false, factory.createNamedExports([]), /*moduleSpecifier*/ undefined); + } + ts.createEmptyExports = createEmptyExports; + function createMemberAccessForPropertyName(factory, target, memberName, location) { + if (ts.isComputedPropertyName(memberName)) { + return ts.setTextRange(factory.createElementAccessExpression(target, memberName.expression), location); + } + else { + var expression = ts.setTextRange(ts.isIdentifierOrPrivateIdentifier(memberName) + ? factory.createPropertyAccessExpression(target, memberName) + : factory.createElementAccessExpression(target, memberName), memberName); + ts.getOrCreateEmitNode(expression).flags |= 64 /* NoNestedSourceMaps */; + return expression; + } + } + ts.createMemberAccessForPropertyName = createMemberAccessForPropertyName; + function createReactNamespace(reactNamespace, parent) { + // To ensure the emit resolver can properly resolve the namespace, we need to + // treat this identifier as if it were a source tree node by clearing the `Synthesized` + // flag and setting a parent node. + var react = ts.parseNodeFactory.createIdentifier(reactNamespace || "React"); + // Set the parent that is in parse tree + // this makes sure that parent chain is intact for checker to traverse complete scope tree + ts.setParent(react, ts.getParseTreeNode(parent)); + return react; + } + function createJsxFactoryExpressionFromEntityName(factory, jsxFactory, parent) { + if (ts.isQualifiedName(jsxFactory)) { + var left = createJsxFactoryExpressionFromEntityName(factory, jsxFactory.left, parent); + var right = factory.createIdentifier(ts.idText(jsxFactory.right)); + right.escapedText = jsxFactory.right.escapedText; + return factory.createPropertyAccessExpression(left, right); + } + else { + return createReactNamespace(ts.idText(jsxFactory), parent); + } + } + function createJsxFactoryExpression(factory, jsxFactoryEntity, reactNamespace, parent) { + return jsxFactoryEntity ? + createJsxFactoryExpressionFromEntityName(factory, jsxFactoryEntity, parent) : + factory.createPropertyAccessExpression(createReactNamespace(reactNamespace, parent), "createElement"); + } + function createJsxFragmentFactoryExpression(factory, jsxFragmentFactoryEntity, reactNamespace, parent) { + return jsxFragmentFactoryEntity ? + createJsxFactoryExpressionFromEntityName(factory, jsxFragmentFactoryEntity, parent) : + factory.createPropertyAccessExpression(createReactNamespace(reactNamespace, parent), "Fragment"); + } + function createExpressionForJsxElement(factory, jsxFactoryEntity, reactNamespace, tagName, props, children, parentElement, location) { + var argumentsList = [tagName]; + if (props) { + argumentsList.push(props); + } + if (children && children.length > 0) { + if (!props) { + argumentsList.push(factory.createNull()); + } + if (children.length > 1) { + for (var _i = 0, children_3 = children; _i < children_3.length; _i++) { + var child = children_3[_i]; + startOnNewLine(child); + argumentsList.push(child); + } + } + else { + argumentsList.push(children[0]); + } + } + return ts.setTextRange(factory.createCallExpression(createJsxFactoryExpression(factory, jsxFactoryEntity, reactNamespace, parentElement), + /*typeArguments*/ undefined, argumentsList), location); + } + ts.createExpressionForJsxElement = createExpressionForJsxElement; + function createExpressionForJsxFragment(factory, jsxFactoryEntity, jsxFragmentFactoryEntity, reactNamespace, children, parentElement, location) { + var tagName = createJsxFragmentFactoryExpression(factory, jsxFragmentFactoryEntity, reactNamespace, parentElement); + var argumentsList = [tagName, factory.createNull()]; + if (children && children.length > 0) { + if (children.length > 1) { + for (var _i = 0, children_4 = children; _i < children_4.length; _i++) { + var child = children_4[_i]; + startOnNewLine(child); + argumentsList.push(child); + } + } + else { + argumentsList.push(children[0]); + } + } + return ts.setTextRange(factory.createCallExpression(createJsxFactoryExpression(factory, jsxFactoryEntity, reactNamespace, parentElement), + /*typeArguments*/ undefined, argumentsList), location); + } + ts.createExpressionForJsxFragment = createExpressionForJsxFragment; + // Utilities + function createForOfBindingStatement(factory, node, boundValue) { + if (ts.isVariableDeclarationList(node)) { + var firstDeclaration = ts.first(node.declarations); + var updatedDeclaration = factory.updateVariableDeclaration(firstDeclaration, firstDeclaration.name, + /*exclamationToken*/ undefined, + /*type*/ undefined, boundValue); + return ts.setTextRange(factory.createVariableStatement( + /*modifiers*/ undefined, factory.updateVariableDeclarationList(node, [updatedDeclaration])), + /*location*/ node); + } + else { + var updatedExpression = ts.setTextRange(factory.createAssignment(node, boundValue), /*location*/ node); + return ts.setTextRange(factory.createExpressionStatement(updatedExpression), /*location*/ node); + } + } + ts.createForOfBindingStatement = createForOfBindingStatement; + function insertLeadingStatement(factory, dest, source) { + if (ts.isBlock(dest)) { + return factory.updateBlock(dest, ts.setTextRange(factory.createNodeArray(__spreadArrays([source], dest.statements)), dest.statements)); + } + else { + return factory.createBlock(factory.createNodeArray([dest, source]), /*multiLine*/ true); + } + } + ts.insertLeadingStatement = insertLeadingStatement; + function createExpressionFromEntityName(factory, node) { + if (ts.isQualifiedName(node)) { + var left = createExpressionFromEntityName(factory, node.left); + // TODO(rbuckton): Does this need to be parented? + var right = ts.setParent(ts.setTextRange(factory.cloneNode(node.right), node.right), node.right.parent); + return ts.setTextRange(factory.createPropertyAccessExpression(left, right), node); + } + else { + // TODO(rbuckton): Does this need to be parented? + return ts.setParent(ts.setTextRange(factory.cloneNode(node), node), node.parent); + } + } + ts.createExpressionFromEntityName = createExpressionFromEntityName; + function createExpressionForPropertyName(factory, memberName) { + if (ts.isIdentifier(memberName)) { + return factory.createStringLiteralFromNode(memberName); + } + else if (ts.isComputedPropertyName(memberName)) { + // TODO(rbuckton): Does this need to be parented? + return ts.setParent(ts.setTextRange(factory.cloneNode(memberName.expression), memberName.expression), memberName.expression.parent); + } + else { + // TODO(rbuckton): Does this need to be parented? + return ts.setParent(ts.setTextRange(factory.cloneNode(memberName), memberName), memberName.parent); + } + } + ts.createExpressionForPropertyName = createExpressionForPropertyName; + function createExpressionForAccessorDeclaration(factory, properties, property, receiver, multiLine) { + var _a = ts.getAllAccessorDeclarations(properties, property), firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor; + if (property === firstAccessor) { + return ts.setTextRange(factory.createObjectDefinePropertyCall(receiver, createExpressionForPropertyName(factory, property.name), factory.createPropertyDescriptor({ + enumerable: factory.createFalse(), + configurable: true, + get: getAccessor && ts.setTextRange(ts.setOriginalNode(factory.createFunctionExpression(getAccessor.modifiers, + /*asteriskToken*/ undefined, + /*name*/ undefined, + /*typeParameters*/ undefined, getAccessor.parameters, + /*type*/ undefined, getAccessor.body // TODO: GH#18217 + ), getAccessor), getAccessor), + set: setAccessor && ts.setTextRange(ts.setOriginalNode(factory.createFunctionExpression(setAccessor.modifiers, + /*asteriskToken*/ undefined, + /*name*/ undefined, + /*typeParameters*/ undefined, setAccessor.parameters, + /*type*/ undefined, setAccessor.body // TODO: GH#18217 + ), setAccessor), setAccessor) + }, !multiLine)), firstAccessor); + } + return undefined; + } + function createExpressionForPropertyAssignment(factory, property, receiver) { + return ts.setOriginalNode(ts.setTextRange(factory.createAssignment(createMemberAccessForPropertyName(factory, receiver, property.name, /*location*/ property.name), property.initializer), property), property); + } + function createExpressionForShorthandPropertyAssignment(factory, property, receiver) { + return ts.setOriginalNode(ts.setTextRange(factory.createAssignment(createMemberAccessForPropertyName(factory, receiver, property.name, /*location*/ property.name), factory.cloneNode(property.name)), + /*location*/ property), + /*original*/ property); + } + function createExpressionForMethodDeclaration(factory, method, receiver) { + return ts.setOriginalNode(ts.setTextRange(factory.createAssignment(createMemberAccessForPropertyName(factory, receiver, method.name, /*location*/ method.name), ts.setOriginalNode(ts.setTextRange(factory.createFunctionExpression(method.modifiers, method.asteriskToken, + /*name*/ undefined, + /*typeParameters*/ undefined, method.parameters, + /*type*/ undefined, method.body // TODO: GH#18217 + ), + /*location*/ method), + /*original*/ method)), + /*location*/ method), + /*original*/ method); + } + function createExpressionForObjectLiteralElementLike(factory, node, property, receiver) { + if (property.name && ts.isPrivateIdentifier(property.name)) { + ts.Debug.failBadSyntaxKind(property.name, "Private identifiers are not allowed in object literals."); + } + switch (property.kind) { + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + return createExpressionForAccessorDeclaration(factory, node.properties, property, receiver, !!node.multiLine); + case 285 /* PropertyAssignment */: + return createExpressionForPropertyAssignment(factory, property, receiver); + case 286 /* ShorthandPropertyAssignment */: + return createExpressionForShorthandPropertyAssignment(factory, property, receiver); + case 164 /* MethodDeclaration */: + return createExpressionForMethodDeclaration(factory, property, receiver); + } + } + ts.createExpressionForObjectLiteralElementLike = createExpressionForObjectLiteralElementLike; + /** + * Gets whether an identifier should only be referred to by its internal name. + */ + function isInternalName(node) { + return (ts.getEmitFlags(node) & 32768 /* InternalName */) !== 0; + } + ts.isInternalName = isInternalName; + /** + * Gets whether an identifier should only be referred to by its local name. + */ + function isLocalName(node) { + return (ts.getEmitFlags(node) & 16384 /* LocalName */) !== 0; + } + ts.isLocalName = isLocalName; + /** + * Gets whether an identifier should only be referred to by its export representation if the + * name points to an exported symbol. + */ + function isExportName(node) { + return (ts.getEmitFlags(node) & 8192 /* ExportName */) !== 0; + } + ts.isExportName = isExportName; + function isUseStrictPrologue(node) { + return ts.isStringLiteral(node.expression) && node.expression.text === "use strict"; + } + function findUseStrictPrologue(statements) { + for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) { + var statement = statements_1[_i]; + if (ts.isPrologueDirective(statement)) { + if (isUseStrictPrologue(statement)) { + return statement; + } + } + else { + break; + } + } + return undefined; + } + ts.findUseStrictPrologue = findUseStrictPrologue; + function startsWithUseStrict(statements) { + var firstStatement = ts.firstOrUndefined(statements); + return firstStatement !== undefined + && ts.isPrologueDirective(firstStatement) + && isUseStrictPrologue(firstStatement); + } + ts.startsWithUseStrict = startsWithUseStrict; + function isCommaSequence(node) { + return node.kind === 213 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ || + node.kind === 332 /* CommaListExpression */; + } + ts.isCommaSequence = isCommaSequence; + function isOuterExpression(node, kinds) { + if (kinds === void 0) { kinds = 15 /* All */; } + switch (node.kind) { + case 204 /* ParenthesizedExpression */: + return (kinds & 1 /* Parentheses */) !== 0; + case 203 /* TypeAssertionExpression */: + case 221 /* AsExpression */: + return (kinds & 2 /* TypeAssertions */) !== 0; + case 222 /* NonNullExpression */: + return (kinds & 4 /* NonNullAssertions */) !== 0; + case 331 /* PartiallyEmittedExpression */: + return (kinds & 8 /* PartiallyEmittedExpressions */) !== 0; + } + return false; + } + ts.isOuterExpression = isOuterExpression; + function skipOuterExpressions(node, kinds) { + if (kinds === void 0) { kinds = 15 /* All */; } + while (isOuterExpression(node, kinds)) { + node = node.expression; + } + return node; + } + ts.skipOuterExpressions = skipOuterExpressions; + function skipAssertions(node) { + return skipOuterExpressions(node, 6 /* Assertions */); + } + ts.skipAssertions = skipAssertions; + function startOnNewLine(node) { + return ts.setStartsOnNewLine(node, /*newLine*/ true); + } + ts.startOnNewLine = startOnNewLine; + function getExternalHelpersModuleName(node) { + var parseNode = ts.getOriginalNode(node, ts.isSourceFile); + var emitNode = parseNode && parseNode.emitNode; + return emitNode && emitNode.externalHelpersModuleName; + } + ts.getExternalHelpersModuleName = getExternalHelpersModuleName; + function hasRecordedExternalHelpers(sourceFile) { + var parseNode = ts.getOriginalNode(sourceFile, ts.isSourceFile); + var emitNode = parseNode && parseNode.emitNode; + return !!emitNode && (!!emitNode.externalHelpersModuleName || !!emitNode.externalHelpers); + } + ts.hasRecordedExternalHelpers = hasRecordedExternalHelpers; + function createExternalHelpersImportDeclarationIfNeeded(nodeFactory, helperFactory, sourceFile, compilerOptions, hasExportStarsToExportValues, hasImportStar, hasImportDefault) { + if (compilerOptions.importHelpers && ts.isEffectiveExternalModule(sourceFile, compilerOptions)) { + var namedBindings = void 0; + var moduleKind = ts.getEmitModuleKind(compilerOptions); + if (moduleKind >= ts.ModuleKind.ES2015 && moduleKind <= ts.ModuleKind.ESNext) { + // use named imports + var helpers = ts.getEmitHelpers(sourceFile); + if (helpers) { + var helperNames = []; + for (var _i = 0, helpers_3 = helpers; _i < helpers_3.length; _i++) { + var helper = helpers_3[_i]; + if (!helper.scoped) { + var importName = helper.importName; + if (importName) { + ts.pushIfUnique(helperNames, importName); + } + } + } + if (ts.some(helperNames)) { + helperNames.sort(ts.compareStringsCaseSensitive); + // Alias the imports if the names are used somewhere in the file. + // NOTE: We don't need to care about global import collisions as this is a module. + namedBindings = nodeFactory.createNamedImports(ts.map(helperNames, function (name) { return ts.isFileLevelUniqueName(sourceFile, name) + ? nodeFactory.createImportSpecifier(/*propertyName*/ undefined, nodeFactory.createIdentifier(name)) + : nodeFactory.createImportSpecifier(nodeFactory.createIdentifier(name), helperFactory.getUnscopedHelperName(name)); })); + var parseNode = ts.getOriginalNode(sourceFile, ts.isSourceFile); + var emitNode = ts.getOrCreateEmitNode(parseNode); + emitNode.externalHelpers = true; + } + } + } + else { + // use a namespace import + var externalHelpersModuleName = getOrCreateExternalHelpersModuleNameIfNeeded(nodeFactory, sourceFile, compilerOptions, hasExportStarsToExportValues, hasImportStar || hasImportDefault); + if (externalHelpersModuleName) { + namedBindings = nodeFactory.createNamespaceImport(externalHelpersModuleName); + } + } + if (namedBindings) { + var externalHelpersImportDeclaration = nodeFactory.createImportDeclaration( + /*decorators*/ undefined, + /*modifiers*/ undefined, nodeFactory.createImportClause(/*isTypeOnly*/ false, /*name*/ undefined, namedBindings), nodeFactory.createStringLiteral(ts.externalHelpersModuleNameText)); + ts.addEmitFlags(externalHelpersImportDeclaration, 67108864 /* NeverApplyImportHelper */); + return externalHelpersImportDeclaration; + } + } + } + ts.createExternalHelpersImportDeclarationIfNeeded = createExternalHelpersImportDeclarationIfNeeded; + function getOrCreateExternalHelpersModuleNameIfNeeded(factory, node, compilerOptions, hasExportStarsToExportValues, hasImportStarOrImportDefault) { + if (compilerOptions.importHelpers && ts.isEffectiveExternalModule(node, compilerOptions)) { + var externalHelpersModuleName = getExternalHelpersModuleName(node); + if (externalHelpersModuleName) { + return externalHelpersModuleName; + } + var moduleKind = ts.getEmitModuleKind(compilerOptions); + var create = (hasExportStarsToExportValues || (compilerOptions.esModuleInterop && hasImportStarOrImportDefault)) + && moduleKind !== ts.ModuleKind.System + && moduleKind < ts.ModuleKind.ES2015; + if (!create) { + var helpers = ts.getEmitHelpers(node); + if (helpers) { + for (var _i = 0, helpers_4 = helpers; _i < helpers_4.length; _i++) { + var helper = helpers_4[_i]; + if (!helper.scoped) { + create = true; + break; + } + } + } + } + if (create) { + var parseNode = ts.getOriginalNode(node, ts.isSourceFile); + var emitNode = ts.getOrCreateEmitNode(parseNode); + return emitNode.externalHelpersModuleName || (emitNode.externalHelpersModuleName = factory.createUniqueName(ts.externalHelpersModuleNameText)); + } + } + } + ts.getOrCreateExternalHelpersModuleNameIfNeeded = getOrCreateExternalHelpersModuleNameIfNeeded; + /** + * Get the name of that target module from an import or export declaration + */ + function getLocalNameForExternalImport(factory, node, sourceFile) { + var namespaceDeclaration = ts.getNamespaceDeclarationNode(node); + if (namespaceDeclaration && !ts.isDefaultImport(node)) { + var name = namespaceDeclaration.name; + return ts.isGeneratedIdentifier(name) ? name : factory.createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, name) || ts.idText(name)); + } + if (node.kind === 258 /* ImportDeclaration */ && node.importClause) { + return factory.getGeneratedNameForNode(node); + } + if (node.kind === 264 /* ExportDeclaration */ && node.moduleSpecifier) { + return factory.getGeneratedNameForNode(node); + } + return undefined; + } + ts.getLocalNameForExternalImport = getLocalNameForExternalImport; + /** + * Get the name of a target module from an import/export declaration as should be written in the emitted output. + * The emitted output name can be different from the input if: + * 1. The module has a /// + * 2. --out or --outFile is used, making the name relative to the rootDir + * 3- The containing SourceFile has an entry in renamedDependencies for the import as requested by some module loaders (e.g. System). + * Otherwise, a new StringLiteral node representing the module name will be returned. + */ + function getExternalModuleNameLiteral(factory, importNode, sourceFile, host, resolver, compilerOptions) { + var moduleName = ts.getExternalModuleName(importNode); // TODO: GH#18217 + if (moduleName.kind === 10 /* StringLiteral */) { + return tryGetModuleNameFromDeclaration(importNode, host, factory, resolver, compilerOptions) + || tryRenameExternalModule(factory, moduleName, sourceFile) + || factory.cloneNode(moduleName); + } + return undefined; + } + ts.getExternalModuleNameLiteral = getExternalModuleNameLiteral; + /** + * Some bundlers (SystemJS builder) sometimes want to rename dependencies. + * Here we check if alternative name was provided for a given moduleName and return it if possible. + */ + function tryRenameExternalModule(factory, moduleName, sourceFile) { + var rename = sourceFile.renamedDependencies && sourceFile.renamedDependencies.get(moduleName.text); + return rename && factory.createStringLiteral(rename); + } + /** + * Get the name of a module as should be written in the emitted output. + * The emitted output name can be different from the input if: + * 1. The module has a /// + * 2. --out or --outFile is used, making the name relative to the rootDir + * Otherwise, a new StringLiteral node representing the module name will be returned. + */ + function tryGetModuleNameFromFile(factory, file, host, options) { + if (!file) { + return undefined; + } + if (file.moduleName) { + return factory.createStringLiteral(file.moduleName); + } + if (!file.isDeclarationFile && ts.outFile(options)) { + return factory.createStringLiteral(ts.getExternalModuleNameFromPath(host, file.fileName)); + } + return undefined; + } + ts.tryGetModuleNameFromFile = tryGetModuleNameFromFile; + function tryGetModuleNameFromDeclaration(declaration, host, factory, resolver, compilerOptions) { + return tryGetModuleNameFromFile(factory, resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions); + } + /** + * Gets the initializer of an BindingOrAssignmentElement. + */ + function getInitializerOfBindingOrAssignmentElement(bindingElement) { + if (ts.isDeclarationBindingElement(bindingElement)) { + // `1` in `let { a = 1 } = ...` + // `1` in `let { a: b = 1 } = ...` + // `1` in `let { a: {b} = 1 } = ...` + // `1` in `let { a: [b] = 1 } = ...` + // `1` in `let [a = 1] = ...` + // `1` in `let [{a} = 1] = ...` + // `1` in `let [[a] = 1] = ...` + return bindingElement.initializer; + } + if (ts.isPropertyAssignment(bindingElement)) { + // `1` in `({ a: b = 1 } = ...)` + // `1` in `({ a: {b} = 1 } = ...)` + // `1` in `({ a: [b] = 1 } = ...)` + var initializer = bindingElement.initializer; + return ts.isAssignmentExpression(initializer, /*excludeCompoundAssignment*/ true) + ? initializer.right + : undefined; + } + if (ts.isShorthandPropertyAssignment(bindingElement)) { + // `1` in `({ a = 1 } = ...)` + return bindingElement.objectAssignmentInitializer; + } + if (ts.isAssignmentExpression(bindingElement, /*excludeCompoundAssignment*/ true)) { + // `1` in `[a = 1] = ...` + // `1` in `[{a} = 1] = ...` + // `1` in `[[a] = 1] = ...` + return bindingElement.right; + } + if (ts.isSpreadElement(bindingElement)) { + // Recovery consistent with existing emit. + return getInitializerOfBindingOrAssignmentElement(bindingElement.expression); + } + } + ts.getInitializerOfBindingOrAssignmentElement = getInitializerOfBindingOrAssignmentElement; + /** + * Gets the name of an BindingOrAssignmentElement. + */ + function getTargetOfBindingOrAssignmentElement(bindingElement) { + if (ts.isDeclarationBindingElement(bindingElement)) { + // `a` in `let { a } = ...` + // `a` in `let { a = 1 } = ...` + // `b` in `let { a: b } = ...` + // `b` in `let { a: b = 1 } = ...` + // `a` in `let { ...a } = ...` + // `{b}` in `let { a: {b} } = ...` + // `{b}` in `let { a: {b} = 1 } = ...` + // `[b]` in `let { a: [b] } = ...` + // `[b]` in `let { a: [b] = 1 } = ...` + // `a` in `let [a] = ...` + // `a` in `let [a = 1] = ...` + // `a` in `let [...a] = ...` + // `{a}` in `let [{a}] = ...` + // `{a}` in `let [{a} = 1] = ...` + // `[a]` in `let [[a]] = ...` + // `[a]` in `let [[a] = 1] = ...` + return bindingElement.name; + } + if (ts.isObjectLiteralElementLike(bindingElement)) { + switch (bindingElement.kind) { + case 285 /* PropertyAssignment */: + // `b` in `({ a: b } = ...)` + // `b` in `({ a: b = 1 } = ...)` + // `{b}` in `({ a: {b} } = ...)` + // `{b}` in `({ a: {b} = 1 } = ...)` + // `[b]` in `({ a: [b] } = ...)` + // `[b]` in `({ a: [b] = 1 } = ...)` + // `b.c` in `({ a: b.c } = ...)` + // `b.c` in `({ a: b.c = 1 } = ...)` + // `b[0]` in `({ a: b[0] } = ...)` + // `b[0]` in `({ a: b[0] = 1 } = ...)` + return getTargetOfBindingOrAssignmentElement(bindingElement.initializer); + case 286 /* ShorthandPropertyAssignment */: + // `a` in `({ a } = ...)` + // `a` in `({ a = 1 } = ...)` + return bindingElement.name; + case 287 /* SpreadAssignment */: + // `a` in `({ ...a } = ...)` + return getTargetOfBindingOrAssignmentElement(bindingElement.expression); + } + // no target + return undefined; + } + if (ts.isAssignmentExpression(bindingElement, /*excludeCompoundAssignment*/ true)) { + // `a` in `[a = 1] = ...` + // `{a}` in `[{a} = 1] = ...` + // `[a]` in `[[a] = 1] = ...` + // `a.b` in `[a.b = 1] = ...` + // `a[0]` in `[a[0] = 1] = ...` + return getTargetOfBindingOrAssignmentElement(bindingElement.left); + } + if (ts.isSpreadElement(bindingElement)) { + // `a` in `[...a] = ...` + return getTargetOfBindingOrAssignmentElement(bindingElement.expression); + } + // `a` in `[a] = ...` + // `{a}` in `[{a}] = ...` + // `[a]` in `[[a]] = ...` + // `a.b` in `[a.b] = ...` + // `a[0]` in `[a[0]] = ...` + return bindingElement; + } + ts.getTargetOfBindingOrAssignmentElement = getTargetOfBindingOrAssignmentElement; + /** + * Determines whether an BindingOrAssignmentElement is a rest element. + */ + function getRestIndicatorOfBindingOrAssignmentElement(bindingElement) { + switch (bindingElement.kind) { + case 159 /* Parameter */: + case 195 /* BindingElement */: + // `...` in `let [...a] = ...` + return bindingElement.dotDotDotToken; + case 217 /* SpreadElement */: + case 287 /* SpreadAssignment */: + // `...` in `[...a] = ...` + return bindingElement; + } + return undefined; + } + ts.getRestIndicatorOfBindingOrAssignmentElement = getRestIndicatorOfBindingOrAssignmentElement; + /** + * Gets the property name of a BindingOrAssignmentElement + */ + function getPropertyNameOfBindingOrAssignmentElement(bindingElement) { + var propertyName = tryGetPropertyNameOfBindingOrAssignmentElement(bindingElement); + ts.Debug.assert(!!propertyName || ts.isSpreadAssignment(bindingElement), "Invalid property name for binding element."); + return propertyName; + } + ts.getPropertyNameOfBindingOrAssignmentElement = getPropertyNameOfBindingOrAssignmentElement; + function tryGetPropertyNameOfBindingOrAssignmentElement(bindingElement) { + switch (bindingElement.kind) { + case 195 /* BindingElement */: + // `a` in `let { a: b } = ...` + // `[a]` in `let { [a]: b } = ...` + // `"a"` in `let { "a": b } = ...` + // `1` in `let { 1: b } = ...` + if (bindingElement.propertyName) { + var propertyName = bindingElement.propertyName; + if (ts.isPrivateIdentifier(propertyName)) { + return ts.Debug.failBadSyntaxKind(propertyName); + } + return ts.isComputedPropertyName(propertyName) && isStringOrNumericLiteral(propertyName.expression) + ? propertyName.expression + : propertyName; + } + break; + case 285 /* PropertyAssignment */: + // `a` in `({ a: b } = ...)` + // `[a]` in `({ [a]: b } = ...)` + // `"a"` in `({ "a": b } = ...)` + // `1` in `({ 1: b } = ...)` + if (bindingElement.name) { + var propertyName = bindingElement.name; + if (ts.isPrivateIdentifier(propertyName)) { + return ts.Debug.failBadSyntaxKind(propertyName); + } + return ts.isComputedPropertyName(propertyName) && isStringOrNumericLiteral(propertyName.expression) + ? propertyName.expression + : propertyName; + } + break; + case 287 /* SpreadAssignment */: + // `a` in `({ ...a } = ...)` + if (bindingElement.name && ts.isPrivateIdentifier(bindingElement.name)) { + return ts.Debug.failBadSyntaxKind(bindingElement.name); + } + return bindingElement.name; + } + var target = getTargetOfBindingOrAssignmentElement(bindingElement); + if (target && ts.isPropertyName(target)) { + return target; + } + } + ts.tryGetPropertyNameOfBindingOrAssignmentElement = tryGetPropertyNameOfBindingOrAssignmentElement; + function isStringOrNumericLiteral(node) { + var kind = node.kind; + return kind === 10 /* StringLiteral */ + || kind === 8 /* NumericLiteral */; + } + /** + * Gets the elements of a BindingOrAssignmentPattern + */ + function getElementsOfBindingOrAssignmentPattern(name) { + switch (name.kind) { + case 193 /* ObjectBindingPattern */: + case 194 /* ArrayBindingPattern */: + case 196 /* ArrayLiteralExpression */: + // `a` in `{a}` + // `a` in `[a]` + return name.elements; + case 197 /* ObjectLiteralExpression */: + // `a` in `{a}` + return name.properties; + } + } + ts.getElementsOfBindingOrAssignmentPattern = getElementsOfBindingOrAssignmentPattern; + /* @internal */ + function getJSDocTypeAliasName(fullName) { + if (fullName) { + var rightNode = fullName; + while (true) { + if (ts.isIdentifier(rightNode) || !rightNode.body) { + return ts.isIdentifier(rightNode) ? rightNode : rightNode.name; + } + rightNode = rightNode.body; + } + } + } + ts.getJSDocTypeAliasName = getJSDocTypeAliasName; + function canHaveModifiers(node) { + var kind = node.kind; + return kind === 159 /* Parameter */ + || kind === 161 /* PropertySignature */ + || kind === 162 /* PropertyDeclaration */ + || kind === 163 /* MethodSignature */ + || kind === 164 /* MethodDeclaration */ + || kind === 165 /* Constructor */ + || kind === 166 /* GetAccessor */ + || kind === 167 /* SetAccessor */ + || kind === 170 /* IndexSignature */ + || kind === 205 /* FunctionExpression */ + || kind === 206 /* ArrowFunction */ + || kind === 218 /* ClassExpression */ + || kind === 229 /* VariableStatement */ + || kind === 248 /* FunctionDeclaration */ + || kind === 249 /* ClassDeclaration */ + || kind === 250 /* InterfaceDeclaration */ + || kind === 251 /* TypeAliasDeclaration */ + || kind === 252 /* EnumDeclaration */ + || kind === 253 /* ModuleDeclaration */ + || kind === 257 /* ImportEqualsDeclaration */ + || kind === 258 /* ImportDeclaration */ + || kind === 263 /* ExportAssignment */ + || kind === 264 /* ExportDeclaration */; + } + ts.canHaveModifiers = canHaveModifiers; + /* @internal */ + function isExportModifier(node) { + return node.kind === 92 /* ExportKeyword */; + } + ts.isExportModifier = isExportModifier; + /* @internal */ + function isAsyncModifier(node) { + return node.kind === 129 /* AsyncKeyword */; + } + ts.isAsyncModifier = isAsyncModifier; + /* @internal */ + function isStaticModifier(node) { + return node.kind === 123 /* StaticKeyword */; + } + ts.isStaticModifier = isStaticModifier; +})(ts || (ts = {})); +var ts; +(function (ts) { + function setTextRange(range, location) { + return location ? ts.setTextRangePosEnd(range, location.pos, location.end) : range; + } + ts.setTextRange = setTextRange; })(ts || (ts = {})); var ts; (function (ts) { @@ -18920,29 +26993,30 @@ var ts; SignatureFlags[SignatureFlags["IgnoreMissingOpenBrace"] = 16] = "IgnoreMissingOpenBrace"; SignatureFlags[SignatureFlags["JSDoc"] = 32] = "JSDoc"; })(SignatureFlags || (SignatureFlags = {})); + var SpeculationKind; + (function (SpeculationKind) { + SpeculationKind[SpeculationKind["TryParse"] = 0] = "TryParse"; + SpeculationKind[SpeculationKind["Lookahead"] = 1] = "Lookahead"; + SpeculationKind[SpeculationKind["Reparse"] = 2] = "Reparse"; + })(SpeculationKind || (SpeculationKind = {})); var NodeConstructor; var TokenConstructor; var IdentifierConstructor; var PrivateIdentifierConstructor; var SourceFileConstructor; - function createNode(kind, pos, end) { - if (kind === 290 /* SourceFile */) { - return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end); - } - else if (kind === 75 /* Identifier */) { - return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end); - } - else if (kind === 76 /* PrivateIdentifier */) { - return new (PrivateIdentifierConstructor || (PrivateIdentifierConstructor = ts.objectAllocator.getPrivateIdentifierConstructor()))(kind, pos, end); - } - else if (!ts.isNodeKind(kind)) { - return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, pos, end); - } - else { - return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end); - } - } - ts.createNode = createNode; + /** + * NOTE: You should not use this, it is only exported to support `createNode` in `~/src/compat/deprecations.ts`. + */ + /* @internal */ + ts.parseBaseNodeFactory = { + createBaseSourceFileNode: function (kind) { return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, -1, -1); }, + createBaseIdentifierNode: function (kind) { return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, -1, -1); }, + createBasePrivateIdentifierNode: function (kind) { return new (PrivateIdentifierConstructor || (PrivateIdentifierConstructor = ts.objectAllocator.getPrivateIdentifierConstructor()))(kind, -1, -1); }, + createBaseTokenNode: function (kind) { return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, -1, -1); }, + createBaseNode: function (kind) { return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, -1, -1); }, + }; + /* @internal */ + ts.parseNodeFactory = ts.createNodeFactory(1 /* NoParenthesizerRules */, ts.parseBaseNodeFactory); function visitNode(cbNode, node) { return node && cbNode(node); } @@ -18981,19 +27055,19 @@ var ts; * that they appear in the source code. The language service depends on this property to locate nodes by position. */ function forEachChild(node, cbNode, cbNodes) { - if (!node || node.kind <= 152 /* LastToken */) { + if (!node || node.kind <= 155 /* LastToken */) { return; } switch (node.kind) { - case 153 /* QualifiedName */: + case 156 /* QualifiedName */: return visitNode(cbNode, node.left) || visitNode(cbNode, node.right); - case 155 /* TypeParameter */: + case 158 /* TypeParameter */: return visitNode(cbNode, node.name) || visitNode(cbNode, node.constraint) || visitNode(cbNode, node.default) || visitNode(cbNode, node.expression); - case 282 /* ShorthandPropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.name) || @@ -19001,9 +27075,9 @@ var ts; visitNode(cbNode, node.exclamationToken) || visitNode(cbNode, node.equalsToken) || visitNode(cbNode, node.objectAssignmentInitializer); - case 283 /* SpreadAssignment */: + case 287 /* SpreadAssignment */: return visitNode(cbNode, node.expression); - case 156 /* Parameter */: + case 159 /* Parameter */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.dotDotDotToken) || @@ -19011,7 +27085,7 @@ var ts; visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.type) || visitNode(cbNode, node.initializer); - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.name) || @@ -19019,51 +27093,51 @@ var ts; visitNode(cbNode, node.exclamationToken) || visitNode(cbNode, node.type) || visitNode(cbNode, node.initializer); - case 158 /* PropertySignature */: + case 161 /* PropertySignature */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.type) || visitNode(cbNode, node.initializer); - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.initializer); - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.exclamationToken) || visitNode(cbNode, node.type) || visitNode(cbNode, node.initializer); - case 191 /* BindingElement */: + case 195 /* BindingElement */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.dotDotDotToken) || visitNode(cbNode, node.propertyName) || visitNode(cbNode, node.name) || visitNode(cbNode, node.initializer); - case 170 /* FunctionType */: - case 171 /* ConstructorType */: - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 167 /* IndexSignature */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 170 /* IndexSignature */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNodes(cbNode, cbNodes, node.typeParameters) || visitNodes(cbNode, cbNodes, node.parameters) || visitNode(cbNode, node.type); - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 201 /* FunctionExpression */: - case 244 /* FunctionDeclaration */: - case 202 /* ArrowFunction */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 205 /* FunctionExpression */: + case 248 /* FunctionDeclaration */: + case 206 /* ArrowFunction */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.asteriskToken) || @@ -19075,359 +27149,364 @@ var ts; visitNode(cbNode, node.type) || visitNode(cbNode, node.equalsGreaterThanToken) || visitNode(cbNode, node.body); - case 169 /* TypeReference */: + case 172 /* TypeReference */: return visitNode(cbNode, node.typeName) || visitNodes(cbNode, cbNodes, node.typeArguments); - case 168 /* TypePredicate */: + case 171 /* TypePredicate */: return visitNode(cbNode, node.assertsModifier) || visitNode(cbNode, node.parameterName) || visitNode(cbNode, node.type); - case 172 /* TypeQuery */: + case 175 /* TypeQuery */: return visitNode(cbNode, node.exprName); - case 173 /* TypeLiteral */: + case 176 /* TypeLiteral */: return visitNodes(cbNode, cbNodes, node.members); - case 174 /* ArrayType */: + case 177 /* ArrayType */: return visitNode(cbNode, node.elementType); - case 175 /* TupleType */: - return visitNodes(cbNode, cbNodes, node.elementTypes); - case 178 /* UnionType */: - case 179 /* IntersectionType */: + case 178 /* TupleType */: + return visitNodes(cbNode, cbNodes, node.elements); + case 181 /* UnionType */: + case 182 /* IntersectionType */: return visitNodes(cbNode, cbNodes, node.types); - case 180 /* ConditionalType */: + case 183 /* ConditionalType */: return visitNode(cbNode, node.checkType) || visitNode(cbNode, node.extendsType) || visitNode(cbNode, node.trueType) || visitNode(cbNode, node.falseType); - case 181 /* InferType */: + case 184 /* InferType */: return visitNode(cbNode, node.typeParameter); - case 188 /* ImportType */: + case 192 /* ImportType */: return visitNode(cbNode, node.argument) || visitNode(cbNode, node.qualifier) || visitNodes(cbNode, cbNodes, node.typeArguments); - case 182 /* ParenthesizedType */: - case 184 /* TypeOperator */: + case 185 /* ParenthesizedType */: + case 187 /* TypeOperator */: return visitNode(cbNode, node.type); - case 185 /* IndexedAccessType */: + case 188 /* IndexedAccessType */: return visitNode(cbNode, node.objectType) || visitNode(cbNode, node.indexType); - case 186 /* MappedType */: + case 189 /* MappedType */: return visitNode(cbNode, node.readonlyToken) || visitNode(cbNode, node.typeParameter) || visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.type); - case 187 /* LiteralType */: + case 190 /* LiteralType */: return visitNode(cbNode, node.literal); - case 189 /* ObjectBindingPattern */: - case 190 /* ArrayBindingPattern */: + case 191 /* NamedTupleMember */: + return visitNode(cbNode, node.dotDotDotToken) || + visitNode(cbNode, node.name) || + visitNode(cbNode, node.questionToken) || + visitNode(cbNode, node.type); + case 193 /* ObjectBindingPattern */: + case 194 /* ArrayBindingPattern */: return visitNodes(cbNode, cbNodes, node.elements); - case 192 /* ArrayLiteralExpression */: + case 196 /* ArrayLiteralExpression */: return visitNodes(cbNode, cbNodes, node.elements); - case 193 /* ObjectLiteralExpression */: + case 197 /* ObjectLiteralExpression */: return visitNodes(cbNode, cbNodes, node.properties); - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: return visitNode(cbNode, node.expression) || visitNode(cbNode, node.questionDotToken) || visitNode(cbNode, node.name); - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: return visitNode(cbNode, node.expression) || visitNode(cbNode, node.questionDotToken) || visitNode(cbNode, node.argumentExpression); - case 196 /* CallExpression */: - case 197 /* NewExpression */: + case 200 /* CallExpression */: + case 201 /* NewExpression */: return visitNode(cbNode, node.expression) || visitNode(cbNode, node.questionDotToken) || visitNodes(cbNode, cbNodes, node.typeArguments) || visitNodes(cbNode, cbNodes, node.arguments); - case 198 /* TaggedTemplateExpression */: + case 202 /* TaggedTemplateExpression */: return visitNode(cbNode, node.tag) || visitNode(cbNode, node.questionDotToken) || visitNodes(cbNode, cbNodes, node.typeArguments) || visitNode(cbNode, node.template); - case 199 /* TypeAssertionExpression */: + case 203 /* TypeAssertionExpression */: return visitNode(cbNode, node.type) || visitNode(cbNode, node.expression); - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return visitNode(cbNode, node.expression); - case 203 /* DeleteExpression */: + case 207 /* DeleteExpression */: return visitNode(cbNode, node.expression); - case 204 /* TypeOfExpression */: + case 208 /* TypeOfExpression */: return visitNode(cbNode, node.expression); - case 205 /* VoidExpression */: + case 209 /* VoidExpression */: return visitNode(cbNode, node.expression); - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: return visitNode(cbNode, node.operand); - case 212 /* YieldExpression */: + case 216 /* YieldExpression */: return visitNode(cbNode, node.asteriskToken) || visitNode(cbNode, node.expression); - case 206 /* AwaitExpression */: + case 210 /* AwaitExpression */: return visitNode(cbNode, node.expression); - case 208 /* PostfixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: return visitNode(cbNode, node.operand); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return visitNode(cbNode, node.left) || visitNode(cbNode, node.operatorToken) || visitNode(cbNode, node.right); - case 217 /* AsExpression */: + case 221 /* AsExpression */: return visitNode(cbNode, node.expression) || visitNode(cbNode, node.type); - case 218 /* NonNullExpression */: + case 222 /* NonNullExpression */: return visitNode(cbNode, node.expression); - case 219 /* MetaProperty */: + case 223 /* MetaProperty */: return visitNode(cbNode, node.name); - case 210 /* ConditionalExpression */: + case 214 /* ConditionalExpression */: return visitNode(cbNode, node.condition) || visitNode(cbNode, node.questionToken) || visitNode(cbNode, node.whenTrue) || visitNode(cbNode, node.colonToken) || visitNode(cbNode, node.whenFalse); - case 213 /* SpreadElement */: + case 217 /* SpreadElement */: return visitNode(cbNode, node.expression); - case 223 /* Block */: - case 250 /* ModuleBlock */: + case 227 /* Block */: + case 254 /* ModuleBlock */: return visitNodes(cbNode, cbNodes, node.statements); - case 290 /* SourceFile */: + case 294 /* SourceFile */: return visitNodes(cbNode, cbNodes, node.statements) || visitNode(cbNode, node.endOfFileToken); - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.declarationList); - case 243 /* VariableDeclarationList */: + case 247 /* VariableDeclarationList */: return visitNodes(cbNode, cbNodes, node.declarations); - case 226 /* ExpressionStatement */: + case 230 /* ExpressionStatement */: return visitNode(cbNode, node.expression); - case 227 /* IfStatement */: + case 231 /* IfStatement */: return visitNode(cbNode, node.expression) || visitNode(cbNode, node.thenStatement) || visitNode(cbNode, node.elseStatement); - case 228 /* DoStatement */: + case 232 /* DoStatement */: return visitNode(cbNode, node.statement) || visitNode(cbNode, node.expression); - case 229 /* WhileStatement */: + case 233 /* WhileStatement */: return visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement); - case 230 /* ForStatement */: + case 234 /* ForStatement */: return visitNode(cbNode, node.initializer) || visitNode(cbNode, node.condition) || visitNode(cbNode, node.incrementor) || visitNode(cbNode, node.statement); - case 231 /* ForInStatement */: + case 235 /* ForInStatement */: return visitNode(cbNode, node.initializer) || visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement); - case 232 /* ForOfStatement */: + case 236 /* ForOfStatement */: return visitNode(cbNode, node.awaitModifier) || visitNode(cbNode, node.initializer) || visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement); - case 233 /* ContinueStatement */: - case 234 /* BreakStatement */: + case 237 /* ContinueStatement */: + case 238 /* BreakStatement */: return visitNode(cbNode, node.label); - case 235 /* ReturnStatement */: + case 239 /* ReturnStatement */: return visitNode(cbNode, node.expression); - case 236 /* WithStatement */: + case 240 /* WithStatement */: return visitNode(cbNode, node.expression) || visitNode(cbNode, node.statement); - case 237 /* SwitchStatement */: + case 241 /* SwitchStatement */: return visitNode(cbNode, node.expression) || visitNode(cbNode, node.caseBlock); - case 251 /* CaseBlock */: + case 255 /* CaseBlock */: return visitNodes(cbNode, cbNodes, node.clauses); - case 277 /* CaseClause */: + case 281 /* CaseClause */: return visitNode(cbNode, node.expression) || visitNodes(cbNode, cbNodes, node.statements); - case 278 /* DefaultClause */: + case 282 /* DefaultClause */: return visitNodes(cbNode, cbNodes, node.statements); - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: return visitNode(cbNode, node.label) || visitNode(cbNode, node.statement); - case 239 /* ThrowStatement */: + case 243 /* ThrowStatement */: return visitNode(cbNode, node.expression); - case 240 /* TryStatement */: + case 244 /* TryStatement */: return visitNode(cbNode, node.tryBlock) || visitNode(cbNode, node.catchClause) || visitNode(cbNode, node.finallyBlock); - case 280 /* CatchClause */: + case 284 /* CatchClause */: return visitNode(cbNode, node.variableDeclaration) || visitNode(cbNode, node.block); - case 157 /* Decorator */: + case 160 /* Decorator */: return visitNode(cbNode, node.expression); - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNodes(cbNode, cbNodes, node.typeParameters) || visitNodes(cbNode, cbNodes, node.heritageClauses) || visitNodes(cbNode, cbNodes, node.members); - case 246 /* InterfaceDeclaration */: + case 250 /* InterfaceDeclaration */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNodes(cbNode, cbNodes, node.typeParameters) || visitNodes(cbNode, cbNodes, node.heritageClauses) || visitNodes(cbNode, cbNodes, node.members); - case 247 /* TypeAliasDeclaration */: + case 251 /* TypeAliasDeclaration */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNodes(cbNode, cbNodes, node.typeParameters) || visitNode(cbNode, node.type); - case 248 /* EnumDeclaration */: + case 252 /* EnumDeclaration */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNodes(cbNode, cbNodes, node.members); - case 284 /* EnumMember */: + case 288 /* EnumMember */: return visitNode(cbNode, node.name) || visitNode(cbNode, node.initializer); - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.body); - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.name) || visitNode(cbNode, node.moduleReference); - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.importClause) || visitNode(cbNode, node.moduleSpecifier); - case 255 /* ImportClause */: + case 259 /* ImportClause */: return visitNode(cbNode, node.name) || visitNode(cbNode, node.namedBindings); - case 252 /* NamespaceExportDeclaration */: + case 256 /* NamespaceExportDeclaration */: return visitNode(cbNode, node.name); - case 256 /* NamespaceImport */: + case 260 /* NamespaceImport */: return visitNode(cbNode, node.name); - case 262 /* NamespaceExport */: + case 266 /* NamespaceExport */: return visitNode(cbNode, node.name); - case 257 /* NamedImports */: - case 261 /* NamedExports */: + case 261 /* NamedImports */: + case 265 /* NamedExports */: return visitNodes(cbNode, cbNodes, node.elements); - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.exportClause) || visitNode(cbNode, node.moduleSpecifier); - case 258 /* ImportSpecifier */: - case 263 /* ExportSpecifier */: + case 262 /* ImportSpecifier */: + case 267 /* ExportSpecifier */: return visitNode(cbNode, node.propertyName) || visitNode(cbNode, node.name); - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: return visitNodes(cbNode, cbNodes, node.decorators) || visitNodes(cbNode, cbNodes, node.modifiers) || visitNode(cbNode, node.expression); - case 211 /* TemplateExpression */: + case 215 /* TemplateExpression */: return visitNode(cbNode, node.head) || visitNodes(cbNode, cbNodes, node.templateSpans); - case 221 /* TemplateSpan */: + case 225 /* TemplateSpan */: return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal); - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: return visitNode(cbNode, node.expression); - case 279 /* HeritageClause */: + case 283 /* HeritageClause */: return visitNodes(cbNode, cbNodes, node.types); - case 216 /* ExpressionWithTypeArguments */: + case 220 /* ExpressionWithTypeArguments */: return visitNode(cbNode, node.expression) || visitNodes(cbNode, cbNodes, node.typeArguments); - case 265 /* ExternalModuleReference */: + case 269 /* ExternalModuleReference */: return visitNode(cbNode, node.expression); - case 264 /* MissingDeclaration */: + case 268 /* MissingDeclaration */: return visitNodes(cbNode, cbNodes, node.decorators); - case 327 /* CommaListExpression */: + case 332 /* CommaListExpression */: return visitNodes(cbNode, cbNodes, node.elements); - case 266 /* JsxElement */: + case 270 /* JsxElement */: return visitNode(cbNode, node.openingElement) || visitNodes(cbNode, cbNodes, node.children) || visitNode(cbNode, node.closingElement); - case 270 /* JsxFragment */: + case 274 /* JsxFragment */: return visitNode(cbNode, node.openingFragment) || visitNodes(cbNode, cbNodes, node.children) || visitNode(cbNode, node.closingFragment); - case 267 /* JsxSelfClosingElement */: - case 268 /* JsxOpeningElement */: + case 271 /* JsxSelfClosingElement */: + case 272 /* JsxOpeningElement */: return visitNode(cbNode, node.tagName) || visitNodes(cbNode, cbNodes, node.typeArguments) || visitNode(cbNode, node.attributes); - case 274 /* JsxAttributes */: + case 278 /* JsxAttributes */: return visitNodes(cbNode, cbNodes, node.properties); - case 273 /* JsxAttribute */: + case 277 /* JsxAttribute */: return visitNode(cbNode, node.name) || visitNode(cbNode, node.initializer); - case 275 /* JsxSpreadAttribute */: + case 279 /* JsxSpreadAttribute */: return visitNode(cbNode, node.expression); - case 276 /* JsxExpression */: + case 280 /* JsxExpression */: return visitNode(cbNode, node.dotDotDotToken) || visitNode(cbNode, node.expression); - case 269 /* JsxClosingElement */: + case 273 /* JsxClosingElement */: return visitNode(cbNode, node.tagName); - case 176 /* OptionalType */: - case 177 /* RestType */: - case 294 /* JSDocTypeExpression */: - case 298 /* JSDocNonNullableType */: - case 297 /* JSDocNullableType */: - case 299 /* JSDocOptionalType */: - case 301 /* JSDocVariadicType */: + case 179 /* OptionalType */: + case 180 /* RestType */: + case 298 /* JSDocTypeExpression */: + case 302 /* JSDocNonNullableType */: + case 301 /* JSDocNullableType */: + case 303 /* JSDocOptionalType */: + case 305 /* JSDocVariadicType */: return visitNode(cbNode, node.type); - case 300 /* JSDocFunctionType */: + case 304 /* JSDocFunctionType */: return visitNodes(cbNode, cbNodes, node.parameters) || visitNode(cbNode, node.type); - case 303 /* JSDocComment */: + case 307 /* JSDocComment */: return visitNodes(cbNode, cbNodes, node.tags); - case 317 /* JSDocParameterTag */: - case 323 /* JSDocPropertyTag */: + case 322 /* JSDocParameterTag */: + case 328 /* JSDocPropertyTag */: return visitNode(cbNode, node.tagName) || (node.isNameFirst ? visitNode(cbNode, node.name) || visitNode(cbNode, node.typeExpression) : visitNode(cbNode, node.typeExpression) || visitNode(cbNode, node.name)); - case 309 /* JSDocAuthorTag */: + case 313 /* JSDocAuthorTag */: return visitNode(cbNode, node.tagName); - case 308 /* JSDocImplementsTag */: + case 312 /* JSDocImplementsTag */: return visitNode(cbNode, node.tagName) || visitNode(cbNode, node.class); - case 307 /* JSDocAugmentsTag */: + case 311 /* JSDocAugmentsTag */: return visitNode(cbNode, node.tagName) || visitNode(cbNode, node.class); - case 321 /* JSDocTemplateTag */: + case 326 /* JSDocTemplateTag */: return visitNode(cbNode, node.tagName) || visitNode(cbNode, node.constraint) || visitNodes(cbNode, cbNodes, node.typeParameters); - case 322 /* JSDocTypedefTag */: + case 327 /* JSDocTypedefTag */: return visitNode(cbNode, node.tagName) || (node.typeExpression && - node.typeExpression.kind === 294 /* JSDocTypeExpression */ + node.typeExpression.kind === 298 /* JSDocTypeExpression */ ? visitNode(cbNode, node.typeExpression) || visitNode(cbNode, node.fullName) : visitNode(cbNode, node.fullName) || visitNode(cbNode, node.typeExpression)); - case 315 /* JSDocCallbackTag */: + case 320 /* JSDocCallbackTag */: return visitNode(cbNode, node.tagName) || visitNode(cbNode, node.fullName) || visitNode(cbNode, node.typeExpression); - case 318 /* JSDocReturnTag */: - case 320 /* JSDocTypeTag */: - case 319 /* JSDocThisTag */: - case 316 /* JSDocEnumTag */: + case 323 /* JSDocReturnTag */: + case 325 /* JSDocTypeTag */: + case 324 /* JSDocThisTag */: + case 321 /* JSDocEnumTag */: return visitNode(cbNode, node.tagName) || visitNode(cbNode, node.typeExpression); - case 305 /* JSDocSignature */: + case 309 /* JSDocSignature */: return ts.forEach(node.typeParameters, cbNode) || ts.forEach(node.parameters, cbNode) || visitNode(cbNode, node.type); - case 304 /* JSDocTypeLiteral */: + case 308 /* JSDocTypeLiteral */: return ts.forEach(node.jsDocPropertyTags, cbNode); - case 306 /* JSDocTag */: - case 310 /* JSDocClassTag */: - case 311 /* JSDocPublicTag */: - case 312 /* JSDocPrivateTag */: - case 313 /* JSDocProtectedTag */: - case 314 /* JSDocReadonlyTag */: + case 310 /* JSDocTag */: + case 315 /* JSDocClassTag */: + case 316 /* JSDocPublicTag */: + case 317 /* JSDocPrivateTag */: + case 318 /* JSDocProtectedTag */: + case 319 /* JSDocReadonlyTag */: return visitNode(cbNode, node.tagName); - case 326 /* PartiallyEmittedExpression */: + case 331 /* PartiallyEmittedExpression */: return visitNode(cbNode, node.expression); } } @@ -19465,8 +27544,8 @@ var ts; } } function visitAllPossibleChildren(parent, children) { - for (var _i = 0, children_1 = children; _i < children_1.length; _i++) { - var child = children_1[_i]; + for (var _i = 0, children_5 = children; _i < children_5.length; _i++) { + var child = children_5[_i]; if (ts.isArray(child)) { if (cbNodes) { var res = cbNodes(child, parent); @@ -19580,16 +27659,37 @@ var ts; var scanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ true); var disallowInAndDecoratorContext = 4096 /* DisallowInContext */ | 16384 /* DecoratorContext */; // capture constructors in 'initializeState' to avoid null checks + // tslint:disable variable-name var NodeConstructor; var TokenConstructor; var IdentifierConstructor; var PrivateIdentifierConstructor; var SourceFileConstructor; - var sourceFile; + // tslint:enable variable-name + function countNode(node) { + nodeCount++; + return node; + } + // Rather than using `createBaseNodeFactory` here, we establish a `BaseNodeFactory` that closes over the + // constructors above, which are reset each time `initializeState` is called. + var baseNodeFactory = { + createBaseSourceFileNode: function (kind) { return countNode(new SourceFileConstructor(kind, /*pos*/ 0, /*end*/ 0)); }, + createBaseIdentifierNode: function (kind) { return countNode(new IdentifierConstructor(kind, /*pos*/ 0, /*end*/ 0)); }, + createBasePrivateIdentifierNode: function (kind) { return countNode(new PrivateIdentifierConstructor(kind, /*pos*/ 0, /*end*/ 0)); }, + createBaseTokenNode: function (kind) { return countNode(new TokenConstructor(kind, /*pos*/ 0, /*end*/ 0)); }, + createBaseNode: function (kind) { return countNode(new NodeConstructor(kind, /*pos*/ 0, /*end*/ 0)); } + }; + var factory = ts.createNodeFactory(1 /* NoParenthesizerRules */ | 2 /* NoNodeConverters */ | 8 /* NoOriginalNode */, baseNodeFactory); + var fileName; + var sourceFlags; + var sourceText; + var languageVersion; + var scriptKind; + var languageVariant; var parseDiagnostics; + var jsDocDiagnostics; var syntaxCursor; var currentToken; - var sourceText; var nodeCount; var identifiers; var privateIdentifiers; @@ -19643,6 +27743,8 @@ var ts; // parsing. These context flags are naturally stored and restored through normal recursive // descent parsing and unwinding. var contextFlags; + // Indicates whether we are currently parsing top-level statements. + var topLevel = true; // Whether or not we've had a parse error since creating the last AST node. If we have // encountered an error, it will be stored on the next AST node we create. Parse errors // can be broken down into three categories: @@ -19675,25 +27777,25 @@ var ts; if (setParentNodes === void 0) { setParentNodes = false; } scriptKind = ts.ensureScriptKind(fileName, scriptKind); if (scriptKind === 6 /* JSON */) { - var result_2 = parseJsonText(fileName, sourceText, languageVersion, syntaxCursor, setParentNodes); - ts.convertToObjectWorker(result_2, result_2.parseDiagnostics, /*returnValue*/ false, /*knownRootOptions*/ undefined, /*jsonConversionNotifier*/ undefined); - result_2.referencedFiles = ts.emptyArray; - result_2.typeReferenceDirectives = ts.emptyArray; - result_2.libReferenceDirectives = ts.emptyArray; - result_2.amdDependencies = ts.emptyArray; - result_2.hasNoDefaultLib = false; - result_2.pragmas = ts.emptyMap; - return result_2; + var result_3 = parseJsonText(fileName, sourceText, languageVersion, syntaxCursor, setParentNodes); + ts.convertToObjectWorker(result_3, result_3.parseDiagnostics, /*returnValue*/ false, /*knownRootOptions*/ undefined, /*jsonConversionNotifier*/ undefined); + result_3.referencedFiles = ts.emptyArray; + result_3.typeReferenceDirectives = ts.emptyArray; + result_3.libReferenceDirectives = ts.emptyArray; + result_3.amdDependencies = ts.emptyArray; + result_3.hasNoDefaultLib = false; + result_3.pragmas = ts.emptyMap; + return result_3; } - initializeState(sourceText, languageVersion, syntaxCursor, scriptKind); - var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind); + initializeState(fileName, sourceText, languageVersion, syntaxCursor, scriptKind); + var result = parseSourceFileWorker(languageVersion, setParentNodes, scriptKind); clearState(); return result; } Parser.parseSourceFile = parseSourceFile; function parseIsolatedEntityName(content, languageVersion) { // Choice of `isDeclarationFile` should be arbitrary - initializeState(content, languageVersion, /*syntaxCursor*/ undefined, 1 /* JS */); + initializeState("", content, languageVersion, /*syntaxCursor*/ undefined, 1 /* JS */); // Prime the scanner. nextToken(); var entityName = parseEntityName(/*allowReservedWords*/ true); @@ -19704,81 +27806,89 @@ var ts; Parser.parseIsolatedEntityName = parseIsolatedEntityName; function parseJsonText(fileName, sourceText, languageVersion, syntaxCursor, setParentNodes) { if (languageVersion === void 0) { languageVersion = 2 /* ES2015 */; } - initializeState(sourceText, languageVersion, syntaxCursor, 6 /* JSON */); - // Set source file so that errors will be reported with this file name - sourceFile = createSourceFile(fileName, 2 /* ES2015 */, 6 /* JSON */, /*isDeclaration*/ false); - sourceFile.flags = contextFlags; + if (setParentNodes === void 0) { setParentNodes = false; } + initializeState(fileName, sourceText, languageVersion, syntaxCursor, 6 /* JSON */); + sourceFlags = contextFlags; // Prime the scanner. nextToken(); var pos = getNodePos(); + var statements, endOfFileToken; if (token() === 1 /* EndOfFileToken */) { - sourceFile.statements = createNodeArray([], pos, pos); - sourceFile.endOfFileToken = parseTokenNode(); + statements = createNodeArray([], pos, pos); + endOfFileToken = parseTokenNode(); } else { - var statement = createNode(226 /* ExpressionStatement */); + var expression = void 0; switch (token()) { case 22 /* OpenBracketToken */: - statement.expression = parseArrayLiteralExpression(); + expression = parseArrayLiteralExpression(); break; - case 106 /* TrueKeyword */: - case 91 /* FalseKeyword */: - case 100 /* NullKeyword */: - statement.expression = parseTokenNode(); + case 109 /* TrueKeyword */: + case 94 /* FalseKeyword */: + case 103 /* NullKeyword */: + expression = parseTokenNode(); break; case 40 /* MinusToken */: if (lookAhead(function () { return nextToken() === 8 /* NumericLiteral */ && nextToken() !== 58 /* ColonToken */; })) { - statement.expression = parsePrefixUnaryExpression(); + expression = parsePrefixUnaryExpression(); } else { - statement.expression = parseObjectLiteralExpression(); + expression = parseObjectLiteralExpression(); } break; case 8 /* NumericLiteral */: case 10 /* StringLiteral */: if (lookAhead(function () { return nextToken() !== 58 /* ColonToken */; })) { - statement.expression = parseLiteralNode(); + expression = parseLiteralNode(); break; } // falls through default: - statement.expression = parseObjectLiteralExpression(); + expression = parseObjectLiteralExpression(); break; } - finishNode(statement); - sourceFile.statements = createNodeArray([statement], pos); - sourceFile.endOfFileToken = parseExpectedToken(1 /* EndOfFileToken */, ts.Diagnostics.Unexpected_token); + var statement = factory.createExpressionStatement(expression); + finishNode(statement, pos); + statements = createNodeArray([statement], pos); + endOfFileToken = parseExpectedToken(1 /* EndOfFileToken */, ts.Diagnostics.Unexpected_token); } + // Set source file so that errors will be reported with this file name + var sourceFile = createSourceFile(fileName, 2 /* ES2015 */, 6 /* JSON */, /*isDeclaration*/ false, statements, endOfFileToken, sourceFlags); if (setParentNodes) { fixupParentReferences(sourceFile); } sourceFile.nodeCount = nodeCount; sourceFile.identifierCount = identifierCount; sourceFile.identifiers = identifiers; - sourceFile.parseDiagnostics = parseDiagnostics; + sourceFile.parseDiagnostics = ts.attachFileToDiagnostics(parseDiagnostics, sourceFile); + if (jsDocDiagnostics) { + sourceFile.jsDocDiagnostics = ts.attachFileToDiagnostics(jsDocDiagnostics, sourceFile); + } var result = sourceFile; clearState(); return result; } Parser.parseJsonText = parseJsonText; - function getLanguageVariant(scriptKind) { - // .tsx and .jsx files are treated as jsx language variant. - return scriptKind === 4 /* TSX */ || scriptKind === 2 /* JSX */ || scriptKind === 1 /* JS */ || scriptKind === 6 /* JSON */ ? 1 /* JSX */ : 0 /* Standard */; - } - function initializeState(_sourceText, languageVersion, _syntaxCursor, scriptKind) { + function initializeState(_fileName, _sourceText, _languageVersion, _syntaxCursor, _scriptKind) { NodeConstructor = ts.objectAllocator.getNodeConstructor(); TokenConstructor = ts.objectAllocator.getTokenConstructor(); IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor(); PrivateIdentifierConstructor = ts.objectAllocator.getPrivateIdentifierConstructor(); SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor(); + fileName = ts.normalizePath(_fileName); sourceText = _sourceText; + languageVersion = _languageVersion; syntaxCursor = _syntaxCursor; + scriptKind = _scriptKind; + languageVariant = ts.getLanguageVariant(_scriptKind); parseDiagnostics = []; parsingContext = 0; - identifiers = ts.createMap(); - privateIdentifiers = ts.createMap(); + identifiers = new ts.Map(); + privateIdentifiers = new ts.Map(); identifierCount = 0; nodeCount = 0; + sourceFlags = 0; + topLevel = true; switch (scriptKind) { case 1 /* JS */: case 2 /* JSX */: @@ -19796,7 +27906,7 @@ var ts; scanner.setText(sourceText); scanner.setOnError(scanError); scanner.setScriptTarget(languageVersion); - scanner.setLanguageVariant(getLanguageVariant(scriptKind)); + scanner.setLanguageVariant(languageVariant); } function clearState() { // Clear out the text the scanner is pointing at, so it doesn't keep anything alive unnecessarily. @@ -19804,78 +27914,183 @@ var ts; scanner.setText(""); scanner.setOnError(undefined); // Clear any data. We don't want to accidentally hold onto it for too long. - parseDiagnostics = undefined; - sourceFile = undefined; - identifiers = undefined; - syntaxCursor = undefined; sourceText = undefined; + languageVersion = undefined; + syntaxCursor = undefined; + scriptKind = undefined; + languageVariant = undefined; + sourceFlags = 0; + parseDiagnostics = undefined; + jsDocDiagnostics = undefined; + parsingContext = 0; + identifiers = undefined; notParenthesizedArrow = undefined; + topLevel = true; } - function parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind) { + function parseSourceFileWorker(languageVersion, setParentNodes, scriptKind) { var isDeclarationFile = isDeclarationFileName(fileName); if (isDeclarationFile) { contextFlags |= 8388608 /* Ambient */; } - sourceFile = createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile); - sourceFile.flags = contextFlags; + sourceFlags = contextFlags; // Prime the scanner. nextToken(); + var statements = parseList(0 /* SourceElements */, parseStatement); + ts.Debug.assert(token() === 1 /* EndOfFileToken */); + var endOfFileToken = addJSDocComment(parseTokenNode()); + var sourceFile = createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile, statements, endOfFileToken, sourceFlags); // A member of ReadonlyArray isn't assignable to a member of T[] (and prevents a direct cast) - but this is where we set up those members so they can be readonly in the future processCommentPragmas(sourceFile, sourceText); processPragmasIntoFields(sourceFile, reportPragmaDiagnostic); - sourceFile.statements = parseList(0 /* SourceElements */, parseStatement); - ts.Debug.assert(token() === 1 /* EndOfFileToken */); - sourceFile.endOfFileToken = addJSDocComment(parseTokenNode()); - setExternalModuleIndicator(sourceFile); sourceFile.commentDirectives = scanner.getCommentDirectives(); sourceFile.nodeCount = nodeCount; sourceFile.identifierCount = identifierCount; sourceFile.identifiers = identifiers; - sourceFile.parseDiagnostics = parseDiagnostics; + sourceFile.parseDiagnostics = ts.attachFileToDiagnostics(parseDiagnostics, sourceFile); + if (jsDocDiagnostics) { + sourceFile.jsDocDiagnostics = ts.attachFileToDiagnostics(jsDocDiagnostics, sourceFile); + } if (setParentNodes) { fixupParentReferences(sourceFile); } return sourceFile; function reportPragmaDiagnostic(pos, end, diagnostic) { - parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, pos, end, diagnostic)); + parseDiagnostics.push(ts.createDetachedDiagnostic(fileName, pos, end, diagnostic)); } } + function withJSDoc(node, hasJSDoc) { + return hasJSDoc ? addJSDocComment(node) : node; + } + var hasDeprecatedTag = false; function addJSDocComment(node) { ts.Debug.assert(!node.jsDoc); // Should only be called once per node - var jsDoc = ts.mapDefined(ts.getJSDocCommentRanges(node, sourceFile.text), function (comment) { return JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos); }); + var jsDoc = ts.mapDefined(ts.getJSDocCommentRanges(node, sourceText), function (comment) { return JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos); }); if (jsDoc.length) node.jsDoc = jsDoc; + if (hasDeprecatedTag) { + hasDeprecatedTag = false; + node.flags |= 134217728 /* Deprecated */; + } return node; } + function reparseTopLevelAwait(sourceFile) { + var savedSyntaxCursor = syntaxCursor; + var baseSyntaxCursor = IncrementalParser.createSyntaxCursor(sourceFile); + syntaxCursor = { currentNode: currentNode }; + var statements = []; + var savedParseDiagnostics = parseDiagnostics; + parseDiagnostics = []; + var pos = 0; + var start = findNextStatementWithAwait(sourceFile.statements, 0); + var _loop_3 = function () { + // append all statements between pos and start + var prevStatement = sourceFile.statements[pos]; + var nextStatement = sourceFile.statements[start]; + ts.addRange(statements, sourceFile.statements, pos, start); + pos = findNextStatementWithoutAwait(sourceFile.statements, start); + // append all diagnostics associated with the copied range + var diagnosticStart = ts.findIndex(savedParseDiagnostics, function (diagnostic) { return diagnostic.start >= prevStatement.pos; }); + var diagnosticEnd = diagnosticStart >= 0 ? ts.findIndex(savedParseDiagnostics, function (diagnostic) { return diagnostic.start >= nextStatement.pos; }, diagnosticStart) : -1; + if (diagnosticStart >= 0) { + ts.addRange(parseDiagnostics, savedParseDiagnostics, diagnosticStart, diagnosticEnd >= 0 ? diagnosticEnd : undefined); + } + // reparse all statements between start and pos. We skip existing diagnostics for the same range and allow the parser to generate new ones. + speculationHelper(function () { + var savedContextFlags = contextFlags; + contextFlags |= 32768 /* AwaitContext */; + scanner.setTextPos(nextStatement.pos); + nextToken(); + while (token() !== 1 /* EndOfFileToken */) { + var startPos = scanner.getStartPos(); + var statement = parseListElement(0 /* SourceElements */, parseStatement); + statements.push(statement); + if (startPos === scanner.getStartPos()) { + nextToken(); + } + if (pos >= 0) { + var nonAwaitStatement = sourceFile.statements[pos]; + if (statement.end === nonAwaitStatement.pos) { + // done reparsing this section + break; + } + if (statement.end > nonAwaitStatement.pos) { + // we ate into the next statement, so we must reparse it. + pos = findNextStatementWithoutAwait(sourceFile.statements, pos + 1); + } + } + } + contextFlags = savedContextFlags; + }, 2 /* Reparse */); + // find the next statement containing an `await` + start = pos >= 0 ? findNextStatementWithAwait(sourceFile.statements, pos) : -1; + }; + while (start !== -1) { + _loop_3(); + } + // append all statements between pos and the end of the list + if (pos >= 0) { + var prevStatement_1 = sourceFile.statements[pos]; + ts.addRange(statements, sourceFile.statements, pos); + // append all diagnostics associated with the copied range + var diagnosticStart = ts.findIndex(savedParseDiagnostics, function (diagnostic) { return diagnostic.start >= prevStatement_1.pos; }); + if (diagnosticStart >= 0) { + ts.addRange(parseDiagnostics, savedParseDiagnostics, diagnosticStart); + } + } + syntaxCursor = savedSyntaxCursor; + return factory.updateSourceFile(sourceFile, ts.setTextRange(factory.createNodeArray(statements), sourceFile.statements)); + function containsPossibleTopLevelAwait(node) { + return !(node.flags & 32768 /* AwaitContext */) + && !!(node.transformFlags & 8388608 /* ContainsPossibleTopLevelAwait */); + } + function findNextStatementWithAwait(statements, start) { + for (var i = start; i < statements.length; i++) { + if (containsPossibleTopLevelAwait(statements[i])) { + return i; + } + } + return -1; + } + function findNextStatementWithoutAwait(statements, start) { + for (var i = start; i < statements.length; i++) { + if (!containsPossibleTopLevelAwait(statements[i])) { + return i; + } + } + return -1; + } + function currentNode(position) { + var node = baseSyntaxCursor.currentNode(position); + if (topLevel && node && containsPossibleTopLevelAwait(node)) { + node.intersectsChange = true; + } + return node; + } + } function fixupParentReferences(rootNode) { // normally parent references are set during binding. However, for clients that only need // a syntax tree, and no semantic features, then the binding process is an unnecessary // overhead. This functions allows us to set all the parents, without all the expense of // binding. - forEachChildRecursively(rootNode, bindParentToChild); - function bindParentToChild(child, parent) { - child.parent = parent; - if (ts.hasJSDocNodes(child)) { - for (var _i = 0, _a = child.jsDoc; _i < _a.length; _i++) { - var doc = _a[_i]; - bindParentToChild(doc, child); - forEachChildRecursively(doc, bindParentToChild); - } - } - } + ts.setParentRecursive(rootNode, /*incremental*/ true); } Parser.fixupParentReferences = fixupParentReferences; - function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile) { + function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile, statements, endOfFileToken, flags) { // code from createNode is inlined here so createNode won't have to deal with special case of creating source files // this is quite rare comparing to other nodes and createNode should be as fast as possible - var sourceFile = new SourceFileConstructor(290 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length); - nodeCount++; + var sourceFile = factory.createSourceFile(statements, endOfFileToken, flags); + ts.setTextRangePosWidth(sourceFile, 0, sourceText.length); + setExternalModuleIndicator(sourceFile); + // If we parsed this as an external module, it may contain top-level await + if (!isDeclarationFile && isExternalModule(sourceFile) && sourceFile.transformFlags & 8388608 /* ContainsPossibleTopLevelAwait */) { + sourceFile = reparseTopLevelAwait(sourceFile); + } sourceFile.text = sourceText; sourceFile.bindDiagnostics = []; sourceFile.bindSuggestionDiagnostics = undefined; sourceFile.languageVersion = languageVersion; - sourceFile.fileName = ts.normalizePath(fileName); - sourceFile.languageVariant = getLanguageVariant(scriptKind); + sourceFile.fileName = fileName; + sourceFile.languageVariant = ts.getLanguageVariant(scriptKind); sourceFile.isDeclarationFile = isDeclarationFile; sourceFile.scriptKind = scriptKind; return sourceFile; @@ -19984,7 +28199,7 @@ var ts; // Don't report another error if it would just be at the same position as the last error. var lastError = ts.lastOrUndefined(parseDiagnostics); if (!lastError || start !== lastError.start) { - parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, start, length, message, arg0)); + parseDiagnostics.push(ts.createDetachedDiagnostic(fileName, start, length, message, arg0)); } // Mark that we've encountered an error. We'll set an appropriate bit on the next // node we finish so that it can't be reused incrementally. @@ -20002,6 +28217,9 @@ var ts; function getNodePos() { return scanner.getStartPos(); } + function hasPrecedingJSDocComment() { + return scanner.hasPrecedingJSDocComment(); + } // Use this function to access the current token instead of reading the currentToken // variable. Since function results aren't narrowed in control flow analysis, this ensures // that the type checker doesn't make wrong assumptions about the type of the current @@ -20014,6 +28232,10 @@ var ts; function nextTokenWithoutCheck() { return currentToken = scanner.scan(); } + function nextTokenAnd(func) { + nextToken(); + return func(); + } function nextToken() { // if the keyword had an escape if (ts.isKeyword(currentToken) && (scanner.hasUnicodeEscape() || scanner.hasExtendedUnicodeEscape())) { @@ -20049,7 +28271,7 @@ var ts; function scanJsxAttributeValue() { return currentToken = scanner.scanJsxAttributeValue(); } - function speculationHelper(callback, isLookAhead) { + function speculationHelper(callback, speculationKind) { // Keep track of the state we'll need to rollback to if lookahead fails (or if the // caller asked us to always reset our state). var saveToken = currentToken; @@ -20063,15 +28285,17 @@ var ts; // If we're only looking ahead, then tell the scanner to only lookahead as well. // Otherwise, if we're actually speculatively parsing, then tell the scanner to do the // same. - var result = isLookAhead + var result = speculationKind !== 0 /* TryParse */ ? scanner.lookAhead(callback) : scanner.tryScan(callback); ts.Debug.assert(saveContextFlags === contextFlags); // If our callback returned something 'falsy' or we're just looking ahead, // then unconditionally restore us to where we were. - if (!result || isLookAhead) { + if (!result || speculationKind !== 0 /* TryParse */) { currentToken = saveToken; - parseDiagnostics.length = saveParseDiagnosticsLength; + if (speculationKind !== 2 /* Reparse */) { + parseDiagnostics.length = saveParseDiagnosticsLength; + } parseErrorBeforeNextFinishedNode = saveParseErrorBeforeNextFinishedNode; } return result; @@ -20081,7 +28305,7 @@ var ts; * is returned from this function. */ function lookAhead(callback) { - return speculationHelper(callback, /*isLookAhead*/ true); + return speculationHelper(callback, 1 /* Lookahead */); } /** Invokes the provided callback. If the callback returns something falsy, then it restores * the parser to the state it was in immediately prior to invoking the callback. If the @@ -20089,24 +28313,30 @@ var ts; * of invoking the callback is returned from this function. */ function tryParse(callback) { - return speculationHelper(callback, /*isLookAhead*/ false); + return speculationHelper(callback, 0 /* TryParse */); + } + function isBindingIdentifier() { + if (token() === 78 /* Identifier */) { + return true; + } + return token() > 115 /* LastReservedWord */; } // Ignore strict mode flag because we will report an error in type checker instead. function isIdentifier() { - if (token() === 75 /* Identifier */) { + if (token() === 78 /* Identifier */) { return true; } // If we have a 'yield' keyword, and we're in the [yield] context, then 'yield' is // considered a keyword and is not an identifier. - if (token() === 121 /* YieldKeyword */ && inYieldContext()) { + if (token() === 124 /* YieldKeyword */ && inYieldContext()) { return false; } // If we have a 'await' keyword, and we're in the [Await] context, then 'await' is // considered a keyword and is not an identifier. - if (token() === 127 /* AwaitKeyword */ && inAwaitContext()) { + if (token() === 130 /* AwaitKeyword */ && inAwaitContext()) { return false; } - return token() > 112 /* LastReservedWord */; + return token() > 115 /* LastReservedWord */; } function parseExpected(kind, diagnosticMessage, shouldAdvance) { if (shouldAdvance === void 0) { shouldAdvance = true; } @@ -20161,14 +28391,16 @@ var ts; createMissingNode(t, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(t)); } function parseTokenNode() { - var node = createNode(token()); + var pos = getNodePos(); + var kind = token(); nextToken(); - return finishNode(node); + return finishNode(factory.createToken(kind), pos); } function parseTokenNodeJSDoc() { - var node = createNode(token()); + var pos = getNodePos(); + var kind = token(); nextTokenJSDoc(); - return finishNode(node); + return finishNode(factory.createToken(kind), pos); } function canParseSemicolon() { // If there's a real semicolon, then we can always parse it out. @@ -20190,33 +28422,13 @@ var ts; return parseExpected(26 /* SemicolonToken */); } } - function createNode(kind, pos) { - nodeCount++; - var p = pos >= 0 ? pos : scanner.getStartPos(); - return ts.isNodeKind(kind) || kind === 0 /* Unknown */ ? new NodeConstructor(kind, p, p) : - kind === 75 /* Identifier */ ? new IdentifierConstructor(kind, p, p) : - kind === 76 /* PrivateIdentifier */ ? new PrivateIdentifierConstructor(kind, p, p) : - new TokenConstructor(kind, p, p); - } - function createNodeWithJSDoc(kind, pos) { - var node = createNode(kind, pos); - if (scanner.getTokenFlags() & 2 /* PrecedingJSDocComment */ && (kind !== 226 /* ExpressionStatement */ || token() !== 20 /* OpenParenToken */)) { - addJSDocComment(node); - } - return node; - } - function createNodeArray(elements, pos, end) { - // Since the element list of a node array is typically created by starting with an empty array and - // repeatedly calling push(), the list may not have the optimal memory layout. We invoke slice() for - // small arrays (1 to 4 elements) to give the VM a chance to allocate an optimal representation. - var length = elements.length; - var array = (length >= 1 && length <= 4 ? elements.slice() : elements); - array.pos = pos; - array.end = end === undefined ? scanner.getStartPos() : end; + function createNodeArray(elements, pos, end, hasTrailingComma) { + var array = factory.createNodeArray(elements, hasTrailingComma); + ts.setTextRangePosEnd(array, pos, end !== null && end !== void 0 ? end : scanner.getStartPos()); return array; } - function finishNode(node, end) { - node.end = end === undefined ? scanner.getStartPos() : end; + function finishNode(node, pos, end) { + ts.setTextRangePosEnd(node, pos, end !== null && end !== void 0 ? end : scanner.getStartPos()); if (contextFlags) { node.flags |= contextFlags; } @@ -20236,14 +28448,14 @@ var ts; else if (diagnosticMessage) { parseErrorAtCurrentToken(diagnosticMessage, arg0); } - var result = createNode(kind); - if (kind === 75 /* Identifier */) { - result.escapedText = ""; - } - else if (ts.isLiteralKind(kind) || ts.isTemplateLiteralKind(kind)) { - result.text = ""; - } - return finishNode(result); + var pos = getNodePos(); + var result = kind === 78 /* Identifier */ ? factory.createIdentifier("", /*typeArguments*/ undefined, /*originalKeywordKind*/ undefined) : + ts.isTemplateLiteralKind(kind) ? factory.createTemplateLiteralLikeNode(kind, "", "", /*templateFlags*/ undefined) : + kind === 8 /* NumericLiteral */ ? factory.createNumericLiteral("", /*numericLiteralFlags*/ undefined) : + kind === 10 /* StringLiteral */ ? factory.createStringLiteral("", /*isSingleQuote*/ undefined) : + kind === 268 /* MissingDeclaration */ ? factory.createMissingDeclaration() : + factory.createToken(kind); + return finishNode(result, pos); } function internIdentifier(text) { var identifier = identifiers.get(text); @@ -20258,16 +28470,14 @@ var ts; function createIdentifier(isIdentifier, diagnosticMessage, privateIdentifierDiagnosticMessage) { identifierCount++; if (isIdentifier) { - var node = createNode(75 /* Identifier */); + var pos = getNodePos(); // Store original token kind if it is not just an Identifier so we can report appropriate error later in type checker - if (token() !== 75 /* Identifier */) { - node.originalKeywordKind = token(); - } - node.escapedText = ts.escapeLeadingUnderscores(internIdentifier(scanner.getTokenValue())); + var originalKeywordKind = token(); + var text = internIdentifier(scanner.getTokenValue()); nextTokenWithoutCheck(); - return finishNode(node); + return finishNode(factory.createIdentifier(text, /*typeArguments*/ undefined, originalKeywordKind), pos); } - if (token() === 76 /* PrivateIdentifier */) { + if (token() === 79 /* PrivateIdentifier */) { parseErrorAtCurrentToken(privateIdentifierDiagnosticMessage || ts.Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies); return createIdentifier(/*isIdentifier*/ true); } @@ -20278,7 +28488,10 @@ var ts; var defaultMessage = isReservedWord ? ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_that_cannot_be_used_here : ts.Diagnostics.Identifier_expected; - return createMissingNode(75 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || defaultMessage, msgArg); + return createMissingNode(78 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || defaultMessage, msgArg); + } + function parseBindingIdentifier(privateIdentifierDiagnosticMessage) { + return createIdentifier(isBindingIdentifier(), /*diagnosticMessage*/ undefined, privateIdentifierDiagnosticMessage); } function parseIdentifier(diagnosticMessage, privateIdentifierDiagnosticMessage) { return createIdentifier(isIdentifier(), diagnosticMessage, privateIdentifierDiagnosticMessage); @@ -20300,7 +28513,7 @@ var ts; if (allowComputedPropertyNames && token() === 22 /* OpenBracketToken */) { return parseComputedPropertyName(); } - if (token() === 76 /* PrivateIdentifier */) { + if (token() === 79 /* PrivateIdentifier */) { return parsePrivateIdentifier(); } return parseIdentifierName(); @@ -20312,14 +28525,14 @@ var ts; // PropertyName [Yield]: // LiteralPropertyName // ComputedPropertyName[?Yield] - var node = createNode(154 /* ComputedPropertyName */); + var pos = getNodePos(); parseExpected(22 /* OpenBracketToken */); // We parse any expression (including a comma expression). But the grammar // says that only an assignment expression is allowed, so the grammar checker // will error if it sees a comma expression. - node.expression = allowInAnd(parseExpression); + var expression = allowInAnd(parseExpression); parseExpected(23 /* CloseBracketToken */); - return finishNode(node); + return finishNode(factory.createComputedPropertyName(expression), pos); } function internPrivateIdentifier(text) { var privateIdentifier = privateIdentifiers.get(text); @@ -20329,10 +28542,10 @@ var ts; return privateIdentifier; } function parsePrivateIdentifier() { - var node = createNode(76 /* PrivateIdentifier */); - node.escapedText = ts.escapeLeadingUnderscores(internPrivateIdentifier(scanner.getTokenText())); + var pos = getNodePos(); + var node = factory.createPrivateIdentifier(internPrivateIdentifier(scanner.getTokenText())); nextToken(); - return finishNode(node); + return finishNode(node, pos); } function parseContextualModifier(t) { return token() === t && tryParse(nextTokenCanFollowModifier); @@ -20346,23 +28559,23 @@ var ts; } function nextTokenCanFollowModifier() { switch (token()) { - case 81 /* ConstKeyword */: + case 84 /* ConstKeyword */: // 'const' is only a modifier if followed by 'enum'. - return nextToken() === 88 /* EnumKeyword */; - case 89 /* ExportKeyword */: + return nextToken() === 91 /* EnumKeyword */; + case 92 /* ExportKeyword */: nextToken(); - if (token() === 84 /* DefaultKeyword */) { + if (token() === 87 /* DefaultKeyword */) { return lookAhead(nextTokenCanFollowDefaultKeyword); } - if (token() === 145 /* TypeKeyword */) { + if (token() === 148 /* TypeKeyword */) { return lookAhead(nextTokenCanFollowExportModifier); } return canFollowExportModifier(); - case 84 /* DefaultKeyword */: + case 87 /* DefaultKeyword */: return nextTokenCanFollowDefaultKeyword(); - case 120 /* StaticKeyword */: - case 131 /* GetKeyword */: - case 142 /* SetKeyword */: + case 123 /* StaticKeyword */: + case 134 /* GetKeyword */: + case 145 /* SetKeyword */: nextToken(); return canFollowModifier(); default: @@ -20371,7 +28584,7 @@ var ts; } function canFollowExportModifier() { return token() !== 41 /* AsteriskToken */ - && token() !== 123 /* AsKeyword */ + && token() !== 126 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier(); } @@ -20391,10 +28604,10 @@ var ts; } function nextTokenCanFollowDefaultKeyword() { nextToken(); - return token() === 80 /* ClassKeyword */ || token() === 94 /* FunctionKeyword */ || - token() === 114 /* InterfaceKeyword */ || - (token() === 122 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) || - (token() === 126 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine)); + return token() === 83 /* ClassKeyword */ || token() === 97 /* FunctionKeyword */ || + token() === 117 /* InterfaceKeyword */ || + (token() === 125 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) || + (token() === 129 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine)); } // True if positioned at the start of a list element function isListElement(parsingContext, inErrorRecovery) { @@ -20414,7 +28627,7 @@ var ts; // outer module. We just want to consume and move on. return !(token() === 26 /* SemicolonToken */ && inErrorRecovery) && isStartOfStatement(); case 2 /* SwitchClauses */: - return token() === 78 /* CaseKeyword */ || token() === 84 /* DefaultKeyword */; + return token() === 81 /* CaseKeyword */ || token() === 87 /* DefaultKeyword */; case 4 /* TypeMembers */: return lookAhead(isTypeMemberStart); case 5 /* ClassMembers */: @@ -20457,9 +28670,9 @@ var ts; return isIdentifier() && !isHeritageClauseExtendsOrImplementsKeyword(); } case 8 /* VariableDeclarations */: - return isIdentifierOrPrivateIdentifierOrPattern(); + return isBindingIdentifierOrPrivateIdentifierOrPattern(); case 10 /* ArrayBindingElements */: - return token() === 27 /* CommaToken */ || token() === 25 /* DotDotDotToken */ || isIdentifierOrPrivateIdentifierOrPattern(); + return token() === 27 /* CommaToken */ || token() === 25 /* DotDotDotToken */ || isBindingIdentifierOrPrivateIdentifierOrPattern(); case 19 /* TypeParameters */: return isIdentifier(); case 15 /* ArrayLiteralMembers */: @@ -20500,7 +28713,7 @@ var ts; // extends {} extends // extends {} implements var next = nextToken(); - return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 90 /* ExtendsKeyword */ || next === 113 /* ImplementsKeyword */; + return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 93 /* ExtendsKeyword */ || next === 116 /* ImplementsKeyword */; } return true; } @@ -20517,8 +28730,8 @@ var ts; return ts.tokenIsIdentifierOrKeywordOrGreaterThan(token()); } function isHeritageClauseExtendsOrImplementsKeyword() { - if (token() === 113 /* ImplementsKeyword */ || - token() === 90 /* ExtendsKeyword */) { + if (token() === 116 /* ImplementsKeyword */ || + token() === 93 /* ExtendsKeyword */) { return lookAhead(nextTokenIsStartOfExpression); } return false; @@ -20548,14 +28761,14 @@ var ts; case 23 /* ImportOrExportSpecifiers */: return token() === 19 /* CloseBraceToken */; case 3 /* SwitchClauseStatements */: - return token() === 19 /* CloseBraceToken */ || token() === 78 /* CaseKeyword */ || token() === 84 /* DefaultKeyword */; + return token() === 19 /* CloseBraceToken */ || token() === 81 /* CaseKeyword */ || token() === 87 /* DefaultKeyword */; case 7 /* HeritageClauseElement */: - return token() === 18 /* OpenBraceToken */ || token() === 90 /* ExtendsKeyword */ || token() === 113 /* ImplementsKeyword */; + return token() === 18 /* OpenBraceToken */ || token() === 93 /* ExtendsKeyword */ || token() === 116 /* ImplementsKeyword */; case 8 /* VariableDeclarations */: return isVariableDeclaratorListTerminator(); case 19 /* TypeParameters */: // Tokens other than '>' are here for better error recovery - return token() === 31 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 90 /* ExtendsKeyword */ || token() === 113 /* ImplementsKeyword */; + return token() === 31 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 93 /* ExtendsKeyword */ || token() === 116 /* ImplementsKeyword */; case 11 /* ArgumentExpressions */: // Tokens other than ')' are here for better error recovery return token() === 21 /* CloseParenToken */ || token() === 26 /* SemicolonToken */; @@ -20772,20 +28985,20 @@ var ts; function isReusableClassMember(node) { if (node) { switch (node.kind) { - case 162 /* Constructor */: - case 167 /* IndexSignature */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 159 /* PropertyDeclaration */: - case 222 /* SemicolonClassElement */: + case 165 /* Constructor */: + case 170 /* IndexSignature */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 162 /* PropertyDeclaration */: + case 226 /* SemicolonClassElement */: return true; - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: // Method declarations are not necessarily reusable. An object-literal // may have a method calls "constructor(...)" and we must reparse that // into an actual .ConstructorDeclaration. var methodDeclaration = node; - var nameIsConstructor = methodDeclaration.name.kind === 75 /* Identifier */ && - methodDeclaration.name.originalKeywordKind === 129 /* ConstructorKeyword */; + var nameIsConstructor = methodDeclaration.name.kind === 78 /* Identifier */ && + methodDeclaration.name.originalKeywordKind === 132 /* ConstructorKeyword */; return !nameIsConstructor; } } @@ -20794,8 +29007,8 @@ var ts; function isReusableSwitchClause(node) { if (node) { switch (node.kind) { - case 277 /* CaseClause */: - case 278 /* DefaultClause */: + case 281 /* CaseClause */: + case 282 /* DefaultClause */: return true; } } @@ -20804,58 +29017,58 @@ var ts; function isReusableStatement(node) { if (node) { switch (node.kind) { - case 244 /* FunctionDeclaration */: - case 225 /* VariableStatement */: - case 223 /* Block */: - case 227 /* IfStatement */: - case 226 /* ExpressionStatement */: - case 239 /* ThrowStatement */: - case 235 /* ReturnStatement */: - case 237 /* SwitchStatement */: - case 234 /* BreakStatement */: - case 233 /* ContinueStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - case 230 /* ForStatement */: - case 229 /* WhileStatement */: - case 236 /* WithStatement */: - case 224 /* EmptyStatement */: - case 240 /* TryStatement */: - case 238 /* LabeledStatement */: - case 228 /* DoStatement */: - case 241 /* DebuggerStatement */: - case 254 /* ImportDeclaration */: - case 253 /* ImportEqualsDeclaration */: - case 260 /* ExportDeclaration */: - case 259 /* ExportAssignment */: - case 249 /* ModuleDeclaration */: - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: - case 248 /* EnumDeclaration */: - case 247 /* TypeAliasDeclaration */: + case 248 /* FunctionDeclaration */: + case 229 /* VariableStatement */: + case 227 /* Block */: + case 231 /* IfStatement */: + case 230 /* ExpressionStatement */: + case 243 /* ThrowStatement */: + case 239 /* ReturnStatement */: + case 241 /* SwitchStatement */: + case 238 /* BreakStatement */: + case 237 /* ContinueStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 234 /* ForStatement */: + case 233 /* WhileStatement */: + case 240 /* WithStatement */: + case 228 /* EmptyStatement */: + case 244 /* TryStatement */: + case 242 /* LabeledStatement */: + case 232 /* DoStatement */: + case 245 /* DebuggerStatement */: + case 258 /* ImportDeclaration */: + case 257 /* ImportEqualsDeclaration */: + case 264 /* ExportDeclaration */: + case 263 /* ExportAssignment */: + case 253 /* ModuleDeclaration */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: + case 252 /* EnumDeclaration */: + case 251 /* TypeAliasDeclaration */: return true; } } return false; } function isReusableEnumMember(node) { - return node.kind === 284 /* EnumMember */; + return node.kind === 288 /* EnumMember */; } function isReusableTypeMember(node) { if (node) { switch (node.kind) { - case 166 /* ConstructSignature */: - case 160 /* MethodSignature */: - case 167 /* IndexSignature */: - case 158 /* PropertySignature */: - case 165 /* CallSignature */: + case 169 /* ConstructSignature */: + case 163 /* MethodSignature */: + case 170 /* IndexSignature */: + case 161 /* PropertySignature */: + case 168 /* CallSignature */: return true; } } return false; } function isReusableVariableDeclaration(node) { - if (node.kind !== 242 /* VariableDeclaration */) { + if (node.kind !== 246 /* VariableDeclaration */) { return false; } // Very subtle incremental parsing bug. Consider the following code: @@ -20876,7 +29089,7 @@ var ts; return variableDeclarator.initializer === undefined; } function isReusableParameter(node) { - if (node.kind !== 156 /* Parameter */) { + if (node.kind !== 159 /* Parameter */) { return false; } // See the comment in isReusableVariableDeclaration for why we do this. @@ -20969,17 +29182,13 @@ var ts; } } parsingContext = saveParsingContext; - var result = createNodeArray(list, listPos); // Recording the trailing comma is deliberately done after the previous // loop, and not just if we see a list terminator. This is because the list // may have ended incorrectly, but it is still important to know if there // was a trailing comma. // Check if the last token was a comma. - if (commaStart >= 0) { - // Always preserve a trailing comma by marking it on the NodeArray - result.hasTrailingComma = true; - } - return result; + // Always preserve a trailing comma by marking it on the NodeArray + return createNodeArray(list, listPos, /*end*/ undefined, commaStart >= 0); } function getExpectedCommaDiagnostic(kind) { return kind === 6 /* EnumMembers */ ? ts.Diagnostics.An_enum_member_name_must_be_followed_by_a_or : undefined; @@ -21001,24 +29210,22 @@ var ts; return createMissingList(); } function parseEntityName(allowReservedWords, diagnosticMessage) { + var pos = getNodePos(); var entity = allowReservedWords ? parseIdentifierName(diagnosticMessage) : parseIdentifier(diagnosticMessage); - var dotPos = scanner.getStartPos(); + var dotPos = getNodePos(); while (parseOptional(24 /* DotToken */)) { if (token() === 29 /* LessThanToken */) { // the entity is part of a JSDoc-style generic, so record the trailing dot for later error reporting entity.jsdocDotPos = dotPos; break; } - dotPos = scanner.getStartPos(); - entity = createQualifiedName(entity, parseRightSideOfDot(allowReservedWords, /* allowPrivateIdentifiers */ false)); + dotPos = getNodePos(); + entity = finishNode(factory.createQualifiedName(entity, parseRightSideOfDot(allowReservedWords, /* allowPrivateIdentifiers */ false)), pos); } return entity; } function createQualifiedName(entity, name) { - var node = createNode(153 /* QualifiedName */, entity.pos); - node.left = entity; - node.right = name; - return finishNode(node); + return finishNode(factory.createQualifiedName(entity, name), entity.pos); } function parseRightSideOfDot(allowIdentifierNames, allowPrivateIdentifiers) { // Technically a keyword is valid here as all identifiers and keywords are identifier names. @@ -21046,40 +29253,42 @@ var ts; // Report that we need an identifier. However, report it right after the dot, // and not on the next token. This is because the next token might actually // be an identifier and the error would be quite confusing. - return createMissingNode(75 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected); + return createMissingNode(78 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected); } } - if (token() === 76 /* PrivateIdentifier */) { + if (token() === 79 /* PrivateIdentifier */) { var node = parsePrivateIdentifier(); - return allowPrivateIdentifiers ? node : createMissingNode(75 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected); + return allowPrivateIdentifiers ? node : createMissingNode(78 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected); } return allowIdentifierNames ? parseIdentifierName() : parseIdentifier(); } - function parseTemplateExpression(isTaggedTemplate) { - var template = createNode(211 /* TemplateExpression */); - template.head = parseTemplateHead(isTaggedTemplate); - ts.Debug.assert(template.head.kind === 15 /* TemplateHead */, "Template head has wrong token kind"); + function parseTemplateSpans(isTaggedTemplate) { + var pos = getNodePos(); var list = []; - var listPos = getNodePos(); + var node; do { - list.push(parseTemplateSpan(isTaggedTemplate)); - } while (ts.last(list).literal.kind === 16 /* TemplateMiddle */); - template.templateSpans = createNodeArray(list, listPos); - return finishNode(template); + node = parseTemplateSpan(isTaggedTemplate); + list.push(node); + } while (node.literal.kind === 16 /* TemplateMiddle */); + return createNodeArray(list, pos); } - function parseTemplateSpan(isTaggedTemplate) { - var span = createNode(221 /* TemplateSpan */); - span.expression = allowInAnd(parseExpression); - var literal; + function parseTemplateExpression(isTaggedTemplate) { + var pos = getNodePos(); + return finishNode(factory.createTemplateExpression(parseTemplateHead(isTaggedTemplate), parseTemplateSpans(isTaggedTemplate)), pos); + } + function parseLiteralOfTemplateSpan(isTaggedTemplate) { if (token() === 19 /* CloseBraceToken */) { reScanTemplateToken(isTaggedTemplate); - literal = parseTemplateMiddleOrTemplateTail(); + return parseTemplateMiddleOrTemplateTail(); } else { - literal = parseExpectedToken(17 /* TemplateTail */, ts.Diagnostics._0_expected, ts.tokenToString(19 /* CloseBraceToken */)); + // TODO(rbuckton): Do we need to call `parseExpectedToken` or can we just call `createMissingNode` directly? + return parseExpectedToken(17 /* TemplateTail */, ts.Diagnostics._0_expected, ts.tokenToString(19 /* CloseBraceToken */)); } - span.literal = literal; - return finishNode(span); + } + function parseTemplateSpan(isTaggedTemplate) { + var pos = getNodePos(); + return finishNode(factory.createTemplateSpan(allowInAnd(parseExpression), parseLiteralOfTemplateSpan(isTaggedTemplate)), pos); } function parseLiteralNode() { return parseLiteralLikeNode(token()); @@ -21097,61 +29306,57 @@ var ts; ts.Debug.assert(fragment.kind === 16 /* TemplateMiddle */ || fragment.kind === 17 /* TemplateTail */, "Template fragment has wrong token kind"); return fragment; } + function getTemplateLiteralRawText(kind) { + var isLast = kind === 14 /* NoSubstitutionTemplateLiteral */ || kind === 17 /* TemplateTail */; + var tokenText = scanner.getTokenText(); + return tokenText.substring(1, tokenText.length - (scanner.isUnterminated() ? 0 : isLast ? 1 : 2)); + } function parseLiteralLikeNode(kind) { - var node = createNode(kind); - node.text = scanner.getTokenValue(); - switch (kind) { - case 14 /* NoSubstitutionTemplateLiteral */: - case 15 /* TemplateHead */: - case 16 /* TemplateMiddle */: - case 17 /* TemplateTail */: - var isLast = kind === 14 /* NoSubstitutionTemplateLiteral */ || kind === 17 /* TemplateTail */; - var tokenText = scanner.getTokenText(); - node.rawText = tokenText.substring(1, tokenText.length - (scanner.isUnterminated() ? 0 : isLast ? 1 : 2)); - break; - } + var pos = getNodePos(); + var node = ts.isTemplateLiteralKind(kind) ? factory.createTemplateLiteralLikeNode(kind, scanner.getTokenValue(), getTemplateLiteralRawText(kind), scanner.getTokenFlags() & 2048 /* TemplateLiteralLikeFlags */) : + // Octal literals are not allowed in strict mode or ES5 + // Note that theoretically the following condition would hold true literals like 009, + // which is not octal. But because of how the scanner separates the tokens, we would + // never get a token like this. Instead, we would get 00 and 9 as two separate tokens. + // We also do not need to check for negatives because any prefix operator would be part of a + // parent unary expression. + kind === 8 /* NumericLiteral */ ? factory.createNumericLiteral(scanner.getTokenValue(), scanner.getNumericLiteralFlags()) : + kind === 10 /* StringLiteral */ ? factory.createStringLiteral(scanner.getTokenValue(), /*isSingleQuote*/ undefined, scanner.hasExtendedUnicodeEscape()) : + ts.isLiteralKind(kind) ? factory.createLiteralLikeNode(kind, scanner.getTokenValue()) : + ts.Debug.fail(); if (scanner.hasExtendedUnicodeEscape()) { node.hasExtendedUnicodeEscape = true; } if (scanner.isUnterminated()) { node.isUnterminated = true; } - // Octal literals are not allowed in strict mode or ES5 - // Note that theoretically the following condition would hold true literals like 009, - // which is not octal.But because of how the scanner separates the tokens, we would - // never get a token like this. Instead, we would get 00 and 9 as two separate tokens. - // We also do not need to check for negatives because any prefix operator would be part of a - // parent unary expression. - if (node.kind === 8 /* NumericLiteral */) { - node.numericLiteralFlags = scanner.getTokenFlags() & 1008 /* NumericLiteralFlags */; - } - if (ts.isTemplateLiteralKind(node.kind)) { - node.templateFlags = scanner.getTokenFlags() & 2048 /* ContainsInvalidEscape */; - } nextToken(); - finishNode(node); - return node; + return finishNode(node, pos); } // TYPES - function parseTypeReference() { - var node = createNode(169 /* TypeReference */); - node.typeName = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected); + function parseEntityNameOfTypeReference() { + return parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected); + } + function parseTypeArgumentsOfTypeReference() { if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 29 /* LessThanToken */) { - node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 29 /* LessThanToken */, 31 /* GreaterThanToken */); + return parseBracketedList(20 /* TypeArguments */, parseType, 29 /* LessThanToken */, 31 /* GreaterThanToken */); } - return finishNode(node); + } + function parseTypeReference() { + var pos = getNodePos(); + return finishNode(factory.createTypeReferenceNode(parseEntityNameOfTypeReference(), parseTypeArgumentsOfTypeReference()), pos); } // If true, we should abort parsing an error function. function typeHasArrowFunctionBlockingParseError(node) { switch (node.kind) { - case 169 /* TypeReference */: + case 172 /* TypeReference */: return ts.nodeIsMissing(node.typeName); - case 170 /* FunctionType */: - case 171 /* ConstructorType */: { + case 173 /* FunctionType */: + case 174 /* ConstructorType */: { var _a = node, parameters = _a.parameters, type = _a.type; return isMissingList(parameters) || typeHasArrowFunctionBlockingParseError(type); } - case 182 /* ParenthesizedType */: + case 185 /* ParenthesizedType */: return typeHasArrowFunctionBlockingParseError(node.type); default: return false; @@ -21159,34 +29364,25 @@ var ts; } function parseThisTypePredicate(lhs) { nextToken(); - var node = createNode(168 /* TypePredicate */, lhs.pos); - node.parameterName = lhs; - node.type = parseType(); - return finishNode(node); + return finishNode(factory.createTypePredicateNode(/*assertsModifier*/ undefined, lhs, parseType()), lhs.pos); } function parseThisTypeNode() { - var node = createNode(183 /* ThisType */); + var pos = getNodePos(); nextToken(); - return finishNode(node); + return finishNode(factory.createThisTypeNode(), pos); } - function parseJSDocAllType(postFixEquals) { - var result = createNode(295 /* JSDocAllType */); - if (postFixEquals) { - return createPostfixType(299 /* JSDocOptionalType */, result); - } - else { - nextToken(); - } - return finishNode(result); + function parseJSDocAllType() { + var pos = getNodePos(); + nextToken(); + return finishNode(factory.createJSDocAllType(), pos); } function parseJSDocNonNullableType() { - var result = createNode(298 /* JSDocNonNullableType */); + var pos = getNodePos(); nextToken(); - result.type = parseNonArrayType(); - return finishNode(result); + return finishNode(factory.createJSDocNonNullableType(parseNonArrayType()), pos); } function parseJSDocUnknownOrNullableType() { - var pos = scanner.getStartPos(); + var pos = getNodePos(); // skip the ? nextToken(); // Need to lookahead to decide if this is a nullable or unknown type. @@ -21204,40 +29400,45 @@ var ts; token() === 31 /* GreaterThanToken */ || token() === 62 /* EqualsToken */ || token() === 51 /* BarToken */) { - var result = createNode(296 /* JSDocUnknownType */, pos); - return finishNode(result); + return finishNode(factory.createJSDocUnknownType(), pos); } else { - var result = createNode(297 /* JSDocNullableType */, pos); - result.type = parseType(); - return finishNode(result); + return finishNode(factory.createJSDocNullableType(parseType()), pos); } } function parseJSDocFunctionType() { + var pos = getNodePos(); + var hasJSDoc = hasPrecedingJSDocComment(); if (lookAhead(nextTokenIsOpenParen)) { - var result = createNodeWithJSDoc(300 /* JSDocFunctionType */); nextToken(); - fillSignature(58 /* ColonToken */, 4 /* Type */ | 32 /* JSDoc */, result); - return finishNode(result); + var parameters = parseParameters(4 /* Type */ | 32 /* JSDoc */); + var type = parseReturnType(58 /* ColonToken */, /*isType*/ false); + return withJSDoc(finishNode(factory.createJSDocFunctionType(parameters, type), pos), hasJSDoc); } - var node = createNode(169 /* TypeReference */); - node.typeName = parseIdentifierName(); - return finishNode(node); + return finishNode(factory.createTypeReferenceNode(parseIdentifierName(), /*typeArguments*/ undefined), pos); } function parseJSDocParameter() { - var parameter = createNode(156 /* Parameter */); - if (token() === 104 /* ThisKeyword */ || token() === 99 /* NewKeyword */) { - parameter.name = parseIdentifierName(); + var pos = getNodePos(); + var name; + if (token() === 107 /* ThisKeyword */ || token() === 102 /* NewKeyword */) { + name = parseIdentifierName(); parseExpected(58 /* ColonToken */); } - parameter.type = parseJSDocType(); - return finishNode(parameter); + return finishNode(factory.createParameterDeclaration( + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*dotDotDotToken*/ undefined, + // TODO(rbuckton): JSDoc parameters don't have names (except `this`/`new`), should we manufacture an empty identifier? + name, + /*questionToken*/ undefined, parseJSDocType(), + /*initializer*/ undefined), pos); } function parseJSDocType() { scanner.setInJSDocType(true); - var moduleSpecifier = parseOptionalToken(135 /* ModuleKeyword */); - if (moduleSpecifier) { - var moduleTag = createNode(302 /* JSDocNamepathType */, moduleSpecifier.pos); + var pos = getNodePos(); + if (parseOptional(138 /* ModuleKeyword */)) { + // TODO(rbuckton): We never set the type for a JSDocNamepathType. What should we put here? + var moduleTag = factory.createJSDocNamepathType(/*type*/ undefined); terminate: while (true) { switch (token()) { case 19 /* CloseBraceToken */: @@ -21250,37 +29451,37 @@ var ts; } } scanner.setInJSDocType(false); - return finishNode(moduleTag); + return finishNode(moduleTag, pos); } - var dotdotdot = parseOptionalToken(25 /* DotDotDotToken */); + var hasDotDotDot = parseOptional(25 /* DotDotDotToken */); var type = parseTypeOrTypePredicate(); scanner.setInJSDocType(false); - if (dotdotdot) { - var variadic = createNode(301 /* JSDocVariadicType */, dotdotdot.pos); - variadic.type = type; - type = finishNode(variadic); + if (hasDotDotDot) { + type = finishNode(factory.createJSDocVariadicType(type), pos); } if (token() === 62 /* EqualsToken */) { - return createPostfixType(299 /* JSDocOptionalType */, type); + nextToken(); + return finishNode(factory.createJSDocOptionalType(type), pos); } return type; } function parseTypeQuery() { - var node = createNode(172 /* TypeQuery */); - parseExpected(108 /* TypeOfKeyword */); - node.exprName = parseEntityName(/*allowReservedWords*/ true); - return finishNode(node); + var pos = getNodePos(); + parseExpected(111 /* TypeOfKeyword */); + return finishNode(factory.createTypeQueryNode(parseEntityName(/*allowReservedWords*/ true)), pos); } function parseTypeParameter() { - var node = createNode(155 /* TypeParameter */); - node.name = parseIdentifier(); - if (parseOptional(90 /* ExtendsKeyword */)) { + var pos = getNodePos(); + var name = parseIdentifier(); + var constraint; + var expression; + if (parseOptional(93 /* ExtendsKeyword */)) { // It's not uncommon for people to write improper constraints to a generic. If the // user writes a constraint that is an expression and not an actual type, then parse // it out as an expression (so we can recover well), but report that a type is needed // instead. if (isStartOfType() || !isStartOfExpression()) { - node.constraint = parseType(); + constraint = parseType(); } else { // It was not a type, and it looked like an expression. Parse out an expression @@ -21290,46 +29491,31 @@ var ts; // // // We do *not* want to consume the `>` as we're consuming the expression for "". - node.expression = parseUnaryExpressionOrHigher(); + expression = parseUnaryExpressionOrHigher(); } } - if (parseOptional(62 /* EqualsToken */)) { - node.default = parseType(); - } - return finishNode(node); + var defaultType = parseOptional(62 /* EqualsToken */) ? parseType() : undefined; + var node = factory.createTypeParameterDeclaration(name, constraint, defaultType); + node.expression = expression; + return finishNode(node, pos); } function parseTypeParameters() { if (token() === 29 /* LessThanToken */) { return parseBracketedList(19 /* TypeParameters */, parseTypeParameter, 29 /* LessThanToken */, 31 /* GreaterThanToken */); } } - function parseParameterType() { - if (parseOptional(58 /* ColonToken */)) { - return parseType(); - } - return undefined; - } function isStartOfParameter(isJSDocParameter) { return token() === 25 /* DotDotDotToken */ || - isIdentifierOrPrivateIdentifierOrPattern() || + isBindingIdentifierOrPrivateIdentifierOrPattern() || ts.isModifierKind(token()) || token() === 59 /* AtToken */ || isStartOfType(/*inStartOfParameter*/ !isJSDocParameter); } - function parseParameter() { - var node = createNodeWithJSDoc(156 /* Parameter */); - if (token() === 104 /* ThisKeyword */) { - node.name = createIdentifier(/*isIdentifier*/ true); - node.type = parseParameterType(); - return finishNode(node); - } - node.decorators = parseDecorators(); - node.modifiers = parseModifiers(); - node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */); + function parseNameOfParameter(modifiers) { // FormalParameter [Yield,Await]: // BindingElement[?Yield,?Await] - node.name = parseIdentifierOrPattern(ts.Diagnostics.Private_identifiers_cannot_be_used_as_parameters); - if (ts.getFullWidth(node.name) === 0 && !node.modifiers && ts.isModifierKind(token())) { + var name = parseIdentifierOrPattern(ts.Diagnostics.Private_identifiers_cannot_be_used_as_parameters); + if (ts.getFullWidth(name) === 0 && !ts.some(modifiers) && ts.isModifierKind(token())) { // in cases like // 'use strict' // function foo(static) @@ -21340,26 +29526,41 @@ var ts; // to avoid this we'll advance cursor to the next token. nextToken(); } - node.questionToken = parseOptionalToken(57 /* QuestionToken */); - node.type = parseParameterType(); - node.initializer = parseInitializer(); - return finishNode(node); + return name; } - /** - * Note: If returnToken is EqualsGreaterThanToken, `signature.type` will always be defined. - * @returns If return type parsing succeeds - */ - function fillSignature(returnToken, flags, signature) { - if (!(flags & 32 /* JSDoc */)) { - signature.typeParameters = parseTypeParameters(); + function parseParameterInOuterAwaitContext() { + return parseParameterWorker(/*inOuterAwaitContext*/ true); + } + function parseParameter() { + return parseParameterWorker(/*inOuterAwaitContext*/ false); + } + function parseParameterWorker(inOuterAwaitContext) { + var pos = getNodePos(); + var hasJSDoc = hasPrecedingJSDocComment(); + if (token() === 107 /* ThisKeyword */) { + var node_1 = factory.createParameterDeclaration( + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*dotDotDotToken*/ undefined, createIdentifier(/*isIdentifier*/ true), + /*questionToken*/ undefined, parseTypeAnnotation(), + /*initializer*/ undefined); + return withJSDoc(finishNode(node_1, pos), hasJSDoc); } - var parametersParsedSuccessfully = parseParameterList(signature, flags); - if (shouldParseReturnType(returnToken, !!(flags & 4 /* Type */))) { - signature.type = parseTypeOrTypePredicate(); - if (typeHasArrowFunctionBlockingParseError(signature.type)) - return false; + // FormalParameter [Yield,Await]: + // BindingElement[?Yield,?Await] + // Decorators are parsed in the outer [Await] context, the rest of the parameter is parsed in the function's [Await] context. + var decorators = inOuterAwaitContext ? doInAwaitContext(parseDecorators) : parseDecorators(); + var savedTopLevel = topLevel; + topLevel = false; + var modifiers = parseModifiers(); + var node = withJSDoc(finishNode(factory.createParameterDeclaration(decorators, modifiers, parseOptionalToken(25 /* DotDotDotToken */), parseNameOfParameter(modifiers), parseOptionalToken(57 /* QuestionToken */), parseTypeAnnotation(), parseInitializer()), pos), hasJSDoc); + topLevel = savedTopLevel; + return node; + } + function parseReturnType(returnToken, isType) { + if (shouldParseReturnType(returnToken, isType)) { + return parseTypeOrTypePredicate(); } - return parametersParsedSuccessfully; } function shouldParseReturnType(returnToken, isType) { if (returnToken === 38 /* EqualsGreaterThanToken */) { @@ -21377,8 +29578,32 @@ var ts; } return false; } - // Returns true on success. - function parseParameterList(signature, flags) { + function parseParametersWorker(flags) { + // FormalParameters [Yield,Await]: (modified) + // [empty] + // FormalParameterList[?Yield,Await] + // + // FormalParameter[Yield,Await]: (modified) + // BindingElement[?Yield,Await] + // + // BindingElement [Yield,Await]: (modified) + // SingleNameBinding[?Yield,?Await] + // BindingPattern[?Yield,?Await]Initializer [In, ?Yield,?Await] opt + // + // SingleNameBinding [Yield,Await]: + // BindingIdentifier[?Yield,?Await]Initializer [In, ?Yield,?Await] opt + var savedYieldContext = inYieldContext(); + var savedAwaitContext = inAwaitContext(); + setYieldContext(!!(flags & 1 /* Yield */)); + setAwaitContext(!!(flags & 2 /* Await */)); + var parameters = flags & 32 /* JSDoc */ ? + parseDelimitedList(17 /* JSDocParameters */, parseJSDocParameter) : + parseDelimitedList(16 /* Parameters */, savedAwaitContext ? parseParameterInOuterAwaitContext : parseParameter); + setYieldContext(savedYieldContext); + setAwaitContext(savedAwaitContext); + return parameters; + } + function parseParameters(flags) { // FormalParameters [Yield,Await]: (modified) // [empty] // FormalParameterList[?Yield,Await] @@ -21393,19 +29618,11 @@ var ts; // SingleNameBinding [Yield,Await]: // BindingIdentifier[?Yield,?Await]Initializer [In, ?Yield,?Await] opt if (!parseExpected(20 /* OpenParenToken */)) { - signature.parameters = createMissingList(); - return false; + return createMissingList(); } - var savedYieldContext = inYieldContext(); - var savedAwaitContext = inAwaitContext(); - setYieldContext(!!(flags & 1 /* Yield */)); - setAwaitContext(!!(flags & 2 /* Await */)); - signature.parameters = flags & 32 /* JSDoc */ ? - parseDelimitedList(17 /* JSDocParameters */, parseJSDocParameter) : - parseDelimitedList(16 /* Parameters */, parseParameter); - setYieldContext(savedYieldContext); - setAwaitContext(savedAwaitContext); - return parseExpected(21 /* CloseParenToken */); + var parameters = parseParametersWorker(flags); + parseExpected(21 /* CloseParenToken */); + return parameters; } function parseTypeMemberSemicolon() { // We allow type members to be separated by commas or (possibly ASI) semicolons. @@ -21417,13 +29634,19 @@ var ts; parseSemicolon(); } function parseSignatureMember(kind) { - var node = createNodeWithJSDoc(kind); - if (kind === 166 /* ConstructSignature */) { - parseExpected(99 /* NewKeyword */); + var pos = getNodePos(); + var hasJSDoc = hasPrecedingJSDocComment(); + if (kind === 169 /* ConstructSignature */) { + parseExpected(102 /* NewKeyword */); } - fillSignature(58 /* ColonToken */, 4 /* Type */, node); + var typeParameters = parseTypeParameters(); + var parameters = parseParameters(4 /* Type */); + var type = parseReturnType(58 /* ColonToken */, /*isType*/ true); parseTypeMemberSemicolon(); - return finishNode(node); + var node = kind === 168 /* CallSignature */ + ? factory.createCallSignature(typeParameters, parameters, type) + : factory.createConstructSignature(typeParameters, parameters, type); + return withJSDoc(finishNode(node, pos), hasJSDoc); } function isIndexSignature() { return token() === 22 /* OpenBracketToken */ && lookAhead(isUnambiguouslyIndexSignature); @@ -21478,34 +29701,36 @@ var ts; nextToken(); return token() === 58 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 23 /* CloseBracketToken */; } - function parseIndexSignatureDeclaration(node) { - node.kind = 167 /* IndexSignature */; - node.parameters = parseBracketedList(16 /* Parameters */, parseParameter, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */); - node.type = parseTypeAnnotation(); + function parseIndexSignatureDeclaration(pos, hasJSDoc, decorators, modifiers) { + var parameters = parseBracketedList(16 /* Parameters */, parseParameter, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */); + var type = parseTypeAnnotation(); parseTypeMemberSemicolon(); - return finishNode(node); + var node = factory.createIndexSignature(decorators, modifiers, parameters, type); + return withJSDoc(finishNode(node, pos), hasJSDoc); } - function parsePropertyOrMethodSignature(node) { - node.name = parsePropertyName(); - node.questionToken = parseOptionalToken(57 /* QuestionToken */); + function parsePropertyOrMethodSignature(pos, hasJSDoc, modifiers) { + var name = parsePropertyName(); + var questionToken = parseOptionalToken(57 /* QuestionToken */); + var node; if (token() === 20 /* OpenParenToken */ || token() === 29 /* LessThanToken */) { - node.kind = 160 /* MethodSignature */; // Method signatures don't exist in expression contexts. So they have neither // [Yield] nor [Await] - fillSignature(58 /* ColonToken */, 4 /* Type */, node); + var typeParameters = parseTypeParameters(); + var parameters = parseParameters(4 /* Type */); + var type = parseReturnType(58 /* ColonToken */, /*isType*/ true); + node = factory.createMethodSignature(modifiers, name, questionToken, typeParameters, parameters, type); } else { - node.kind = 158 /* PropertySignature */; - node.type = parseTypeAnnotation(); - if (token() === 62 /* EqualsToken */) { - // Although type literal properties cannot not have initializers, we attempt - // to parse an initializer so we can report in the checker that an interface - // property or type literal property cannot have an initializer. + var type = parseTypeAnnotation(); + node = factory.createPropertySignature(modifiers, name, questionToken, type); + // Although type literal properties cannot not have initializers, we attempt + // to parse an initializer so we can report in the checker that an interface + // property or type literal property cannot have an initializer. + if (token() === 62 /* EqualsToken */) node.initializer = parseInitializer(); - } } parseTypeMemberSemicolon(); - return finishNode(node); + return withJSDoc(finishNode(node, pos), hasJSDoc); } function isTypeMemberStart() { // Return true if we have the start of a signature member @@ -21541,17 +29766,18 @@ var ts; } function parseTypeMember() { if (token() === 20 /* OpenParenToken */ || token() === 29 /* LessThanToken */) { - return parseSignatureMember(165 /* CallSignature */); + return parseSignatureMember(168 /* CallSignature */); } - if (token() === 99 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) { - return parseSignatureMember(166 /* ConstructSignature */); + if (token() === 102 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) { + return parseSignatureMember(169 /* ConstructSignature */); } - var node = createNodeWithJSDoc(0 /* Unknown */); - node.modifiers = parseModifiers(); + var pos = getNodePos(); + var hasJSDoc = hasPrecedingJSDocComment(); + var modifiers = parseModifiers(); if (isIndexSignature()) { - return parseIndexSignatureDeclaration(node); + return parseIndexSignatureDeclaration(pos, hasJSDoc, /*decorators*/ undefined, modifiers); } - return parsePropertyOrMethodSignature(node); + return parsePropertyOrMethodSignature(pos, hasJSDoc, modifiers); } function nextTokenIsOpenParenOrLessThan() { nextToken(); @@ -21570,9 +29796,8 @@ var ts; return false; } function parseTypeLiteral() { - var node = createNode(173 /* TypeLiteral */); - node.members = parseObjectTypeMembers(); - return finishNode(node); + var pos = getNodePos(); + return finishNode(factory.createTypeLiteralNode(parseObjectTypeMembers()), pos); } function parseObjectTypeMembers() { var members; @@ -21588,119 +29813,137 @@ var ts; function isStartOfMappedType() { nextToken(); if (token() === 39 /* PlusToken */ || token() === 40 /* MinusToken */) { - return nextToken() === 138 /* ReadonlyKeyword */; + return nextToken() === 141 /* ReadonlyKeyword */; } - if (token() === 138 /* ReadonlyKeyword */) { + if (token() === 141 /* ReadonlyKeyword */) { nextToken(); } - return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 97 /* InKeyword */; + return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 100 /* InKeyword */; } function parseMappedTypeParameter() { - var node = createNode(155 /* TypeParameter */); - node.name = parseIdentifier(); - parseExpected(97 /* InKeyword */); - node.constraint = parseType(); - return finishNode(node); + var pos = getNodePos(); + var name = parseIdentifierName(); + parseExpected(100 /* InKeyword */); + var type = parseType(); + return finishNode(factory.createTypeParameterDeclaration(name, type, /*defaultType*/ undefined), pos); } function parseMappedType() { - var node = createNode(186 /* MappedType */); + var pos = getNodePos(); parseExpected(18 /* OpenBraceToken */); - if (token() === 138 /* ReadonlyKeyword */ || token() === 39 /* PlusToken */ || token() === 40 /* MinusToken */) { - node.readonlyToken = parseTokenNode(); - if (node.readonlyToken.kind !== 138 /* ReadonlyKeyword */) { - parseExpectedToken(138 /* ReadonlyKeyword */); + var readonlyToken; + if (token() === 141 /* ReadonlyKeyword */ || token() === 39 /* PlusToken */ || token() === 40 /* MinusToken */) { + readonlyToken = parseTokenNode(); + if (readonlyToken.kind !== 141 /* ReadonlyKeyword */) { + parseExpected(141 /* ReadonlyKeyword */); } } parseExpected(22 /* OpenBracketToken */); - node.typeParameter = parseMappedTypeParameter(); + var typeParameter = parseMappedTypeParameter(); parseExpected(23 /* CloseBracketToken */); + var questionToken; if (token() === 57 /* QuestionToken */ || token() === 39 /* PlusToken */ || token() === 40 /* MinusToken */) { - node.questionToken = parseTokenNode(); - if (node.questionToken.kind !== 57 /* QuestionToken */) { - parseExpectedToken(57 /* QuestionToken */); + questionToken = parseTokenNode(); + if (questionToken.kind !== 57 /* QuestionToken */) { + parseExpected(57 /* QuestionToken */); } } - node.type = parseTypeAnnotation(); + var type = parseTypeAnnotation(); parseSemicolon(); parseExpected(19 /* CloseBraceToken */); - return finishNode(node); + return finishNode(factory.createMappedTypeNode(readonlyToken, typeParameter, questionToken, type), pos); } function parseTupleElementType() { var pos = getNodePos(); if (parseOptional(25 /* DotDotDotToken */)) { - var node = createNode(177 /* RestType */, pos); - node.type = parseType(); - return finishNode(node); + return finishNode(factory.createRestTypeNode(parseType()), pos); } var type = parseType(); - if (!(contextFlags & 4194304 /* JSDoc */) && type.kind === 297 /* JSDocNullableType */ && type.pos === type.type.pos) { - type.kind = 176 /* OptionalType */; + if (ts.isJSDocNullableType(type) && type.pos === type.type.pos) { + var node = factory.createOptionalTypeNode(type.type); + ts.setTextRange(node, type); + node.flags = type.flags; + return node; } return type; } + function isNextTokenColonOrQuestionColon() { + return nextToken() === 58 /* ColonToken */ || (token() === 57 /* QuestionToken */ && nextToken() === 58 /* ColonToken */); + } + function isTupleElementName() { + if (token() === 25 /* DotDotDotToken */) { + return ts.tokenIsIdentifierOrKeyword(nextToken()) && isNextTokenColonOrQuestionColon(); + } + return ts.tokenIsIdentifierOrKeyword(token()) && isNextTokenColonOrQuestionColon(); + } + function parseTupleElementNameOrTupleElementType() { + if (lookAhead(isTupleElementName)) { + var pos = getNodePos(); + var hasJSDoc = hasPrecedingJSDocComment(); + var dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */); + var name = parseIdentifierName(); + var questionToken = parseOptionalToken(57 /* QuestionToken */); + parseExpected(58 /* ColonToken */); + var type = parseTupleElementType(); + var node = factory.createNamedTupleMember(dotDotDotToken, name, questionToken, type); + return withJSDoc(finishNode(node, pos), hasJSDoc); + } + return parseTupleElementType(); + } function parseTupleType() { - var node = createNode(175 /* TupleType */); - node.elementTypes = parseBracketedList(21 /* TupleElementTypes */, parseTupleElementType, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */); - return finishNode(node); + var pos = getNodePos(); + return finishNode(factory.createTupleTypeNode(parseBracketedList(21 /* TupleElementTypes */, parseTupleElementNameOrTupleElementType, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */)), pos); } function parseParenthesizedType() { - var node = createNode(182 /* ParenthesizedType */); + var pos = getNodePos(); parseExpected(20 /* OpenParenToken */); - node.type = parseType(); + var type = parseType(); parseExpected(21 /* CloseParenToken */); - return finishNode(node); + return finishNode(factory.createParenthesizedType(type), pos); } function parseFunctionOrConstructorType() { var pos = getNodePos(); - var kind = parseOptional(99 /* NewKeyword */) ? 171 /* ConstructorType */ : 170 /* FunctionType */; - var node = createNodeWithJSDoc(kind, pos); - fillSignature(38 /* EqualsGreaterThanToken */, 4 /* Type */, node); - return finishNode(node); + var hasJSDoc = hasPrecedingJSDocComment(); + var isConstructorType = parseOptional(102 /* NewKeyword */); + var typeParameters = parseTypeParameters(); + var parameters = parseParameters(4 /* Type */); + var type = parseReturnType(38 /* EqualsGreaterThanToken */, /*isType*/ false); + var node = isConstructorType + ? factory.createConstructorTypeNode(typeParameters, parameters, type) + : factory.createFunctionTypeNode(typeParameters, parameters, type); + return withJSDoc(finishNode(node, pos), hasJSDoc); } function parseKeywordAndNoDot() { var node = parseTokenNode(); return token() === 24 /* DotToken */ ? undefined : node; } function parseLiteralTypeNode(negative) { - var node = createNode(187 /* LiteralType */); - var unaryMinusExpression; + var pos = getNodePos(); if (negative) { - unaryMinusExpression = createNode(207 /* PrefixUnaryExpression */); - unaryMinusExpression.operator = 40 /* MinusToken */; nextToken(); } - var expression = token() === 106 /* TrueKeyword */ || token() === 91 /* FalseKeyword */ - ? parseTokenNode() - : parseLiteralLikeNode(token()); + var expression = token() === 109 /* TrueKeyword */ || token() === 94 /* FalseKeyword */ || token() === 103 /* NullKeyword */ ? + parseTokenNode() : + parseLiteralLikeNode(token()); if (negative) { - unaryMinusExpression.operand = expression; - finishNode(unaryMinusExpression); - expression = unaryMinusExpression; + expression = finishNode(factory.createPrefixUnaryExpression(40 /* MinusToken */, expression), pos); } - node.literal = expression; - return finishNode(node); + return finishNode(factory.createLiteralTypeNode(expression), pos); } function isStartOfTypeOfImportType() { nextToken(); - return token() === 96 /* ImportKeyword */; + return token() === 99 /* ImportKeyword */; } function parseImportType() { - sourceFile.flags |= 1048576 /* PossiblyContainsDynamicImport */; - var node = createNode(188 /* ImportType */); - if (parseOptional(108 /* TypeOfKeyword */)) { - node.isTypeOf = true; - } - parseExpected(96 /* ImportKeyword */); + sourceFlags |= 1048576 /* PossiblyContainsDynamicImport */; + var pos = getNodePos(); + var isTypeOf = parseOptional(111 /* TypeOfKeyword */); + parseExpected(99 /* ImportKeyword */); parseExpected(20 /* OpenParenToken */); - node.argument = parseType(); + var type = parseType(); parseExpected(21 /* CloseParenToken */); - if (parseOptional(24 /* DotToken */)) { - node.qualifier = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected); - } - if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 29 /* LessThanToken */) { - node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 29 /* LessThanToken */, 31 /* GreaterThanToken */); - } - return finishNode(node); + var qualifier = parseOptional(24 /* DotToken */) ? parseEntityNameOfTypeReference() : undefined; + var typeArguments = parseTypeArgumentsOfTypeReference(); + return finishNode(factory.createImportTypeNode(type, qualifier, typeArguments, isTypeOf), pos); } function nextTokenIsNumericOrBigIntLiteral() { nextToken(); @@ -21708,29 +29951,31 @@ var ts; } function parseNonArrayType() { switch (token()) { - case 125 /* AnyKeyword */: - case 148 /* UnknownKeyword */: - case 143 /* StringKeyword */: - case 140 /* NumberKeyword */: - case 151 /* BigIntKeyword */: - case 144 /* SymbolKeyword */: - case 128 /* BooleanKeyword */: - case 146 /* UndefinedKeyword */: - case 137 /* NeverKeyword */: - case 141 /* ObjectKeyword */: + case 128 /* AnyKeyword */: + case 151 /* UnknownKeyword */: + case 146 /* StringKeyword */: + case 143 /* NumberKeyword */: + case 154 /* BigIntKeyword */: + case 147 /* SymbolKeyword */: + case 131 /* BooleanKeyword */: + case 149 /* UndefinedKeyword */: + case 140 /* NeverKeyword */: + case 144 /* ObjectKeyword */: // If these are followed by a dot, then parse these out as a dotted type reference instead. return tryParse(parseKeywordAndNoDot) || parseTypeReference(); - case 41 /* AsteriskToken */: - return parseJSDocAllType(/*postfixEquals*/ false); case 65 /* AsteriskEqualsToken */: - return parseJSDocAllType(/*postfixEquals*/ true); + // If there is '*=', treat it as * followed by postfix = + scanner.reScanAsteriskEqualsToken(); + // falls through + case 41 /* AsteriskToken */: + return parseJSDocAllType(); case 60 /* QuestionQuestionToken */: - // If there is '??', consider that is prefix '?' in JSDoc type. + // If there is '??', treat it as prefix-'?' in JSDoc type. scanner.reScanQuestionToken(); // falls through case 57 /* QuestionToken */: return parseJSDocUnknownOrNullableType(); - case 94 /* FunctionKeyword */: + case 97 /* FunctionKeyword */: return parseJSDocFunctionType(); case 53 /* ExclamationToken */: return parseJSDocNonNullableType(); @@ -21738,24 +29983,24 @@ var ts; case 10 /* StringLiteral */: case 8 /* NumericLiteral */: case 9 /* BigIntLiteral */: - case 106 /* TrueKeyword */: - case 91 /* FalseKeyword */: + case 109 /* TrueKeyword */: + case 94 /* FalseKeyword */: + case 103 /* NullKeyword */: return parseLiteralTypeNode(); case 40 /* MinusToken */: return lookAhead(nextTokenIsNumericOrBigIntLiteral) ? parseLiteralTypeNode(/*negative*/ true) : parseTypeReference(); - case 110 /* VoidKeyword */: - case 100 /* NullKeyword */: + case 113 /* VoidKeyword */: return parseTokenNode(); - case 104 /* ThisKeyword */: { + case 107 /* ThisKeyword */: { var thisKeyword = parseThisTypeNode(); - if (token() === 133 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) { + if (token() === 136 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) { return parseThisTypePredicate(thisKeyword); } else { return thisKeyword; } } - case 108 /* TypeOfKeyword */: + case 111 /* TypeOfKeyword */: return lookAhead(isStartOfTypeOfImportType) ? parseImportType() : parseTypeQuery(); case 18 /* OpenBraceToken */: return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral(); @@ -21763,9 +30008,9 @@ var ts; return parseTupleType(); case 20 /* OpenParenToken */: return parseParenthesizedType(); - case 96 /* ImportKeyword */: + case 99 /* ImportKeyword */: return parseImportType(); - case 124 /* AssertsKeyword */: + case 127 /* AssertsKeyword */: return lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine) ? parseAssertsTypePredicate() : parseTypeReference(); default: return parseTypeReference(); @@ -21773,42 +30018,42 @@ var ts; } function isStartOfType(inStartOfParameter) { switch (token()) { - case 125 /* AnyKeyword */: - case 148 /* UnknownKeyword */: - case 143 /* StringKeyword */: - case 140 /* NumberKeyword */: - case 151 /* BigIntKeyword */: - case 128 /* BooleanKeyword */: - case 138 /* ReadonlyKeyword */: - case 144 /* SymbolKeyword */: - case 147 /* UniqueKeyword */: - case 110 /* VoidKeyword */: - case 146 /* UndefinedKeyword */: - case 100 /* NullKeyword */: - case 104 /* ThisKeyword */: - case 108 /* TypeOfKeyword */: - case 137 /* NeverKeyword */: + case 128 /* AnyKeyword */: + case 151 /* UnknownKeyword */: + case 146 /* StringKeyword */: + case 143 /* NumberKeyword */: + case 154 /* BigIntKeyword */: + case 131 /* BooleanKeyword */: + case 141 /* ReadonlyKeyword */: + case 147 /* SymbolKeyword */: + case 150 /* UniqueKeyword */: + case 113 /* VoidKeyword */: + case 149 /* UndefinedKeyword */: + case 103 /* NullKeyword */: + case 107 /* ThisKeyword */: + case 111 /* TypeOfKeyword */: + case 140 /* NeverKeyword */: case 18 /* OpenBraceToken */: case 22 /* OpenBracketToken */: case 29 /* LessThanToken */: case 51 /* BarToken */: case 50 /* AmpersandToken */: - case 99 /* NewKeyword */: + case 102 /* NewKeyword */: case 10 /* StringLiteral */: case 8 /* NumericLiteral */: case 9 /* BigIntLiteral */: - case 106 /* TrueKeyword */: - case 91 /* FalseKeyword */: - case 141 /* ObjectKeyword */: + case 109 /* TrueKeyword */: + case 94 /* FalseKeyword */: + case 144 /* ObjectKeyword */: case 41 /* AsteriskToken */: case 57 /* QuestionToken */: case 53 /* ExclamationToken */: case 25 /* DotDotDotToken */: - case 132 /* InferKeyword */: - case 96 /* ImportKeyword */: - case 124 /* AssertsKeyword */: + case 135 /* InferKeyword */: + case 99 /* ImportKeyword */: + case 127 /* AssertsKeyword */: return true; - case 94 /* FunctionKeyword */: + case 97 /* FunctionKeyword */: return !inStartOfParameter; case 40 /* MinusToken */: return !inStartOfParameter && lookAhead(nextTokenIsNumericOrBigIntLiteral); @@ -21825,33 +30070,32 @@ var ts; return token() === 21 /* CloseParenToken */ || isStartOfParameter(/*isJSDocParameter*/ false) || isStartOfType(); } function parsePostfixTypeOrHigher() { + var pos = getNodePos(); var type = parseNonArrayType(); while (!scanner.hasPrecedingLineBreak()) { switch (token()) { case 53 /* ExclamationToken */: - type = createPostfixType(298 /* JSDocNonNullableType */, type); + nextToken(); + type = finishNode(factory.createJSDocNonNullableType(type), pos); break; case 57 /* QuestionToken */: - // If not in JSDoc and next token is start of a type we have a conditional type - if (!(contextFlags & 4194304 /* JSDoc */) && lookAhead(nextTokenIsStartOfType)) { + // If next token is start of a type we have a conditional type + if (lookAhead(nextTokenIsStartOfType)) { return type; } - type = createPostfixType(297 /* JSDocNullableType */, type); + nextToken(); + type = finishNode(factory.createJSDocNullableType(type), pos); break; case 22 /* OpenBracketToken */: parseExpected(22 /* OpenBracketToken */); if (isStartOfType()) { - var node = createNode(185 /* IndexedAccessType */, type.pos); - node.objectType = type; - node.indexType = parseType(); + var indexType = parseType(); parseExpected(23 /* CloseBracketToken */); - type = finishNode(node); + type = finishNode(factory.createIndexedAccessTypeNode(type, indexType), pos); } else { - var node = createNode(174 /* ArrayType */, type.pos); - node.elementType = type; parseExpected(23 /* CloseBracketToken */); - type = finishNode(node); + type = finishNode(factory.createArrayTypeNode(type), pos); } break; default: @@ -21860,72 +30104,92 @@ var ts; } return type; } - function createPostfixType(kind, type) { - nextToken(); - var postfix = createNode(kind, type.pos); - postfix.type = type; - return finishNode(postfix); - } function parseTypeOperator(operator) { - var node = createNode(184 /* TypeOperator */); + var pos = getNodePos(); parseExpected(operator); - node.operator = operator; - node.type = parseTypeOperatorOrHigher(); - return finishNode(node); + return finishNode(factory.createTypeOperatorNode(operator, parseTypeOperatorOrHigher()), pos); + } + function parseTypeParameterOfInferType() { + var pos = getNodePos(); + return finishNode(factory.createTypeParameterDeclaration(parseIdentifier(), + /*constraint*/ undefined, + /*defaultType*/ undefined), pos); } function parseInferType() { - var node = createNode(181 /* InferType */); - parseExpected(132 /* InferKeyword */); - var typeParameter = createNode(155 /* TypeParameter */); - typeParameter.name = parseIdentifier(); - node.typeParameter = finishNode(typeParameter); - return finishNode(node); + var pos = getNodePos(); + parseExpected(135 /* InferKeyword */); + return finishNode(factory.createInferTypeNode(parseTypeParameterOfInferType()), pos); } function parseTypeOperatorOrHigher() { var operator = token(); switch (operator) { - case 134 /* KeyOfKeyword */: - case 147 /* UniqueKeyword */: - case 138 /* ReadonlyKeyword */: + case 137 /* KeyOfKeyword */: + case 150 /* UniqueKeyword */: + case 141 /* ReadonlyKeyword */: return parseTypeOperator(operator); - case 132 /* InferKeyword */: + case 135 /* InferKeyword */: return parseInferType(); } return parsePostfixTypeOrHigher(); } - function parseUnionOrIntersectionType(kind, parseConstituentType, operator) { - var start = scanner.getStartPos(); + function parseFunctionOrConstructorTypeToError(isInUnionType) { + // the function type and constructor type shorthand notation + // are not allowed directly in unions and intersections, but we'll + // try to parse them gracefully and issue a helpful message. + if (isStartOfFunctionTypeOrConstructorType()) { + var type = parseFunctionOrConstructorType(); + var diagnostic = void 0; + if (ts.isFunctionTypeNode(type)) { + diagnostic = isInUnionType + ? ts.Diagnostics.Function_type_notation_must_be_parenthesized_when_used_in_a_union_type + : ts.Diagnostics.Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type; + } + else { + diagnostic = isInUnionType + ? ts.Diagnostics.Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type + : ts.Diagnostics.Constructor_type_notation_must_be_parenthesized_when_used_in_an_intersection_type; + } + parseErrorAtRange(type, diagnostic); + return type; + } + return undefined; + } + function parseUnionOrIntersectionType(operator, parseConstituentType, createTypeNode) { + var pos = getNodePos(); + var isUnionType = operator === 51 /* BarToken */; var hasLeadingOperator = parseOptional(operator); - var type = parseConstituentType(); + var type = hasLeadingOperator && parseFunctionOrConstructorTypeToError(isUnionType) + || parseConstituentType(); if (token() === operator || hasLeadingOperator) { var types = [type]; while (parseOptional(operator)) { - types.push(parseConstituentType()); + types.push(parseFunctionOrConstructorTypeToError(isUnionType) || parseConstituentType()); } - var node = createNode(kind, start); - node.types = createNodeArray(types, start); - type = finishNode(node); + type = finishNode(createTypeNode(createNodeArray(types, pos)), pos); } return type; } function parseIntersectionTypeOrHigher() { - return parseUnionOrIntersectionType(179 /* IntersectionType */, parseTypeOperatorOrHigher, 50 /* AmpersandToken */); + return parseUnionOrIntersectionType(50 /* AmpersandToken */, parseTypeOperatorOrHigher, factory.createIntersectionTypeNode); } function parseUnionTypeOrHigher() { - return parseUnionOrIntersectionType(178 /* UnionType */, parseIntersectionTypeOrHigher, 51 /* BarToken */); + return parseUnionOrIntersectionType(51 /* BarToken */, parseIntersectionTypeOrHigher, factory.createUnionTypeNode); } - function isStartOfFunctionType() { + function isStartOfFunctionTypeOrConstructorType() { if (token() === 29 /* LessThanToken */) { return true; } - return token() === 20 /* OpenParenToken */ && lookAhead(isUnambiguouslyStartOfFunctionType); + if (token() === 20 /* OpenParenToken */ && lookAhead(isUnambiguouslyStartOfFunctionType)) { + return true; + } + return token() === 102 /* NewKeyword */; } function skipParameterStart() { if (ts.isModifierKind(token())) { // Skip modifiers parseModifiers(); } - if (isIdentifier() || token() === 104 /* ThisKeyword */) { + if (isIdentifier() || token() === 107 /* ThisKeyword */) { nextToken(); return true; } @@ -21966,14 +30230,11 @@ var ts; return false; } function parseTypeOrTypePredicate() { + var pos = getNodePos(); var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix); var type = parseType(); if (typePredicateVariable) { - var node = createNode(168 /* TypePredicate */, typePredicateVariable.pos); - node.assertsModifier = undefined; - node.parameterName = typePredicateVariable; - node.type = type; - return finishNode(node); + return finishNode(factory.createTypePredicateNode(/*assertsModifier*/ undefined, typePredicateVariable, type), pos); } else { return type; @@ -21981,17 +30242,17 @@ var ts; } function parseTypePredicatePrefix() { var id = parseIdentifier(); - if (token() === 133 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) { + if (token() === 136 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) { nextToken(); return id; } } function parseAssertsTypePredicate() { - var node = createNode(168 /* TypePredicate */); - node.assertsModifier = parseExpectedToken(124 /* AssertsKeyword */); - node.parameterName = token() === 104 /* ThisKeyword */ ? parseThisTypeNode() : parseIdentifier(); - node.type = parseOptional(133 /* IsKeyword */) ? parseType() : undefined; - return finishNode(node); + var pos = getNodePos(); + var assertsModifier = parseExpectedToken(127 /* AssertsKeyword */); + var parameterName = token() === 107 /* ThisKeyword */ ? parseThisTypeNode() : parseIdentifier(); + var type = parseOptional(136 /* IsKeyword */) ? parseType() : undefined; + return finishNode(factory.createTypePredicateNode(assertsModifier, parameterName, type), pos); } function parseType() { // The rules about 'yield' only apply to actual code/expression contexts. They don't @@ -21999,20 +30260,19 @@ var ts; return doOutsideOfContext(40960 /* TypeExcludesFlags */, parseTypeWorker); } function parseTypeWorker(noConditionalTypes) { - if (isStartOfFunctionType() || token() === 99 /* NewKeyword */) { + if (isStartOfFunctionTypeOrConstructorType()) { return parseFunctionOrConstructorType(); } + var pos = getNodePos(); var type = parseUnionTypeOrHigher(); - if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(90 /* ExtendsKeyword */)) { - var node = createNode(180 /* ConditionalType */, type.pos); - node.checkType = type; + if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(93 /* ExtendsKeyword */)) { // The type following 'extends' is not permitted to be another conditional type - node.extendsType = parseTypeWorker(/*noConditionalTypes*/ true); + var extendsType = parseTypeWorker(/*noConditionalTypes*/ true); parseExpected(57 /* QuestionToken */); - node.trueType = parseTypeWorker(); + var trueType = parseTypeWorker(); parseExpected(58 /* ColonToken */); - node.falseType = parseTypeWorker(); - return finishNode(node); + var falseType = parseTypeWorker(); + return finishNode(factory.createConditionalTypeNode(type, extendsType, trueType, falseType), pos); } return type; } @@ -22022,11 +30282,11 @@ var ts; // EXPRESSIONS function isStartOfLeftHandSideExpression() { switch (token()) { - case 104 /* ThisKeyword */: - case 102 /* SuperKeyword */: - case 100 /* NullKeyword */: - case 106 /* TrueKeyword */: - case 91 /* FalseKeyword */: + case 107 /* ThisKeyword */: + case 105 /* SuperKeyword */: + case 103 /* NullKeyword */: + case 109 /* TrueKeyword */: + case 94 /* FalseKeyword */: case 8 /* NumericLiteral */: case 9 /* BigIntLiteral */: case 10 /* StringLiteral */: @@ -22035,14 +30295,14 @@ var ts; case 20 /* OpenParenToken */: case 22 /* OpenBracketToken */: case 18 /* OpenBraceToken */: - case 94 /* FunctionKeyword */: - case 80 /* ClassKeyword */: - case 99 /* NewKeyword */: + case 97 /* FunctionKeyword */: + case 83 /* ClassKeyword */: + case 102 /* NewKeyword */: case 43 /* SlashToken */: case 67 /* SlashEqualsToken */: - case 75 /* Identifier */: + case 78 /* Identifier */: return true; - case 96 /* ImportKeyword */: + case 99 /* ImportKeyword */: return lookAhead(nextTokenIsOpenParenOrLessThanOrDot); default: return isIdentifier(); @@ -22057,15 +30317,15 @@ var ts; case 40 /* MinusToken */: case 54 /* TildeToken */: case 53 /* ExclamationToken */: - case 85 /* DeleteKeyword */: - case 108 /* TypeOfKeyword */: - case 110 /* VoidKeyword */: + case 88 /* DeleteKeyword */: + case 111 /* TypeOfKeyword */: + case 113 /* VoidKeyword */: case 45 /* PlusPlusToken */: case 46 /* MinusMinusToken */: case 29 /* LessThanToken */: - case 127 /* AwaitKeyword */: - case 121 /* YieldKeyword */: - case 76 /* PrivateIdentifier */: + case 130 /* AwaitKeyword */: + case 124 /* YieldKeyword */: + case 79 /* PrivateIdentifier */: // Yield/await always starts an expression. Either it is an identifier (in which case // it is definitely an expression). Or it's a keyword (either because we're in // a generator or async function, or in strict mode (or both)) and it started a yield or await expression. @@ -22084,8 +30344,8 @@ var ts; function isStartOfExpressionStatement() { // As per the grammar, none of '{' or 'function' or 'class' can start an expression statement. return token() !== 18 /* OpenBraceToken */ && - token() !== 94 /* FunctionKeyword */ && - token() !== 80 /* ClassKeyword */ && + token() !== 97 /* FunctionKeyword */ && + token() !== 83 /* ClassKeyword */ && token() !== 59 /* AtToken */ && isStartOfExpression(); } @@ -22098,10 +30358,11 @@ var ts; if (saveDecoratorContext) { setDecoratorContext(/*val*/ false); } + var pos = getNodePos(); var expr = parseAssignmentExpressionOrHigher(); var operatorToken; while ((operatorToken = parseOptionalToken(27 /* CommaToken */))) { - expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher()); + expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher(), pos); } if (saveDecoratorContext) { setDecoratorContext(/*val*/ true); @@ -22150,12 +30411,13 @@ var ts; // Otherwise, we try to parse out the conditional expression bit. We want to allow any // binary expression here, so we pass in the 'lowest' precedence here so that it matches // and consumes anything. - var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0); + var pos = getNodePos(); + var expr = parseBinaryExpressionOrHigher(0 /* Lowest */); // To avoid a look-ahead, we did not handle the case of an arrow function with a single un-parenthesized // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single // identifier and the current token is an arrow. - if (expr.kind === 75 /* Identifier */ && token() === 38 /* EqualsGreaterThanToken */) { - return parseSimpleArrowFunctionExpression(expr); + if (expr.kind === 78 /* Identifier */ && token() === 38 /* EqualsGreaterThanToken */) { + return parseSimpleArrowFunctionExpression(pos, expr, /*asyncModifier*/ undefined); } // Now see if we might be in cases '2' or '3'. // If the expression was a LHS expression, and we have an assignment operator, then @@ -22164,13 +30426,13 @@ var ts; // Note: we call reScanGreaterToken so that we get an appropriately merged token // for cases like `> > =` becoming `>>=` if (ts.isLeftHandSideExpression(expr) && ts.isAssignmentOperator(reScanGreaterToken())) { - return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher()); + return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher(), pos); } // It wasn't an assignment or a lambda. This is a conditional expression: - return parseConditionalExpressionRest(expr); + return parseConditionalExpressionRest(expr, pos); } function isYieldExpression() { - if (token() === 121 /* YieldKeyword */) { + if (token() === 124 /* YieldKeyword */) { // If we have a 'yield' keyword, and this is a context where yield expressions are // allowed, then definitely parse out a yield expression. if (inYieldContext()) { @@ -22199,7 +30461,7 @@ var ts; return !scanner.hasPrecedingLineBreak() && isIdentifier(); } function parseYieldExpression() { - var node = createNode(212 /* YieldExpression */); + var pos = getNodePos(); // YieldExpression[In] : // yield // yield [no LineTerminator here] [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield] @@ -22207,33 +30469,29 @@ var ts; nextToken(); if (!scanner.hasPrecedingLineBreak() && (token() === 41 /* AsteriskToken */ || isStartOfExpression())) { - node.asteriskToken = parseOptionalToken(41 /* AsteriskToken */); - node.expression = parseAssignmentExpressionOrHigher(); - return finishNode(node); + return finishNode(factory.createYieldExpression(parseOptionalToken(41 /* AsteriskToken */), parseAssignmentExpressionOrHigher()), pos); } else { // if the next token is not on the same line as yield. or we don't have an '*' or // the start of an expression, then this is just a simple "yield" expression. - return finishNode(node); + return finishNode(factory.createYieldExpression(/*asteriskToken*/ undefined, /*expression*/ undefined), pos); } } - function parseSimpleArrowFunctionExpression(identifier, asyncModifier) { + function parseSimpleArrowFunctionExpression(pos, identifier, asyncModifier) { ts.Debug.assert(token() === 38 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>"); - var node; - if (asyncModifier) { - node = createNode(202 /* ArrowFunction */, asyncModifier.pos); - node.modifiers = asyncModifier; - } - else { - node = createNode(202 /* ArrowFunction */, identifier.pos); - } - var parameter = createNode(156 /* Parameter */, identifier.pos); - parameter.name = identifier; - finishNode(parameter); - node.parameters = createNodeArray([parameter], parameter.pos, parameter.end); - node.equalsGreaterThanToken = parseExpectedToken(38 /* EqualsGreaterThanToken */); - node.body = parseArrowFunctionExpressionBody(/*isAsync*/ !!asyncModifier); - return addJSDocComment(finishNode(node)); + var parameter = factory.createParameterDeclaration( + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*dotDotDotToken*/ undefined, identifier, + /*questionToken*/ undefined, + /*type*/ undefined, + /*initializer*/ undefined); + finishNode(parameter, identifier.pos); + var parameters = createNodeArray([parameter], parameter.pos, parameter.end); + var equalsGreaterThanToken = parseExpectedToken(38 /* EqualsGreaterThanToken */); + var body = parseArrowFunctionExpressionBody(/*isAsync*/ !!asyncModifier); + var node = factory.createArrowFunction(asyncModifier, /*typeParameters*/ undefined, parameters, /*type*/ undefined, equalsGreaterThanToken, body); + return addJSDocComment(finishNode(node, pos)); } function tryParseParenthesizedArrowFunctionExpression() { var triState = isParenthesizedArrowFunctionExpression(); @@ -22245,29 +30503,16 @@ var ts; // following => or { token. Otherwise, we *might* have an arrow function. Try to parse // it out, but don't allow any ambiguity, and return 'undefined' if this could be an // expression instead. - var arrowFunction = triState === 1 /* True */ - ? parseParenthesizedArrowFunctionExpressionHead(/*allowAmbiguity*/ true) - : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead); - if (!arrowFunction) { - // Didn't appear to actually be a parenthesized arrow function. Just bail out. - return undefined; - } - var isAsync = hasModifierOfKind(arrowFunction, 126 /* AsyncKeyword */); - // If we have an arrow, then try to parse the body. Even if not, try to parse if we - // have an opening brace, just in case we're in an error state. - var lastToken = token(); - arrowFunction.equalsGreaterThanToken = parseExpectedToken(38 /* EqualsGreaterThanToken */); - arrowFunction.body = (lastToken === 38 /* EqualsGreaterThanToken */ || lastToken === 18 /* OpenBraceToken */) - ? parseArrowFunctionExpressionBody(isAsync) - : parseIdentifier(); - return finishNode(arrowFunction); + return triState === 1 /* True */ ? + parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ true) : + tryParse(parsePossibleParenthesizedArrowFunctionExpression); } // True -> We definitely expect a parenthesized arrow function here. // False -> There *cannot* be a parenthesized arrow function here. // Unknown -> There *might* be a parenthesized arrow function here. // Speculatively look ahead to be sure, and rollback if not. function isParenthesizedArrowFunctionExpression() { - if (token() === 20 /* OpenParenToken */ || token() === 29 /* LessThanToken */ || token() === 126 /* AsyncKeyword */) { + if (token() === 20 /* OpenParenToken */ || token() === 29 /* LessThanToken */ || token() === 129 /* AsyncKeyword */) { return lookAhead(isParenthesizedArrowFunctionExpressionWorker); } if (token() === 38 /* EqualsGreaterThanToken */) { @@ -22280,7 +30525,7 @@ var ts; return 0 /* False */; } function isParenthesizedArrowFunctionExpressionWorker() { - if (token() === 126 /* AsyncKeyword */) { + if (token() === 129 /* AsyncKeyword */) { nextToken(); if (scanner.hasPrecedingLineBreak()) { return 0 /* False */; @@ -22324,13 +30569,13 @@ var ts; // Check for "(xxx yyy", where xxx is a modifier and yyy is an identifier. This // isn't actually allowed, but we want to treat it as a lambda so we can provide // a good error message. - if (ts.isModifierKind(second) && second !== 126 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) { + if (ts.isModifierKind(second) && second !== 129 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) { return 1 /* True */; } // If we had "(" followed by something that's not an identifier, // then this definitely doesn't look like a lambda. "this" is not // valid, but we want to parse it and then give a semantic error. - if (!isIdentifier() && second !== 104 /* ThisKeyword */) { + if (!isIdentifier() && second !== 107 /* ThisKeyword */) { return 0 /* False */; } switch (nextToken()) { @@ -22363,10 +30608,10 @@ var ts; return 0 /* False */; } // JSX overrides - if (sourceFile.languageVariant === 1 /* JSX */) { + if (languageVariant === 1 /* JSX */) { var isArrowFunctionInJsx = lookAhead(function () { var third = nextToken(); - if (third === 90 /* ExtendsKeyword */) { + if (third === 93 /* ExtendsKeyword */) { var fourth = nextToken(); switch (fourth) { case 62 /* EqualsToken */: @@ -22390,24 +30635,25 @@ var ts; return 2 /* Unknown */; } } - function parsePossibleParenthesizedArrowFunctionExpressionHead() { + function parsePossibleParenthesizedArrowFunctionExpression() { var tokenPos = scanner.getTokenPos(); - if (notParenthesizedArrow && notParenthesizedArrow.has(tokenPos.toString())) { + if (notParenthesizedArrow === null || notParenthesizedArrow === void 0 ? void 0 : notParenthesizedArrow.has(tokenPos)) { return undefined; } - var result = parseParenthesizedArrowFunctionExpressionHead(/*allowAmbiguity*/ false); + var result = parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ false); if (!result) { - (notParenthesizedArrow || (notParenthesizedArrow = ts.createMap())).set(tokenPos.toString(), true); + (notParenthesizedArrow || (notParenthesizedArrow = new ts.Set())).add(tokenPos); } return result; } function tryParseAsyncSimpleArrowFunctionExpression() { // We do a check here so that we won't be doing unnecessarily call to "lookAhead" - if (token() === 126 /* AsyncKeyword */) { + if (token() === 129 /* AsyncKeyword */) { if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) { + var pos = getNodePos(); var asyncModifier = parseModifiersForArrowFunction(); - var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0); - return parseSimpleArrowFunctionExpression(expr, asyncModifier); + var expr = parseBinaryExpressionOrHigher(0 /* Lowest */); + return parseSimpleArrowFunctionExpression(pos, expr, asyncModifier); } } return undefined; @@ -22416,7 +30662,7 @@ var ts; // AsyncArrowFunctionExpression: // 1) async[no LineTerminator here]AsyncArrowBindingIdentifier[?Yield][no LineTerminator here]=>AsyncConciseBody[?In] // 2) CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await][no LineTerminator here]=>AsyncConciseBody[?In] - if (token() === 126 /* AsyncKeyword */) { + if (token() === 129 /* AsyncKeyword */) { nextToken(); // If the "async" is followed by "=>" token then it is not a beginning of an async arrow-function // but instead a simple arrow-function which will be parsed inside "parseAssignmentExpressionOrHigher" @@ -22424,17 +30670,18 @@ var ts; return 0 /* False */; } // Check for un-parenthesized AsyncArrowFunction - var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0); - if (!scanner.hasPrecedingLineBreak() && expr.kind === 75 /* Identifier */ && token() === 38 /* EqualsGreaterThanToken */) { + var expr = parseBinaryExpressionOrHigher(0 /* Lowest */); + if (!scanner.hasPrecedingLineBreak() && expr.kind === 78 /* Identifier */ && token() === 38 /* EqualsGreaterThanToken */) { return 1 /* True */; } } return 0 /* False */; } - function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) { - var node = createNodeWithJSDoc(202 /* ArrowFunction */); - node.modifiers = parseModifiersForArrowFunction(); - var isAsync = hasModifierOfKind(node, 126 /* AsyncKeyword */) ? 2 /* Await */ : 0 /* None */; + function parseParenthesizedArrowFunctionExpression(allowAmbiguity) { + var pos = getNodePos(); + var hasJSDoc = hasPrecedingJSDocComment(); + var modifiers = parseModifiersForArrowFunction(); + var isAsync = ts.some(modifiers, ts.isAsyncModifier) ? 2 /* Await */ : 0 /* None */; // Arrow functions are never generators. // // If we're speculatively parsing a signature for a parenthesized arrow function, then @@ -22442,7 +30689,22 @@ var ts; // a => (b => c) // And think that "(b =>" was actually a parenthesized arrow function with a missing // close paren. - if (!fillSignature(58 /* ColonToken */, isAsync, node) && !allowAmbiguity) { + var typeParameters = parseTypeParameters(); + var parameters; + if (!parseExpected(20 /* OpenParenToken */)) { + if (!allowAmbiguity) { + return undefined; + } + parameters = createMissingList(); + } + else { + parameters = parseParametersWorker(isAsync); + if (!parseExpected(21 /* CloseParenToken */) && !allowAmbiguity) { + return undefined; + } + } + var type = parseReturnType(58 /* ColonToken */, /*isType*/ false); + if (type && !allowAmbiguity && typeHasArrowFunctionBlockingParseError(type)) { return undefined; } // Parsing a signature isn't enough. @@ -22454,20 +30716,28 @@ var ts; // - "a ? (b): function() {}" will too, since function() is a valid JSDoc function type. // // So we need just a bit of lookahead to ensure that it can only be a signature. - var hasJSDocFunctionType = node.type && ts.isJSDocFunctionType(node.type); + var hasJSDocFunctionType = type && ts.isJSDocFunctionType(type); if (!allowAmbiguity && token() !== 38 /* EqualsGreaterThanToken */ && (hasJSDocFunctionType || token() !== 18 /* OpenBraceToken */)) { // Returning undefined here will cause our caller to rewind to where we started from. return undefined; } - return node; + // If we have an arrow, then try to parse the body. Even if not, try to parse if we + // have an opening brace, just in case we're in an error state. + var lastToken = token(); + var equalsGreaterThanToken = parseExpectedToken(38 /* EqualsGreaterThanToken */); + var body = (lastToken === 38 /* EqualsGreaterThanToken */ || lastToken === 18 /* OpenBraceToken */) + ? parseArrowFunctionExpressionBody(ts.some(modifiers, ts.isAsyncModifier)) + : parseIdentifier(); + var node = factory.createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body); + return withJSDoc(finishNode(node, pos), hasJSDoc); } function parseArrowFunctionExpressionBody(isAsync) { if (token() === 18 /* OpenBraceToken */) { return parseFunctionBlock(isAsync ? 2 /* Await */ : 0 /* None */); } if (token() !== 26 /* SemicolonToken */ && - token() !== 94 /* FunctionKeyword */ && - token() !== 80 /* ClassKeyword */ && + token() !== 97 /* FunctionKeyword */ && + token() !== 83 /* ClassKeyword */ && isStartOfStatement() && !isStartOfExpressionStatement()) { // Check if we got a plain statement (i.e. no expression-statements, no function/class expressions/declarations) @@ -22486,11 +30756,15 @@ var ts; // Note: even when 'IgnoreMissingOpenBrace' is passed, parseBody will still error. return parseFunctionBlock(16 /* IgnoreMissingOpenBrace */ | (isAsync ? 2 /* Await */ : 0 /* None */)); } - return isAsync + var savedTopLevel = topLevel; + topLevel = false; + var node = isAsync ? doInAwaitContext(parseAssignmentExpressionOrHigher) : doOutsideOfAwaitContext(parseAssignmentExpressionOrHigher); + topLevel = savedTopLevel; + return node; } - function parseConditionalExpressionRest(leftOperand) { + function parseConditionalExpressionRest(leftOperand, pos) { // Note: we are passed in an expression which was produced from parseBinaryExpressionOrHigher. var questionToken = parseOptionalToken(57 /* QuestionToken */); if (!questionToken) { @@ -22498,24 +30772,20 @@ var ts; } // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and // we do not that for the 'whenFalse' part. - var node = createNode(210 /* ConditionalExpression */, leftOperand.pos); - node.condition = leftOperand; - node.questionToken = questionToken; - node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher); - node.colonToken = parseExpectedToken(58 /* ColonToken */); - node.whenFalse = ts.nodeIsPresent(node.colonToken) + var colonToken; + return finishNode(factory.createConditionalExpression(leftOperand, questionToken, doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher), colonToken = parseExpectedToken(58 /* ColonToken */), ts.nodeIsPresent(colonToken) ? parseAssignmentExpressionOrHigher() - : createMissingNode(75 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(58 /* ColonToken */)); - return finishNode(node); + : createMissingNode(78 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(58 /* ColonToken */))), pos); } function parseBinaryExpressionOrHigher(precedence) { + var pos = getNodePos(); var leftOperand = parseUnaryExpressionOrHigher(); - return parseBinaryExpressionRest(precedence, leftOperand); + return parseBinaryExpressionRest(precedence, leftOperand, pos); } function isInOrOfKeyword(t) { - return t === 97 /* InKeyword */ || t === 152 /* OfKeyword */; + return t === 100 /* InKeyword */ || t === 155 /* OfKeyword */; } - function parseBinaryExpressionRest(precedence, leftOperand) { + function parseBinaryExpressionRest(precedence, leftOperand, pos) { while (true) { // We either have a binary operator here, or we're finished. We call // reScanGreaterToken so that we merge token sequences like > and = into >= @@ -22548,10 +30818,10 @@ var ts; if (!consumeCurrentOperator) { break; } - if (token() === 97 /* InKeyword */ && inDisallowInContext()) { + if (token() === 100 /* InKeyword */ && inDisallowInContext()) { break; } - if (token() === 123 /* AsKeyword */) { + if (token() === 126 /* AsKeyword */) { // Make sure we *do* perform ASI for constructs like this: // var x = foo // as (Bar) @@ -22566,57 +30836,41 @@ var ts; } } else { - leftOperand = makeBinaryExpression(leftOperand, parseTokenNode(), parseBinaryExpressionOrHigher(newPrecedence)); + leftOperand = makeBinaryExpression(leftOperand, parseTokenNode(), parseBinaryExpressionOrHigher(newPrecedence), pos); } } return leftOperand; } function isBinaryOperator() { - if (inDisallowInContext() && token() === 97 /* InKeyword */) { + if (inDisallowInContext() && token() === 100 /* InKeyword */) { return false; } return ts.getBinaryOperatorPrecedence(token()) > 0; } - function makeBinaryExpression(left, operatorToken, right) { - var node = createNode(209 /* BinaryExpression */, left.pos); - node.left = left; - node.operatorToken = operatorToken; - node.right = right; - return finishNode(node); + function makeBinaryExpression(left, operatorToken, right, pos) { + return finishNode(factory.createBinaryExpression(left, operatorToken, right), pos); } function makeAsExpression(left, right) { - var node = createNode(217 /* AsExpression */, left.pos); - node.expression = left; - node.type = right; - return finishNode(node); + return finishNode(factory.createAsExpression(left, right), left.pos); } function parsePrefixUnaryExpression() { - var node = createNode(207 /* PrefixUnaryExpression */); - node.operator = token(); - nextToken(); - node.operand = parseSimpleUnaryExpression(); - return finishNode(node); + var pos = getNodePos(); + return finishNode(factory.createPrefixUnaryExpression(token(), nextTokenAnd(parseSimpleUnaryExpression)), pos); } function parseDeleteExpression() { - var node = createNode(203 /* DeleteExpression */); - nextToken(); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + var pos = getNodePos(); + return finishNode(factory.createDeleteExpression(nextTokenAnd(parseSimpleUnaryExpression)), pos); } function parseTypeOfExpression() { - var node = createNode(204 /* TypeOfExpression */); - nextToken(); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + var pos = getNodePos(); + return finishNode(factory.createTypeOfExpression(nextTokenAnd(parseSimpleUnaryExpression)), pos); } function parseVoidExpression() { - var node = createNode(205 /* VoidExpression */); - nextToken(); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + var pos = getNodePos(); + return finishNode(factory.createVoidExpression(nextTokenAnd(parseSimpleUnaryExpression)), pos); } function isAwaitExpression() { - if (token() === 127 /* AwaitKeyword */) { + if (token() === 130 /* AwaitKeyword */) { if (inAwaitContext()) { return true; } @@ -22626,10 +30880,8 @@ var ts; return false; } function parseAwaitExpression() { - var node = createNode(206 /* AwaitExpression */); - nextToken(); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + var pos = getNodePos(); + return finishNode(factory.createAwaitExpression(nextTokenAnd(parseSimpleUnaryExpression)), pos); } /** * Parse ES7 exponential expression and await expression @@ -22649,9 +30901,10 @@ var ts; * 5) --UnaryExpression[?Yield] */ if (isUpdateExpression()) { + var pos = getNodePos(); var updateExpression = parseUpdateExpression(); return token() === 42 /* AsteriskAsteriskToken */ ? - parseBinaryExpressionRest(ts.getBinaryOperatorPrecedence(token()), updateExpression) : + parseBinaryExpressionRest(ts.getBinaryOperatorPrecedence(token()), updateExpression, pos) : updateExpression; } /** @@ -22670,7 +30923,7 @@ var ts; if (token() === 42 /* AsteriskAsteriskToken */) { var pos = ts.skipTrivia(sourceText, simpleUnaryExpression.pos); var end = simpleUnaryExpression.end; - if (simpleUnaryExpression.kind === 199 /* TypeAssertionExpression */) { + if (simpleUnaryExpression.kind === 203 /* TypeAssertionExpression */) { parseErrorAt(pos, end, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses); } else { @@ -22700,18 +30953,18 @@ var ts; case 54 /* TildeToken */: case 53 /* ExclamationToken */: return parsePrefixUnaryExpression(); - case 85 /* DeleteKeyword */: + case 88 /* DeleteKeyword */: return parseDeleteExpression(); - case 108 /* TypeOfKeyword */: + case 111 /* TypeOfKeyword */: return parseTypeOfExpression(); - case 110 /* VoidKeyword */: + case 113 /* VoidKeyword */: return parseVoidExpression(); case 29 /* LessThanToken */: // This is modified UnaryExpression grammar in TypeScript // UnaryExpression (modified): // < type > UnaryExpression return parseTypeAssertion(); - case 127 /* AwaitKeyword */: + case 130 /* AwaitKeyword */: if (isAwaitExpression()) { return parseAwaitExpression(); } @@ -22738,14 +30991,14 @@ var ts; case 40 /* MinusToken */: case 54 /* TildeToken */: case 53 /* ExclamationToken */: - case 85 /* DeleteKeyword */: - case 108 /* TypeOfKeyword */: - case 110 /* VoidKeyword */: - case 127 /* AwaitKeyword */: + case 88 /* DeleteKeyword */: + case 111 /* TypeOfKeyword */: + case 113 /* VoidKeyword */: + case 130 /* AwaitKeyword */: return false; case 29 /* LessThanToken */: // If we are not in JSX context, we are parsing TypeAssertion which is an UnaryExpression - if (sourceFile.languageVariant !== 1 /* JSX */) { + if (languageVariant !== 1 /* JSX */) { return false; } // We are in JSX context and the token is part of JSXElement. @@ -22767,24 +31020,19 @@ var ts; */ function parseUpdateExpression() { if (token() === 45 /* PlusPlusToken */ || token() === 46 /* MinusMinusToken */) { - var node = createNode(207 /* PrefixUnaryExpression */); - node.operator = token(); - nextToken(); - node.operand = parseLeftHandSideExpressionOrHigher(); - return finishNode(node); + var pos = getNodePos(); + return finishNode(factory.createPrefixUnaryExpression(token(), nextTokenAnd(parseLeftHandSideExpressionOrHigher)), pos); } - else if (sourceFile.languageVariant === 1 /* JSX */ && token() === 29 /* LessThanToken */ && lookAhead(nextTokenIsIdentifierOrKeywordOrGreaterThan)) { + else if (languageVariant === 1 /* JSX */ && token() === 29 /* LessThanToken */ && lookAhead(nextTokenIsIdentifierOrKeywordOrGreaterThan)) { // JSXElement is part of primaryExpression return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true); } var expression = parseLeftHandSideExpressionOrHigher(); ts.Debug.assert(ts.isLeftHandSideExpression(expression)); if ((token() === 45 /* PlusPlusToken */ || token() === 46 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) { - var node = createNode(208 /* PostfixUnaryExpression */, expression.pos); - node.operand = expression; - node.operator = token(); + var operator = token(); nextToken(); - return finishNode(node); + return finishNode(factory.createPostfixUnaryExpression(expression, operator), expression.pos); } return expression; } @@ -22820,39 +31068,36 @@ var ts; // the last two CallExpression productions. 2) We see 'import' which must start import call. // 3)we have a MemberExpression which either completes the LeftHandSideExpression, // or starts the beginning of the first four CallExpression productions. + var pos = getNodePos(); var expression; - if (token() === 96 /* ImportKeyword */) { + if (token() === 99 /* ImportKeyword */) { if (lookAhead(nextTokenIsOpenParenOrLessThan)) { // We don't want to eagerly consume all import keyword as import call expression so we look ahead to find "(" // For example: // var foo3 = require("subfolder // import * as foo1 from "module-from-node // We want this import to be a statement rather than import call expression - sourceFile.flags |= 1048576 /* PossiblyContainsDynamicImport */; + sourceFlags |= 1048576 /* PossiblyContainsDynamicImport */; expression = parseTokenNode(); } else if (lookAhead(nextTokenIsDot)) { // This is an 'import.*' metaproperty (i.e. 'import.meta') - var fullStart = scanner.getStartPos(); nextToken(); // advance past the 'import' nextToken(); // advance past the dot - var node = createNode(219 /* MetaProperty */, fullStart); - node.keywordToken = 96 /* ImportKeyword */; - node.name = parseIdentifierName(); - expression = finishNode(node); - sourceFile.flags |= 2097152 /* PossiblyContainsImportMeta */; + expression = finishNode(factory.createMetaProperty(99 /* ImportKeyword */, parseIdentifierName()), pos); + sourceFlags |= 2097152 /* PossiblyContainsImportMeta */; } else { expression = parseMemberExpressionOrHigher(); } } else { - expression = token() === 102 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher(); + expression = token() === 105 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher(); } // Now, we *may* be complete. However, we might have consumed the start of a // CallExpression or OptionalExpression. As such, we need to consume the rest // of it here to be complete. - return parseCallExpressionRest(expression); + return parseCallExpressionRest(pos, expression); } function parseMemberExpressionOrHigher() { // Note: to make our lives simpler, we decompose the NewExpression productions and @@ -22902,10 +31147,12 @@ var ts; // // Because CallExpression and MemberExpression are left recursive, we need to bottom out // of the recursion immediately. So we parse out a primary expression to start with. + var pos = getNodePos(); var expression = parsePrimaryExpression(); - return parseMemberExpressionRest(expression, /*allowOptionalChain*/ true); + return parseMemberExpressionRest(pos, expression, /*allowOptionalChain*/ true); } function parseSuperExpression() { + var pos = getNodePos(); var expression = parseTokenNode(); if (token() === 29 /* LessThanToken */) { var startPos = getNodePos(); @@ -22919,35 +31166,27 @@ var ts; } // If we have seen "super" it must be followed by '(' or '.'. // If it wasn't then just try to parse out a '.' and report an error. - var node = createNode(194 /* PropertyAccessExpression */, expression.pos); - node.expression = expression; parseExpectedToken(24 /* DotToken */, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access); // private names will never work with `super` (`super.#foo`), but that's a semantic error, not syntactic - node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true, /*allowPrivateIdentifiers*/ true); - return finishNode(node); + return finishNode(factory.createPropertyAccessExpression(expression, parseRightSideOfDot(/*allowIdentifierNames*/ true, /*allowPrivateIdentifiers*/ true)), pos); } - function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext) { + function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition) { + var pos = getNodePos(); var opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext); var result; - if (opening.kind === 268 /* JsxOpeningElement */) { - var node = createNode(266 /* JsxElement */, opening.pos); - node.openingElement = opening; - node.children = parseJsxChildren(node.openingElement); - node.closingElement = parseJsxClosingElement(inExpressionContext); - if (!tagNamesAreEquivalent(node.openingElement.tagName, node.closingElement.tagName)) { - parseErrorAtRange(node.closingElement, ts.Diagnostics.Expected_corresponding_JSX_closing_tag_for_0, ts.getTextOfNodeFromSourceText(sourceText, node.openingElement.tagName)); + if (opening.kind === 272 /* JsxOpeningElement */) { + var children = parseJsxChildren(opening); + var closingElement = parseJsxClosingElement(inExpressionContext); + if (!tagNamesAreEquivalent(opening.tagName, closingElement.tagName)) { + parseErrorAtRange(closingElement, ts.Diagnostics.Expected_corresponding_JSX_closing_tag_for_0, ts.getTextOfNodeFromSourceText(sourceText, opening.tagName)); } - result = finishNode(node); + result = finishNode(factory.createJsxElement(opening, children, closingElement), pos); } - else if (opening.kind === 271 /* JsxOpeningFragment */) { - var node = createNode(270 /* JsxFragment */, opening.pos); - node.openingFragment = opening; - node.children = parseJsxChildren(node.openingFragment); - node.closingFragment = parseJsxClosingFragment(inExpressionContext); - result = finishNode(node); + else if (opening.kind === 275 /* JsxOpeningFragment */) { + result = finishNode(factory.createJsxFragment(opening, parseJsxChildren(opening), parseJsxClosingFragment(inExpressionContext)), pos); } else { - ts.Debug.assert(opening.kind === 267 /* JsxSelfClosingElement */); + ts.Debug.assert(opening.kind === 271 /* JsxSelfClosingElement */); // Nothing else to do for self-closing elements result = opening; } @@ -22959,26 +31198,22 @@ var ts; // Since JSX elements are invalid < operands anyway, this lookahead parse will only occur in error scenarios // of one sort or another. if (inExpressionContext && token() === 29 /* LessThanToken */) { - var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true); }); + var topBadPos_1 = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition; + var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true, topBadPos_1); }); if (invalidElement) { - parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element); - var badNode = createNode(209 /* BinaryExpression */, result.pos); - badNode.end = invalidElement.end; - badNode.left = result; - badNode.right = invalidElement; - badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false); - badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos; - return badNode; + var operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false); + ts.setTextRangePosWidth(operatorToken, invalidElement.pos, 0); + parseErrorAt(ts.skipTrivia(sourceText, topBadPos_1), invalidElement.end, ts.Diagnostics.JSX_expressions_must_have_one_parent_element); + return finishNode(factory.createBinaryExpression(result, operatorToken, invalidElement), pos); } } return result; } function parseJsxText() { - var node = createNode(11 /* JsxText */); - node.text = scanner.getTokenValue(); - node.containsOnlyTriviaWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */; + var pos = getNodePos(); + var node = factory.createJsxText(scanner.getTokenValue(), currentToken === 12 /* JsxTextAllWhiteSpaces */); currentToken = scanner.scanJsxToken(); - return finishNode(node); + return finishNode(node, pos); } function parseJsxChild(openingTag, token) { switch (token) { @@ -23025,18 +31260,16 @@ var ts; return createNodeArray(list, listPos); } function parseJsxAttributes() { - var jsxAttributes = createNode(274 /* JsxAttributes */); - jsxAttributes.properties = parseList(13 /* JsxAttributes */, parseJsxAttribute); - return finishNode(jsxAttributes); + var pos = getNodePos(); + return finishNode(factory.createJsxAttributes(parseList(13 /* JsxAttributes */, parseJsxAttribute)), pos); } function parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext) { - var fullStart = scanner.getStartPos(); + var pos = getNodePos(); parseExpected(29 /* LessThanToken */); if (token() === 31 /* GreaterThanToken */) { // See below for explanation of scanJsxText - var node_1 = createNode(271 /* JsxOpeningFragment */, fullStart); scanJsxText(); - return finishNode(node_1); + return finishNode(factory.createJsxOpeningFragment(), pos); } var tagName = parseJsxElementName(); var typeArguments = tryParseTypeArguments(); @@ -23046,8 +31279,8 @@ var ts; // Closing tag, so scan the immediately-following text with the JSX scanning instead // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate // scanning errors - node = createNode(268 /* JsxOpeningElement */, fullStart); scanJsxText(); + node = factory.createJsxOpeningElement(tagName, typeArguments, attributes); } else { parseExpected(43 /* SlashToken */); @@ -23058,41 +31291,38 @@ var ts; parseExpected(31 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false); scanJsxText(); } - node = createNode(267 /* JsxSelfClosingElement */, fullStart); + node = factory.createJsxSelfClosingElement(tagName, typeArguments, attributes); } - node.tagName = tagName; - node.typeArguments = typeArguments; - node.attributes = attributes; - return finishNode(node); + return finishNode(node, pos); } function parseJsxElementName() { + var pos = getNodePos(); scanJsxIdentifier(); // JsxElement can have name in the form of // propertyAccessExpression // primaryExpression in the form of an identifier and "this" keyword // We can't just simply use parseLeftHandSideExpressionOrHigher because then we will start consider class,function etc as a keyword // We only want to consider "this" as a primaryExpression - var expression = token() === 104 /* ThisKeyword */ ? + var expression = token() === 107 /* ThisKeyword */ ? parseTokenNode() : parseIdentifierName(); while (parseOptional(24 /* DotToken */)) { - var propertyAccess = createNode(194 /* PropertyAccessExpression */, expression.pos); - propertyAccess.expression = expression; - propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true, /*allowPrivateIdentifiers*/ false); - expression = finishNode(propertyAccess); + expression = finishNode(factory.createPropertyAccessExpression(expression, parseRightSideOfDot(/*allowIdentifierNames*/ true, /*allowPrivateIdentifiers*/ false)), pos); } return expression; } function parseJsxExpression(inExpressionContext) { - var node = createNode(276 /* JsxExpression */); + var pos = getNodePos(); if (!parseExpected(18 /* OpenBraceToken */)) { return undefined; } + var dotDotDotToken; + var expression; if (token() !== 19 /* CloseBraceToken */) { - node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */); + dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */); // Only an AssignmentExpression is valid here per the JSX spec, // but we can unambiguously parse a comma sequence and provide // a better error message in grammar checking. - node.expression = parseExpression(); + expression = parseExpression(); } if (inExpressionContext) { parseExpected(19 /* CloseBraceToken */); @@ -23102,39 +31332,30 @@ var ts; scanJsxText(); } } - return finishNode(node); + return finishNode(factory.createJsxExpression(dotDotDotToken, expression), pos); } function parseJsxAttribute() { if (token() === 18 /* OpenBraceToken */) { return parseJsxSpreadAttribute(); } scanJsxIdentifier(); - var node = createNode(273 /* JsxAttribute */); - node.name = parseIdentifierName(); - if (token() === 62 /* EqualsToken */) { - switch (scanJsxAttributeValue()) { - case 10 /* StringLiteral */: - node.initializer = parseLiteralNode(); - break; - default: - node.initializer = parseJsxExpression(/*inExpressionContext*/ true); - break; - } - } - return finishNode(node); + var pos = getNodePos(); + return finishNode(factory.createJsxAttribute(parseIdentifierName(), token() !== 62 /* EqualsToken */ ? undefined : + scanJsxAttributeValue() === 10 /* StringLiteral */ ? parseLiteralNode() : + parseJsxExpression(/*inExpressionContext*/ true)), pos); } function parseJsxSpreadAttribute() { - var node = createNode(275 /* JsxSpreadAttribute */); + var pos = getNodePos(); parseExpected(18 /* OpenBraceToken */); parseExpected(25 /* DotDotDotToken */); - node.expression = parseExpression(); + var expression = parseExpression(); parseExpected(19 /* CloseBraceToken */); - return finishNode(node); + return finishNode(factory.createJsxSpreadAttribute(expression), pos); } function parseJsxClosingElement(inExpressionContext) { - var node = createNode(269 /* JsxClosingElement */); + var pos = getNodePos(); parseExpected(30 /* LessThanSlashToken */); - node.tagName = parseJsxElementName(); + var tagName = parseJsxElementName(); if (inExpressionContext) { parseExpected(31 /* GreaterThanToken */); } @@ -23142,10 +31363,10 @@ var ts; parseExpected(31 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false); scanJsxText(); } - return finishNode(node); + return finishNode(factory.createJsxClosingElement(tagName), pos); } function parseJsxClosingFragment(inExpressionContext) { - var node = createNode(272 /* JsxClosingFragment */); + var pos = getNodePos(); parseExpected(30 /* LessThanSlashToken */); if (ts.tokenIsIdentifierOrKeyword(token())) { parseErrorAtRange(parseJsxElementName(), ts.Diagnostics.Expected_corresponding_closing_tag_for_JSX_fragment); @@ -23157,15 +31378,15 @@ var ts; parseExpected(31 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false); scanJsxText(); } - return finishNode(node); + return finishNode(factory.createJsxJsxClosingFragment(), pos); } function parseTypeAssertion() { - var node = createNode(199 /* TypeAssertionExpression */); + var pos = getNodePos(); parseExpected(29 /* LessThanToken */); - node.type = parseType(); + var type = parseType(); parseExpected(31 /* GreaterThanToken */); - node.expression = parseSimpleUnaryExpression(); - return finishNode(node); + var expression = parseSimpleUnaryExpression(); + return finishNode(factory.createTypeAssertion(type, expression), pos); } function nextTokenIsIdentifierOrKeywordOrOpenBracketOrTemplate() { nextToken(); @@ -23198,40 +31419,36 @@ var ts; } return false; } - function parsePropertyAccessExpressionRest(expression, questionDotToken) { - var propertyAccess = createNode(194 /* PropertyAccessExpression */, expression.pos); - propertyAccess.expression = expression; - propertyAccess.questionDotToken = questionDotToken; - propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true, /*allowPrivateIdentifiers*/ true); - if (questionDotToken || tryReparseOptionalChain(expression)) { - propertyAccess.flags |= 32 /* OptionalChain */; - if (ts.isPrivateIdentifier(propertyAccess.name)) { - parseErrorAtRange(propertyAccess.name, ts.Diagnostics.An_optional_chain_cannot_contain_private_identifiers); - } + function parsePropertyAccessExpressionRest(pos, expression, questionDotToken) { + var name = parseRightSideOfDot(/*allowIdentifierNames*/ true, /*allowPrivateIdentifiers*/ true); + var isOptionalChain = questionDotToken || tryReparseOptionalChain(expression); + var propertyAccess = isOptionalChain ? + factory.createPropertyAccessChain(expression, questionDotToken, name) : + factory.createPropertyAccessExpression(expression, name); + if (isOptionalChain && ts.isPrivateIdentifier(propertyAccess.name)) { + parseErrorAtRange(propertyAccess.name, ts.Diagnostics.An_optional_chain_cannot_contain_private_identifiers); } - return finishNode(propertyAccess); + return finishNode(propertyAccess, pos); } - function parseElementAccessExpressionRest(expression, questionDotToken) { - var indexedAccess = createNode(195 /* ElementAccessExpression */, expression.pos); - indexedAccess.expression = expression; - indexedAccess.questionDotToken = questionDotToken; + function parseElementAccessExpressionRest(pos, expression, questionDotToken) { + var argumentExpression; if (token() === 23 /* CloseBracketToken */) { - indexedAccess.argumentExpression = createMissingNode(75 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument); + argumentExpression = createMissingNode(78 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument); } else { var argument = allowInAnd(parseExpression); if (ts.isStringOrNumericLiteralLike(argument)) { argument.text = internIdentifier(argument.text); } - indexedAccess.argumentExpression = argument; + argumentExpression = argument; } parseExpected(23 /* CloseBracketToken */); - if (questionDotToken || tryReparseOptionalChain(expression)) { - indexedAccess.flags |= 32 /* OptionalChain */; - } - return finishNode(indexedAccess); + var indexedAccess = questionDotToken || tryReparseOptionalChain(expression) ? + factory.createElementAccessChain(expression, questionDotToken, argumentExpression) : + factory.createElementAccessExpression(expression, argumentExpression); + return finishNode(indexedAccess, pos); } - function parseMemberExpressionRest(expression, allowOptionalChain) { + function parseMemberExpressionRest(pos, expression, allowOptionalChain) { while (true) { var questionDotToken = void 0; var isPropertyAccess = false; @@ -23243,23 +31460,21 @@ var ts; isPropertyAccess = parseOptional(24 /* DotToken */); } if (isPropertyAccess) { - expression = parsePropertyAccessExpressionRest(expression, questionDotToken); + expression = parsePropertyAccessExpressionRest(pos, expression, questionDotToken); continue; } if (!questionDotToken && token() === 53 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) { nextToken(); - var nonNullExpression = createNode(218 /* NonNullExpression */, expression.pos); - nonNullExpression.expression = expression; - expression = finishNode(nonNullExpression); + expression = finishNode(factory.createNonNullExpression(expression), pos); continue; } // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName if ((questionDotToken || !inDecoratorContext()) && parseOptional(22 /* OpenBracketToken */)) { - expression = parseElementAccessExpressionRest(expression, questionDotToken); + expression = parseElementAccessExpressionRest(pos, expression, questionDotToken); continue; } if (isTemplateStartOfTaggedTemplate()) { - expression = parseTaggedTemplateRest(expression, questionDotToken, /*typeArguments*/ undefined); + expression = parseTaggedTemplateRest(pos, expression, questionDotToken, /*typeArguments*/ undefined); continue; } return expression; @@ -23268,22 +31483,19 @@ var ts; function isTemplateStartOfTaggedTemplate() { return token() === 14 /* NoSubstitutionTemplateLiteral */ || token() === 15 /* TemplateHead */; } - function parseTaggedTemplateRest(tag, questionDotToken, typeArguments) { - var tagExpression = createNode(198 /* TaggedTemplateExpression */, tag.pos); - tagExpression.tag = tag; - tagExpression.questionDotToken = questionDotToken; - tagExpression.typeArguments = typeArguments; - tagExpression.template = token() === 14 /* NoSubstitutionTemplateLiteral */ - ? (reScanTemplateHeadOrNoSubstitutionTemplate(), parseLiteralNode()) - : parseTemplateExpression(/*isTaggedTemplate*/ true); + function parseTaggedTemplateRest(pos, tag, questionDotToken, typeArguments) { + var tagExpression = factory.createTaggedTemplateExpression(tag, typeArguments, token() === 14 /* NoSubstitutionTemplateLiteral */ ? + (reScanTemplateHeadOrNoSubstitutionTemplate(), parseLiteralNode()) : + parseTemplateExpression(/*isTaggedTemplate*/ true)); if (questionDotToken || tag.flags & 32 /* OptionalChain */) { tagExpression.flags |= 32 /* OptionalChain */; } - return finishNode(tagExpression); + tagExpression.questionDotToken = questionDotToken; + return finishNode(tagExpression, pos); } - function parseCallExpressionRest(expression) { + function parseCallExpressionRest(pos, expression) { while (true) { - expression = parseMemberExpressionRest(expression, /*allowOptionalChain*/ true); + expression = parseMemberExpressionRest(pos, expression, /*allowOptionalChain*/ true); var questionDotToken = parseOptionalToken(28 /* QuestionDotToken */); // handle 'foo<()' if (token() === 29 /* LessThanToken */ || token() === 47 /* LessThanLessThanToken */) { @@ -23294,40 +31506,29 @@ var ts; var typeArguments = tryParse(parseTypeArgumentsInExpression); if (typeArguments) { if (isTemplateStartOfTaggedTemplate()) { - expression = parseTaggedTemplateRest(expression, questionDotToken, typeArguments); + expression = parseTaggedTemplateRest(pos, expression, questionDotToken, typeArguments); continue; } - var callExpr = createNode(196 /* CallExpression */, expression.pos); - callExpr.expression = expression; - callExpr.questionDotToken = questionDotToken; - callExpr.typeArguments = typeArguments; - callExpr.arguments = parseArgumentList(); - if (questionDotToken || tryReparseOptionalChain(expression)) { - callExpr.flags |= 32 /* OptionalChain */; - } - expression = finishNode(callExpr); + var argumentList = parseArgumentList(); + var callExpr = questionDotToken || tryReparseOptionalChain(expression) ? + factory.createCallChain(expression, questionDotToken, typeArguments, argumentList) : + factory.createCallExpression(expression, typeArguments, argumentList); + expression = finishNode(callExpr, pos); continue; } } else if (token() === 20 /* OpenParenToken */) { - var callExpr = createNode(196 /* CallExpression */, expression.pos); - callExpr.expression = expression; - callExpr.questionDotToken = questionDotToken; - callExpr.arguments = parseArgumentList(); - if (questionDotToken || tryReparseOptionalChain(expression)) { - callExpr.flags |= 32 /* OptionalChain */; - } - expression = finishNode(callExpr); + var argumentList = parseArgumentList(); + var callExpr = questionDotToken || tryReparseOptionalChain(expression) ? + factory.createCallChain(expression, questionDotToken, /*typeArguments*/ undefined, argumentList) : + factory.createCallExpression(expression, /*typeArguments*/ undefined, argumentList); + expression = finishNode(callExpr, pos); continue; } if (questionDotToken) { // We failed to parse anything, so report a missing identifier here. - var propertyAccess = createNode(194 /* PropertyAccessExpression */, expression.pos); - propertyAccess.expression = expression; - propertyAccess.questionDotToken = questionDotToken; - propertyAccess.name = createMissingNode(75 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics.Identifier_expected); - propertyAccess.flags |= 32 /* OptionalChain */; - expression = finishNode(propertyAccess); + var name = createMissingNode(78 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics.Identifier_expected); + expression = finishNode(factory.createPropertyAccessChain(expression, questionDotToken, name), pos); } break; } @@ -23403,11 +31604,11 @@ var ts; case 10 /* StringLiteral */: case 14 /* NoSubstitutionTemplateLiteral */: return parseLiteralNode(); - case 104 /* ThisKeyword */: - case 102 /* SuperKeyword */: - case 100 /* NullKeyword */: - case 106 /* TrueKeyword */: - case 91 /* FalseKeyword */: + case 107 /* ThisKeyword */: + case 105 /* SuperKeyword */: + case 103 /* NullKeyword */: + case 109 /* TrueKeyword */: + case 94 /* FalseKeyword */: return parseTokenNode(); case 20 /* OpenParenToken */: return parseParenthesizedExpression(); @@ -23415,7 +31616,7 @@ var ts; return parseArrayLiteralExpression(); case 18 /* OpenBraceToken */: return parseObjectLiteralExpression(); - case 126 /* AsyncKeyword */: + case 129 /* AsyncKeyword */: // Async arrow functions are parsed earlier in parseAssignmentExpressionOrHigher. // If we encounter `async [no LineTerminator here] function` then this is an async // function; otherwise, its an identifier. @@ -23423,11 +31624,11 @@ var ts; break; } return parseFunctionExpression(); - case 80 /* ClassKeyword */: + case 83 /* ClassKeyword */: return parseClassExpression(); - case 94 /* FunctionKeyword */: + case 97 /* FunctionKeyword */: return parseFunctionExpression(); - case 99 /* NewKeyword */: + case 102 /* NewKeyword */: return parseNewExpressionOrNewDotTarget(); case 43 /* SlashToken */: case 67 /* SlashEqualsToken */: @@ -23441,96 +31642,99 @@ var ts; return parseIdentifier(ts.Diagnostics.Expression_expected); } function parseParenthesizedExpression() { - var node = createNodeWithJSDoc(200 /* ParenthesizedExpression */); + var pos = getNodePos(); + var hasJSDoc = hasPrecedingJSDocComment(); parseExpected(20 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); + var expression = allowInAnd(parseExpression); parseExpected(21 /* CloseParenToken */); - return finishNode(node); + return withJSDoc(finishNode(factory.createParenthesizedExpression(expression), pos), hasJSDoc); } function parseSpreadElement() { - var node = createNode(213 /* SpreadElement */); + var pos = getNodePos(); parseExpected(25 /* DotDotDotToken */); - node.expression = parseAssignmentExpressionOrHigher(); - return finishNode(node); + var expression = parseAssignmentExpressionOrHigher(); + return finishNode(factory.createSpreadElement(expression), pos); } function parseArgumentOrArrayLiteralElement() { return token() === 25 /* DotDotDotToken */ ? parseSpreadElement() : - token() === 27 /* CommaToken */ ? createNode(215 /* OmittedExpression */) : + token() === 27 /* CommaToken */ ? finishNode(factory.createOmittedExpression(), getNodePos()) : parseAssignmentExpressionOrHigher(); } function parseArgumentExpression() { return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement); } function parseArrayLiteralExpression() { - var node = createNode(192 /* ArrayLiteralExpression */); + var pos = getNodePos(); parseExpected(22 /* OpenBracketToken */); - if (scanner.hasPrecedingLineBreak()) { - node.multiLine = true; - } - node.elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement); + var multiLine = scanner.hasPrecedingLineBreak(); + var elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement); parseExpected(23 /* CloseBracketToken */); - return finishNode(node); + return finishNode(factory.createArrayLiteralExpression(elements, multiLine), pos); } function parseObjectLiteralElement() { - var node = createNodeWithJSDoc(0 /* Unknown */); + var pos = getNodePos(); + var hasJSDoc = hasPrecedingJSDocComment(); if (parseOptionalToken(25 /* DotDotDotToken */)) { - node.kind = 283 /* SpreadAssignment */; - node.expression = parseAssignmentExpressionOrHigher(); - return finishNode(node); + var expression = parseAssignmentExpressionOrHigher(); + return withJSDoc(finishNode(factory.createSpreadAssignment(expression), pos), hasJSDoc); } - node.decorators = parseDecorators(); - node.modifiers = parseModifiers(); - if (parseContextualModifier(131 /* GetKeyword */)) { - return parseAccessorDeclaration(node, 163 /* GetAccessor */); + var decorators = parseDecorators(); + var modifiers = parseModifiers(); + if (parseContextualModifier(134 /* GetKeyword */)) { + return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 166 /* GetAccessor */); } - if (parseContextualModifier(142 /* SetKeyword */)) { - return parseAccessorDeclaration(node, 164 /* SetAccessor */); + if (parseContextualModifier(145 /* SetKeyword */)) { + return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 167 /* SetAccessor */); } var asteriskToken = parseOptionalToken(41 /* AsteriskToken */); var tokenIsIdentifier = isIdentifier(); - node.name = parsePropertyName(); + var name = parsePropertyName(); // Disallowing of optional property assignments and definite assignment assertion happens in the grammar checker. - node.questionToken = parseOptionalToken(57 /* QuestionToken */); - node.exclamationToken = parseOptionalToken(53 /* ExclamationToken */); + var questionToken = parseOptionalToken(57 /* QuestionToken */); + var exclamationToken = parseOptionalToken(53 /* ExclamationToken */); if (asteriskToken || token() === 20 /* OpenParenToken */ || token() === 29 /* LessThanToken */) { - return parseMethodDeclaration(node, asteriskToken); + return parseMethodDeclaration(pos, hasJSDoc, decorators, modifiers, asteriskToken, name, questionToken, exclamationToken); } // check if it is short-hand property assignment or normal property assignment // NOTE: if token is EqualsToken it is interpreted as CoverInitializedName production // CoverInitializedName[Yield] : // IdentifierReference[?Yield] Initializer[In, ?Yield] // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern + var node; var isShorthandPropertyAssignment = tokenIsIdentifier && (token() !== 58 /* ColonToken */); if (isShorthandPropertyAssignment) { - node.kind = 282 /* ShorthandPropertyAssignment */; var equalsToken = parseOptionalToken(62 /* EqualsToken */); - if (equalsToken) { - node.equalsToken = equalsToken; - node.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher); - } + var objectAssignmentInitializer = equalsToken ? allowInAnd(parseAssignmentExpressionOrHigher) : undefined; + node = factory.createShorthandPropertyAssignment(name, objectAssignmentInitializer); + // Save equals token for error reporting. + // TODO(rbuckton): Consider manufacturing this when we need to report an error as it is otherwise not useful. + node.equalsToken = equalsToken; } else { - node.kind = 281 /* PropertyAssignment */; parseExpected(58 /* ColonToken */); - node.initializer = allowInAnd(parseAssignmentExpressionOrHigher); + var initializer = allowInAnd(parseAssignmentExpressionOrHigher); + node = factory.createPropertyAssignment(name, initializer); } - return finishNode(node); + // Decorators, Modifiers, questionToken, and exclamationToken are not supported by property assignments and are reported in the grammar checker + node.decorators = decorators; + node.modifiers = modifiers; + node.questionToken = questionToken; + node.exclamationToken = exclamationToken; + return withJSDoc(finishNode(node, pos), hasJSDoc); } function parseObjectLiteralExpression() { - var node = createNode(193 /* ObjectLiteralExpression */); + var pos = getNodePos(); var openBracePosition = scanner.getTokenPos(); parseExpected(18 /* OpenBraceToken */); - if (scanner.hasPrecedingLineBreak()) { - node.multiLine = true; - } - node.properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimiter*/ true); + var multiLine = scanner.hasPrecedingLineBreak(); + var properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimiter*/ true); if (!parseExpected(19 /* CloseBraceToken */)) { var lastError = ts.lastOrUndefined(parseDiagnostics); if (lastError && lastError.code === ts.Diagnostics._0_expected.code) { - ts.addRelatedInfo(lastError, ts.createFileDiagnostic(sourceFile, openBracePosition, 1, ts.Diagnostics.The_parser_expected_to_find_a_to_match_the_token_here)); + ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, openBracePosition, 1, ts.Diagnostics.The_parser_expected_to_find_a_to_match_the_token_here)); } } - return finishNode(node); + return finishNode(factory.createObjectLiteralExpression(properties, multiLine), pos); } function parseFunctionExpression() { // GeneratorExpression: @@ -23542,85 +31746,86 @@ var ts; if (saveDecoratorContext) { setDecoratorContext(/*val*/ false); } - var node = createNodeWithJSDoc(201 /* FunctionExpression */); - node.modifiers = parseModifiers(); - parseExpected(94 /* FunctionKeyword */); - node.asteriskToken = parseOptionalToken(41 /* AsteriskToken */); - var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */; - var isAsync = hasModifierOfKind(node, 126 /* AsyncKeyword */) ? 2 /* Await */ : 0 /* None */; - node.name = - isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) : - isGenerator ? doInYieldContext(parseOptionalIdentifier) : - isAsync ? doInAwaitContext(parseOptionalIdentifier) : - parseOptionalIdentifier(); - fillSignature(58 /* ColonToken */, isGenerator | isAsync, node); - node.body = parseFunctionBlock(isGenerator | isAsync); + var pos = getNodePos(); + var hasJSDoc = hasPrecedingJSDocComment(); + var modifiers = parseModifiers(); + parseExpected(97 /* FunctionKeyword */); + var asteriskToken = parseOptionalToken(41 /* AsteriskToken */); + var isGenerator = asteriskToken ? 1 /* Yield */ : 0 /* None */; + var isAsync = ts.some(modifiers, ts.isAsyncModifier) ? 2 /* Await */ : 0 /* None */; + var name = isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalBindingIdentifier) : + isGenerator ? doInYieldContext(parseOptionalBindingIdentifier) : + isAsync ? doInAwaitContext(parseOptionalBindingIdentifier) : + parseOptionalBindingIdentifier(); + var typeParameters = parseTypeParameters(); + var parameters = parseParameters(isGenerator | isAsync); + var type = parseReturnType(58 /* ColonToken */, /*isType*/ false); + var body = parseFunctionBlock(isGenerator | isAsync); if (saveDecoratorContext) { setDecoratorContext(/*val*/ true); } - return finishNode(node); + var node = factory.createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body); + return withJSDoc(finishNode(node, pos), hasJSDoc); } - function parseOptionalIdentifier() { - return isIdentifier() ? parseIdentifier() : undefined; + function parseOptionalBindingIdentifier() { + return isBindingIdentifier() ? parseBindingIdentifier() : undefined; } function parseNewExpressionOrNewDotTarget() { - var fullStart = scanner.getStartPos(); - parseExpected(99 /* NewKeyword */); + var pos = getNodePos(); + parseExpected(102 /* NewKeyword */); if (parseOptional(24 /* DotToken */)) { - var node_2 = createNode(219 /* MetaProperty */, fullStart); - node_2.keywordToken = 99 /* NewKeyword */; - node_2.name = parseIdentifierName(); - return finishNode(node_2); + var name = parseIdentifierName(); + return finishNode(factory.createMetaProperty(102 /* NewKeyword */, name), pos); } + var expressionPos = getNodePos(); var expression = parsePrimaryExpression(); var typeArguments; while (true) { - expression = parseMemberExpressionRest(expression, /*allowOptionalChain*/ false); + expression = parseMemberExpressionRest(expressionPos, expression, /*allowOptionalChain*/ false); typeArguments = tryParse(parseTypeArgumentsInExpression); if (isTemplateStartOfTaggedTemplate()) { ts.Debug.assert(!!typeArguments, "Expected a type argument list; all plain tagged template starts should be consumed in 'parseMemberExpressionRest'"); - expression = parseTaggedTemplateRest(expression, /*optionalChain*/ undefined, typeArguments); + expression = parseTaggedTemplateRest(expressionPos, expression, /*optionalChain*/ undefined, typeArguments); typeArguments = undefined; } break; } - var node = createNode(197 /* NewExpression */, fullStart); - node.expression = expression; - node.typeArguments = typeArguments; + var argumentsArray; if (token() === 20 /* OpenParenToken */) { - node.arguments = parseArgumentList(); + argumentsArray = parseArgumentList(); } - else if (node.typeArguments) { - parseErrorAt(fullStart, scanner.getStartPos(), ts.Diagnostics.A_new_expression_with_type_arguments_must_always_be_followed_by_a_parenthesized_argument_list); + else if (typeArguments) { + parseErrorAt(pos, scanner.getStartPos(), ts.Diagnostics.A_new_expression_with_type_arguments_must_always_be_followed_by_a_parenthesized_argument_list); } - return finishNode(node); + return finishNode(factory.createNewExpression(expression, typeArguments, argumentsArray), pos); } // STATEMENTS function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) { - var node = createNode(223 /* Block */); + var pos = getNodePos(); var openBracePosition = scanner.getTokenPos(); if (parseExpected(18 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) { - if (scanner.hasPrecedingLineBreak()) { - node.multiLine = true; - } - node.statements = parseList(1 /* BlockStatements */, parseStatement); + var multiLine = scanner.hasPrecedingLineBreak(); + var statements = parseList(1 /* BlockStatements */, parseStatement); if (!parseExpected(19 /* CloseBraceToken */)) { var lastError = ts.lastOrUndefined(parseDiagnostics); if (lastError && lastError.code === ts.Diagnostics._0_expected.code) { - ts.addRelatedInfo(lastError, ts.createFileDiagnostic(sourceFile, openBracePosition, 1, ts.Diagnostics.The_parser_expected_to_find_a_to_match_the_token_here)); + ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, openBracePosition, 1, ts.Diagnostics.The_parser_expected_to_find_a_to_match_the_token_here)); } } + return finishNode(factory.createBlock(statements, multiLine), pos); } else { - node.statements = createMissingList(); + var statements = createMissingList(); + return finishNode(factory.createBlock(statements, /*multiLine*/ undefined), pos); } - return finishNode(node); } function parseFunctionBlock(flags, diagnosticMessage) { var savedYieldContext = inYieldContext(); setYieldContext(!!(flags & 1 /* Yield */)); var savedAwaitContext = inAwaitContext(); setAwaitContext(!!(flags & 2 /* Await */)); + var savedTopLevel = topLevel; + topLevel = false; // We may be in a [Decorator] context when parsing a function expression or // arrow function. The body of the function is not in [Decorator] context. var saveDecoratorContext = inDecoratorContext(); @@ -23631,219 +31836,224 @@ var ts; if (saveDecoratorContext) { setDecoratorContext(/*val*/ true); } + topLevel = savedTopLevel; setYieldContext(savedYieldContext); setAwaitContext(savedAwaitContext); return block; } function parseEmptyStatement() { - var node = createNode(224 /* EmptyStatement */); + var pos = getNodePos(); parseExpected(26 /* SemicolonToken */); - return finishNode(node); + return finishNode(factory.createEmptyStatement(), pos); } function parseIfStatement() { - var node = createNode(227 /* IfStatement */); - parseExpected(95 /* IfKeyword */); + var pos = getNodePos(); + parseExpected(98 /* IfKeyword */); parseExpected(20 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); + var expression = allowInAnd(parseExpression); parseExpected(21 /* CloseParenToken */); - node.thenStatement = parseStatement(); - node.elseStatement = parseOptional(87 /* ElseKeyword */) ? parseStatement() : undefined; - return finishNode(node); + var thenStatement = parseStatement(); + var elseStatement = parseOptional(90 /* ElseKeyword */) ? parseStatement() : undefined; + return finishNode(factory.createIfStatement(expression, thenStatement, elseStatement), pos); } function parseDoStatement() { - var node = createNode(228 /* DoStatement */); - parseExpected(86 /* DoKeyword */); - node.statement = parseStatement(); - parseExpected(111 /* WhileKeyword */); + var pos = getNodePos(); + parseExpected(89 /* DoKeyword */); + var statement = parseStatement(); + parseExpected(114 /* WhileKeyword */); parseExpected(20 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); + var expression = allowInAnd(parseExpression); parseExpected(21 /* CloseParenToken */); // From: https://mail.mozilla.org/pipermail/es-discuss/2011-August/016188.html // 157 min --- All allen at wirfs-brock.com CONF --- "do{;}while(false)false" prohibited in // spec but allowed in consensus reality. Approved -- this is the de-facto standard whereby // do;while(0)x will have a semicolon inserted before x. parseOptional(26 /* SemicolonToken */); - return finishNode(node); + return finishNode(factory.createDoStatement(statement, expression), pos); } function parseWhileStatement() { - var node = createNode(229 /* WhileStatement */); - parseExpected(111 /* WhileKeyword */); + var pos = getNodePos(); + parseExpected(114 /* WhileKeyword */); parseExpected(20 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); + var expression = allowInAnd(parseExpression); parseExpected(21 /* CloseParenToken */); - node.statement = parseStatement(); - return finishNode(node); + var statement = parseStatement(); + return finishNode(factory.createWhileStatement(expression, statement), pos); } function parseForOrForInOrForOfStatement() { var pos = getNodePos(); - parseExpected(93 /* ForKeyword */); - var awaitToken = parseOptionalToken(127 /* AwaitKeyword */); + parseExpected(96 /* ForKeyword */); + var awaitToken = parseOptionalToken(130 /* AwaitKeyword */); parseExpected(20 /* OpenParenToken */); var initializer; if (token() !== 26 /* SemicolonToken */) { - if (token() === 109 /* VarKeyword */ || token() === 115 /* LetKeyword */ || token() === 81 /* ConstKeyword */) { + if (token() === 112 /* VarKeyword */ || token() === 118 /* LetKeyword */ || token() === 84 /* ConstKeyword */) { initializer = parseVariableDeclarationList(/*inForStatementInitializer*/ true); } else { initializer = disallowInAnd(parseExpression); } } - var forOrForInOrForOfStatement; - if (awaitToken ? parseExpected(152 /* OfKeyword */) : parseOptional(152 /* OfKeyword */)) { - var forOfStatement = createNode(232 /* ForOfStatement */, pos); - forOfStatement.awaitModifier = awaitToken; - forOfStatement.initializer = initializer; - forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher); + var node; + if (awaitToken ? parseExpected(155 /* OfKeyword */) : parseOptional(155 /* OfKeyword */)) { + var expression = allowInAnd(parseAssignmentExpressionOrHigher); parseExpected(21 /* CloseParenToken */); - forOrForInOrForOfStatement = forOfStatement; + node = factory.createForOfStatement(awaitToken, initializer, expression, parseStatement()); } - else if (parseOptional(97 /* InKeyword */)) { - var forInStatement = createNode(231 /* ForInStatement */, pos); - forInStatement.initializer = initializer; - forInStatement.expression = allowInAnd(parseExpression); + else if (parseOptional(100 /* InKeyword */)) { + var expression = allowInAnd(parseExpression); parseExpected(21 /* CloseParenToken */); - forOrForInOrForOfStatement = forInStatement; + node = factory.createForInStatement(initializer, expression, parseStatement()); } else { - var forStatement = createNode(230 /* ForStatement */, pos); - forStatement.initializer = initializer; parseExpected(26 /* SemicolonToken */); - if (token() !== 26 /* SemicolonToken */ && token() !== 21 /* CloseParenToken */) { - forStatement.condition = allowInAnd(parseExpression); - } + var condition = token() !== 26 /* SemicolonToken */ && token() !== 21 /* CloseParenToken */ + ? allowInAnd(parseExpression) + : undefined; parseExpected(26 /* SemicolonToken */); - if (token() !== 21 /* CloseParenToken */) { - forStatement.incrementor = allowInAnd(parseExpression); - } + var incrementor = token() !== 21 /* CloseParenToken */ + ? allowInAnd(parseExpression) + : undefined; parseExpected(21 /* CloseParenToken */); - forOrForInOrForOfStatement = forStatement; + node = factory.createForStatement(initializer, condition, incrementor, parseStatement()); } - forOrForInOrForOfStatement.statement = parseStatement(); - return finishNode(forOrForInOrForOfStatement); + return finishNode(node, pos); } function parseBreakOrContinueStatement(kind) { - var node = createNode(kind); - parseExpected(kind === 234 /* BreakStatement */ ? 77 /* BreakKeyword */ : 82 /* ContinueKeyword */); - if (!canParseSemicolon()) { - node.label = parseIdentifier(); - } + var pos = getNodePos(); + parseExpected(kind === 238 /* BreakStatement */ ? 80 /* BreakKeyword */ : 85 /* ContinueKeyword */); + var label = canParseSemicolon() ? undefined : parseIdentifier(); parseSemicolon(); - return finishNode(node); + var node = kind === 238 /* BreakStatement */ + ? factory.createBreakStatement(label) + : factory.createContinueStatement(label); + return finishNode(node, pos); } function parseReturnStatement() { - var node = createNode(235 /* ReturnStatement */); - parseExpected(101 /* ReturnKeyword */); - if (!canParseSemicolon()) { - node.expression = allowInAnd(parseExpression); - } + var pos = getNodePos(); + parseExpected(104 /* ReturnKeyword */); + var expression = canParseSemicolon() ? undefined : allowInAnd(parseExpression); parseSemicolon(); - return finishNode(node); + return finishNode(factory.createReturnStatement(expression), pos); } function parseWithStatement() { - var node = createNode(236 /* WithStatement */); - parseExpected(112 /* WithKeyword */); + var pos = getNodePos(); + parseExpected(115 /* WithKeyword */); parseExpected(20 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); + var expression = allowInAnd(parseExpression); parseExpected(21 /* CloseParenToken */); - node.statement = doInsideOfContext(16777216 /* InWithStatement */, parseStatement); - return finishNode(node); + var statement = doInsideOfContext(16777216 /* InWithStatement */, parseStatement); + return finishNode(factory.createWithStatement(expression, statement), pos); } function parseCaseClause() { - var node = createNode(277 /* CaseClause */); - parseExpected(78 /* CaseKeyword */); - node.expression = allowInAnd(parseExpression); + var pos = getNodePos(); + parseExpected(81 /* CaseKeyword */); + var expression = allowInAnd(parseExpression); parseExpected(58 /* ColonToken */); - node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement); - return finishNode(node); + var statements = parseList(3 /* SwitchClauseStatements */, parseStatement); + return finishNode(factory.createCaseClause(expression, statements), pos); } function parseDefaultClause() { - var node = createNode(278 /* DefaultClause */); - parseExpected(84 /* DefaultKeyword */); + var pos = getNodePos(); + parseExpected(87 /* DefaultKeyword */); parseExpected(58 /* ColonToken */); - node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement); - return finishNode(node); + var statements = parseList(3 /* SwitchClauseStatements */, parseStatement); + return finishNode(factory.createDefaultClause(statements), pos); } function parseCaseOrDefaultClause() { - return token() === 78 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause(); + return token() === 81 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause(); + } + function parseCaseBlock() { + var pos = getNodePos(); + parseExpected(18 /* OpenBraceToken */); + var clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause); + parseExpected(19 /* CloseBraceToken */); + return finishNode(factory.createCaseBlock(clauses), pos); } function parseSwitchStatement() { - var node = createNode(237 /* SwitchStatement */); - parseExpected(103 /* SwitchKeyword */); + var pos = getNodePos(); + parseExpected(106 /* SwitchKeyword */); parseExpected(20 /* OpenParenToken */); - node.expression = allowInAnd(parseExpression); + var expression = allowInAnd(parseExpression); parseExpected(21 /* CloseParenToken */); - var caseBlock = createNode(251 /* CaseBlock */); - parseExpected(18 /* OpenBraceToken */); - caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause); - parseExpected(19 /* CloseBraceToken */); - node.caseBlock = finishNode(caseBlock); - return finishNode(node); + var caseBlock = parseCaseBlock(); + return finishNode(factory.createSwitchStatement(expression, caseBlock), pos); } function parseThrowStatement() { // ThrowStatement[Yield] : // throw [no LineTerminator here]Expression[In, ?Yield]; + var pos = getNodePos(); + parseExpected(108 /* ThrowKeyword */); // Because of automatic semicolon insertion, we need to report error if this // throw could be terminated with a semicolon. Note: we can't call 'parseExpression' // directly as that might consume an expression on the following line. - // We just return 'undefined' in that case. The actual error will be reported in the - // grammar walker. - var node = createNode(239 /* ThrowStatement */); - parseExpected(105 /* ThrowKeyword */); - node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression); + // Instead, we create a "missing" identifier, but don't report an error. The actual error + // will be reported in the grammar walker. + var expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression); + if (expression === undefined) { + identifierCount++; + expression = finishNode(factory.createIdentifier(""), getNodePos()); + } parseSemicolon(); - return finishNode(node); + return finishNode(factory.createThrowStatement(expression), pos); } // TODO: Review for error recovery function parseTryStatement() { - var node = createNode(240 /* TryStatement */); - parseExpected(107 /* TryKeyword */); - node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false); - node.catchClause = token() === 79 /* CatchKeyword */ ? parseCatchClause() : undefined; + var pos = getNodePos(); + parseExpected(110 /* TryKeyword */); + var tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false); + var catchClause = token() === 82 /* CatchKeyword */ ? parseCatchClause() : undefined; // If we don't have a catch clause, then we must have a finally clause. Try to parse // one out no matter what. - if (!node.catchClause || token() === 92 /* FinallyKeyword */) { - parseExpected(92 /* FinallyKeyword */); - node.finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false); + var finallyBlock; + if (!catchClause || token() === 95 /* FinallyKeyword */) { + parseExpected(95 /* FinallyKeyword */); + finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false); } - return finishNode(node); + return finishNode(factory.createTryStatement(tryBlock, catchClause, finallyBlock), pos); } function parseCatchClause() { - var result = createNode(280 /* CatchClause */); - parseExpected(79 /* CatchKeyword */); + var pos = getNodePos(); + parseExpected(82 /* CatchKeyword */); + var variableDeclaration; if (parseOptional(20 /* OpenParenToken */)) { - result.variableDeclaration = parseVariableDeclaration(); + variableDeclaration = parseVariableDeclaration(); parseExpected(21 /* CloseParenToken */); } else { // Keep shape of node to avoid degrading performance. - result.variableDeclaration = undefined; + variableDeclaration = undefined; } - result.block = parseBlock(/*ignoreMissingOpenBrace*/ false); - return finishNode(result); + var block = parseBlock(/*ignoreMissingOpenBrace*/ false); + return finishNode(factory.createCatchClause(variableDeclaration, block), pos); } function parseDebuggerStatement() { - var node = createNode(241 /* DebuggerStatement */); - parseExpected(83 /* DebuggerKeyword */); + var pos = getNodePos(); + parseExpected(86 /* DebuggerKeyword */); parseSemicolon(); - return finishNode(node); + return finishNode(factory.createDebuggerStatement(), pos); } function parseExpressionOrLabeledStatement() { // Avoiding having to do the lookahead for a labeled statement by just trying to parse // out an expression, seeing if it is identifier and then seeing if it is followed by // a colon. - var node = createNodeWithJSDoc(token() === 75 /* Identifier */ ? 0 /* Unknown */ : 226 /* ExpressionStatement */); + var pos = getNodePos(); + var hasJSDoc = hasPrecedingJSDocComment(); + var node; + var hasParen = token() === 20 /* OpenParenToken */; var expression = allowInAnd(parseExpression); - if (expression.kind === 75 /* Identifier */ && parseOptional(58 /* ColonToken */)) { - node.kind = 238 /* LabeledStatement */; - node.label = expression; - node.statement = parseStatement(); + if (ts.isIdentifier(expression) && parseOptional(58 /* ColonToken */)) { + node = factory.createLabeledStatement(expression, parseStatement()); } else { - node.kind = 226 /* ExpressionStatement */; - node.expression = expression; parseSemicolon(); + node = factory.createExpressionStatement(expression); + if (hasParen) { + // do not parse the same jsdoc twice + hasJSDoc = false; + } } - return finishNode(node); + return withJSDoc(finishNode(node, pos), hasJSDoc); } function nextTokenIsIdentifierOrKeywordOnSameLine() { nextToken(); @@ -23851,11 +32061,11 @@ var ts; } function nextTokenIsClassKeywordOnSameLine() { nextToken(); - return token() === 80 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak(); + return token() === 83 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak(); } function nextTokenIsFunctionKeywordOnSameLine() { nextToken(); - return token() === 94 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak(); + return token() === 97 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak(); } function nextTokenIsIdentifierOrKeywordOrLiteralOnSameLine() { nextToken(); @@ -23864,12 +32074,12 @@ var ts; function isDeclaration() { while (true) { switch (token()) { - case 109 /* VarKeyword */: - case 115 /* LetKeyword */: - case 81 /* ConstKeyword */: - case 94 /* FunctionKeyword */: - case 80 /* ClassKeyword */: - case 88 /* EnumKeyword */: + case 112 /* VarKeyword */: + case 118 /* LetKeyword */: + case 84 /* ConstKeyword */: + case 97 /* FunctionKeyword */: + case 83 /* ClassKeyword */: + case 91 /* EnumKeyword */: return true; // 'declare', 'module', 'namespace', 'interface'* and 'type' are all legal JavaScript identifiers; // however, an identifier cannot be followed by another identifier on the same line. This is what we @@ -23892,44 +32102,44 @@ var ts; // I {} // // could be legal, it would add complexity for very little gain. - case 114 /* InterfaceKeyword */: - case 145 /* TypeKeyword */: + case 117 /* InterfaceKeyword */: + case 148 /* TypeKeyword */: return nextTokenIsIdentifierOnSameLine(); - case 135 /* ModuleKeyword */: - case 136 /* NamespaceKeyword */: + case 138 /* ModuleKeyword */: + case 139 /* NamespaceKeyword */: return nextTokenIsIdentifierOrStringLiteralOnSameLine(); - case 122 /* AbstractKeyword */: - case 126 /* AsyncKeyword */: - case 130 /* DeclareKeyword */: - case 117 /* PrivateKeyword */: - case 118 /* ProtectedKeyword */: - case 119 /* PublicKeyword */: - case 138 /* ReadonlyKeyword */: + case 125 /* AbstractKeyword */: + case 129 /* AsyncKeyword */: + case 133 /* DeclareKeyword */: + case 120 /* PrivateKeyword */: + case 121 /* ProtectedKeyword */: + case 122 /* PublicKeyword */: + case 141 /* ReadonlyKeyword */: nextToken(); // ASI takes effect for this modifier. if (scanner.hasPrecedingLineBreak()) { return false; } continue; - case 150 /* GlobalKeyword */: + case 153 /* GlobalKeyword */: nextToken(); - return token() === 18 /* OpenBraceToken */ || token() === 75 /* Identifier */ || token() === 89 /* ExportKeyword */; - case 96 /* ImportKeyword */: + return token() === 18 /* OpenBraceToken */ || token() === 78 /* Identifier */ || token() === 92 /* ExportKeyword */; + case 99 /* ImportKeyword */: nextToken(); return token() === 10 /* StringLiteral */ || token() === 41 /* AsteriskToken */ || token() === 18 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token()); - case 89 /* ExportKeyword */: + case 92 /* ExportKeyword */: var currentToken_1 = nextToken(); - if (currentToken_1 === 145 /* TypeKeyword */) { + if (currentToken_1 === 148 /* TypeKeyword */) { currentToken_1 = lookAhead(nextToken); } if (currentToken_1 === 62 /* EqualsToken */ || currentToken_1 === 41 /* AsteriskToken */ || - currentToken_1 === 18 /* OpenBraceToken */ || currentToken_1 === 84 /* DefaultKeyword */ || - currentToken_1 === 123 /* AsKeyword */) { + currentToken_1 === 18 /* OpenBraceToken */ || currentToken_1 === 87 /* DefaultKeyword */ || + currentToken_1 === 126 /* AsKeyword */) { return true; } continue; - case 120 /* StaticKeyword */: + case 123 /* StaticKeyword */: nextToken(); continue; default: @@ -23945,48 +32155,48 @@ var ts; case 59 /* AtToken */: case 26 /* SemicolonToken */: case 18 /* OpenBraceToken */: - case 109 /* VarKeyword */: - case 115 /* LetKeyword */: - case 94 /* FunctionKeyword */: - case 80 /* ClassKeyword */: - case 88 /* EnumKeyword */: - case 95 /* IfKeyword */: - case 86 /* DoKeyword */: - case 111 /* WhileKeyword */: - case 93 /* ForKeyword */: - case 82 /* ContinueKeyword */: - case 77 /* BreakKeyword */: - case 101 /* ReturnKeyword */: - case 112 /* WithKeyword */: - case 103 /* SwitchKeyword */: - case 105 /* ThrowKeyword */: - case 107 /* TryKeyword */: - case 83 /* DebuggerKeyword */: + case 112 /* VarKeyword */: + case 118 /* LetKeyword */: + case 97 /* FunctionKeyword */: + case 83 /* ClassKeyword */: + case 91 /* EnumKeyword */: + case 98 /* IfKeyword */: + case 89 /* DoKeyword */: + case 114 /* WhileKeyword */: + case 96 /* ForKeyword */: + case 85 /* ContinueKeyword */: + case 80 /* BreakKeyword */: + case 104 /* ReturnKeyword */: + case 115 /* WithKeyword */: + case 106 /* SwitchKeyword */: + case 108 /* ThrowKeyword */: + case 110 /* TryKeyword */: + case 86 /* DebuggerKeyword */: // 'catch' and 'finally' do not actually indicate that the code is part of a statement, // however, we say they are here so that we may gracefully parse them and error later. // falls through - case 79 /* CatchKeyword */: - case 92 /* FinallyKeyword */: + case 82 /* CatchKeyword */: + case 95 /* FinallyKeyword */: return true; - case 96 /* ImportKeyword */: + case 99 /* ImportKeyword */: return isStartOfDeclaration() || lookAhead(nextTokenIsOpenParenOrLessThanOrDot); - case 81 /* ConstKeyword */: - case 89 /* ExportKeyword */: + case 84 /* ConstKeyword */: + case 92 /* ExportKeyword */: return isStartOfDeclaration(); - case 126 /* AsyncKeyword */: - case 130 /* DeclareKeyword */: - case 114 /* InterfaceKeyword */: - case 135 /* ModuleKeyword */: - case 136 /* NamespaceKeyword */: - case 145 /* TypeKeyword */: - case 150 /* GlobalKeyword */: + case 129 /* AsyncKeyword */: + case 133 /* DeclareKeyword */: + case 117 /* InterfaceKeyword */: + case 138 /* ModuleKeyword */: + case 139 /* NamespaceKeyword */: + case 148 /* TypeKeyword */: + case 153 /* GlobalKeyword */: // When these don't start a declaration, they're an identifier in an expression statement return true; - case 119 /* PublicKeyword */: - case 117 /* PrivateKeyword */: - case 118 /* ProtectedKeyword */: - case 120 /* StaticKeyword */: - case 138 /* ReadonlyKeyword */: + case 122 /* PublicKeyword */: + case 120 /* PrivateKeyword */: + case 121 /* ProtectedKeyword */: + case 123 /* StaticKeyword */: + case 141 /* ReadonlyKeyword */: // When these don't start a declaration, they may be the start of a class member if an identifier // immediately follows. Otherwise they're an identifier in an expression statement. return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine); @@ -24009,64 +32219,64 @@ var ts; return parseEmptyStatement(); case 18 /* OpenBraceToken */: return parseBlock(/*ignoreMissingOpenBrace*/ false); - case 109 /* VarKeyword */: - return parseVariableStatement(createNodeWithJSDoc(242 /* VariableDeclaration */)); - case 115 /* LetKeyword */: + case 112 /* VarKeyword */: + return parseVariableStatement(getNodePos(), hasPrecedingJSDocComment(), /*decorators*/ undefined, /*modifiers*/ undefined); + case 118 /* LetKeyword */: if (isLetDeclaration()) { - return parseVariableStatement(createNodeWithJSDoc(242 /* VariableDeclaration */)); + return parseVariableStatement(getNodePos(), hasPrecedingJSDocComment(), /*decorators*/ undefined, /*modifiers*/ undefined); } break; - case 94 /* FunctionKeyword */: - return parseFunctionDeclaration(createNodeWithJSDoc(244 /* FunctionDeclaration */)); - case 80 /* ClassKeyword */: - return parseClassDeclaration(createNodeWithJSDoc(245 /* ClassDeclaration */)); - case 95 /* IfKeyword */: + case 97 /* FunctionKeyword */: + return parseFunctionDeclaration(getNodePos(), hasPrecedingJSDocComment(), /*decorators*/ undefined, /*modifiers*/ undefined); + case 83 /* ClassKeyword */: + return parseClassDeclaration(getNodePos(), hasPrecedingJSDocComment(), /*decorators*/ undefined, /*modifiers*/ undefined); + case 98 /* IfKeyword */: return parseIfStatement(); - case 86 /* DoKeyword */: + case 89 /* DoKeyword */: return parseDoStatement(); - case 111 /* WhileKeyword */: + case 114 /* WhileKeyword */: return parseWhileStatement(); - case 93 /* ForKeyword */: + case 96 /* ForKeyword */: return parseForOrForInOrForOfStatement(); - case 82 /* ContinueKeyword */: - return parseBreakOrContinueStatement(233 /* ContinueStatement */); - case 77 /* BreakKeyword */: - return parseBreakOrContinueStatement(234 /* BreakStatement */); - case 101 /* ReturnKeyword */: + case 85 /* ContinueKeyword */: + return parseBreakOrContinueStatement(237 /* ContinueStatement */); + case 80 /* BreakKeyword */: + return parseBreakOrContinueStatement(238 /* BreakStatement */); + case 104 /* ReturnKeyword */: return parseReturnStatement(); - case 112 /* WithKeyword */: + case 115 /* WithKeyword */: return parseWithStatement(); - case 103 /* SwitchKeyword */: + case 106 /* SwitchKeyword */: return parseSwitchStatement(); - case 105 /* ThrowKeyword */: + case 108 /* ThrowKeyword */: return parseThrowStatement(); - case 107 /* TryKeyword */: + case 110 /* TryKeyword */: // Include 'catch' and 'finally' for error recovery. // falls through - case 79 /* CatchKeyword */: - case 92 /* FinallyKeyword */: + case 82 /* CatchKeyword */: + case 95 /* FinallyKeyword */: return parseTryStatement(); - case 83 /* DebuggerKeyword */: + case 86 /* DebuggerKeyword */: return parseDebuggerStatement(); case 59 /* AtToken */: return parseDeclaration(); - case 126 /* AsyncKeyword */: - case 114 /* InterfaceKeyword */: - case 145 /* TypeKeyword */: - case 135 /* ModuleKeyword */: - case 136 /* NamespaceKeyword */: - case 130 /* DeclareKeyword */: - case 81 /* ConstKeyword */: - case 88 /* EnumKeyword */: - case 89 /* ExportKeyword */: - case 96 /* ImportKeyword */: - case 117 /* PrivateKeyword */: - case 118 /* ProtectedKeyword */: - case 119 /* PublicKeyword */: - case 122 /* AbstractKeyword */: - case 120 /* StaticKeyword */: - case 138 /* ReadonlyKeyword */: - case 150 /* GlobalKeyword */: + case 129 /* AsyncKeyword */: + case 117 /* InterfaceKeyword */: + case 148 /* TypeKeyword */: + case 138 /* ModuleKeyword */: + case 139 /* NamespaceKeyword */: + case 133 /* DeclareKeyword */: + case 84 /* ConstKeyword */: + case 91 /* EnumKeyword */: + case 92 /* ExportKeyword */: + case 99 /* ImportKeyword */: + case 120 /* PrivateKeyword */: + case 121 /* ProtectedKeyword */: + case 122 /* PublicKeyword */: + case 125 /* AbstractKeyword */: + case 123 /* StaticKeyword */: + case 141 /* ReadonlyKeyword */: + case 153 /* GlobalKeyword */: if (isStartOfDeclaration()) { return parseDeclaration(); } @@ -24075,32 +32285,35 @@ var ts; return parseExpressionOrLabeledStatement(); } function isDeclareModifier(modifier) { - return modifier.kind === 130 /* DeclareKeyword */; + return modifier.kind === 133 /* DeclareKeyword */; } function parseDeclaration() { - var modifiers = lookAhead(function () { return (parseDecorators(), parseModifiers()); }); + // TODO: Can we hold onto the parsed decorators/modifiers and advance the scanner + // if we can't reuse the declaration, so that we don't do this work twice? + // // `parseListElement` attempted to get the reused node at this position, // but the ambient context flag was not yet set, so the node appeared // not reusable in that context. - var isAmbient = ts.some(modifiers, isDeclareModifier); + var isAmbient = ts.some(lookAhead(function () { return (parseDecorators(), parseModifiers()); }), isDeclareModifier); if (isAmbient) { - var node_3 = tryReuseAmbientDeclaration(); - if (node_3) { - return node_3; + var node = tryReuseAmbientDeclaration(); + if (node) { + return node; } } - var node = createNodeWithJSDoc(0 /* Unknown */); - node.decorators = parseDecorators(); - node.modifiers = parseModifiers(); + var pos = getNodePos(); + var hasJSDoc = hasPrecedingJSDocComment(); + var decorators = parseDecorators(); + var modifiers = parseModifiers(); if (isAmbient) { - for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) { + for (var _i = 0, _a = modifiers; _i < _a.length; _i++) { var m = _a[_i]; m.flags |= 8388608 /* Ambient */; } - return doInsideOfContext(8388608 /* Ambient */, function () { return parseDeclarationWorker(node); }); + return doInsideOfContext(8388608 /* Ambient */, function () { return parseDeclarationWorker(pos, hasJSDoc, decorators, modifiers); }); } else { - return parseDeclarationWorker(node); + return parseDeclarationWorker(pos, hasJSDoc, decorators, modifiers); } } function tryReuseAmbientDeclaration() { @@ -24111,48 +32324,48 @@ var ts; } }); } - function parseDeclarationWorker(node) { + function parseDeclarationWorker(pos, hasJSDoc, decorators, modifiers) { switch (token()) { - case 109 /* VarKeyword */: - case 115 /* LetKeyword */: - case 81 /* ConstKeyword */: - return parseVariableStatement(node); - case 94 /* FunctionKeyword */: - return parseFunctionDeclaration(node); - case 80 /* ClassKeyword */: - return parseClassDeclaration(node); - case 114 /* InterfaceKeyword */: - return parseInterfaceDeclaration(node); - case 145 /* TypeKeyword */: - return parseTypeAliasDeclaration(node); - case 88 /* EnumKeyword */: - return parseEnumDeclaration(node); - case 150 /* GlobalKeyword */: - case 135 /* ModuleKeyword */: - case 136 /* NamespaceKeyword */: - return parseModuleDeclaration(node); - case 96 /* ImportKeyword */: - return parseImportDeclarationOrImportEqualsDeclaration(node); - case 89 /* ExportKeyword */: + case 112 /* VarKeyword */: + case 118 /* LetKeyword */: + case 84 /* ConstKeyword */: + return parseVariableStatement(pos, hasJSDoc, decorators, modifiers); + case 97 /* FunctionKeyword */: + return parseFunctionDeclaration(pos, hasJSDoc, decorators, modifiers); + case 83 /* ClassKeyword */: + return parseClassDeclaration(pos, hasJSDoc, decorators, modifiers); + case 117 /* InterfaceKeyword */: + return parseInterfaceDeclaration(pos, hasJSDoc, decorators, modifiers); + case 148 /* TypeKeyword */: + return parseTypeAliasDeclaration(pos, hasJSDoc, decorators, modifiers); + case 91 /* EnumKeyword */: + return parseEnumDeclaration(pos, hasJSDoc, decorators, modifiers); + case 153 /* GlobalKeyword */: + case 138 /* ModuleKeyword */: + case 139 /* NamespaceKeyword */: + return parseModuleDeclaration(pos, hasJSDoc, decorators, modifiers); + case 99 /* ImportKeyword */: + return parseImportDeclarationOrImportEqualsDeclaration(pos, hasJSDoc, decorators, modifiers); + case 92 /* ExportKeyword */: nextToken(); switch (token()) { - case 84 /* DefaultKeyword */: + case 87 /* DefaultKeyword */: case 62 /* EqualsToken */: - return parseExportAssignment(node); - case 123 /* AsKeyword */: - return parseNamespaceExportDeclaration(node); + return parseExportAssignment(pos, hasJSDoc, decorators, modifiers); + case 126 /* AsKeyword */: + return parseNamespaceExportDeclaration(pos, hasJSDoc, decorators, modifiers); default: - return parseExportDeclaration(node); + return parseExportDeclaration(pos, hasJSDoc, decorators, modifiers); } default: - if (node.decorators || node.modifiers) { + if (decorators || modifiers) { // We reached this point because we encountered decorators and/or modifiers and assumed a declaration // would follow. For recovery and error reporting purposes, return an incomplete declaration. - var missing = createMissingNode(264 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected); - missing.pos = node.pos; - missing.decorators = node.decorators; - missing.modifiers = node.modifiers; - return finishNode(missing); + var missing = createMissingNode(268 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected); + ts.setTextRangePos(missing, pos); + missing.decorators = decorators; + missing.modifiers = modifiers; + return missing; } return undefined; // TODO: GH#18217 } @@ -24170,50 +32383,51 @@ var ts; } // DECLARATIONS function parseArrayBindingElement() { + var pos = getNodePos(); if (token() === 27 /* CommaToken */) { - return createNode(215 /* OmittedExpression */); + return finishNode(factory.createOmittedExpression(), pos); } - var node = createNode(191 /* BindingElement */); - node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */); - node.name = parseIdentifierOrPattern(); - node.initializer = parseInitializer(); - return finishNode(node); + var dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */); + var name = parseIdentifierOrPattern(); + var initializer = parseInitializer(); + return finishNode(factory.createBindingElement(dotDotDotToken, /*propertyName*/ undefined, name, initializer), pos); } function parseObjectBindingElement() { - var node = createNode(191 /* BindingElement */); - node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */); - var tokenIsIdentifier = isIdentifier(); + var pos = getNodePos(); + var dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */); + var tokenIsIdentifier = isBindingIdentifier(); var propertyName = parsePropertyName(); + var name; if (tokenIsIdentifier && token() !== 58 /* ColonToken */) { - node.name = propertyName; + name = propertyName; + propertyName = undefined; } else { parseExpected(58 /* ColonToken */); - node.propertyName = propertyName; - node.name = parseIdentifierOrPattern(); + name = parseIdentifierOrPattern(); } - node.initializer = parseInitializer(); - return finishNode(node); + var initializer = parseInitializer(); + return finishNode(factory.createBindingElement(dotDotDotToken, propertyName, name, initializer), pos); } function parseObjectBindingPattern() { - var node = createNode(189 /* ObjectBindingPattern */); + var pos = getNodePos(); parseExpected(18 /* OpenBraceToken */); - node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement); + var elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement); parseExpected(19 /* CloseBraceToken */); - return finishNode(node); + return finishNode(factory.createObjectBindingPattern(elements), pos); } function parseArrayBindingPattern() { - var node = createNode(190 /* ArrayBindingPattern */); + var pos = getNodePos(); parseExpected(22 /* OpenBracketToken */); - node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement); + var elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement); parseExpected(23 /* CloseBracketToken */); - return finishNode(node); + return finishNode(factory.createArrayBindingPattern(elements), pos); } - function isIdentifierOrPrivateIdentifierOrPattern() { + function isBindingIdentifierOrPrivateIdentifierOrPattern() { return token() === 18 /* OpenBraceToken */ || token() === 22 /* OpenBracketToken */ - || token() === 76 /* PrivateIdentifier */ - || isIdentifier(); + || token() === 79 /* PrivateIdentifier */ + || isBindingIdentifier(); } function parseIdentifierOrPattern(privateIdentifierDiagnosticMessage) { if (token() === 22 /* OpenBracketToken */) { @@ -24222,34 +32436,35 @@ var ts; if (token() === 18 /* OpenBraceToken */) { return parseObjectBindingPattern(); } - return parseIdentifier(/*diagnosticMessage*/ undefined, privateIdentifierDiagnosticMessage); + return parseBindingIdentifier(privateIdentifierDiagnosticMessage); } function parseVariableDeclarationAllowExclamation() { return parseVariableDeclaration(/*allowExclamation*/ true); } function parseVariableDeclaration(allowExclamation) { - var node = createNode(242 /* VariableDeclaration */); - node.name = parseIdentifierOrPattern(ts.Diagnostics.Private_identifiers_are_not_allowed_in_variable_declarations); - if (allowExclamation && node.name.kind === 75 /* Identifier */ && + var pos = getNodePos(); + var name = parseIdentifierOrPattern(ts.Diagnostics.Private_identifiers_are_not_allowed_in_variable_declarations); + var exclamationToken; + if (allowExclamation && name.kind === 78 /* Identifier */ && token() === 53 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) { - node.exclamationToken = parseTokenNode(); + exclamationToken = parseTokenNode(); } - node.type = parseTypeAnnotation(); - if (!isInOrOfKeyword(token())) { - node.initializer = parseInitializer(); - } - return finishNode(node); + var type = parseTypeAnnotation(); + var initializer = isInOrOfKeyword(token()) ? undefined : parseInitializer(); + var node = factory.createVariableDeclaration(name, exclamationToken, type, initializer); + return finishNode(node, pos); } function parseVariableDeclarationList(inForStatementInitializer) { - var node = createNode(243 /* VariableDeclarationList */); + var pos = getNodePos(); + var flags = 0; switch (token()) { - case 109 /* VarKeyword */: + case 112 /* VarKeyword */: break; - case 115 /* LetKeyword */: - node.flags |= 1 /* Let */; + case 118 /* LetKeyword */: + flags |= 1 /* Let */; break; - case 81 /* ConstKeyword */: - node.flags |= 2 /* Const */; + case 84 /* ConstKeyword */: + flags |= 2 /* Const */; break; default: ts.Debug.fail(); @@ -24264,40 +32479,51 @@ var ts; // So we need to look ahead to determine if 'of' should be treated as a keyword in // this context. // The checker will then give an error that there is an empty declaration list. - if (token() === 152 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) { - node.declarations = createMissingList(); + var declarations; + if (token() === 155 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) { + declarations = createMissingList(); } else { var savedDisallowIn = inDisallowInContext(); setDisallowInContext(inForStatementInitializer); - node.declarations = parseDelimitedList(8 /* VariableDeclarations */, inForStatementInitializer ? parseVariableDeclaration : parseVariableDeclarationAllowExclamation); + declarations = parseDelimitedList(8 /* VariableDeclarations */, inForStatementInitializer ? parseVariableDeclaration : parseVariableDeclarationAllowExclamation); setDisallowInContext(savedDisallowIn); } - return finishNode(node); + return finishNode(factory.createVariableDeclarationList(declarations, flags), pos); } function canFollowContextualOfKeyword() { return nextTokenIsIdentifier() && nextToken() === 21 /* CloseParenToken */; } - function parseVariableStatement(node) { - node.kind = 225 /* VariableStatement */; - node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false); + function parseVariableStatement(pos, hasJSDoc, decorators, modifiers) { + var declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false); parseSemicolon(); - return finishNode(node); + var node = factory.createVariableStatement(modifiers, declarationList); + // Decorators are not allowed on a variable statement, so we keep track of them to report them in the grammar checker. + node.decorators = decorators; + return withJSDoc(finishNode(node, pos), hasJSDoc); } - function parseFunctionDeclaration(node) { - node.kind = 244 /* FunctionDeclaration */; - parseExpected(94 /* FunctionKeyword */); - node.asteriskToken = parseOptionalToken(41 /* AsteriskToken */); - node.name = hasModifierOfKind(node, 84 /* DefaultKeyword */) ? parseOptionalIdentifier() : parseIdentifier(); - var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */; - var isAsync = hasModifierOfKind(node, 126 /* AsyncKeyword */) ? 2 /* Await */ : 0 /* None */; - fillSignature(58 /* ColonToken */, isGenerator | isAsync, node); - node.body = parseFunctionBlockOrSemicolon(isGenerator | isAsync, ts.Diagnostics.or_expected); - return finishNode(node); + function parseFunctionDeclaration(pos, hasJSDoc, decorators, modifiers) { + var savedAwaitContext = inAwaitContext(); + var modifierFlags = ts.modifiersToFlags(modifiers); + parseExpected(97 /* FunctionKeyword */); + var asteriskToken = parseOptionalToken(41 /* AsteriskToken */); + // We don't parse the name here in await context, instead we will report a grammar error in the checker. + var name = modifierFlags & 512 /* Default */ ? parseOptionalBindingIdentifier() : parseBindingIdentifier(); + var isGenerator = asteriskToken ? 1 /* Yield */ : 0 /* None */; + var isAsync = modifierFlags & 256 /* Async */ ? 2 /* Await */ : 0 /* None */; + var typeParameters = parseTypeParameters(); + if (modifierFlags & 1 /* Export */) + setAwaitContext(/*value*/ true); + var parameters = parseParameters(isGenerator | isAsync); + var type = parseReturnType(58 /* ColonToken */, /*isType*/ false); + var body = parseFunctionBlockOrSemicolon(isGenerator | isAsync, ts.Diagnostics.or_expected); + setAwaitContext(savedAwaitContext); + var node = factory.createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body); + return withJSDoc(finishNode(node, pos), hasJSDoc); } function parseConstructorName() { - if (token() === 129 /* ConstructorKeyword */) { - return parseExpected(129 /* ConstructorKeyword */); + if (token() === 132 /* ConstructorKeyword */) { + return parseExpected(132 /* ConstructorKeyword */); } if (token() === 10 /* StringLiteral */ && lookAhead(nextToken) === 20 /* OpenParenToken */) { return tryParse(function () { @@ -24306,52 +32532,66 @@ var ts; }); } } - function tryParseConstructorDeclaration(node) { + function tryParseConstructorDeclaration(pos, hasJSDoc, decorators, modifiers) { return tryParse(function () { if (parseConstructorName()) { - node.kind = 162 /* Constructor */; - fillSignature(58 /* ColonToken */, 0 /* None */, node); - node.body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected); - return finishNode(node); + var typeParameters = parseTypeParameters(); + var parameters = parseParameters(0 /* None */); + var type = parseReturnType(58 /* ColonToken */, /*isType*/ false); + var body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected); + var node = factory.createConstructorDeclaration(decorators, modifiers, parameters, body); + // Attach `typeParameters` and `type` if they exist so that we can report them in the grammar checker. + node.typeParameters = typeParameters; + node.type = type; + return withJSDoc(finishNode(node, pos), hasJSDoc); } }); } - function parseMethodDeclaration(node, asteriskToken, diagnosticMessage) { - node.kind = 161 /* MethodDeclaration */; - node.asteriskToken = asteriskToken; + function parseMethodDeclaration(pos, hasJSDoc, decorators, modifiers, asteriskToken, name, questionToken, exclamationToken, diagnosticMessage) { var isGenerator = asteriskToken ? 1 /* Yield */ : 0 /* None */; - var isAsync = hasModifierOfKind(node, 126 /* AsyncKeyword */) ? 2 /* Await */ : 0 /* None */; - fillSignature(58 /* ColonToken */, isGenerator | isAsync, node); - node.body = parseFunctionBlockOrSemicolon(isGenerator | isAsync, diagnosticMessage); - return finishNode(node); + var isAsync = ts.some(modifiers, ts.isAsyncModifier) ? 2 /* Await */ : 0 /* None */; + var typeParameters = parseTypeParameters(); + var parameters = parseParameters(isGenerator | isAsync); + var type = parseReturnType(58 /* ColonToken */, /*isType*/ false); + var body = parseFunctionBlockOrSemicolon(isGenerator | isAsync, diagnosticMessage); + var node = factory.createMethodDeclaration(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body); + // An exclamation token on a method is invalid syntax and will be handled by the grammar checker + node.exclamationToken = exclamationToken; + return withJSDoc(finishNode(node, pos), hasJSDoc); } - function parsePropertyDeclaration(node) { - node.kind = 159 /* PropertyDeclaration */; - if (!node.questionToken && token() === 53 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) { - node.exclamationToken = parseTokenNode(); - } - node.type = parseTypeAnnotation(); - node.initializer = doOutsideOfContext(8192 /* YieldContext */ | 32768 /* AwaitContext */ | 4096 /* DisallowInContext */, parseInitializer); + function parsePropertyDeclaration(pos, hasJSDoc, decorators, modifiers, name, questionToken) { + var exclamationToken = !questionToken && !scanner.hasPrecedingLineBreak() ? parseOptionalToken(53 /* ExclamationToken */) : undefined; + var type = parseTypeAnnotation(); + var initializer = doOutsideOfContext(8192 /* YieldContext */ | 32768 /* AwaitContext */ | 4096 /* DisallowInContext */, parseInitializer); parseSemicolon(); - return finishNode(node); + var node = factory.createPropertyDeclaration(decorators, modifiers, name, questionToken || exclamationToken, type, initializer); + return withJSDoc(finishNode(node, pos), hasJSDoc); } - function parsePropertyOrMethodDeclaration(node) { + function parsePropertyOrMethodDeclaration(pos, hasJSDoc, decorators, modifiers) { var asteriskToken = parseOptionalToken(41 /* AsteriskToken */); - node.name = parsePropertyName(); + var name = parsePropertyName(); // Note: this is not legal as per the grammar. But we allow it in the parser and // report an error in the grammar checker. - node.questionToken = parseOptionalToken(57 /* QuestionToken */); + var questionToken = parseOptionalToken(57 /* QuestionToken */); if (asteriskToken || token() === 20 /* OpenParenToken */ || token() === 29 /* LessThanToken */) { - return parseMethodDeclaration(node, asteriskToken, ts.Diagnostics.or_expected); + return parseMethodDeclaration(pos, hasJSDoc, decorators, modifiers, asteriskToken, name, questionToken, /*exclamationToken*/ undefined, ts.Diagnostics.or_expected); } - return parsePropertyDeclaration(node); + return parsePropertyDeclaration(pos, hasJSDoc, decorators, modifiers, name, questionToken); } - function parseAccessorDeclaration(node, kind) { - node.kind = kind; - node.name = parsePropertyName(); - fillSignature(58 /* ColonToken */, 0 /* None */, node); - node.body = parseFunctionBlockOrSemicolon(0 /* None */); - return finishNode(node); + function parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, kind) { + var name = parsePropertyName(); + var typeParameters = parseTypeParameters(); + var parameters = parseParameters(0 /* None */); + var type = parseReturnType(58 /* ColonToken */, /*isType*/ false); + var body = parseFunctionBlockOrSemicolon(0 /* None */); + var node = kind === 166 /* GetAccessor */ + ? factory.createGetAccessorDeclaration(decorators, modifiers, name, parameters, type, body) + : factory.createSetAccessorDeclaration(decorators, modifiers, name, parameters, body); + // Keep track of `typeParameters` (for both) and `type` (for setters) if they were parsed those indicate grammar errors + node.typeParameters = typeParameters; + if (type && node.kind === 167 /* SetAccessor */) + node.type = type; + return withJSDoc(finishNode(node, pos), hasJSDoc); } function isClassMemberStart() { var idToken; @@ -24388,7 +32628,7 @@ var ts; // If we were able to get any potential identifier... if (idToken !== undefined) { // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse. - if (!ts.isKeyword(idToken) || idToken === 142 /* SetKeyword */ || idToken === 131 /* GetKeyword */) { + if (!ts.isKeyword(idToken) || idToken === 145 /* SetKeyword */ || idToken === 134 /* GetKeyword */) { return true; } // If it *is* a keyword, but not an accessor, check a little farther along @@ -24412,20 +32652,50 @@ var ts; } return false; } - function parseDecorators() { - var list; - var listPos = getNodePos(); - while (true) { - var decoratorStart = getNodePos(); - if (!parseOptional(59 /* AtToken */)) { - break; - } - var decorator = createNode(157 /* Decorator */, decoratorStart); - decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher); - finishNode(decorator); - (list || (list = [])).push(decorator); + function parseDecoratorExpression() { + if (inAwaitContext() && token() === 130 /* AwaitKeyword */) { + // `@await` is is disallowed in an [Await] context, but can cause parsing to go off the rails + // This simply parses the missing identifier and moves on. + var pos = getNodePos(); + var awaitExpression = parseIdentifier(ts.Diagnostics.Expression_expected); + nextToken(); + var memberExpression = parseMemberExpressionRest(pos, awaitExpression, /*allowOptionalChain*/ true); + return parseCallExpressionRest(pos, memberExpression); } - return list && createNodeArray(list, listPos); + return parseLeftHandSideExpressionOrHigher(); + } + function tryParseDecorator() { + var pos = getNodePos(); + if (!parseOptional(59 /* AtToken */)) { + return undefined; + } + var expression = doInDecoratorContext(parseDecoratorExpression); + return finishNode(factory.createDecorator(expression), pos); + } + function parseDecorators() { + var pos = getNodePos(); + var list, decorator; + while (decorator = tryParseDecorator()) { + list = ts.append(list, decorator); + } + return list && createNodeArray(list, pos); + } + function tryParseModifier(permitInvalidConstAsModifier) { + var pos = getNodePos(); + var kind = token(); + if (token() === 84 /* ConstKeyword */ && permitInvalidConstAsModifier) { + // We need to ensure that any subsequent modifiers appear on the same line + // so that when 'const' is a standalone declaration, we don't issue an error. + if (!tryParse(nextTokenIsOnSameLineAndCanFollowModifier)) { + return undefined; + } + } + else { + if (!parseAnyContextualModifier()) { + return undefined; + } + } + return finishNode(factory.createToken(kind), pos); } /* * There are situations in which a modifier like 'const' will appear unexpectedly, such as on a class member. @@ -24435,62 +32705,46 @@ var ts; * In such situations, 'permitInvalidConstAsModifier' should be set to true. */ function parseModifiers(permitInvalidConstAsModifier) { - var list; - var listPos = getNodePos(); - while (true) { - var modifierStart = scanner.getStartPos(); - var modifierKind = token(); - if (token() === 81 /* ConstKeyword */ && permitInvalidConstAsModifier) { - // We need to ensure that any subsequent modifiers appear on the same line - // so that when 'const' is a standalone declaration, we don't issue an error. - if (!tryParse(nextTokenIsOnSameLineAndCanFollowModifier)) { - break; - } - } - else { - if (!parseAnyContextualModifier()) { - break; - } - } - var modifier = finishNode(createNode(modifierKind, modifierStart)); - (list || (list = [])).push(modifier); + var pos = getNodePos(); + var list, modifier; + while (modifier = tryParseModifier(permitInvalidConstAsModifier)) { + list = ts.append(list, modifier); } - return list && createNodeArray(list, listPos); + return list && createNodeArray(list, pos); } function parseModifiersForArrowFunction() { var modifiers; - if (token() === 126 /* AsyncKeyword */) { - var modifierStart = scanner.getStartPos(); - var modifierKind = token(); + if (token() === 129 /* AsyncKeyword */) { + var pos = getNodePos(); nextToken(); - var modifier = finishNode(createNode(modifierKind, modifierStart)); - modifiers = createNodeArray([modifier], modifierStart); + var modifier = finishNode(factory.createToken(129 /* AsyncKeyword */), pos); + modifiers = createNodeArray([modifier], pos); } return modifiers; } function parseClassElement() { + var pos = getNodePos(); if (token() === 26 /* SemicolonToken */) { - var result = createNode(222 /* SemicolonClassElement */); nextToken(); - return finishNode(result); + return finishNode(factory.createSemicolonClassElement(), pos); } - var node = createNodeWithJSDoc(0 /* Unknown */); - node.decorators = parseDecorators(); - node.modifiers = parseModifiers(/*permitInvalidConstAsModifier*/ true); - if (parseContextualModifier(131 /* GetKeyword */)) { - return parseAccessorDeclaration(node, 163 /* GetAccessor */); + var hasJSDoc = hasPrecedingJSDocComment(); + var decorators = parseDecorators(); + var modifiers = parseModifiers(/*permitInvalidConstAsModifier*/ true); + if (parseContextualModifier(134 /* GetKeyword */)) { + return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 166 /* GetAccessor */); } - if (parseContextualModifier(142 /* SetKeyword */)) { - return parseAccessorDeclaration(node, 164 /* SetAccessor */); + if (parseContextualModifier(145 /* SetKeyword */)) { + return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 167 /* SetAccessor */); } - if (token() === 129 /* ConstructorKeyword */ || token() === 10 /* StringLiteral */) { - var constructorDeclaration = tryParseConstructorDeclaration(node); + if (token() === 132 /* ConstructorKeyword */ || token() === 10 /* StringLiteral */) { + var constructorDeclaration = tryParseConstructorDeclaration(pos, hasJSDoc, decorators, modifiers); if (constructorDeclaration) { return constructorDeclaration; } } if (isIndexSignature()) { - return parseIndexSignatureDeclaration(node); + return parseIndexSignatureDeclaration(pos, hasJSDoc, decorators, modifiers); } // It is very important that we check this *after* checking indexers because // the [ token can start an index signature or a computed property name @@ -24499,48 +32753,56 @@ var ts; token() === 8 /* NumericLiteral */ || token() === 41 /* AsteriskToken */ || token() === 22 /* OpenBracketToken */) { - var isAmbient = node.modifiers && ts.some(node.modifiers, isDeclareModifier); + var isAmbient = ts.some(modifiers, isDeclareModifier); if (isAmbient) { - for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) { + for (var _i = 0, _a = modifiers; _i < _a.length; _i++) { var m = _a[_i]; m.flags |= 8388608 /* Ambient */; } - return doInsideOfContext(8388608 /* Ambient */, function () { return parsePropertyOrMethodDeclaration(node); }); + return doInsideOfContext(8388608 /* Ambient */, function () { return parsePropertyOrMethodDeclaration(pos, hasJSDoc, decorators, modifiers); }); } else { - return parsePropertyOrMethodDeclaration(node); + return parsePropertyOrMethodDeclaration(pos, hasJSDoc, decorators, modifiers); } } - if (node.decorators || node.modifiers) { + if (decorators || modifiers) { // treat this as a property declaration with a missing name. - node.name = createMissingNode(75 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected); - return parsePropertyDeclaration(node); + var name = createMissingNode(78 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected); + return parsePropertyDeclaration(pos, hasJSDoc, decorators, modifiers, name, /*questionToken*/ undefined); } // 'isClassMemberStart' should have hinted not to attempt parsing. return ts.Debug.fail("Should not have attempted to parse class member declaration."); } function parseClassExpression() { - return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 214 /* ClassExpression */); + return parseClassDeclarationOrExpression(getNodePos(), hasPrecedingJSDocComment(), /*decorators*/ undefined, /*modifiers*/ undefined, 218 /* ClassExpression */); } - function parseClassDeclaration(node) { - return parseClassDeclarationOrExpression(node, 245 /* ClassDeclaration */); + function parseClassDeclaration(pos, hasJSDoc, decorators, modifiers) { + return parseClassDeclarationOrExpression(pos, hasJSDoc, decorators, modifiers, 249 /* ClassDeclaration */); } - function parseClassDeclarationOrExpression(node, kind) { - node.kind = kind; - parseExpected(80 /* ClassKeyword */); - node.name = parseNameOfClassDeclarationOrExpression(); - node.typeParameters = parseTypeParameters(); - node.heritageClauses = parseHeritageClauses(); + function parseClassDeclarationOrExpression(pos, hasJSDoc, decorators, modifiers, kind) { + var savedAwaitContext = inAwaitContext(); + parseExpected(83 /* ClassKeyword */); + // We don't parse the name here in await context, instead we will report a grammar error in the checker. + var name = parseNameOfClassDeclarationOrExpression(); + var typeParameters = parseTypeParameters(); + if (ts.some(modifiers, ts.isExportModifier)) + setAwaitContext(/*value*/ true); + var heritageClauses = parseHeritageClauses(); + var members; if (parseExpected(18 /* OpenBraceToken */)) { // ClassTail[Yield,Await] : (Modified) See 14.5 // ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt } - node.members = parseClassMembers(); + members = parseClassMembers(); parseExpected(19 /* CloseBraceToken */); } else { - node.members = createMissingList(); + members = createMissingList(); } - return finishNode(node); + setAwaitContext(savedAwaitContext); + var node = kind === 249 /* ClassDeclaration */ + ? factory.createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) + : factory.createClassExpression(decorators, modifiers, name, typeParameters, heritageClauses, members); + return withJSDoc(finishNode(node, pos), hasJSDoc); } function parseNameOfClassDeclarationOrExpression() { // implements is a future reserved word so @@ -24548,12 +32810,12 @@ var ts; // - class expression with omitted name, 'implements' starts heritage clause // - class with name 'implements' // 'isImplementsClause' helps to disambiguate between these two cases - return isIdentifier() && !isImplementsClause() - ? parseIdentifier() + return isBindingIdentifier() && !isImplementsClause() + ? createIdentifier(isBindingIdentifier()) : undefined; } function isImplementsClause() { - return token() === 113 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword); + return token() === 116 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword); } function parseHeritageClauses() { // ClassTail[Yield,Await] : (Modified) See 14.5 @@ -24564,133 +32826,137 @@ var ts; return undefined; } function parseHeritageClause() { + var pos = getNodePos(); var tok = token(); - ts.Debug.assert(tok === 90 /* ExtendsKeyword */ || tok === 113 /* ImplementsKeyword */); // isListElement() should ensure this. - var node = createNode(279 /* HeritageClause */); - node.token = tok; + ts.Debug.assert(tok === 93 /* ExtendsKeyword */ || tok === 116 /* ImplementsKeyword */); // isListElement() should ensure this. nextToken(); - node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments); - return finishNode(node); + var types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments); + return finishNode(factory.createHeritageClause(tok, types), pos); } function parseExpressionWithTypeArguments() { - var node = createNode(216 /* ExpressionWithTypeArguments */); - node.expression = parseLeftHandSideExpressionOrHigher(); - node.typeArguments = tryParseTypeArguments(); - return finishNode(node); + var pos = getNodePos(); + var expression = parseLeftHandSideExpressionOrHigher(); + var typeArguments = tryParseTypeArguments(); + return finishNode(factory.createExpressionWithTypeArguments(expression, typeArguments), pos); } function tryParseTypeArguments() { return token() === 29 /* LessThanToken */ ? parseBracketedList(20 /* TypeArguments */, parseType, 29 /* LessThanToken */, 31 /* GreaterThanToken */) : undefined; } function isHeritageClause() { - return token() === 90 /* ExtendsKeyword */ || token() === 113 /* ImplementsKeyword */; + return token() === 93 /* ExtendsKeyword */ || token() === 116 /* ImplementsKeyword */; } function parseClassMembers() { return parseList(5 /* ClassMembers */, parseClassElement); } - function parseInterfaceDeclaration(node) { - node.kind = 246 /* InterfaceDeclaration */; - parseExpected(114 /* InterfaceKeyword */); - node.name = parseIdentifier(); - node.typeParameters = parseTypeParameters(); - node.heritageClauses = parseHeritageClauses(); - node.members = parseObjectTypeMembers(); - return finishNode(node); + function parseInterfaceDeclaration(pos, hasJSDoc, decorators, modifiers) { + parseExpected(117 /* InterfaceKeyword */); + var name = parseIdentifier(); + var typeParameters = parseTypeParameters(); + var heritageClauses = parseHeritageClauses(); + var members = parseObjectTypeMembers(); + var node = factory.createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members); + return withJSDoc(finishNode(node, pos), hasJSDoc); } - function parseTypeAliasDeclaration(node) { - node.kind = 247 /* TypeAliasDeclaration */; - parseExpected(145 /* TypeKeyword */); - node.name = parseIdentifier(); - node.typeParameters = parseTypeParameters(); + function parseTypeAliasDeclaration(pos, hasJSDoc, decorators, modifiers) { + parseExpected(148 /* TypeKeyword */); + var name = parseIdentifier(); + var typeParameters = parseTypeParameters(); parseExpected(62 /* EqualsToken */); - node.type = parseType(); + var type = parseType(); parseSemicolon(); - return finishNode(node); + var node = factory.createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type); + return withJSDoc(finishNode(node, pos), hasJSDoc); } // In an ambient declaration, the grammar only allows integer literals as initializers. // In a non-ambient declaration, the grammar allows uninitialized members only in a // ConstantEnumMemberSection, which starts at the beginning of an enum declaration // or any time an integer literal initializer is encountered. function parseEnumMember() { - var node = createNodeWithJSDoc(284 /* EnumMember */); - node.name = parsePropertyName(); - node.initializer = allowInAnd(parseInitializer); - return finishNode(node); + var pos = getNodePos(); + var hasJSDoc = hasPrecedingJSDocComment(); + var name = parsePropertyName(); + var initializer = allowInAnd(parseInitializer); + return withJSDoc(finishNode(factory.createEnumMember(name, initializer), pos), hasJSDoc); } - function parseEnumDeclaration(node) { - node.kind = 248 /* EnumDeclaration */; - parseExpected(88 /* EnumKeyword */); - node.name = parseIdentifier(); + function parseEnumDeclaration(pos, hasJSDoc, decorators, modifiers) { + parseExpected(91 /* EnumKeyword */); + var name = parseIdentifier(); + var members; if (parseExpected(18 /* OpenBraceToken */)) { - node.members = doOutsideOfYieldAndAwaitContext(function () { return parseDelimitedList(6 /* EnumMembers */, parseEnumMember); }); + members = doOutsideOfYieldAndAwaitContext(function () { return parseDelimitedList(6 /* EnumMembers */, parseEnumMember); }); parseExpected(19 /* CloseBraceToken */); } else { - node.members = createMissingList(); + members = createMissingList(); } - return finishNode(node); + var node = factory.createEnumDeclaration(decorators, modifiers, name, members); + return withJSDoc(finishNode(node, pos), hasJSDoc); } function parseModuleBlock() { - var node = createNode(250 /* ModuleBlock */); + var pos = getNodePos(); + var statements; if (parseExpected(18 /* OpenBraceToken */)) { - node.statements = parseList(1 /* BlockStatements */, parseStatement); + statements = parseList(1 /* BlockStatements */, parseStatement); parseExpected(19 /* CloseBraceToken */); } else { - node.statements = createMissingList(); + statements = createMissingList(); } - return finishNode(node); + return finishNode(factory.createModuleBlock(statements), pos); } - function parseModuleOrNamespaceDeclaration(node, flags) { - node.kind = 249 /* ModuleDeclaration */; + function parseModuleOrNamespaceDeclaration(pos, hasJSDoc, decorators, modifiers, flags) { // If we are parsing a dotted namespace name, we want to // propagate the 'Namespace' flag across the names if set. var namespaceFlag = flags & 16 /* Namespace */; - node.flags |= flags; - node.name = parseIdentifier(); - node.body = parseOptional(24 /* DotToken */) - ? parseModuleOrNamespaceDeclaration(createNode(0 /* Unknown */), 4 /* NestedNamespace */ | namespaceFlag) + var name = parseIdentifier(); + var body = parseOptional(24 /* DotToken */) + ? parseModuleOrNamespaceDeclaration(getNodePos(), /*hasJSDoc*/ false, /*decorators*/ undefined, /*modifiers*/ undefined, 4 /* NestedNamespace */ | namespaceFlag) : parseModuleBlock(); - return finishNode(node); + var node = factory.createModuleDeclaration(decorators, modifiers, name, body, flags); + return withJSDoc(finishNode(node, pos), hasJSDoc); } - function parseAmbientExternalModuleDeclaration(node) { - node.kind = 249 /* ModuleDeclaration */; - if (token() === 150 /* GlobalKeyword */) { + function parseAmbientExternalModuleDeclaration(pos, hasJSDoc, decorators, modifiers) { + var flags = 0; + var name; + if (token() === 153 /* GlobalKeyword */) { // parse 'global' as name of global scope augmentation - node.name = parseIdentifier(); - node.flags |= 1024 /* GlobalAugmentation */; + name = parseIdentifier(); + flags |= 1024 /* GlobalAugmentation */; } else { - node.name = parseLiteralNode(); - node.name.text = internIdentifier(node.name.text); + name = parseLiteralNode(); + name.text = internIdentifier(name.text); } + var body; if (token() === 18 /* OpenBraceToken */) { - node.body = parseModuleBlock(); + body = parseModuleBlock(); } else { parseSemicolon(); } - return finishNode(node); + var node = factory.createModuleDeclaration(decorators, modifiers, name, body, flags); + return withJSDoc(finishNode(node, pos), hasJSDoc); } - function parseModuleDeclaration(node) { + function parseModuleDeclaration(pos, hasJSDoc, decorators, modifiers) { var flags = 0; - if (token() === 150 /* GlobalKeyword */) { + if (token() === 153 /* GlobalKeyword */) { // global augmentation - return parseAmbientExternalModuleDeclaration(node); + return parseAmbientExternalModuleDeclaration(pos, hasJSDoc, decorators, modifiers); } - else if (parseOptional(136 /* NamespaceKeyword */)) { + else if (parseOptional(139 /* NamespaceKeyword */)) { flags |= 16 /* Namespace */; } else { - parseExpected(135 /* ModuleKeyword */); + parseExpected(138 /* ModuleKeyword */); if (token() === 10 /* StringLiteral */) { - return parseAmbientExternalModuleDeclaration(node); + return parseAmbientExternalModuleDeclaration(pos, hasJSDoc, decorators, modifiers); } } - return parseModuleOrNamespaceDeclaration(node, flags); + return parseModuleOrNamespaceDeclaration(pos, hasJSDoc, decorators, modifiers, flags); } function isExternalModuleReference() { - return token() === 139 /* RequireKeyword */ && + return token() === 142 /* RequireKeyword */ && lookAhead(nextTokenIsOpenParen); } function nextTokenIsOpenParen() { @@ -24699,46 +32965,50 @@ var ts; function nextTokenIsSlash() { return nextToken() === 43 /* SlashToken */; } - function parseNamespaceExportDeclaration(node) { - node.kind = 252 /* NamespaceExportDeclaration */; - parseExpected(123 /* AsKeyword */); - parseExpected(136 /* NamespaceKeyword */); - node.name = parseIdentifier(); + function parseNamespaceExportDeclaration(pos, hasJSDoc, decorators, modifiers) { + parseExpected(126 /* AsKeyword */); + parseExpected(139 /* NamespaceKeyword */); + var name = parseIdentifier(); parseSemicolon(); - return finishNode(node); + var node = factory.createNamespaceExportDeclaration(name); + // NamespaceExportDeclaration nodes cannot have decorators or modifiers, so we attach them here so we can report them in the grammar checker + node.decorators = decorators; + node.modifiers = modifiers; + return withJSDoc(finishNode(node, pos), hasJSDoc); } - function parseImportDeclarationOrImportEqualsDeclaration(node) { - parseExpected(96 /* ImportKeyword */); + function parseImportDeclarationOrImportEqualsDeclaration(pos, hasJSDoc, decorators, modifiers) { + parseExpected(99 /* ImportKeyword */); var afterImportPos = scanner.getStartPos(); + // We don't parse the identifier here in await context, instead we will report a grammar error in the checker. var identifier; if (isIdentifier()) { identifier = parseIdentifier(); } var isTypeOnly = false; - if (token() !== 149 /* FromKeyword */ && + if (token() !== 152 /* FromKeyword */ && (identifier === null || identifier === void 0 ? void 0 : identifier.escapedText) === "type" && (isIdentifier() || tokenAfterImportDefinitelyProducesImportDeclaration())) { isTypeOnly = true; identifier = isIdentifier() ? parseIdentifier() : undefined; } if (identifier && !tokenAfterImportedIdentifierDefinitelyProducesImportDeclaration()) { - return parseImportEqualsDeclaration(node, identifier, isTypeOnly); + return parseImportEqualsDeclaration(pos, hasJSDoc, decorators, modifiers, identifier, isTypeOnly); } - // Import statement - node.kind = 254 /* ImportDeclaration */; // ImportDeclaration: // import ImportClause from ModuleSpecifier ; // import ModuleSpecifier; + var importClause; if (identifier || // import id token() === 41 /* AsteriskToken */ || // import * token() === 18 /* OpenBraceToken */ // import { ) { - node.importClause = parseImportClause(identifier, afterImportPos, isTypeOnly); - parseExpected(149 /* FromKeyword */); + importClause = parseImportClause(identifier, afterImportPos, isTypeOnly); + parseExpected(152 /* FromKeyword */); } - node.moduleSpecifier = parseModuleSpecifier(); + var moduleSpecifier = parseModuleSpecifier(); parseSemicolon(); - return finishNode(node); + var node = factory.createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier); + return withJSDoc(finishNode(node, pos), hasJSDoc); } function tokenAfterImportDefinitelyProducesImportDeclaration() { return token() === 41 /* AsteriskToken */ || token() === 18 /* OpenBraceToken */; @@ -24746,41 +33016,34 @@ var ts; function tokenAfterImportedIdentifierDefinitelyProducesImportDeclaration() { // In `import id ___`, the current token decides whether to produce // an ImportDeclaration or ImportEqualsDeclaration. - return token() === 27 /* CommaToken */ || token() === 149 /* FromKeyword */; + return token() === 27 /* CommaToken */ || token() === 152 /* FromKeyword */; } - function parseImportEqualsDeclaration(node, identifier, isTypeOnly) { - node.kind = 253 /* ImportEqualsDeclaration */; - node.name = identifier; + function parseImportEqualsDeclaration(pos, hasJSDoc, decorators, modifiers, identifier, isTypeOnly) { parseExpected(62 /* EqualsToken */); - node.moduleReference = parseModuleReference(); + var moduleReference = parseModuleReference(); parseSemicolon(); - var finished = finishNode(node); + var node = factory.createImportEqualsDeclaration(decorators, modifiers, identifier, moduleReference); + var finished = withJSDoc(finishNode(node, pos), hasJSDoc); if (isTypeOnly) { parseErrorAtRange(finished, ts.Diagnostics.Only_ECMAScript_imports_may_use_import_type); } return finished; } - function parseImportClause(identifier, fullStart, isTypeOnly) { + function parseImportClause(identifier, pos, isTypeOnly) { // ImportClause: // ImportedDefaultBinding // NameSpaceImport // NamedImports // ImportedDefaultBinding, NameSpaceImport // ImportedDefaultBinding, NamedImports - var importClause = createNode(255 /* ImportClause */, fullStart); - importClause.isTypeOnly = isTypeOnly; - if (identifier) { - // ImportedDefaultBinding: - // ImportedBinding - importClause.name = identifier; - } // If there was no default import or if there is comma token after default import // parse namespace or named imports - if (!importClause.name || + var namedBindings; + if (!identifier || parseOptional(27 /* CommaToken */)) { - importClause.namedBindings = token() === 41 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(257 /* NamedImports */); + namedBindings = token() === 41 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(261 /* NamedImports */); } - return finishNode(importClause); + return finishNode(factory.createImportClause(isTypeOnly, identifier, namedBindings), pos); } function parseModuleReference() { return isExternalModuleReference() @@ -24788,12 +33051,12 @@ var ts; : parseEntityName(/*allowReservedWords*/ false); } function parseExternalModuleReference() { - var node = createNode(265 /* ExternalModuleReference */); - parseExpected(139 /* RequireKeyword */); + var pos = getNodePos(); + parseExpected(142 /* RequireKeyword */); parseExpected(20 /* OpenParenToken */); - node.expression = parseModuleSpecifier(); + var expression = parseModuleSpecifier(); parseExpected(21 /* CloseParenToken */); - return finishNode(node); + return finishNode(factory.createExternalModuleReference(expression), pos); } function parseModuleSpecifier() { if (token() === 10 /* StringLiteral */) { @@ -24811,14 +33074,14 @@ var ts; function parseNamespaceImport() { // NameSpaceImport: // * as ImportedBinding - var namespaceImport = createNode(256 /* NamespaceImport */); + var pos = getNodePos(); parseExpected(41 /* AsteriskToken */); - parseExpected(123 /* AsKeyword */); - namespaceImport.name = parseIdentifier(); - return finishNode(namespaceImport); + parseExpected(126 /* AsKeyword */); + var name = parseIdentifier(); + return finishNode(factory.createNamespaceImport(name), pos); } function parseNamedImportsOrExports(kind) { - var node = createNode(kind); + var pos = getNodePos(); // NamedImports: // { } // { ImportsList } @@ -24826,17 +33089,19 @@ var ts; // ImportsList: // ImportSpecifier // ImportsList, ImportSpecifier - node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 257 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */); - return finishNode(node); + var node = kind === 261 /* NamedImports */ + ? factory.createNamedImports(parseBracketedList(23 /* ImportOrExportSpecifiers */, parseImportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */)) + : factory.createNamedExports(parseBracketedList(23 /* ImportOrExportSpecifiers */, parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */)); + return finishNode(node, pos); } function parseExportSpecifier() { - return parseImportOrExportSpecifier(263 /* ExportSpecifier */); + return parseImportOrExportSpecifier(267 /* ExportSpecifier */); } function parseImportSpecifier() { - return parseImportOrExportSpecifier(258 /* ImportSpecifier */); + return parseImportOrExportSpecifier(262 /* ImportSpecifier */); } function parseImportOrExportSpecifier(kind) { - var node = createNode(kind); + var pos = getNodePos(); // ImportSpecifier: // BindingIdentifier // IdentifierName as BindingIdentifier @@ -24847,62 +33112,74 @@ var ts; var checkIdentifierStart = scanner.getTokenPos(); var checkIdentifierEnd = scanner.getTextPos(); var identifierName = parseIdentifierName(); - if (token() === 123 /* AsKeyword */) { - node.propertyName = identifierName; - parseExpected(123 /* AsKeyword */); + var propertyName; + var name; + if (token() === 126 /* AsKeyword */) { + propertyName = identifierName; + parseExpected(126 /* AsKeyword */); checkIdentifierIsKeyword = ts.isKeyword(token()) && !isIdentifier(); checkIdentifierStart = scanner.getTokenPos(); checkIdentifierEnd = scanner.getTextPos(); - node.name = parseIdentifierName(); + name = parseIdentifierName(); } else { - node.name = identifierName; + name = identifierName; } - if (kind === 258 /* ImportSpecifier */ && checkIdentifierIsKeyword) { + if (kind === 262 /* ImportSpecifier */ && checkIdentifierIsKeyword) { parseErrorAt(checkIdentifierStart, checkIdentifierEnd, ts.Diagnostics.Identifier_expected); } - return finishNode(node); + var node = kind === 262 /* ImportSpecifier */ + ? factory.createImportSpecifier(propertyName, name) + : factory.createExportSpecifier(propertyName, name); + return finishNode(node, pos); } function parseNamespaceExport(pos) { - var node = createNode(262 /* NamespaceExport */, pos); - node.name = parseIdentifier(); - return finishNode(node); + return finishNode(factory.createNamespaceExport(parseIdentifier()), pos); } - function parseExportDeclaration(node) { - node.kind = 260 /* ExportDeclaration */; - node.isTypeOnly = parseOptional(145 /* TypeKeyword */); - var namespaceExportPos = scanner.getStartPos(); + function parseExportDeclaration(pos, hasJSDoc, decorators, modifiers) { + var savedAwaitContext = inAwaitContext(); + setAwaitContext(/*value*/ true); + var exportClause; + var moduleSpecifier; + var isTypeOnly = parseOptional(148 /* TypeKeyword */); + var namespaceExportPos = getNodePos(); if (parseOptional(41 /* AsteriskToken */)) { - if (parseOptional(123 /* AsKeyword */)) { - node.exportClause = parseNamespaceExport(namespaceExportPos); + if (parseOptional(126 /* AsKeyword */)) { + exportClause = parseNamespaceExport(namespaceExportPos); } - parseExpected(149 /* FromKeyword */); - node.moduleSpecifier = parseModuleSpecifier(); + parseExpected(152 /* FromKeyword */); + moduleSpecifier = parseModuleSpecifier(); } else { - node.exportClause = parseNamedImportsOrExports(261 /* NamedExports */); + exportClause = parseNamedImportsOrExports(265 /* NamedExports */); // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios, // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`) // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect. - if (token() === 149 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) { - parseExpected(149 /* FromKeyword */); - node.moduleSpecifier = parseModuleSpecifier(); + if (token() === 152 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) { + parseExpected(152 /* FromKeyword */); + moduleSpecifier = parseModuleSpecifier(); } } parseSemicolon(); - return finishNode(node); + setAwaitContext(savedAwaitContext); + var node = factory.createExportDeclaration(decorators, modifiers, isTypeOnly, exportClause, moduleSpecifier); + return withJSDoc(finishNode(node, pos), hasJSDoc); } - function parseExportAssignment(node) { - node.kind = 259 /* ExportAssignment */; + function parseExportAssignment(pos, hasJSDoc, decorators, modifiers) { + var savedAwaitContext = inAwaitContext(); + setAwaitContext(/*value*/ true); + var isExportEquals; if (parseOptional(62 /* EqualsToken */)) { - node.isExportEquals = true; + isExportEquals = true; } else { - parseExpected(84 /* DefaultKeyword */); + parseExpected(87 /* DefaultKeyword */); } - node.expression = parseAssignmentExpressionOrHigher(); + var expression = parseAssignmentExpressionOrHigher(); parseSemicolon(); - return finishNode(node); + setAwaitContext(savedAwaitContext); + var node = factory.createExportAssignment(decorators, modifiers, isExportEquals, expression); + return withJSDoc(finishNode(node, pos), hasJSDoc); } function setExternalModuleIndicator(sourceFile) { // Try to use the first top-level import/export when available, then @@ -24912,11 +33189,11 @@ var ts; getImportMetaIfNecessary(sourceFile); } function isAnExternalModuleIndicatorNode(node) { - return hasModifierOfKind(node, 89 /* ExportKeyword */) - || node.kind === 253 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 265 /* ExternalModuleReference */ - || node.kind === 254 /* ImportDeclaration */ - || node.kind === 259 /* ExportAssignment */ - || node.kind === 260 /* ExportDeclaration */ ? node : undefined; + return hasModifierOfKind(node, 92 /* ExportKeyword */) + || ts.isImportEqualsDeclaration(node) && ts.isExternalModuleReference(node.moduleReference) + || ts.isImportDeclaration(node) + || ts.isExportAssignment(node) + || ts.isExportDeclaration(node) ? node : undefined; } function getImportMetaIfNecessary(sourceFile) { return sourceFile.flags & 2097152 /* PossiblyContainsImportMeta */ ? @@ -24931,7 +33208,7 @@ var ts; return ts.some(node.modifiers, function (m) { return m.kind === kind; }); } function isImportMeta(node) { - return ts.isMetaProperty(node) && node.keywordToken === 96 /* ImportKeyword */ && node.name.escapedText === "meta"; + return ts.isMetaProperty(node) && node.keywordToken === 99 /* ImportKeyword */ && node.name.escapedText === "meta"; } var ParsingContext; (function (ParsingContext) { @@ -24970,51 +33247,52 @@ var ts; var JSDocParser; (function (JSDocParser) { function parseJSDocTypeExpressionForTests(content, start, length) { - initializeState(content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */); - sourceFile = createSourceFile("file.js", 99 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false); + initializeState("file.js", content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */); scanner.setText(content, start, length); currentToken = scanner.scan(); var jsDocTypeExpression = parseJSDocTypeExpression(); - var diagnostics = parseDiagnostics; + var sourceFile = createSourceFile("file.js", 99 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false, [], factory.createToken(1 /* EndOfFileToken */), 0 /* None */); + var diagnostics = ts.attachFileToDiagnostics(parseDiagnostics, sourceFile); + if (jsDocDiagnostics) { + sourceFile.jsDocDiagnostics = ts.attachFileToDiagnostics(jsDocDiagnostics, sourceFile); + } clearState(); return jsDocTypeExpression ? { jsDocTypeExpression: jsDocTypeExpression, diagnostics: diagnostics } : undefined; } JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests; // Parses out a JSDoc type expression. function parseJSDocTypeExpression(mayOmitBraces) { - var result = createNode(294 /* JSDocTypeExpression */); + var pos = getNodePos(); var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(18 /* OpenBraceToken */); - result.type = doInsideOfContext(4194304 /* JSDoc */, parseJSDocType); + var type = doInsideOfContext(4194304 /* JSDoc */, parseJSDocType); if (!mayOmitBraces || hasBrace) { parseExpectedJSDoc(19 /* CloseBraceToken */); } + var result = factory.createJSDocTypeExpression(type); fixupParentReferences(result); - return finishNode(result); + return finishNode(result, pos); } JSDocParser.parseJSDocTypeExpression = parseJSDocTypeExpression; function parseIsolatedJSDocComment(content, start, length) { - initializeState(content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */); - sourceFile = { languageVariant: 0 /* Standard */, text: content }; + initializeState("", content, 99 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */); var jsDoc = doInsideOfContext(4194304 /* JSDoc */, function () { return parseJSDocCommentWorker(start, length); }); - var diagnostics = parseDiagnostics; + var sourceFile = { languageVariant: 0 /* Standard */, text: content }; + var diagnostics = ts.attachFileToDiagnostics(parseDiagnostics, sourceFile); clearState(); return jsDoc ? { jsDoc: jsDoc, diagnostics: diagnostics } : undefined; } JSDocParser.parseIsolatedJSDocComment = parseIsolatedJSDocComment; function parseJSDocComment(parent, start, length) { - var _a; var saveToken = currentToken; var saveParseDiagnosticsLength = parseDiagnostics.length; var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode; var comment = doInsideOfContext(4194304 /* JSDoc */, function () { return parseJSDocCommentWorker(start, length); }); - if (comment) { - comment.parent = parent; - } + ts.setParent(comment, parent); if (contextFlags & 131072 /* JavaScriptFile */) { - if (!sourceFile.jsDocDiagnostics) { - sourceFile.jsDocDiagnostics = []; + if (!jsDocDiagnostics) { + jsDocDiagnostics = []; } - (_a = sourceFile.jsDocDiagnostics).push.apply(_a, parseDiagnostics); + jsDocDiagnostics.push.apply(jsDocDiagnostics, parseDiagnostics); } currentToken = saveToken; parseDiagnostics.length = saveParseDiagnosticsLength; @@ -25145,10 +33423,9 @@ var ts; } } function createJSDocComment() { - var result = createNode(303 /* JSDocComment */, start); - result.tags = tags && createNodeArray(tags, tagsPos, tagsEnd); - result.comment = comments.length ? comments.join("") : undefined; - return finishNode(result, end); + var comment = comments.length ? comments.join("") : undefined; + var tagsArray = tags && createNodeArray(tags, tagsPos, tagsEnd); + return finishNode(factory.createJSDocComment(comment, tagsArray), start, end); } function isNextNonwhitespaceTokenEndOfFile() { // We must use infinite lookahead, as there could be any number of newlines :( @@ -25204,36 +33481,40 @@ var ts; var tag; switch (tagName.escapedText) { case "author": - tag = parseAuthorTag(start, tagName, margin); + tag = parseAuthorTag(start, tagName, margin, indentText); break; case "implements": - tag = parseImplementsTag(start, tagName); + tag = parseImplementsTag(start, tagName, margin, indentText); break; case "augments": case "extends": - tag = parseAugmentsTag(start, tagName); + tag = parseAugmentsTag(start, tagName, margin, indentText); break; case "class": case "constructor": - tag = parseSimpleTag(start, 310 /* JSDocClassTag */, tagName); + tag = parseSimpleTag(start, factory.createJSDocClassTag, tagName, margin, indentText); break; case "public": - tag = parseSimpleTag(start, 311 /* JSDocPublicTag */, tagName); + tag = parseSimpleTag(start, factory.createJSDocPublicTag, tagName, margin, indentText); break; case "private": - tag = parseSimpleTag(start, 312 /* JSDocPrivateTag */, tagName); + tag = parseSimpleTag(start, factory.createJSDocPrivateTag, tagName, margin, indentText); break; case "protected": - tag = parseSimpleTag(start, 313 /* JSDocProtectedTag */, tagName); + tag = parseSimpleTag(start, factory.createJSDocProtectedTag, tagName, margin, indentText); break; case "readonly": - tag = parseSimpleTag(start, 314 /* JSDocReadonlyTag */, tagName); + tag = parseSimpleTag(start, factory.createJSDocReadonlyTag, tagName, margin, indentText); + break; + case "deprecated": + hasDeprecatedTag = true; + tag = parseSimpleTag(start, factory.createJSDocDeprecatedTag, tagName, margin, indentText); break; case "this": - tag = parseThisTag(start, tagName); + tag = parseThisTag(start, tagName, margin, indentText); break; case "enum": - tag = parseEnumTag(start, tagName); + tag = parseEnumTag(start, tagName, margin, indentText); break; case "arg": case "argument": @@ -25241,33 +33522,33 @@ var ts; return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, margin); case "return": case "returns": - tag = parseReturnTag(start, tagName); + tag = parseReturnTag(start, tagName, margin, indentText); break; case "template": - tag = parseTemplateTag(start, tagName); + tag = parseTemplateTag(start, tagName, margin, indentText); break; case "type": - tag = parseTypeTag(start, tagName); + tag = parseTypeTag(start, tagName, margin, indentText); break; case "typedef": - tag = parseTypedefTag(start, tagName, margin); + tag = parseTypedefTag(start, tagName, margin, indentText); break; case "callback": - tag = parseCallbackTag(start, tagName, margin); + tag = parseCallbackTag(start, tagName, margin, indentText); break; default: - tag = parseUnknownTag(start, tagName); + tag = parseUnknownTag(start, tagName, margin, indentText); break; } - if (!tag.comment) { - // some tags, like typedef and callback, have already parsed their comments earlier - if (!indentText) { - margin += tag.end - tag.pos; - } - tag.comment = parseTagComments(margin, indentText.slice(margin)); - } return tag; } + function parseTrailingTagComments(pos, end, margin, indentText) { + // some tags, like typedef and callback, have already parsed their comments earlier + if (!indentText) { + margin += end - pos; + } + return parseTagComments(margin, indentText.slice(margin)); + } function parseTagComments(indent, initialMargin) { var comments = []; var state = 0 /* BeginningOfLine */; @@ -25290,11 +33571,9 @@ var ts; loop: while (true) { switch (tok) { case 4 /* NewLineTrivia */: - if (state >= 1 /* SawAsterisk */) { - state = 0 /* BeginningOfLine */; - // don't use pushComment here because we want to keep the margin unchanged - comments.push(scanner.getTokenText()); - } + state = 0 /* BeginningOfLine */; + // don't use pushComment here because we want to keep the margin unchanged + comments.push(scanner.getTokenText()); indent = 0; break; case 59 /* AtToken */: @@ -25361,10 +33640,9 @@ var ts; removeTrailingWhitespace(comments); return comments.length === 0 ? undefined : comments.join(""); } - function parseUnknownTag(start, tagName) { - var result = createNode(306 /* JSDocTag */, start); - result.tagName = tagName; - return finishNode(result); + function parseUnknownTag(start, tagName, indent, indentText) { + var end = getNodePos(); + return finishNode(factory.createJSDocUnknownTag(tagName, parseTrailingTagComments(start, end, indent, indentText)), start, end); } function addTag(tag) { if (!tag) { @@ -25407,9 +33685,9 @@ var ts; } function isObjectOrObjectArrayTypeReference(node) { switch (node.kind) { - case 141 /* ObjectKeyword */: + case 144 /* ObjectKeyword */: return true; - case 174 /* ArrayType */: + case 177 /* ArrayType */: return isObjectOrObjectArrayTypeReference(node.elementType); default: return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object" && !node.typeArguments; @@ -25424,79 +33702,64 @@ var ts; if (isNameFirst) { typeExpression = tryParseTypeExpression(); } - var result = target === 1 /* Property */ ? - createNode(323 /* JSDocPropertyTag */, start) : - createNode(317 /* JSDocParameterTag */, start); var comment = parseTagComments(indent + scanner.getStartPos() - start); var nestedTypeLiteral = target !== 4 /* CallbackParameter */ && parseNestedTypeLiteral(typeExpression, name, target, indent); if (nestedTypeLiteral) { typeExpression = nestedTypeLiteral; isNameFirst = true; } - result.tagName = tagName; - result.typeExpression = typeExpression; - result.name = name; - result.isNameFirst = isNameFirst; - result.isBracketed = isBracketed; - result.comment = comment; - return finishNode(result); + var result = target === 1 /* Property */ + ? factory.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) + : factory.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment); + return finishNode(result, start); } function parseNestedTypeLiteral(typeExpression, name, target, indent) { if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) { - var typeLiteralExpression = createNode(294 /* JSDocTypeExpression */, scanner.getTokenPos()); + var pos = getNodePos(); var child = void 0; - var jsdocTypeLiteral = void 0; - var start_3 = scanner.getStartPos(); var children = void 0; while (child = tryParse(function () { return parseChildParameterOrPropertyTag(target, indent, name); })) { - if (child.kind === 317 /* JSDocParameterTag */ || child.kind === 323 /* JSDocPropertyTag */) { + if (child.kind === 322 /* JSDocParameterTag */ || child.kind === 328 /* JSDocPropertyTag */) { children = ts.append(children, child); } } if (children) { - jsdocTypeLiteral = createNode(304 /* JSDocTypeLiteral */, start_3); - jsdocTypeLiteral.jsDocPropertyTags = children; - if (typeExpression.type.kind === 174 /* ArrayType */) { - jsdocTypeLiteral.isArrayType = true; - } - typeLiteralExpression.type = finishNode(jsdocTypeLiteral); - return finishNode(typeLiteralExpression); + var literal = finishNode(factory.createJSDocTypeLiteral(children, typeExpression.type.kind === 177 /* ArrayType */), pos); + return finishNode(factory.createJSDocTypeExpression(literal), pos); } } } - function parseReturnTag(start, tagName) { + function parseReturnTag(start, tagName, indent, indentText) { if (ts.some(tags, ts.isJSDocReturnTag)) { parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText); } - var result = createNode(318 /* JSDocReturnTag */, start); - result.tagName = tagName; - result.typeExpression = tryParseTypeExpression(); - return finishNode(result); + var typeExpression = tryParseTypeExpression(); + var end = getNodePos(); + return finishNode(factory.createJSDocReturnTag(tagName, typeExpression, parseTrailingTagComments(start, end, indent, indentText)), start, end); } - function parseTypeTag(start, tagName) { + function parseTypeTag(start, tagName, indent, indentText) { if (ts.some(tags, ts.isJSDocTypeTag)) { parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText); } - var result = createNode(320 /* JSDocTypeTag */, start); - result.tagName = tagName; - result.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true); - return finishNode(result); + var typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true); + var end = getNodePos(); + var comments = indent !== undefined && indentText !== undefined ? parseTrailingTagComments(start, end, indent, indentText) : undefined; + return finishNode(factory.createJSDocTypeTag(tagName, typeExpression, comments), start, end); } - function parseAuthorTag(start, tagName, indent) { - var result = createNode(309 /* JSDocAuthorTag */, start); - result.tagName = tagName; + function parseAuthorTag(start, tagName, indent, indentText) { var authorInfoWithEmail = tryParse(function () { return tryParseAuthorNameAndEmail(); }); if (!authorInfoWithEmail) { - return finishNode(result); + var end_1 = getNodePos(); + return finishNode(factory.createJSDocAuthorTag(tagName, parseTrailingTagComments(start, end_1, indent, indentText)), start, end_1); } - result.comment = authorInfoWithEmail; + var comments = authorInfoWithEmail; if (lookAhead(function () { return nextToken() !== 4 /* NewLineTrivia */; })) { var comment = parseTagComments(indent); if (comment) { - result.comment += comment; + comments += comment; } } - return finishNode(result); + return finishNode(factory.createJSDocAuthorTag(tagName, comments), start); } function tryParseAuthorNameAndEmail() { var comments = []; @@ -25505,7 +33768,7 @@ var ts; var token = scanner.getToken(); loop: while (true) { switch (token) { - case 75 /* Identifier */: + case 78 /* Identifier */: case 5 /* WhitespaceTrivia */: case 24 /* DotToken */: case 59 /* AtToken */: @@ -25536,79 +33799,75 @@ var ts; return comments.length === 0 ? undefined : comments.join(""); } } - function parseImplementsTag(start, tagName) { - var result = createNode(308 /* JSDocImplementsTag */, start); - result.tagName = tagName; - result.class = parseExpressionWithTypeArgumentsForAugments(); - return finishNode(result); + function parseImplementsTag(start, tagName, margin, indentText) { + var className = parseExpressionWithTypeArgumentsForAugments(); + var end = getNodePos(); + return finishNode(factory.createJSDocImplementsTag(tagName, className, parseTrailingTagComments(start, end, margin, indentText)), start, end); } - function parseAugmentsTag(start, tagName) { - var result = createNode(307 /* JSDocAugmentsTag */, start); - result.tagName = tagName; - result.class = parseExpressionWithTypeArgumentsForAugments(); - return finishNode(result); + function parseAugmentsTag(start, tagName, margin, indentText) { + var className = parseExpressionWithTypeArgumentsForAugments(); + var end = getNodePos(); + return finishNode(factory.createJSDocAugmentsTag(tagName, className, parseTrailingTagComments(start, end, margin, indentText)), start, end); } function parseExpressionWithTypeArgumentsForAugments() { var usedBrace = parseOptional(18 /* OpenBraceToken */); - var node = createNode(216 /* ExpressionWithTypeArguments */); - node.expression = parsePropertyAccessEntityNameExpression(); - node.typeArguments = tryParseTypeArguments(); - var res = finishNode(node); + var pos = getNodePos(); + var expression = parsePropertyAccessEntityNameExpression(); + var typeArguments = tryParseTypeArguments(); + var node = factory.createExpressionWithTypeArguments(expression, typeArguments); + var res = finishNode(node, pos); if (usedBrace) { parseExpected(19 /* CloseBraceToken */); } return res; } function parsePropertyAccessEntityNameExpression() { + var pos = getNodePos(); var node = parseJSDocIdentifierName(); while (parseOptional(24 /* DotToken */)) { - var prop = createNode(194 /* PropertyAccessExpression */, node.pos); - prop.expression = node; - prop.name = parseJSDocIdentifierName(); - node = finishNode(prop); + var name = parseJSDocIdentifierName(); + node = finishNode(factory.createPropertyAccessExpression(node, name), pos); } return node; } - function parseSimpleTag(start, kind, tagName) { - var tag = createNode(kind, start); - tag.tagName = tagName; - return finishNode(tag); + function parseSimpleTag(start, createTag, tagName, margin, indentText) { + var end = getNodePos(); + return finishNode(createTag(tagName, parseTrailingTagComments(start, end, margin, indentText)), start, end); } - function parseThisTag(start, tagName) { - var tag = createNode(319 /* JSDocThisTag */, start); - tag.tagName = tagName; - tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true); + function parseThisTag(start, tagName, margin, indentText) { + var typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true); skipWhitespace(); - return finishNode(tag); + var end = getNodePos(); + return finishNode(factory.createJSDocThisTag(tagName, typeExpression, parseTrailingTagComments(start, end, margin, indentText)), start, end); } - function parseEnumTag(start, tagName) { - var tag = createNode(316 /* JSDocEnumTag */, start); - tag.tagName = tagName; - tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true); + function parseEnumTag(start, tagName, margin, indentText) { + var typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true); skipWhitespace(); - return finishNode(tag); + var end = getNodePos(); + return finishNode(factory.createJSDocEnumTag(tagName, typeExpression, parseTrailingTagComments(start, end, margin, indentText)), start, end); } - function parseTypedefTag(start, tagName, indent) { + function parseTypedefTag(start, tagName, indent, indentText) { + var _a; var typeExpression = tryParseTypeExpression(); skipWhitespaceOrAsterisk(); - var typedefTag = createNode(322 /* JSDocTypedefTag */, start); - typedefTag.tagName = tagName; - typedefTag.fullName = parseJSDocTypeNameWithNamespace(); - typedefTag.name = getJSDocTypeAliasName(typedefTag.fullName); + var fullName = parseJSDocTypeNameWithNamespace(); skipWhitespace(); - typedefTag.comment = parseTagComments(indent); - typedefTag.typeExpression = typeExpression; + var comment = parseTagComments(indent); var end; if (!typeExpression || isObjectOrObjectArrayTypeReference(typeExpression.type)) { var child = void 0; - var jsdocTypeLiteral = void 0; var childTypeTag = void 0; + var jsDocPropertyTags = void 0; + var hasChildren = false; while (child = tryParse(function () { return parseChildPropertyTag(indent); })) { - if (!jsdocTypeLiteral) { - jsdocTypeLiteral = createNode(304 /* JSDocTypeLiteral */, start); - } - if (child.kind === 320 /* JSDocTypeTag */) { + hasChildren = true; + if (child.kind === 325 /* JSDocTypeTag */) { if (childTypeTag) { + parseErrorAtCurrentToken(ts.Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags); + var lastError = ts.lastOrUndefined(parseDiagnostics); + if (lastError) { + ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, 0, 0, ts.Diagnostics.The_tag_was_first_specified_here)); + } break; } else { @@ -25616,21 +33875,27 @@ var ts; } } else { - jsdocTypeLiteral.jsDocPropertyTags = ts.append(jsdocTypeLiteral.jsDocPropertyTags, child); + jsDocPropertyTags = ts.append(jsDocPropertyTags, child); } } - if (jsdocTypeLiteral) { - if (typeExpression && typeExpression.type.kind === 174 /* ArrayType */) { - jsdocTypeLiteral.isArrayType = true; - } - typedefTag.typeExpression = childTypeTag && childTypeTag.typeExpression && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ? + if (hasChildren) { + var isArrayType = typeExpression && typeExpression.type.kind === 177 /* ArrayType */; + var jsdocTypeLiteral = factory.createJSDocTypeLiteral(jsDocPropertyTags, isArrayType); + typeExpression = childTypeTag && childTypeTag.typeExpression && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ? childTypeTag.typeExpression : - finishNode(jsdocTypeLiteral); - end = typedefTag.typeExpression.end; + finishNode(jsdocTypeLiteral, start); + end = typeExpression.end; } } // Only include the characters between the name end and the next token if a comment was actually parsed out - otherwise it's just whitespace - return finishNode(typedefTag, end || typedefTag.comment !== undefined ? scanner.getStartPos() : (typedefTag.fullName || typedefTag.typeExpression || typedefTag.tagName).end); + end = end || comment !== undefined ? + getNodePos() : + ((_a = fullName !== null && fullName !== void 0 ? fullName : typeExpression) !== null && _a !== void 0 ? _a : tagName).end; + if (!comment) { + comment = parseTrailingTagComments(start, end, indent, indentText); + } + var typedefTag = factory.createJSDocTypedefTag(tagName, typeExpression, fullName, comment); + return finishNode(typedefTag, start, end); } function parseJSDocTypeNameWithNamespace(nested) { var pos = scanner.getTokenPos(); @@ -25639,56 +33904,45 @@ var ts; } var typeNameOrNamespaceName = parseJSDocIdentifierName(); if (parseOptional(24 /* DotToken */)) { - var jsDocNamespaceNode = createNode(249 /* ModuleDeclaration */, pos); - if (nested) { - jsDocNamespaceNode.flags |= 4 /* NestedNamespace */; - } - jsDocNamespaceNode.name = typeNameOrNamespaceName; - jsDocNamespaceNode.body = parseJSDocTypeNameWithNamespace(/*nested*/ true); - return finishNode(jsDocNamespaceNode); + var body = parseJSDocTypeNameWithNamespace(/*nested*/ true); + var jsDocNamespaceNode = factory.createModuleDeclaration( + /*decorators*/ undefined, + /*modifiers*/ undefined, typeNameOrNamespaceName, body, nested ? 4 /* NestedNamespace */ : undefined); + return finishNode(jsDocNamespaceNode, pos); } if (nested) { typeNameOrNamespaceName.isInJSDocNamespace = true; } return typeNameOrNamespaceName; } - function parseCallbackTag(start, tagName, indent) { - var callbackTag = createNode(315 /* JSDocCallbackTag */, start); - callbackTag.tagName = tagName; - callbackTag.fullName = parseJSDocTypeNameWithNamespace(); - callbackTag.name = getJSDocTypeAliasName(callbackTag.fullName); - skipWhitespace(); - callbackTag.comment = parseTagComments(indent); + function parseCallbackTagParameters(indent) { + var pos = getNodePos(); var child; - var jsdocSignature = createNode(305 /* JSDocSignature */, start); - jsdocSignature.parameters = []; + var parameters; while (child = tryParse(function () { return parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent); })) { - jsdocSignature.parameters = ts.append(jsdocSignature.parameters, child); + parameters = ts.append(parameters, child); } + return createNodeArray(parameters || [], pos); + } + function parseCallbackTag(start, tagName, indent, indentText) { + var fullName = parseJSDocTypeNameWithNamespace(); + skipWhitespace(); + var comment = parseTagComments(indent); + var parameters = parseCallbackTagParameters(indent); var returnTag = tryParse(function () { if (parseOptionalJsdoc(59 /* AtToken */)) { var tag = parseTag(indent); - if (tag && tag.kind === 318 /* JSDocReturnTag */) { + if (tag && tag.kind === 323 /* JSDocReturnTag */) { return tag; } } }); - if (returnTag) { - jsdocSignature.type = returnTag; - } - callbackTag.typeExpression = finishNode(jsdocSignature); - return finishNode(callbackTag); - } - function getJSDocTypeAliasName(fullName) { - if (fullName) { - var rightNode = fullName; - while (true) { - if (ts.isIdentifier(rightNode) || !rightNode.body) { - return ts.isIdentifier(rightNode) ? rightNode : rightNode.name; - } - rightNode = rightNode.body; - } + var typeExpression = finishNode(factory.createJSDocSignature(/*typeParameters*/ undefined, parameters, returnTag), start); + var end = getNodePos(); + if (!comment) { + comment = parseTrailingTagComments(start, end, indent, indentText); } + return finishNode(factory.createJSDocCallbackTag(tagName, typeExpression, fullName, comment), start, end); } function escapedTextsEqual(a, b) { while (!ts.isIdentifier(a) || !ts.isIdentifier(b)) { @@ -25713,7 +33967,7 @@ var ts; case 59 /* AtToken */: if (canParseTag) { var child = tryParseChildTag(target, indent); - if (child && (child.kind === 317 /* JSDocParameterTag */ || child.kind === 323 /* JSDocPropertyTag */) && + if (child && (child.kind === 322 /* JSDocParameterTag */ || child.kind === 328 /* JSDocPropertyTag */) && target !== 4 /* CallbackParameter */ && name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) { return false; @@ -25732,7 +33986,7 @@ var ts; } seenAsterisk = true; break; - case 75 /* Identifier */: + case 78 /* Identifier */: canParseTag = false; break; case 1 /* EndOfFileToken */: @@ -25767,28 +34021,37 @@ var ts; } return parseParameterOrPropertyTag(start, tagName, target, indent); } - function parseTemplateTag(start, tagName) { - // the template tag looks like '@template {Constraint} T,U,V' - var constraint; - if (token() === 18 /* OpenBraceToken */) { - constraint = parseJSDocTypeExpression(); - } + function parseTemplateTagTypeParameter() { + var typeParameterPos = getNodePos(); + var name = parseJSDocIdentifierName(ts.Diagnostics.Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces); + return finishNode(factory.createTypeParameterDeclaration(name, /*constraint*/ undefined, /*defaultType*/ undefined), typeParameterPos); + } + function parseTemplateTagTypeParameters() { + var pos = getNodePos(); var typeParameters = []; - var typeParametersPos = getNodePos(); do { skipWhitespace(); - var typeParameter = createNode(155 /* TypeParameter */); - typeParameter.name = parseJSDocIdentifierName(ts.Diagnostics.Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces); - finishNode(typeParameter); + typeParameters.push(parseTemplateTagTypeParameter()); skipWhitespaceOrAsterisk(); - typeParameters.push(typeParameter); } while (parseOptionalJsdoc(27 /* CommaToken */)); - var result = createNode(321 /* JSDocTemplateTag */, start); - result.tagName = tagName; - result.constraint = constraint; - result.typeParameters = createNodeArray(typeParameters, typeParametersPos); - finishNode(result); - return result; + return createNodeArray(typeParameters, pos); + } + function parseTemplateTag(start, tagName, indent, indentText) { + // The template tag looks like one of the following: + // @template T,U,V + // @template {Constraint} T + // + // According to the [closure docs](https://github.com/google/closure-compiler/wiki/Generic-Types#multiple-bounded-template-types): + // > Multiple bounded generics cannot be declared on the same line. For the sake of clarity, if multiple templates share the same + // > type bound they must be declared on separate lines. + // + // TODO: Determine whether we should enforce this in the checker. + // TODO: Consider moving the `constraint` to the first type parameter as we could then remove `getEffectiveConstraintOfTypeParameter`. + // TODO: Consider only parsing a single type parameter if there is a constraint. + var constraint = token() === 18 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined; + var typeParameters = parseTemplateTagTypeParameters(); + var end = getNodePos(); + return finishNode(factory.createJSDocTemplateTag(tagName, constraint, typeParameters, parseTrailingTagComments(start, end, indent, indentText)), start, end); } function parseOptionalJsdoc(t) { if (token() === t) { @@ -25816,17 +34079,14 @@ var ts; } function parseJSDocIdentifierName(message) { if (!ts.tokenIsIdentifierOrKeyword(token())) { - return createMissingNode(75 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected); + return createMissingNode(78 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected); } identifierCount++; var pos = scanner.getTokenPos(); var end = scanner.getTextPos(); - var result = createNode(75 /* Identifier */, pos); - if (token() !== 75 /* Identifier */) { - result.originalKeywordKind = token(); - } - result.escapedText = ts.escapeLeadingUnderscores(internIdentifier(scanner.getTokenValue())); - finishNode(result, end); + var originalKeywordKind = token(); + var text = internIdentifier(scanner.getTokenValue()); + var result = finishNode(factory.createIdentifier(text, /*typeArguments*/ undefined, originalKeywordKind), pos, end); nextTokenJSDoc(); return result; } @@ -25856,6 +34116,7 @@ var ts; var incrementalSourceFile = sourceFile; ts.Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed); incrementalSourceFile.hasBeenIncrementallyParsed = true; + Parser.fixupParentReferences(incrementalSourceFile); var oldText = sourceFile.text; var syntaxCursor = createSyntaxCursor(sourceFile); // Make the actual change larger so that we know to reparse anything whose lookahead @@ -25965,8 +34226,7 @@ var ts; if (node._children) { node._children = undefined; } - node.pos += delta; - node.end += delta; + ts.setTextRangePosEnd(node, node.pos + delta, node.end + delta); if (aggressiveChecks && shouldCheckNode(node)) { ts.Debug.assert(text === newText.substring(node.pos, node.end)); } @@ -25981,8 +34241,7 @@ var ts; } function visitArray(array) { array._children = undefined; - array.pos += delta; - array.end += delta; + ts.setTextRangePosEnd(array, array.pos + delta, array.end + delta); for (var _i = 0, array_8 = array; _i < array_8.length; _i++) { var node = array_8[_i]; visitNode(node); @@ -25993,7 +34252,7 @@ var ts; switch (node.kind) { case 10 /* StringLiteral */: case 8 /* NumericLiteral */: - case 75 /* Identifier */: + case 78 /* Identifier */: return true; } return false; @@ -26031,7 +34290,7 @@ var ts; // // The element will keep its position if possible. Or Move backward to the new-end // if it's in the 'Y' range. - element.pos = Math.min(element.pos, changeRangeNewEnd); + var pos = Math.min(element.pos, changeRangeNewEnd); // If the 'end' is after the change range, then we always adjust it by the delta // amount. However, if the end is in the change range, then how we adjust it // will depend on if delta is positive or negative. If delta is positive then we @@ -26052,20 +34311,18 @@ var ts; // However any element that ended after that will have their pos adjusted to be // at the end of the new range. i.e. any node that ended in the 'Y' range will // be adjusted to have their end at the end of the 'Z' range. - if (element.end >= changeRangeOldEnd) { + var end = element.end >= changeRangeOldEnd ? // Element ends after the change range. Always adjust the end pos. - element.end += delta; - } - else { + element.end + delta : // Element ends in the change range. The element will keep its position if // possible. Or Move backward to the new-end if it's in the 'Y' range. - element.end = Math.min(element.end, changeRangeNewEnd); - } - ts.Debug.assert(element.pos <= element.end); + Math.min(element.end, changeRangeNewEnd); + ts.Debug.assert(pos <= end); if (element.parent) { - ts.Debug.assert(element.pos >= element.parent.pos); - ts.Debug.assert(element.end <= element.parent.end); + ts.Debug.assertGreaterThanOrEqual(pos, element.parent.pos); + ts.Debug.assertLessThanOrEqual(end, element.parent.end); } + ts.setTextRangePosEnd(element, pos, end); } function checkNodePositions(node, aggressiveChecks) { if (aggressiveChecks) { @@ -26348,6 +34605,7 @@ var ts; } } } + IncrementalParser.createSyntaxCursor = createSyntaxCursor; var InvalidPosition; (function (InvalidPosition) { InvalidPosition[InvalidPosition["Value"] = -1] = "Value"; @@ -26366,7 +34624,7 @@ var ts; var comment = sourceText.substring(range.pos, range.end); extractPragmas(pragmas, range, comment); } - context.pragmas = ts.createMap(); + context.pragmas = new ts.Map(); for (var _b = 0, pragmas_1 = pragmas; _b < pragmas_1.length; _b++) { var pragma = pragmas_1[_b]; if (context.pragmas.has(pragma.name)) { @@ -26453,13 +34711,15 @@ var ts; }); break; } - case "jsx": return; // Accessed directly + case "jsx": + case "jsxfrag": + return; // Accessed directly default: ts.Debug.fail("Unhandled pragma kind"); // Can this be made into an assertNever in the future? } }); } ts.processPragmasIntoFields = processPragmasIntoFields; - var namedArgRegExCache = ts.createMap(); + var namedArgRegExCache = new ts.Map(); function getNamedArgRegEx(name) { if (namedArgRegExCache.has(name)) { return namedArgRegExCache.get(name); @@ -26559,10 +34819,10 @@ var ts; if (lhs.kind !== rhs.kind) { return false; } - if (lhs.kind === 75 /* Identifier */) { + if (lhs.kind === 78 /* Identifier */) { return lhs.escapedText === rhs.escapedText; } - if (lhs.kind === 104 /* ThisKeyword */) { + if (lhs.kind === 107 /* ThisKeyword */) { return true; } // If we are at this statement then we must have PropertyAccessExpression and because tag name in Jsx element can only @@ -26628,6 +34888,7 @@ var ts; ["es2020.promise", "lib.es2020.promise.d.ts"], ["es2020.string", "lib.es2020.string.d.ts"], ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"], + ["es2020.intl", "lib.es2020.intl.d.ts"], ["esnext.array", "lib.es2019.array.d.ts"], ["esnext.symbol", "lib.es2019.symbol.d.ts"], ["esnext.asynciterable", "lib.es2018.asynciterable.d.ts"], @@ -26648,39 +34909,39 @@ var ts; * option as well as for resolving lib reference directives. */ /* @internal */ - ts.libMap = ts.createMapFromEntries(libEntries); + ts.libMap = new ts.Map(libEntries); // Watch related options /* @internal */ ts.optionsForWatch = [ { name: "watchFile", - type: ts.createMapFromTemplate({ + type: new ts.Map(ts.getEntries({ fixedpollinginterval: ts.WatchFileKind.FixedPollingInterval, prioritypollinginterval: ts.WatchFileKind.PriorityPollingInterval, dynamicprioritypolling: ts.WatchFileKind.DynamicPriorityPolling, usefsevents: ts.WatchFileKind.UseFsEvents, usefseventsonparentdirectory: ts.WatchFileKind.UseFsEventsOnParentDirectory, - }), + })), category: ts.Diagnostics.Advanced_Options, description: ts.Diagnostics.Specify_strategy_for_watching_file_Colon_FixedPollingInterval_default_PriorityPollingInterval_DynamicPriorityPolling_UseFsEvents_UseFsEventsOnParentDirectory, }, { name: "watchDirectory", - type: ts.createMapFromTemplate({ + type: new ts.Map(ts.getEntries({ usefsevents: ts.WatchDirectoryKind.UseFsEvents, fixedpollinginterval: ts.WatchDirectoryKind.FixedPollingInterval, dynamicprioritypolling: ts.WatchDirectoryKind.DynamicPriorityPolling, - }), + })), category: ts.Diagnostics.Advanced_Options, description: ts.Diagnostics.Specify_strategy_for_watching_directory_on_platforms_that_don_t_support_recursive_watching_natively_Colon_UseFsEvents_default_FixedPollingInterval_DynamicPriorityPolling, }, { name: "fallbackPolling", - type: ts.createMapFromTemplate({ + type: new ts.Map(ts.getEntries({ fixedinterval: ts.PollingWatchKind.FixedInterval, priorityinterval: ts.PollingWatchKind.PriorityInterval, dynamicpriority: ts.PollingWatchKind.DynamicPriority, - }), + })), category: ts.Diagnostics.Advanced_Options, description: ts.Diagnostics.Specify_strategy_for_creating_a_polling_watch_when_it_fails_to_create_using_file_system_events_Colon_FixedInterval_default_PriorityInterval_DynamicPriority, }, @@ -26851,7 +35112,7 @@ var ts; { name: "target", shortName: "t", - type: ts.createMapFromTemplate({ + type: new ts.Map(ts.getEntries({ es3: 0 /* ES3 */, es5: 1 /* ES5 */, es6: 2 /* ES2015 */, @@ -26862,7 +35123,7 @@ var ts; es2019: 6 /* ES2019 */, es2020: 7 /* ES2020 */, esnext: 99 /* ESNext */, - }), + })), affectsSourceFile: true, affectsModuleResolution: true, affectsEmit: true, @@ -26874,7 +35135,7 @@ var ts; { name: "module", shortName: "m", - type: ts.createMapFromTemplate({ + type: new ts.Map(ts.getEntries({ none: ts.ModuleKind.None, commonjs: ts.ModuleKind.CommonJS, amd: ts.ModuleKind.AMD, @@ -26884,7 +35145,7 @@ var ts; es2015: ts.ModuleKind.ES2015, es2020: ts.ModuleKind.ES2020, esnext: ts.ModuleKind.ESNext - }), + })), affectsModuleResolution: true, affectsEmit: true, paramType: ts.Diagnostics.KIND, @@ -26921,11 +35182,11 @@ var ts; }, { name: "jsx", - type: ts.createMapFromTemplate({ + type: new ts.Map(ts.getEntries({ "preserve": 1 /* Preserve */, "react-native": 3 /* ReactNative */, "react": 2 /* React */ - }), + })), affectsSourceFile: true, paramType: ts.Diagnostics.KIND, showInSimplifiedHelpView: true, @@ -27027,7 +35288,6 @@ var ts; { name: "noEmit", type: "boolean", - affectsEmit: true, showInSimplifiedHelpView: true, category: ts.Diagnostics.Basic_Options, description: ts.Diagnostics.Do_not_emit_outputs, @@ -27042,11 +35302,11 @@ var ts; }, { name: "importsNotUsedAsValues", - type: ts.createMapFromTemplate({ + type: new ts.Map(ts.getEntries({ remove: 0 /* Remove */, preserve: 1 /* Preserve */, error: 2 /* Error */ - }), + })), affectsEmit: true, affectsSemanticDiagnostics: true, category: ts.Diagnostics.Advanced_Options, @@ -27173,10 +35433,10 @@ var ts; // Module Resolution { name: "moduleResolution", - type: ts.createMapFromTemplate({ + type: new ts.Map(ts.getEntries({ node: ts.ModuleResolutionKind.NodeJs, classic: ts.ModuleResolutionKind.Classic, - }), + })), affectsModuleResolution: true, paramType: ts.Diagnostics.STRATEGY, category: ts.Diagnostics.Module_Resolution_Options, @@ -27325,6 +35585,12 @@ var ts; category: ts.Diagnostics.Advanced_Options, description: ts.Diagnostics.Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h }, + { + name: "jsxFragmentFactory", + type: "string", + category: ts.Diagnostics.Advanced_Options, + description: ts.Diagnostics.Specify_the_JSX_fragment_factory_function_to_use_when_targeting_react_JSX_emit_with_jsxFactory_compiler_option_is_specified_e_g_Fragment + }, { name: "resolveJsonModule", type: "boolean", @@ -27371,10 +35637,10 @@ var ts; }, { name: "newLine", - type: ts.createMapFromTemplate({ + type: new ts.Map(ts.getEntries({ crlf: 0 /* CarriageReturnLineFeed */, lf: 1 /* LineFeed */ - }), + })), affectsEmit: true, paramType: ts.Diagnostics.NEWLINE, category: ts.Diagnostics.Advanced_Options, @@ -27435,6 +35701,13 @@ var ts; category: ts.Diagnostics.Advanced_Options, description: ts.Diagnostics.Disable_solution_searching_for_this_project }, + { + name: "disableReferencedProjectLoad", + type: "boolean", + isTSConfigOnly: true, + category: ts.Diagnostics.Advanced_Options, + description: ts.Diagnostics.Disable_loading_referenced_projects + }, { name: "noImplicitUseStrict", type: "boolean", @@ -27633,8 +35906,8 @@ var ts; ]; /*@internal*/ function createOptionNameMap(optionDeclarations) { - var optionsNameMap = ts.createMap(); - var shortOptionNames = ts.createMap(); + var optionsNameMap = new ts.Map(); + var shortOptionNames = new ts.Map(); ts.forEach(optionDeclarations, function (option) { optionsNameMap.set(option.name.toLowerCase(), option); if (option.shortName) { @@ -28126,8 +36399,8 @@ var ts; } function convertObjectLiteralExpressionToJson(node, knownOptions, extraKeyDiagnostics, parentOption) { var result = returnValue ? {} : undefined; - var _loop_3 = function (element) { - if (element.kind !== 281 /* PropertyAssignment */) { + var _loop_4 = function (element) { + if (element.kind !== 285 /* PropertyAssignment */) { errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element, ts.Diagnostics.Property_assignment_expected)); return "continue"; } @@ -28179,7 +36452,7 @@ var ts; }; for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { var element = _a[_i]; - _loop_3(element); + _loop_4(element); } return result; } @@ -28192,13 +36465,13 @@ var ts; } function convertPropertyValueToJson(valueExpression, option) { switch (valueExpression.kind) { - case 106 /* TrueKeyword */: + case 109 /* TrueKeyword */: reportInvalidOptionValue(option && option.type !== "boolean"); return true; - case 91 /* FalseKeyword */: + case 94 /* FalseKeyword */: reportInvalidOptionValue(option && option.type !== "boolean"); return false; - case 100 /* NullKeyword */: + case 103 /* NullKeyword */: reportInvalidOptionValue(option && option.name === "extends"); // "extends" is the only option we don't allow null/undefined for return null; // eslint-disable-line no-null/no-null case 10 /* StringLiteral */: @@ -28218,13 +36491,13 @@ var ts; case 8 /* NumericLiteral */: reportInvalidOptionValue(option && option.type !== "number"); return Number(valueExpression.text); - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: if (valueExpression.operator !== 40 /* MinusToken */ || valueExpression.operand.kind !== 8 /* NumericLiteral */) { break; // not valid JSON syntax } reportInvalidOptionValue(option && option.type !== "number"); return -Number(valueExpression.operand.text); - case 193 /* ObjectLiteralExpression */: + case 197 /* ObjectLiteralExpression */: reportInvalidOptionValue(option && option.type !== "object"); var objectLiteralExpression = valueExpression; // Currently having element option declaration in the tsconfig with type "object" @@ -28241,7 +36514,7 @@ var ts; return convertObjectLiteralExpressionToJson(objectLiteralExpression, /* knownOptions*/ undefined, /*extraKeyDiagnosticMessage */ undefined, /*parentOption*/ undefined); } - case 192 /* ArrayLiteralExpression */: + case 196 /* ArrayLiteralExpression */: reportInvalidOptionValue(option && option.type !== "list"); return convertArrayLiteralExpressionToJson(valueExpression.elements, option && option.element); } @@ -28360,9 +36633,9 @@ var ts; } function serializeOptionBaseObject(options, _a, pathOptions) { var optionsNameMap = _a.optionsNameMap; - var result = ts.createMap(); + var result = new ts.Map(); var getCanonicalFileName = pathOptions && ts.createGetCanonicalFileName(pathOptions.useCaseSensitiveFileNames); - var _loop_4 = function (name) { + var _loop_5 = function (name) { if (ts.hasProperty(options, name)) { // tsconfig only options cannot be specified via command line, // so we can assume that only types that can appear here string | number | boolean @@ -28396,7 +36669,7 @@ var ts; } }; for (var name in options) { - _loop_4(name); + _loop_5(name); } return result; } @@ -28483,8 +36756,8 @@ var ts; result.push("" + tab + tab + "/* " + ts.getLocaleSpecificMessage(ts.Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashtsconfig_json_to_read_more_about_this_file) + " */"); result.push(""); // Print out each row, aligning all the descriptions on the same column. - for (var _a = 0, entries_3 = entries; _a < entries_3.length; _a++) { - var entry = entries_3[_a]; + for (var _a = 0, entries_2 = entries; _a < entries_2.length; _a++) { + var entry = entries_2[_a]; var value = entry.value, _b = entry.description, description = _b === void 0 ? "" : _b; result.push(value && "" + tab + tab + value + (description && (makePadding(marginLength - value.length + 2) + description))); } @@ -28608,51 +36881,46 @@ var ts; configFileSpecs: spec }; function getFileNames() { - var filesSpecs; - if (ts.hasProperty(raw, "files") && !isNullOrUndefined(raw.files)) { - if (ts.isArray(raw.files)) { - filesSpecs = raw.files; - var hasReferences = ts.hasProperty(raw, "references") && !isNullOrUndefined(raw.references); - var hasZeroOrNoReferences = !hasReferences || raw.references.length === 0; - var hasExtends = ts.hasProperty(raw, "extends"); - if (filesSpecs.length === 0 && hasZeroOrNoReferences && !hasExtends) { - if (sourceFile) { - var fileName = configFileName || "tsconfig.json"; - var diagnosticMessage = ts.Diagnostics.The_files_list_in_config_file_0_is_empty; - var nodeValue = ts.firstDefined(ts.getTsConfigPropArray(sourceFile, "files"), function (property) { return property.initializer; }); - var error = nodeValue - ? ts.createDiagnosticForNodeInSourceFile(sourceFile, nodeValue, diagnosticMessage, fileName) - : ts.createCompilerDiagnostic(diagnosticMessage, fileName); - errors.push(error); - } - else { - createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.The_files_list_in_config_file_0_is_empty, configFileName || "tsconfig.json"); - } + var referencesOfRaw = getPropFromRaw("references", function (element) { return typeof element === "object"; }, "object"); + if (ts.isArray(referencesOfRaw)) { + for (var _i = 0, referencesOfRaw_1 = referencesOfRaw; _i < referencesOfRaw_1.length; _i++) { + var ref = referencesOfRaw_1[_i]; + if (typeof ref.path !== "string") { + createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "reference.path", "string"); + } + else { + (projectReferences || (projectReferences = [])).push({ + path: ts.getNormalizedAbsolutePath(ref.path, basePath), + originalPath: ref.path, + prepend: ref.prepend, + circular: ref.circular + }); } } - else { - createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array"); + } + var filesSpecs = toPropValue(getSpecsFromRaw("files")); + if (filesSpecs) { + var hasZeroOrNoReferences = referencesOfRaw === "no-prop" || ts.isArray(referencesOfRaw) && referencesOfRaw.length === 0; + var hasExtends = ts.hasProperty(raw, "extends"); + if (filesSpecs.length === 0 && hasZeroOrNoReferences && !hasExtends) { + if (sourceFile) { + var fileName = configFileName || "tsconfig.json"; + var diagnosticMessage = ts.Diagnostics.The_files_list_in_config_file_0_is_empty; + var nodeValue = ts.firstDefined(ts.getTsConfigPropArray(sourceFile, "files"), function (property) { return property.initializer; }); + var error = nodeValue + ? ts.createDiagnosticForNodeInSourceFile(sourceFile, nodeValue, diagnosticMessage, fileName) + : ts.createCompilerDiagnostic(diagnosticMessage, fileName); + errors.push(error); + } + else { + createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.The_files_list_in_config_file_0_is_empty, configFileName || "tsconfig.json"); + } } } - var includeSpecs; - if (ts.hasProperty(raw, "include") && !isNullOrUndefined(raw.include)) { - if (ts.isArray(raw.include)) { - includeSpecs = raw.include; - } - else { - createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "include", "Array"); - } - } - var excludeSpecs; - if (ts.hasProperty(raw, "exclude") && !isNullOrUndefined(raw.exclude)) { - if (ts.isArray(raw.exclude)) { - excludeSpecs = raw.exclude; - } - else { - createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "exclude", "Array"); - } - } - else if (raw.compilerOptions) { + var includeSpecs = toPropValue(getSpecsFromRaw("include")); + var excludeOfRaw = getSpecsFromRaw("exclude"); + var excludeSpecs = toPropValue(excludeOfRaw); + if (excludeOfRaw === "no-prop" && raw.compilerOptions) { var outDir = raw.compilerOptions.outDir; var declarationDir = raw.compilerOptions.declarationDir; if (outDir || declarationDir) { @@ -28663,31 +36931,32 @@ var ts; includeSpecs = ["**/*"]; } var result = matchFileNames(filesSpecs, includeSpecs, excludeSpecs, configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath, options, host, errors, extraFileExtensions, sourceFile); - if (shouldReportNoInputFiles(result, canJsonReportNoInutFiles(raw), resolutionStack)) { + if (shouldReportNoInputFiles(result, canJsonReportNoInputFiles(raw), resolutionStack)) { errors.push(getErrorForNoInputFiles(result.spec, configFileName)); } - if (ts.hasProperty(raw, "references") && !isNullOrUndefined(raw.references)) { - if (ts.isArray(raw.references)) { - for (var _i = 0, _a = raw.references; _i < _a.length; _i++) { - var ref = _a[_i]; - if (typeof ref.path !== "string") { - createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "reference.path", "string"); - } - else { - (projectReferences || (projectReferences = [])).push({ - path: ts.getNormalizedAbsolutePath(ref.path, basePath), - originalPath: ref.path, - prepend: ref.prepend, - circular: ref.circular - }); - } + return result; + } + function toPropValue(specResult) { + return ts.isArray(specResult) ? specResult : undefined; + } + function getSpecsFromRaw(prop) { + return getPropFromRaw(prop, ts.isString, "string"); + } + function getPropFromRaw(prop, validateElement, elementTypeName) { + if (ts.hasProperty(raw, prop) && !isNullOrUndefined(raw[prop])) { + if (ts.isArray(raw[prop])) { + var result = raw[prop]; + if (!sourceFile && !ts.every(result, validateElement)) { + errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, prop, elementTypeName)); } + return result; } else { - createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "references", "Array"); + createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, prop, "Array"); + return "not-array"; } } - return result; + return "no-prop"; } function createCompilerDiagnosticOnlyIfJson(message, arg0, arg1) { if (!sourceFile) { @@ -28706,10 +36975,10 @@ var ts; return result.fileNames.length === 0 && canJsonReportNoInutFiles && (!resolutionStack || resolutionStack.length === 0); } /*@internal*/ - function canJsonReportNoInutFiles(raw) { + function canJsonReportNoInputFiles(raw) { return !ts.hasProperty(raw, "files") && !ts.hasProperty(raw, "references"); } - ts.canJsonReportNoInutFiles = canJsonReportNoInutFiles; + ts.canJsonReportNoInputFiles = canJsonReportNoInputFiles; /*@internal*/ function updateErrorForNoInputFiles(result, configFileName, configFileSpecs, configParseDiagnostics, canJsonReportNoInutFiles) { var existingErrors = configParseDiagnostics.length; @@ -29112,7 +37381,15 @@ var ts; // or a recursive directory. This information is used by filesystem watchers to monitor for // new entries in these paths. var wildcardDirectories = getWildcardDirectories(validatedIncludeSpecs, validatedExcludeSpecs, basePath, host.useCaseSensitiveFileNames); - var spec = { filesSpecs: filesSpecs, includeSpecs: includeSpecs, excludeSpecs: excludeSpecs, validatedIncludeSpecs: validatedIncludeSpecs, validatedExcludeSpecs: validatedExcludeSpecs, wildcardDirectories: wildcardDirectories }; + var spec = { + filesSpecs: filesSpecs, + includeSpecs: includeSpecs, + excludeSpecs: excludeSpecs, + validatedFilesSpec: ts.filter(filesSpecs, ts.isString), + validatedIncludeSpecs: validatedIncludeSpecs, + validatedExcludeSpecs: validatedExcludeSpecs, + wildcardDirectories: wildcardDirectories + }; return getFileNamesFromConfigSpecs(spec, basePath, options, host, extraFileExtensions); } /** @@ -29126,38 +37403,38 @@ var ts; */ /* @internal */ function getFileNamesFromConfigSpecs(spec, basePath, options, host, extraFileExtensions) { - if (extraFileExtensions === void 0) { extraFileExtensions = []; } + if (extraFileExtensions === void 0) { extraFileExtensions = ts.emptyArray; } basePath = ts.normalizePath(basePath); var keyMapper = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames); // Literal file names (provided via the "files" array in tsconfig.json) are stored in a // file map with a possibly case insensitive key. We use this map later when when including // wildcard paths. - var literalFileMap = ts.createMap(); + var literalFileMap = new ts.Map(); // Wildcard paths (provided via the "includes" array in tsconfig.json) are stored in a // file map with a possibly case insensitive key. We use this map to store paths matched // via wildcard, and to handle extension priority. - var wildcardFileMap = ts.createMap(); + var wildcardFileMap = new ts.Map(); // Wildcard paths of json files (provided via the "includes" array in tsconfig.json) are stored in a // file map with a possibly case insensitive key. We use this map to store paths matched // via wildcard of *.json kind - var wildCardJsonFileMap = ts.createMap(); - var filesSpecs = spec.filesSpecs, validatedIncludeSpecs = spec.validatedIncludeSpecs, validatedExcludeSpecs = spec.validatedExcludeSpecs, wildcardDirectories = spec.wildcardDirectories; + var wildCardJsonFileMap = new ts.Map(); + var validatedFilesSpec = spec.validatedFilesSpec, validatedIncludeSpecs = spec.validatedIncludeSpecs, validatedExcludeSpecs = spec.validatedExcludeSpecs, wildcardDirectories = spec.wildcardDirectories; // Rather than requery this for each file and filespec, we query the supported extensions // once and store it on the expansion context. var supportedExtensions = ts.getSupportedExtensions(options, extraFileExtensions); var supportedExtensionsWithJsonIfResolveJsonModule = ts.getSuppoertedExtensionsWithJsonIfResolveJsonModule(options, supportedExtensions); // Literal files are always included verbatim. An "include" or "exclude" specification cannot // remove a literal file. - if (filesSpecs) { - for (var _i = 0, filesSpecs_1 = filesSpecs; _i < filesSpecs_1.length; _i++) { - var fileName = filesSpecs_1[_i]; + if (validatedFilesSpec) { + for (var _i = 0, validatedFilesSpec_1 = validatedFilesSpec; _i < validatedFilesSpec_1.length; _i++) { + var fileName = validatedFilesSpec_1[_i]; var file = ts.getNormalizedAbsolutePath(fileName, basePath); literalFileMap.set(keyMapper(file), file); } } var jsonOnlyIncludeRegexes; if (validatedIncludeSpecs && validatedIncludeSpecs.length > 0) { - var _loop_5 = function (file) { + var _loop_6 = function (file) { if (ts.fileExtensionIs(file, ".json" /* Json */)) { // Valid only if *.json specified if (!jsonOnlyIncludeRegexes) { @@ -29195,7 +37472,7 @@ var ts; }; for (var _a = 0, _b = host.readDirectory(basePath, supportedExtensionsWithJsonIfResolveJsonModule, validatedExcludeSpecs, validatedIncludeSpecs, /*depth*/ undefined); _a < _b.length; _a++) { var file = _b[_a]; - _loop_5(file); + _loop_6(file); } } var literalFiles = ts.arrayFrom(literalFileMap.values()); @@ -29207,8 +37484,33 @@ var ts; }; } ts.getFileNamesFromConfigSpecs = getFileNamesFromConfigSpecs; + /* @internal */ + function isExcludedFile(pathToCheck, spec, basePath, useCaseSensitiveFileNames, currentDirectory) { + var validatedFilesSpec = spec.validatedFilesSpec, validatedIncludeSpecs = spec.validatedIncludeSpecs, validatedExcludeSpecs = spec.validatedExcludeSpecs; + if (!ts.length(validatedIncludeSpecs) || !ts.length(validatedExcludeSpecs)) + return false; + basePath = ts.normalizePath(basePath); + var keyMapper = ts.createGetCanonicalFileName(useCaseSensitiveFileNames); + if (validatedFilesSpec) { + for (var _i = 0, validatedFilesSpec_2 = validatedFilesSpec; _i < validatedFilesSpec_2.length; _i++) { + var fileName = validatedFilesSpec_2[_i]; + if (keyMapper(ts.getNormalizedAbsolutePath(fileName, basePath)) === pathToCheck) + return false; + } + } + var excludePattern = ts.getRegularExpressionForWildcard(validatedExcludeSpecs, ts.combinePaths(ts.normalizePath(currentDirectory), basePath), "exclude"); + var excludeRegex = excludePattern && ts.getRegexFromPattern(excludePattern, useCaseSensitiveFileNames); + if (!excludeRegex) + return false; + if (excludeRegex.test(pathToCheck)) + return true; + return !ts.hasExtension(pathToCheck) && excludeRegex.test(ts.ensureTrailingDirectorySeparator(pathToCheck)); + } + ts.isExcludedFile = isExcludedFile; function validateSpecs(specs, errors, allowTrailingRecursion, jsonSourceFile, specKey) { return specs.filter(function (spec) { + if (!ts.isString(spec)) + return false; var diag = specToDiagnostic(spec, allowTrailingRecursion); if (diag !== undefined) { errors.push(createDiagnostic(diag, spec)); @@ -29292,7 +37594,10 @@ var ts; }; } if (ts.isImplicitGlob(spec)) { - return { key: spec, flags: 1 /* Recursive */ }; + return { + key: useCaseSensitiveFileNames ? spec : ts.toFileNameLowerCase(spec), + flags: 1 /* Recursive */ + }; } return undefined; } @@ -29731,8 +38036,8 @@ var ts; ts.createModuleResolutionCache = createModuleResolutionCache; /*@internal*/ function createCacheWithRedirects(options) { - var ownMap = ts.createMap(); - var redirectsMap = ts.createMap(); + var ownMap = new ts.Map(); + var redirectsMap = new ts.Map(); return { ownMap: ownMap, redirectsMap: redirectsMap, @@ -29755,7 +38060,7 @@ var ts; var redirects = redirectsMap.get(path); if (!redirects) { // Reuse map if redirected reference map uses same resolution - redirects = !options || ts.optionsHaveModuleResolutionChanges(options, redirectedReference.commandLine.options) ? ts.createMap() : ownMap; + redirects = !options || ts.optionsHaveModuleResolutionChanges(options, redirectedReference.commandLine.options) ? new ts.Map() : ownMap; redirectsMap.set(path, redirects); } return redirects; @@ -29771,7 +38076,7 @@ var ts; return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName, directoryToModuleNameMap: directoryToModuleNameMap, moduleNameToDirectoryMap: moduleNameToDirectoryMap }; function getOrCreateCacheForDirectory(directoryName, redirectedReference) { var path = ts.toPath(directoryName, currentDirectory, getCanonicalFileName); - return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, ts.createMap); + return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, function () { return new ts.Map(); }); } function getOrCreateCacheForModuleName(nonRelativeModuleName, redirectedReference) { ts.Debug.assert(!ts.isExternalModuleNameRelative(nonRelativeModuleName)); @@ -29787,7 +38092,7 @@ var ts; return result; } function createPerModuleNameCache() { - var directoryPathMap = ts.createMap(); + var directoryPathMap = new ts.Map(); return { get: get, set: set }; function get(directory) { return directoryPathMap.get(ts.toPath(directory, currentDirectory, getCanonicalFileName)); @@ -30650,14 +38955,15 @@ var ts; function getModuleInstanceState(node, visited) { if (node.body && !node.body.parent) { // getModuleInstanceStateForAliasTarget needs to walk up the parent chain, so parent pointers must be set on this tree already - setParentPointers(node, node.body); + ts.setParent(node.body, node); + ts.setParentRecursive(node.body, /*incremental*/ false); } return node.body ? getModuleInstanceStateCached(node.body, visited) : 1 /* Instantiated */; } ts.getModuleInstanceState = getModuleInstanceState; function getModuleInstanceStateCached(node, visited) { - if (visited === void 0) { visited = ts.createMap(); } - var nodeId = "" + ts.getNodeId(node); + if (visited === void 0) { visited = new ts.Map(); } + var nodeId = ts.getNodeId(node); if (visited.has(nodeId)) { return visited.get(nodeId) || 0 /* NonInstantiated */; } @@ -30670,26 +38976,26 @@ var ts; // A module is uninstantiated if it contains only switch (node.kind) { // 1. interface declarations, type alias declarations - case 246 /* InterfaceDeclaration */: - case 247 /* TypeAliasDeclaration */: + case 250 /* InterfaceDeclaration */: + case 251 /* TypeAliasDeclaration */: return 0 /* NonInstantiated */; // 2. const enum declarations - case 248 /* EnumDeclaration */: + case 252 /* EnumDeclaration */: if (ts.isEnumConst(node)) { return 2 /* ConstEnumOnly */; } break; // 3. non-exported import declarations - case 254 /* ImportDeclaration */: - case 253 /* ImportEqualsDeclaration */: - if (!(ts.hasModifier(node, 1 /* Export */))) { + case 258 /* ImportDeclaration */: + case 257 /* ImportEqualsDeclaration */: + if (!(ts.hasSyntacticModifier(node, 1 /* Export */))) { return 0 /* NonInstantiated */; } break; // 4. Export alias declarations pointing at only uninstantiated modules or things uninstantiated modules contain - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: var exportDeclaration = node; - if (!exportDeclaration.moduleSpecifier && exportDeclaration.exportClause && exportDeclaration.exportClause.kind === 261 /* NamedExports */) { + if (!exportDeclaration.moduleSpecifier && exportDeclaration.exportClause && exportDeclaration.exportClause.kind === 265 /* NamedExports */) { var state = 0 /* NonInstantiated */; for (var _i = 0, _a = exportDeclaration.exportClause.elements; _i < _a.length; _i++) { var specifier = _a[_i]; @@ -30705,7 +39011,7 @@ var ts; } break; // 5. other uninstantiated module declarations. - case 250 /* ModuleBlock */: { + case 254 /* ModuleBlock */: { var state_1 = 0 /* NonInstantiated */; ts.forEachChild(node, function (n) { var childState = getModuleInstanceStateCached(n, visited); @@ -30727,9 +39033,9 @@ var ts; }); return state_1; } - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: return getModuleInstanceState(node, visited); - case 75 /* Identifier */: + case 78 /* Identifier */: // Only jsdoc typedef definition can exist in jsdoc namespace, and it should // be considered the same as type alias if (node.isInJSDocNamespace) { @@ -30745,11 +39051,12 @@ var ts; if (ts.isBlock(p) || ts.isModuleBlock(p) || ts.isSourceFile(p)) { var statements = p.statements; var found = void 0; - for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) { - var statement = statements_1[_i]; + for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) { + var statement = statements_2[_i]; if (ts.nodeHasName(statement, name)) { if (!statement.parent) { - setParentPointers(p, statement); + ts.setParent(statement, p); + ts.setParentRecursive(statement, /*incremental*/ false); } var state = getModuleInstanceStateCached(statement, visited); if (found === undefined || state > found) { @@ -30840,9 +39147,6 @@ var ts; var classifiableNames; var unreachableFlow = { flags: 1 /* Unreachable */ }; var reportedUnreachableFlow = { flags: 1 /* Unreachable */ }; - // state used to aggregate transform flags during bind. - var subtreeTransformFlags = 0 /* None */; - var skipTransformFlagAggregation; /** * Inside the binder, we may create a diagnostic for an as-yet unbound node (with potentially no parent pointers, implying no accessible source file) * If so, the node _must_ be in the current file (as that's the only way anything could have traversed to it to yield it as the error node) @@ -30856,9 +39160,8 @@ var ts; options = opts; languageVersion = ts.getEmitScriptTarget(options); inStrictMode = bindInStrictMode(file, opts); - classifiableNames = ts.createUnderscoreEscapedMap(); + classifiableNames = new ts.Set(); symbolCount = 0; - skipTransformFlagAggregation = file.isDeclarationFile; Symbol = ts.objectAllocator.getSymbolConstructor(); // Attach debugging information if necessary ts.Debug.attachFlowNodeDebugInfo(unreachableFlow); @@ -30889,7 +39192,6 @@ var ts; activeLabelList = undefined; hasExplicitReturn = false; emitFlags = 0 /* None */; - subtreeTransformFlags = 0 /* None */; } return bindSourceFile; function bindInStrictMode(file, opts) { @@ -30926,7 +39228,7 @@ var ts; // Should not be called on a declaration with a computed property name, // unless it is a well known Symbol. function getDeclarationName(node) { - if (node.kind === 259 /* ExportAssignment */) { + if (node.kind === 263 /* ExportAssignment */) { return node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */; } var name = ts.getNameOfDeclaration(node); @@ -30935,7 +39237,7 @@ var ts; var moduleName = ts.getTextOfIdentifierOrLiteral(name); return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\""); } - if (name.kind === 154 /* ComputedPropertyName */) { + if (name.kind === 157 /* ComputedPropertyName */) { var nameExpression = name.expression; // treat computed property names where expression is string/numeric literal as just string/numeric literal if (ts.isStringOrNumericLiteralLike(nameExpression)) { @@ -30963,36 +39265,36 @@ var ts; return ts.isPropertyNameLiteral(name) ? ts.getEscapedTextOfIdentifierOrLiteral(name) : undefined; } switch (node.kind) { - case 162 /* Constructor */: + case 165 /* Constructor */: return "__constructor" /* Constructor */; - case 170 /* FunctionType */: - case 165 /* CallSignature */: - case 305 /* JSDocSignature */: + case 173 /* FunctionType */: + case 168 /* CallSignature */: + case 309 /* JSDocSignature */: return "__call" /* Call */; - case 171 /* ConstructorType */: - case 166 /* ConstructSignature */: + case 174 /* ConstructorType */: + case 169 /* ConstructSignature */: return "__new" /* New */; - case 167 /* IndexSignature */: + case 170 /* IndexSignature */: return "__index" /* Index */; - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: return "__export" /* ExportStar */; - case 290 /* SourceFile */: + case 294 /* SourceFile */: // json file should behave as // module.exports = ... return "export=" /* ExportEquals */; - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: if (ts.getAssignmentDeclarationKind(node) === 2 /* ModuleExports */) { // module.exports = ... return "export=" /* ExportEquals */; } ts.Debug.fail("Unknown binary declaration kind"); break; - case 300 /* JSDocFunctionType */: + case 304 /* JSDocFunctionType */: return (ts.isJSDocConstructSignature(node) ? "__new" /* New */ : "__call" /* Call */); - case 156 /* Parameter */: + case 159 /* Parameter */: // Parameters with names are handled at the top of this function. Parameters // without names can only come from JSDocFunctionTypes. - ts.Debug.assert(node.parent.kind === 300 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; }); + ts.Debug.assert(node.parent.kind === 304 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; }); var functionType = node.parent; var index = functionType.parameters.indexOf(node); return "arg" + index; @@ -31011,7 +39313,7 @@ var ts; */ function declareSymbol(symbolTable, parent, node, includes, excludes, isReplaceableByMethod) { ts.Debug.assert(!ts.hasDynamicName(node)); - var isDefaultExport = ts.hasModifier(node, 512 /* Default */) || ts.isExportSpecifier(node) && node.name.escapedText === "default"; + var isDefaultExport = ts.hasSyntacticModifier(node, 512 /* Default */) || ts.isExportSpecifier(node) && node.name.escapedText === "default"; // The exported symbol for an export default function/class node is always named "default" var name = isDefaultExport && parent ? "default" /* Default */ : getDeclarationName(node); var symbol; @@ -31044,7 +39346,7 @@ var ts; // just add this node into the declarations list of the symbol. symbol = symbolTable.get(name); if (includes & 2885600 /* Classifiable */) { - classifiableNames.set(name, true); + classifiableNames.add(name); } if (!symbol) { symbolTable.set(name, symbol = createSymbol(0 /* None */, name)); @@ -31064,7 +39366,7 @@ var ts; else if (!(includes & 3 /* Variable */ && symbol.flags & 67108864 /* Assignment */)) { // Assignment declarations are allowed to merge with variables, no matter what other flags they have. if (ts.isNamedDeclaration(node)) { - node.name.parent = node; + ts.setParent(node.name, node); } // Report errors every position with duplicate declaration // Report errors on previous encountered declarations @@ -31092,7 +39394,7 @@ var ts; // 1. multiple export default of class declaration or function declaration by checking NodeFlags.Default // 2. multiple export default of export assignment. This one doesn't have NodeFlags.Default on (as export default doesn't considered as modifiers) if (symbol.declarations && symbol.declarations.length && - (node.kind === 259 /* ExportAssignment */ && !node.isExportEquals)) { + (node.kind === 263 /* ExportAssignment */ && !node.isExportEquals)) { message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports; messageNeedsName_1 = false; multipleDefaultExports_1 = true; @@ -31100,7 +39402,7 @@ var ts; } } var relatedInformation_1 = []; - if (ts.isTypeAliasDeclaration(node) && ts.nodeIsMissing(node.type) && ts.hasModifier(node, 1 /* Export */) && symbol.flags & (2097152 /* Alias */ | 788968 /* Type */ | 1920 /* Namespace */)) { + if (ts.isTypeAliasDeclaration(node) && ts.nodeIsMissing(node.type) && ts.hasSyntacticModifier(node, 1 /* Export */) && symbol.flags & (2097152 /* Alias */ | 788968 /* Type */ | 1920 /* Namespace */)) { // export type T; - may have meant export type { T }? relatedInformation_1.push(createDiagnosticForNode(node, ts.Diagnostics.Did_you_mean_0, "export type { " + ts.unescapeLeadingUnderscores(node.name.escapedText) + " }")); } @@ -31131,7 +39433,7 @@ var ts; function declareModuleMember(node, symbolFlags, symbolExcludes) { var hasExportModifier = ts.getCombinedModifierFlags(node) & 1 /* Export */; if (symbolFlags & 2097152 /* Alias */) { - if (node.kind === 263 /* ExportSpecifier */ || (node.kind === 253 /* ImportEqualsDeclaration */ && hasExportModifier)) { + if (node.kind === 267 /* ExportSpecifier */ || (node.kind === 257 /* ImportEqualsDeclaration */ && hasExportModifier)) { return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); } else { @@ -31156,7 +39458,7 @@ var ts; if (ts.isJSDocTypeAlias(node)) ts.Debug.assert(ts.isInJSFile(node)); // We shouldn't add symbols for JSDoc nodes if not in a JS file. if ((!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 64 /* ExportContext */)) || ts.isJSDocTypeAlias(node)) { - if (!container.locals || (ts.hasModifier(node, 512 /* Default */) && !getDeclarationName(node))) { + if (!container.locals || (ts.hasSyntacticModifier(node, 512 /* Default */) && !getDeclarationName(node))) { return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); // No local symbol for an unnamed default! } var exportKind = symbolFlags & 111551 /* Value */ ? 1048576 /* ExportValue */ : 0; @@ -31198,7 +39500,7 @@ var ts; // for it. We must clear this so we don't accidentally move any stale data forward from // a previous compilation. if (containerFlags & 1 /* IsContainer */) { - if (node.kind !== 202 /* ArrowFunction */) { + if (node.kind !== 206 /* ArrowFunction */) { thisParentContainer = container; } container = blockScopeContainer = node; @@ -31219,7 +39521,7 @@ var ts; var saveExceptionTarget = currentExceptionTarget; var saveActiveLabelList = activeLabelList; var saveHasExplicitReturn = hasExplicitReturn; - var isIIFE = containerFlags & 16 /* IsFunctionExpression */ && !ts.hasModifier(node, 256 /* Async */) && + var isIIFE = containerFlags & 16 /* IsFunctionExpression */ && !ts.hasSyntacticModifier(node, 256 /* Async */) && !node.asteriskToken && !!ts.getImmediatelyInvokedFunctionExpression(node); // A non-async, non-generator IIFE is considered part of the containing control flow. Return statements behave // similarly to break statements that exit to a label just past the statement body. @@ -31231,7 +39533,7 @@ var ts; } // We create a return control flow graph for IIFEs and constructors. For constructors // we use the return control flow graph in strict property initialization checks. - currentReturnTarget = isIIFE || node.kind === 162 /* Constructor */ ? createBranchLabel() : undefined; + currentReturnTarget = isIIFE || node.kind === 165 /* Constructor */ || (ts.isInJSFile && (node.kind === 248 /* FunctionDeclaration */ || node.kind === 205 /* FunctionExpression */)) ? createBranchLabel() : undefined; currentExceptionTarget = undefined; currentBreakTarget = undefined; currentContinueTarget = undefined; @@ -31246,13 +39548,13 @@ var ts; node.flags |= 512 /* HasExplicitReturn */; node.endFlowNode = currentFlow; } - if (node.kind === 290 /* SourceFile */) { + if (node.kind === 294 /* SourceFile */) { node.flags |= emitFlags; } if (currentReturnTarget) { addAntecedent(currentReturnTarget, currentFlow); currentFlow = finishFlowLabel(currentReturnTarget); - if (node.kind === 162 /* Constructor */) { + if (node.kind === 165 /* Constructor */ || (ts.isInJSFile && (node.kind === 248 /* FunctionDeclaration */ || node.kind === 205 /* FunctionExpression */))) { node.returnFlowNode = currentFlow; } } @@ -31278,144 +39580,113 @@ var ts; thisParentContainer = saveThisParentContainer; blockScopeContainer = savedBlockScopeContainer; } - function bindChildren(node) { - if (skipTransformFlagAggregation) { - bindChildrenWorker(node); - } - else if (node.transformFlags & 536870912 /* HasComputedFlags */) { - skipTransformFlagAggregation = true; - bindChildrenWorker(node); - skipTransformFlagAggregation = false; - subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind); - } - else { - var savedSubtreeTransformFlags = subtreeTransformFlags; - subtreeTransformFlags = 0; - bindChildrenWorker(node); - subtreeTransformFlags = savedSubtreeTransformFlags | computeTransformFlagsForNode(node, subtreeTransformFlags); - } - } function bindEachFunctionsFirst(nodes) { - bindEach(nodes, function (n) { return n.kind === 244 /* FunctionDeclaration */ ? bind(n) : undefined; }); - bindEach(nodes, function (n) { return n.kind !== 244 /* FunctionDeclaration */ ? bind(n) : undefined; }); + bindEach(nodes, function (n) { return n.kind === 248 /* FunctionDeclaration */ ? bind(n) : undefined; }); + bindEach(nodes, function (n) { return n.kind !== 248 /* FunctionDeclaration */ ? bind(n) : undefined; }); } function bindEach(nodes, bindFunction) { if (bindFunction === void 0) { bindFunction = bind; } if (nodes === undefined) { return; } - if (skipTransformFlagAggregation) { - ts.forEach(nodes, bindFunction); - } - else { - var savedSubtreeTransformFlags = subtreeTransformFlags; - subtreeTransformFlags = 0 /* None */; - var nodeArrayFlags = 0 /* None */; - for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) { - var node = nodes_2[_i]; - bindFunction(node); - nodeArrayFlags |= node.transformFlags & ~536870912 /* HasComputedFlags */; - } - nodes.transformFlags = nodeArrayFlags | 536870912 /* HasComputedFlags */; - subtreeTransformFlags |= savedSubtreeTransformFlags; - } + ts.forEach(nodes, bindFunction); } function bindEachChild(node) { ts.forEachChild(node, bind, bindEach); } - function bindChildrenWorker(node) { + function bindChildren(node) { if (checkUnreachable(node)) { bindEachChild(node); bindJSDoc(node); return; } - if (node.kind >= 225 /* FirstStatement */ && node.kind <= 241 /* LastStatement */ && !options.allowUnreachableCode) { + if (node.kind >= 229 /* FirstStatement */ && node.kind <= 245 /* LastStatement */ && !options.allowUnreachableCode) { node.flowNode = currentFlow; } switch (node.kind) { - case 229 /* WhileStatement */: + case 233 /* WhileStatement */: bindWhileStatement(node); break; - case 228 /* DoStatement */: + case 232 /* DoStatement */: bindDoStatement(node); break; - case 230 /* ForStatement */: + case 234 /* ForStatement */: bindForStatement(node); break; - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: bindForInOrForOfStatement(node); break; - case 227 /* IfStatement */: + case 231 /* IfStatement */: bindIfStatement(node); break; - case 235 /* ReturnStatement */: - case 239 /* ThrowStatement */: + case 239 /* ReturnStatement */: + case 243 /* ThrowStatement */: bindReturnOrThrow(node); break; - case 234 /* BreakStatement */: - case 233 /* ContinueStatement */: + case 238 /* BreakStatement */: + case 237 /* ContinueStatement */: bindBreakOrContinueStatement(node); break; - case 240 /* TryStatement */: + case 244 /* TryStatement */: bindTryStatement(node); break; - case 237 /* SwitchStatement */: + case 241 /* SwitchStatement */: bindSwitchStatement(node); break; - case 251 /* CaseBlock */: + case 255 /* CaseBlock */: bindCaseBlock(node); break; - case 277 /* CaseClause */: + case 281 /* CaseClause */: bindCaseClause(node); break; - case 226 /* ExpressionStatement */: + case 230 /* ExpressionStatement */: bindExpressionStatement(node); break; - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: bindLabeledStatement(node); break; - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: bindPrefixUnaryExpressionFlow(node); break; - case 208 /* PostfixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: bindPostfixUnaryExpressionFlow(node); break; - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: bindBinaryExpressionFlow(node); break; - case 203 /* DeleteExpression */: + case 207 /* DeleteExpression */: bindDeleteExpressionFlow(node); break; - case 210 /* ConditionalExpression */: + case 214 /* ConditionalExpression */: bindConditionalExpressionFlow(node); break; - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: bindVariableDeclarationFlow(node); break; - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: bindAccessExpressionFlow(node); break; - case 196 /* CallExpression */: + case 200 /* CallExpression */: bindCallExpressionFlow(node); break; - case 218 /* NonNullExpression */: + case 222 /* NonNullExpression */: bindNonNullExpressionFlow(node); break; - case 322 /* JSDocTypedefTag */: - case 315 /* JSDocCallbackTag */: - case 316 /* JSDocEnumTag */: + case 327 /* JSDocTypedefTag */: + case 320 /* JSDocCallbackTag */: + case 321 /* JSDocEnumTag */: bindJSDocTypeAlias(node); break; // In source files and blocks, bind functions first to match hoisting that occurs at runtime - case 290 /* SourceFile */: { + case 294 /* SourceFile */: { bindEachFunctionsFirst(node.statements); bind(node.endOfFileToken); break; } - case 223 /* Block */: - case 250 /* ModuleBlock */: + case 227 /* Block */: + case 254 /* ModuleBlock */: bindEachFunctionsFirst(node.statements); break; default: @@ -31426,28 +39697,29 @@ var ts; } function isNarrowingExpression(expr) { switch (expr.kind) { - case 75 /* Identifier */: - case 104 /* ThisKeyword */: - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: + case 78 /* Identifier */: + case 107 /* ThisKeyword */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: return containsNarrowableReference(expr); - case 196 /* CallExpression */: + case 200 /* CallExpression */: return hasNarrowableArgument(expr); - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return isNarrowingExpression(expr.expression); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return isNarrowingBinaryExpression(expr); - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: return expr.operator === 53 /* ExclamationToken */ && isNarrowingExpression(expr.operand); - case 204 /* TypeOfExpression */: + case 208 /* TypeOfExpression */: return isNarrowingExpression(expr.expression); } return false; } function isNarrowableReference(expr) { - return expr.kind === 75 /* Identifier */ || expr.kind === 104 /* ThisKeyword */ || expr.kind === 102 /* SuperKeyword */ || + return expr.kind === 78 /* Identifier */ || expr.kind === 107 /* ThisKeyword */ || expr.kind === 105 /* SuperKeyword */ || (ts.isPropertyAccessExpression(expr) || ts.isNonNullExpression(expr) || ts.isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression) || - ts.isElementAccessExpression(expr) && ts.isStringOrNumericLiteralLike(expr.argumentExpression) && isNarrowableReference(expr.expression); + ts.isElementAccessExpression(expr) && ts.isStringOrNumericLiteralLike(expr.argumentExpression) && isNarrowableReference(expr.expression) || + ts.isAssignmentExpression(expr) && isNarrowableReference(expr.left); } function containsNarrowableReference(expr) { return isNarrowableReference(expr) || ts.isOptionalChain(expr) && containsNarrowableReference(expr.expression); @@ -31461,7 +39733,7 @@ var ts; } } } - if (expr.expression.kind === 194 /* PropertyAccessExpression */ && + if (expr.expression.kind === 198 /* PropertyAccessExpression */ && containsNarrowableReference(expr.expression.expression)) { return true; } @@ -31476,6 +39748,9 @@ var ts; function isNarrowingBinaryExpression(expr) { switch (expr.operatorToken.kind) { case 62 /* EqualsToken */: + case 74 /* BarBarEqualsToken */: + case 75 /* AmpersandAmpersandEqualsToken */: + case 76 /* QuestionQuestionEqualsToken */: return containsNarrowableReference(expr.left); case 34 /* EqualsEqualsToken */: case 35 /* ExclamationEqualsToken */: @@ -31483,9 +39758,9 @@ var ts; case 37 /* ExclamationEqualsEqualsToken */: return isNarrowableOperand(expr.left) || isNarrowableOperand(expr.right) || isNarrowingTypeofOperands(expr.right, expr.left) || isNarrowingTypeofOperands(expr.left, expr.right); - case 98 /* InstanceOfKeyword */: + case 101 /* InstanceOfKeyword */: return isNarrowableOperand(expr.left); - case 97 /* InKeyword */: + case 100 /* InKeyword */: return isNarrowableInOperands(expr.left, expr.right); case 27 /* CommaToken */: return isNarrowingExpression(expr.right); @@ -31494,9 +39769,9 @@ var ts; } function isNarrowableOperand(expr) { switch (expr.kind) { - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return isNarrowableOperand(expr.expression); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: switch (expr.operatorToken.kind) { case 62 /* EqualsToken */: return isNarrowableOperand(expr.left); @@ -31532,8 +39807,8 @@ var ts; if (!expression) { return flags & 32 /* TrueCondition */ ? antecedent : unreachableFlow; } - if ((expression.kind === 106 /* TrueKeyword */ && flags & 64 /* FalseCondition */ || - expression.kind === 91 /* FalseKeyword */ && flags & 32 /* TrueCondition */) && + if ((expression.kind === 109 /* TrueKeyword */ && flags & 64 /* FalseCondition */ || + expression.kind === 94 /* FalseKeyword */ && flags & 32 /* TrueCondition */) && !ts.isExpressionOfOptionalChainRoot(expression) && !ts.isNullishCoalesce(expression.parent)) { return unreachableFlow; } @@ -31572,37 +39847,42 @@ var ts; function isStatementCondition(node) { var parent = node.parent; switch (parent.kind) { - case 227 /* IfStatement */: - case 229 /* WhileStatement */: - case 228 /* DoStatement */: + case 231 /* IfStatement */: + case 233 /* WhileStatement */: + case 232 /* DoStatement */: return parent.expression === node; - case 230 /* ForStatement */: - case 210 /* ConditionalExpression */: + case 234 /* ForStatement */: + case 214 /* ConditionalExpression */: return parent.condition === node; } return false; } function isLogicalExpression(node) { while (true) { - if (node.kind === 200 /* ParenthesizedExpression */) { + if (node.kind === 204 /* ParenthesizedExpression */) { node = node.expression; } - else if (node.kind === 207 /* PrefixUnaryExpression */ && node.operator === 53 /* ExclamationToken */) { + else if (node.kind === 211 /* PrefixUnaryExpression */ && node.operator === 53 /* ExclamationToken */) { node = node.operand; } else { - return node.kind === 209 /* BinaryExpression */ && (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */ || + return node.kind === 213 /* BinaryExpression */ && (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */ || node.operatorToken.kind === 56 /* BarBarToken */ || node.operatorToken.kind === 60 /* QuestionQuestionToken */); } } } + function isLogicalAssignmentExpression(node) { + node = ts.skipParentheses(node); + return ts.isBinaryExpression(node) && ts.isLogicalOrCoalescingAssignmentOperator(node.operatorToken.kind); + } function isTopLevelLogicalExpression(node) { while (ts.isParenthesizedExpression(node.parent) || ts.isPrefixUnaryExpression(node.parent) && node.parent.operator === 53 /* ExclamationToken */) { node = node.parent; } return !isStatementCondition(node) && + !isLogicalAssignmentExpression(node.parent) && !isLogicalExpression(node.parent) && !(ts.isOptionalChain(node.parent) && node.parent.expression === node); } @@ -31617,7 +39897,7 @@ var ts; } function bindCondition(node, trueTarget, falseTarget) { doWithConditionalBranches(bind, node, trueTarget, falseTarget); - if (!node || !isLogicalExpression(node) && !(ts.isOptionalChain(node) && ts.isOutermostOptionalChain(node))) { + if (!node || !isLogicalAssignmentExpression(node) && !isLogicalExpression(node) && !(ts.isOptionalChain(node) && ts.isOutermostOptionalChain(node))) { addAntecedent(trueTarget, createFlowCondition(32 /* TrueCondition */, currentFlow, node)); addAntecedent(falseTarget, createFlowCondition(64 /* FalseCondition */, currentFlow, node)); } @@ -31633,7 +39913,7 @@ var ts; } function setContinueTarget(node, target) { var label = activeLabelList; - while (label && node.parent.kind === 238 /* LabeledStatement */) { + while (label && node.parent.kind === 242 /* LabeledStatement */) { label.continueTarget = target; label = label.next; node = node.parent; @@ -31684,12 +39964,12 @@ var ts; bind(node.expression); addAntecedent(preLoopLabel, currentFlow); currentFlow = preLoopLabel; - if (node.kind === 232 /* ForOfStatement */) { + if (node.kind === 236 /* ForOfStatement */) { bind(node.awaitModifier); } addAntecedent(postLoopLabel, currentFlow); bind(node.initializer); - if (node.initializer.kind !== 243 /* VariableDeclarationList */) { + if (node.initializer.kind !== 247 /* VariableDeclarationList */) { bindAssignmentTargetFlow(node.initializer); } bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel); @@ -31711,7 +39991,7 @@ var ts; } function bindReturnOrThrow(node) { bind(node.expression); - if (node.kind === 235 /* ReturnStatement */) { + if (node.kind === 239 /* ReturnStatement */) { hasExplicitReturn = true; if (currentReturnTarget) { addAntecedent(currentReturnTarget, currentFlow); @@ -31728,7 +40008,7 @@ var ts; return undefined; } function bindBreakOrContinueFlow(node, breakTarget, continueTarget) { - var flowLabel = node.kind === 234 /* BreakStatement */ ? breakTarget : continueTarget; + var flowLabel = node.kind === 238 /* BreakStatement */ ? breakTarget : continueTarget; if (flowLabel) { addAntecedent(flowLabel, currentFlow); currentFlow = unreachableFlow; @@ -31809,6 +40089,11 @@ var ts; if (currentReturnTarget && returnLabel.antecedents) { addAntecedent(currentReturnTarget, createReduceLabel(finallyLabel, returnLabel.antecedents, currentFlow)); } + // If we have an outer exception target (i.e. a containing try-finally or try-catch-finally), add a + // control flow that goes back through the finally blok and back through each possible exception source. + if (currentExceptionTarget && exceptionLabel.antecedents) { + addAntecedent(currentExceptionTarget, createReduceLabel(finallyLabel, exceptionLabel.antecedents, currentFlow)); + } // If the end of the finally block is reachable, but the end of the try and catch blocks are not, // convert the current flow to unreachable. For example, 'try { return 1; } finally { ... }' should // result in an unreachable current control flow. @@ -31828,7 +40113,7 @@ var ts; preSwitchCaseFlow = currentFlow; bind(node.caseBlock); addAntecedent(postSwitchLabel, currentFlow); - var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 278 /* DefaultClause */; }); + var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 282 /* DefaultClause */; }); // We mark a switch statement as possibly exhaustive if it has no default clause and if all // case clauses have unreachable end points (e.g. they all return). Note, we no longer need // this property in control flow analysis, it's there only for backwards compatibility. @@ -31841,8 +40126,6 @@ var ts; currentFlow = finishFlowLabel(postSwitchLabel); } function bindCaseBlock(node) { - var savedSubtreeTransformFlags = subtreeTransformFlags; - subtreeTransformFlags = 0; var clauses = node.clauses; var isNarrowingSwitch = isNarrowingExpression(node.parent.expression); var fallthroughFlow = unreachableFlow; @@ -31863,8 +40146,6 @@ var ts; clause.fallthroughFlowNode = currentFlow; } } - clauses.transformFlags = subtreeTransformFlags | 536870912 /* HasComputedFlags */; - subtreeTransformFlags |= savedSubtreeTransformFlags; } function bindCaseClause(node) { var saveCurrentFlow = currentFlow; @@ -31877,9 +40158,9 @@ var ts; bind(node.expression); // A top level call expression with a dotted function name and at least one argument // is potentially an assertion and is therefore included in the control flow. - if (node.expression.kind === 196 /* CallExpression */) { + if (node.expression.kind === 200 /* CallExpression */) { var call = node.expression; - if (ts.isDottedName(call.expression)) { + if (ts.isDottedName(call.expression) && call.expression.kind !== 105 /* SuperKeyword */) { currentFlow = createFlowCall(currentFlow, call); } } @@ -31903,7 +40184,7 @@ var ts; currentFlow = finishFlowLabel(postStatementLabel); } function bindDestructuringTargetFlow(node) { - if (node.kind === 209 /* BinaryExpression */ && node.operatorToken.kind === 62 /* EqualsToken */) { + if (node.kind === 213 /* BinaryExpression */ && node.operatorToken.kind === 62 /* EqualsToken */) { bindAssignmentTargetFlow(node.left); } else { @@ -31914,10 +40195,10 @@ var ts; if (isNarrowableReference(node)) { currentFlow = createFlowMutation(16 /* Assignment */, currentFlow, node); } - else if (node.kind === 192 /* ArrayLiteralExpression */) { + else if (node.kind === 196 /* ArrayLiteralExpression */) { for (var _i = 0, _a = node.elements; _i < _a.length; _i++) { var e = _a[_i]; - if (e.kind === 213 /* SpreadElement */) { + if (e.kind === 217 /* SpreadElement */) { bindAssignmentTargetFlow(e.expression); } else { @@ -31925,24 +40206,24 @@ var ts; } } } - else if (node.kind === 193 /* ObjectLiteralExpression */) { + else if (node.kind === 197 /* ObjectLiteralExpression */) { for (var _b = 0, _c = node.properties; _b < _c.length; _b++) { var p = _c[_b]; - if (p.kind === 281 /* PropertyAssignment */) { + if (p.kind === 285 /* PropertyAssignment */) { bindDestructuringTargetFlow(p.initializer); } - else if (p.kind === 282 /* ShorthandPropertyAssignment */) { + else if (p.kind === 286 /* ShorthandPropertyAssignment */) { bindAssignmentTargetFlow(p.name); } - else if (p.kind === 283 /* SpreadAssignment */) { + else if (p.kind === 287 /* SpreadAssignment */) { bindAssignmentTargetFlow(p.expression); } } } } - function bindLogicalExpression(node, trueTarget, falseTarget) { + function bindLogicalLikeExpression(node, trueTarget, falseTarget) { var preRightLabel = createBranchLabel(); - if (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */) { + if (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */ || node.operatorToken.kind === 75 /* AmpersandAmpersandEqualsToken */) { bindCondition(node.left, preRightLabel, falseTarget); } else { @@ -31950,7 +40231,15 @@ var ts; } currentFlow = finishFlowLabel(preRightLabel); bind(node.operatorToken); - bindCondition(node.right, trueTarget, falseTarget); + if (ts.isLogicalOrCoalescingAssignmentOperator(node.operatorToken.kind)) { + doWithConditionalBranches(bind, node.right, trueTarget, falseTarget); + bindAssignmentTargetFlow(node.left); + addAntecedent(trueTarget, createFlowCondition(32 /* TrueCondition */, currentFlow, node)); + addAntecedent(falseTarget, createFlowCondition(64 /* FalseCondition */, currentFlow, node)); + } + else { + bindCondition(node.right, trueTarget, falseTarget); + } } function bindPrefixUnaryExpressionFlow(node) { if (node.operator === 53 /* ExclamationToken */) { @@ -31988,7 +40277,6 @@ var ts; state: [1 /* MaybeBindLeft */], inStrictMode: [undefined], parent: [undefined], - subtreeFlags: [undefined] }; var stackIndex = 0; while (stackIndex >= 0) { @@ -31997,27 +40285,12 @@ var ts; case 0 /* BindThenBindChildren */: { // This state is used only when recuring, to emulate the work that `bind` does before // reaching `bindChildren`. A normal call to `bindBinaryExpressionFlow` will already have done this work. - node.parent = parent; + ts.setParent(node, parent); var saveInStrictMode = inStrictMode; bindWorker(node); var saveParent = parent; parent = node; - var subtreeFlagsState = void 0; - // While this next part does the work of `bindChildren` before it descends into `bindChildrenWorker` - // and uses `subtreeFlagsState` to queue up the work that needs to be done once the node is bound. - if (skipTransformFlagAggregation) { - // do nothing extra - } - else if (node.transformFlags & 536870912 /* HasComputedFlags */) { - skipTransformFlagAggregation = true; - subtreeFlagsState = -1; - } - else { - var savedSubtreeTransformFlags = subtreeTransformFlags; - subtreeTransformFlags = 0; - subtreeFlagsState = savedSubtreeTransformFlags; - } - advanceState(1 /* MaybeBindLeft */, saveInStrictMode, saveParent, subtreeFlagsState); + advanceState(1 /* MaybeBindLeft */, saveInStrictMode, saveParent); break; } case 1 /* MaybeBindLeft */: { @@ -32025,14 +40298,15 @@ var ts; // TODO: bindLogicalExpression is recursive - if we want to handle deeply nested `&&` expressions // we'll need to handle the `bindLogicalExpression` scenarios in this state machine, too // For now, though, since the common cases are chained `+`, leaving it recursive is fine - if (operator === 55 /* AmpersandAmpersandToken */ || operator === 56 /* BarBarToken */ || operator === 60 /* QuestionQuestionToken */) { + if (operator === 55 /* AmpersandAmpersandToken */ || operator === 56 /* BarBarToken */ || operator === 60 /* QuestionQuestionToken */ || + ts.isLogicalOrCoalescingAssignmentOperator(operator)) { if (isTopLevelLogicalExpression(node)) { var postExpressionLabel = createBranchLabel(); - bindLogicalExpression(node, postExpressionLabel, postExpressionLabel); + bindLogicalLikeExpression(node, postExpressionLabel, postExpressionLabel); currentFlow = finishFlowLabel(postExpressionLabel); } else { - bindLogicalExpression(node, currentTrueTarget, currentFalseTarget); + bindLogicalLikeExpression(node, currentTrueTarget, currentFalseTarget); } completeNode(); } @@ -32056,7 +40330,7 @@ var ts; var operator = node.operatorToken.kind; if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) { bindAssignmentTargetFlow(node.left); - if (operator === 62 /* EqualsToken */ && node.left.kind === 195 /* ElementAccessExpression */) { + if (operator === 62 /* EqualsToken */ && node.left.kind === 199 /* ElementAccessExpression */) { var elementAccess = node.left; if (isNarrowableOperand(elementAccess.expression)) { currentFlow = createFlowMutation(256 /* ArrayMutation */, currentFlow, node); @@ -32073,7 +40347,7 @@ var ts; * Note that `advanceState` sets the _current_ head state, and that `maybeBind` potentially pushes on a new * head state; so `advanceState` must be called before any `maybeBind` during a state's execution. */ - function advanceState(state, isInStrictMode, parent, subtreeFlags) { + function advanceState(state, isInStrictMode, parent) { workStacks.state[stackIndex] = state; if (isInStrictMode !== undefined) { workStacks.inStrictMode[stackIndex] = isInStrictMode; @@ -32081,19 +40355,9 @@ var ts; if (parent !== undefined) { workStacks.parent[stackIndex] = parent; } - if (subtreeFlags !== undefined) { - workStacks.subtreeFlags[stackIndex] = subtreeFlags; - } } function completeNode() { if (workStacks.inStrictMode[stackIndex] !== undefined) { - if (workStacks.subtreeFlags[stackIndex] === -1) { - skipTransformFlagAggregation = false; - subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind); - } - else if (workStacks.subtreeFlags[stackIndex] !== undefined) { - subtreeTransformFlags = workStacks.subtreeFlags[stackIndex] | computeTransformFlagsForNode(node, subtreeTransformFlags); - } inStrictMode = workStacks.inStrictMode[stackIndex]; parent = workStacks.parent[stackIndex]; } @@ -32109,7 +40373,6 @@ var ts; workStacks.state[stackIndex] = 0 /* BindThenBindChildren */; workStacks.inStrictMode[stackIndex] = undefined; workStacks.parent[stackIndex] = undefined; - workStacks.subtreeFlags[stackIndex] = undefined; } else { bind(node); @@ -32118,7 +40381,7 @@ var ts; } function bindDeleteExpressionFlow(node) { bindEachChild(node); - if (node.expression.kind === 194 /* PropertyAccessExpression */) { + if (node.expression.kind === 198 /* PropertyAccessExpression */) { bindAssignmentTargetFlow(node.expression); } } @@ -32156,15 +40419,16 @@ var ts; } } function bindJSDocTypeAlias(node) { - node.tagName.parent = node; - if (node.kind !== 316 /* JSDocEnumTag */ && node.fullName) { - setParentPointers(node, node.fullName); + ts.setParent(node.tagName, node); + if (node.kind !== 321 /* JSDocEnumTag */ && node.fullName) { + ts.setParent(node.fullName, node); + ts.setParentRecursive(node.fullName, /*incremental*/ false); } } function bindJSDocClassTag(node) { bindEachChild(node); var host = ts.getHostSignatureFromJSDoc(node); - if (host && host.kind !== 161 /* MethodDeclaration */) { + if (host && host.kind !== 164 /* MethodDeclaration */) { addDeclarationToSymbol(host.symbol, host, 32 /* Class */); } } @@ -32177,15 +40441,15 @@ var ts; } function bindOptionalChainRest(node) { switch (node.kind) { - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: bind(node.questionDotToken); bind(node.name); break; - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: bind(node.questionDotToken); bind(node.argumentExpression); break; - case 196 /* CallExpression */: + case 200 /* CallExpression */: bind(node.questionDotToken); bindEach(node.typeArguments); bindEach(node.arguments); @@ -32250,16 +40514,19 @@ var ts; // an immediately invoked function expression (IIFE). Initialize the flowNode property to // the current control flow (which includes evaluation of the IIFE arguments). var expr = ts.skipParentheses(node.expression); - if (expr.kind === 201 /* FunctionExpression */ || expr.kind === 202 /* ArrowFunction */) { + if (expr.kind === 205 /* FunctionExpression */ || expr.kind === 206 /* ArrowFunction */) { bindEach(node.typeArguments); bindEach(node.arguments); bind(node.expression); } else { bindEachChild(node); + if (node.expression.kind === 105 /* SuperKeyword */) { + currentFlow = createFlowCall(currentFlow, node); + } } } - if (node.expression.kind === 194 /* PropertyAccessExpression */) { + if (node.expression.kind === 198 /* PropertyAccessExpression */) { var propertyAccess = node.expression; if (ts.isIdentifier(propertyAccess.name) && isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) { currentFlow = createFlowMutation(256 /* ArrayMutation */, currentFlow, node); @@ -32268,54 +40535,54 @@ var ts; } function getContainerFlags(node) { switch (node.kind) { - case 214 /* ClassExpression */: - case 245 /* ClassDeclaration */: - case 248 /* EnumDeclaration */: - case 193 /* ObjectLiteralExpression */: - case 173 /* TypeLiteral */: - case 304 /* JSDocTypeLiteral */: - case 274 /* JsxAttributes */: + case 218 /* ClassExpression */: + case 249 /* ClassDeclaration */: + case 252 /* EnumDeclaration */: + case 197 /* ObjectLiteralExpression */: + case 176 /* TypeLiteral */: + case 308 /* JSDocTypeLiteral */: + case 278 /* JsxAttributes */: return 1 /* IsContainer */; - case 246 /* InterfaceDeclaration */: + case 250 /* InterfaceDeclaration */: return 1 /* IsContainer */ | 64 /* IsInterface */; - case 249 /* ModuleDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 186 /* MappedType */: + case 253 /* ModuleDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 189 /* MappedType */: return 1 /* IsContainer */ | 32 /* HasLocals */; - case 290 /* SourceFile */: + case 294 /* SourceFile */: return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */; - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: if (ts.isObjectLiteralOrClassExpressionMethod(node)) { return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 128 /* IsObjectLiteralOrClassExpressionMethod */; } // falls through - case 162 /* Constructor */: - case 244 /* FunctionDeclaration */: - case 160 /* MethodSignature */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 165 /* CallSignature */: - case 305 /* JSDocSignature */: - case 300 /* JSDocFunctionType */: - case 170 /* FunctionType */: - case 166 /* ConstructSignature */: - case 167 /* IndexSignature */: - case 171 /* ConstructorType */: + case 165 /* Constructor */: + case 248 /* FunctionDeclaration */: + case 163 /* MethodSignature */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 168 /* CallSignature */: + case 309 /* JSDocSignature */: + case 304 /* JSDocFunctionType */: + case 173 /* FunctionType */: + case 169 /* ConstructSignature */: + case 170 /* IndexSignature */: + case 174 /* ConstructorType */: return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */; - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */; - case 250 /* ModuleBlock */: + case 254 /* ModuleBlock */: return 4 /* IsControlFlowContainer */; - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: return node.initializer ? 4 /* IsControlFlowContainer */ : 0; - case 280 /* CatchClause */: - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - case 251 /* CaseBlock */: + case 284 /* CatchClause */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 255 /* CaseBlock */: return 2 /* IsBlockScopedContainer */; - case 223 /* Block */: + case 227 /* Block */: // do not treat blocks directly inside a function as a block-scoped-container. // Locals that reside in this block should go to the function locals. Otherwise 'x' // would not appear to be a redeclaration of a block scoped local in the following @@ -32348,45 +40615,45 @@ var ts; // members are declared (for example, a member of a class will go into a specific // symbol table depending on if it is static or not). We defer to specialized // handlers to take care of declaring these child members. - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: return declareModuleMember(node, symbolFlags, symbolExcludes); - case 290 /* SourceFile */: + case 294 /* SourceFile */: return declareSourceFileMember(node, symbolFlags, symbolExcludes); - case 214 /* ClassExpression */: - case 245 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 249 /* ClassDeclaration */: return declareClassMember(node, symbolFlags, symbolExcludes); - case 248 /* EnumDeclaration */: + case 252 /* EnumDeclaration */: return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); - case 173 /* TypeLiteral */: - case 304 /* JSDocTypeLiteral */: - case 193 /* ObjectLiteralExpression */: - case 246 /* InterfaceDeclaration */: - case 274 /* JsxAttributes */: + case 176 /* TypeLiteral */: + case 308 /* JSDocTypeLiteral */: + case 197 /* ObjectLiteralExpression */: + case 250 /* InterfaceDeclaration */: + case 278 /* JsxAttributes */: // Interface/Object-types always have their children added to the 'members' of // their container. They are only accessible through an instance of their // container, and are never in scope otherwise (even inside the body of the // object / type / interface declaring them). An exception is type parameters, // which are in scope without qualification (similar to 'locals'). return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); - case 170 /* FunctionType */: - case 171 /* ConstructorType */: - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 305 /* JSDocSignature */: - case 167 /* IndexSignature */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: - case 300 /* JSDocFunctionType */: - case 322 /* JSDocTypedefTag */: - case 315 /* JSDocCallbackTag */: - case 247 /* TypeAliasDeclaration */: - case 186 /* MappedType */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 309 /* JSDocSignature */: + case 170 /* IndexSignature */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 304 /* JSDocFunctionType */: + case 327 /* JSDocTypedefTag */: + case 320 /* JSDocCallbackTag */: + case 251 /* TypeAliasDeclaration */: + case 189 /* MappedType */: // All the children of these container types are never visible through another // symbol (i.e. through another symbol's 'exports' or 'members'). Instead, // they're only accessed 'lexically' (i.e. from code that exists underneath @@ -32397,7 +40664,7 @@ var ts; } } function declareClassMember(node, symbolFlags, symbolExcludes) { - return ts.hasModifier(node, 32 /* Static */) + return ts.hasSyntacticModifier(node, 32 /* Static */) ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes) : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes); } @@ -32423,7 +40690,7 @@ var ts; function bindModuleDeclaration(node) { setExportContextFlag(node); if (ts.isAmbientModule(node)) { - if (ts.hasModifier(node, 1 /* Export */)) { + if (ts.hasSyntacticModifier(node, 1 /* Export */)) { errorOnFirstToken(node, ts.Diagnostics.export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible); } if (ts.isModuleAugmentationExternal(node)) { @@ -32484,10 +40751,10 @@ var ts; ElementKind[ElementKind["Accessor"] = 2] = "Accessor"; })(ElementKind || (ElementKind = {})); if (inStrictMode && !ts.isAssignmentTarget(node)) { - var seen = ts.createUnderscoreEscapedMap(); + var seen = new ts.Map(); for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { var prop = _a[_i]; - if (prop.kind === 283 /* SpreadAssignment */ || prop.name.kind !== 75 /* Identifier */) { + if (prop.kind === 287 /* SpreadAssignment */ || prop.name.kind !== 78 /* Identifier */) { continue; } var identifier = prop.name; @@ -32499,7 +40766,7 @@ var ts; // c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true. // d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields - var currentKind = prop.kind === 281 /* PropertyAssignment */ || prop.kind === 282 /* ShorthandPropertyAssignment */ || prop.kind === 161 /* MethodDeclaration */ + var currentKind = prop.kind === 285 /* PropertyAssignment */ || prop.kind === 286 /* ShorthandPropertyAssignment */ || prop.kind === 164 /* MethodDeclaration */ ? 1 /* Property */ : 2 /* Accessor */; var existingKind = seen.get(identifier.escapedText); @@ -32531,10 +40798,10 @@ var ts; } function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) { switch (blockScopeContainer.kind) { - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: declareModuleMember(node, symbolFlags, symbolExcludes); break; - case 290 /* SourceFile */: + case 294 /* SourceFile */: if (ts.isExternalOrCommonJsModule(container)) { declareModuleMember(node, symbolFlags, symbolExcludes); break; @@ -32602,7 +40869,7 @@ var ts; container = oldContainer; } } - else if (ts.isJSDocEnumTag(typeAlias) || !typeAlias.fullName || typeAlias.fullName.kind === 75 /* Identifier */) { + else if (ts.isJSDocEnumTag(typeAlias) || !typeAlias.fullName || typeAlias.fullName.kind === 78 /* Identifier */) { parent = typeAlias.parent; bindBlockScopedDeclaration(typeAlias, 524288 /* TypeAlias */, 788968 /* TypeAliasExcludes */); } @@ -32617,18 +40884,31 @@ var ts; currentFlow = saveCurrentFlow; } // The binder visits every node in the syntax tree so it is a convenient place to perform a single localized - // check for reserved words used as identifiers in strict mode code. - function checkStrictModeIdentifier(node) { - if (inStrictMode && - node.originalKeywordKind >= 113 /* FirstFutureReservedWord */ && - node.originalKeywordKind <= 121 /* LastFutureReservedWord */ && - !ts.isIdentifierName(node) && + // check for reserved words used as identifiers in strict mode code, as well as `yield` or `await` in + // [Yield] or [Await] contexts, respectively. + function checkContextualIdentifier(node) { + // Report error only if there are no parse errors in file + if (!file.parseDiagnostics.length && !(node.flags & 8388608 /* Ambient */) && - !(node.flags & 4194304 /* JSDoc */)) { - // Report error only if there are no parse errors in file - if (!file.parseDiagnostics.length) { + !(node.flags & 4194304 /* JSDoc */) && + !ts.isIdentifierName(node)) { + // strict mode identifiers + if (inStrictMode && + node.originalKeywordKind >= 116 /* FirstFutureReservedWord */ && + node.originalKeywordKind <= 124 /* LastFutureReservedWord */) { file.bindDiagnostics.push(createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node))); } + else if (node.originalKeywordKind === 130 /* AwaitKeyword */) { + if (ts.isExternalModule(file) && ts.isInTopLevelContext(node)) { + file.bindDiagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_at_the_top_level_of_a_module, ts.declarationNameToString(node))); + } + else if (node.flags & 32768 /* AwaitContext */) { + file.bindDiagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_that_cannot_be_used_here, ts.declarationNameToString(node))); + } + } + else if (node.originalKeywordKind === 124 /* YieldKeyword */ && node.flags & 8192 /* YieldContext */) { + file.bindDiagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_that_cannot_be_used_here, ts.declarationNameToString(node))); + } } } function getStrictModeIdentifierMessage(node) { @@ -32668,7 +40948,7 @@ var ts; } function checkStrictModeDeleteExpression(node) { // Grammar checking - if (inStrictMode && node.expression.kind === 75 /* Identifier */) { + if (inStrictMode && node.expression.kind === 78 /* Identifier */) { // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its // UnaryExpression is a direct reference to a variable, function argument, or function name var span = ts.getErrorSpanForNode(file, node.expression); @@ -32679,7 +40959,7 @@ var ts; return ts.isIdentifier(node) && (node.escapedText === "eval" || node.escapedText === "arguments"); } function checkStrictModeEvalOrArguments(contextNode, name) { - if (name && name.kind === 75 /* Identifier */) { + if (name && name.kind === 78 /* Identifier */) { var identifier = name; if (isEvalOrArgumentsIdentifier(identifier)) { // We check first if the name is inside class declaration or class expression; if so give explicit message @@ -32720,8 +41000,8 @@ var ts; function checkStrictModeFunctionDeclaration(node) { if (languageVersion < 2 /* ES2015 */) { // Report error if function is not top level function declaration - if (blockScopeContainer.kind !== 290 /* SourceFile */ && - blockScopeContainer.kind !== 249 /* ModuleDeclaration */ && + if (blockScopeContainer.kind !== 294 /* SourceFile */ && + blockScopeContainer.kind !== 253 /* ModuleDeclaration */ && !ts.isFunctionLike(blockScopeContainer)) { // We check first if the name is inside class declaration or class expression; if so give explicit message // otherwise report generic error message. @@ -32789,7 +41069,7 @@ var ts; if (!node) { return; } - node.parent = parent; + ts.setParent(node, parent); var saveInStrictMode = inStrictMode; // Even though in the AST the jsdoc @typedef node belongs to the current node, // its symbol might be in the same scope with the current node's symbol. Consider: @@ -32816,7 +41096,7 @@ var ts; // the current 'container' node when it changes. This helps us know which symbol table // a local should go into for example. Since terminal nodes are known not to have // children, as an optimization we don't process those. - if (node.kind > 152 /* LastToken */) { + if (node.kind > 155 /* LastToken */) { var saveParent = parent; parent = node; var containerFlags = getContainerFlags(node); @@ -32828,8 +41108,7 @@ var ts; } parent = saveParent; } - else if (!skipTransformFlagAggregation && (node.transformFlags & 536870912 /* HasComputedFlags */) === 0) { - subtreeTransformFlags |= computeTransformFlagsForNode(node, 0); + else { var saveParent = parent; if (node.kind === 1 /* EndOfFileToken */) parent = node; @@ -32849,15 +41128,16 @@ var ts; else { for (var _b = 0, _c = node.jsDoc; _b < _c.length; _b++) { var j = _c[_b]; - setParentPointers(node, j); + ts.setParent(j, node); + ts.setParentRecursive(j, /*incremental*/ false); } } } } function updateStrictModeStatementList(statements) { if (!inStrictMode) { - for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) { - var statement = statements_2[_i]; + for (var _i = 0, statements_3 = statements; _i < statements_3.length; _i++) { + var statement = statements_3[_i]; if (!ts.isPrologueDirective(statement)) { return; } @@ -32878,7 +41158,7 @@ var ts; function bindWorker(node) { switch (node.kind) { /* Strict mode checks */ - case 75 /* Identifier */: + case 78 /* Identifier */: // for typedef type names with namespaces, bind the new jsdoc type symbol here // because it requires all containing namespaces to be in effect, namely the // current "blockScopeContainer" needs to be set to its immediate namespace parent. @@ -32891,15 +41171,18 @@ var ts; break; } // falls through - case 104 /* ThisKeyword */: - if (currentFlow && (ts.isExpression(node) || parent.kind === 282 /* ShorthandPropertyAssignment */)) { + case 107 /* ThisKeyword */: + if (currentFlow && (ts.isExpression(node) || parent.kind === 286 /* ShorthandPropertyAssignment */)) { node.flowNode = currentFlow; } - return checkStrictModeIdentifier(node); - case 76 /* PrivateIdentifier */: + return checkContextualIdentifier(node); + case 105 /* SuperKeyword */: + node.flowNode = currentFlow; + break; + case 79 /* PrivateIdentifier */: return checkPrivateIdentifier(node); - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: var expr = node; if (currentFlow && isNarrowableReference(expr)) { expr.flowNode = currentFlow; @@ -32914,7 +41197,7 @@ var ts; declareSymbol(file.locals, /*parent*/ undefined, expr.expression, 1 /* FunctionScopedVariable */ | 134217728 /* ModuleExports */, 111550 /* FunctionScopedVariableExcludes */); } break; - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: var specialKind = ts.getAssignmentDeclarationKind(node); switch (specialKind) { case 1 /* ExportsProperty */: @@ -32942,78 +41225,78 @@ var ts; ts.Debug.fail("Unknown binary expression special property assignment kind"); } return checkStrictModeBinaryExpression(node); - case 280 /* CatchClause */: + case 284 /* CatchClause */: return checkStrictModeCatchClause(node); - case 203 /* DeleteExpression */: + case 207 /* DeleteExpression */: return checkStrictModeDeleteExpression(node); case 8 /* NumericLiteral */: return checkStrictModeNumericLiteral(node); - case 208 /* PostfixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: return checkStrictModePostfixUnaryExpression(node); - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: return checkStrictModePrefixUnaryExpression(node); - case 236 /* WithStatement */: + case 240 /* WithStatement */: return checkStrictModeWithStatement(node); - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: return checkStrictModeLabeledStatement(node); - case 183 /* ThisType */: + case 186 /* ThisType */: seenThisKeyword = true; return; - case 168 /* TypePredicate */: + case 171 /* TypePredicate */: break; // Binding the children will handle everything - case 155 /* TypeParameter */: + case 158 /* TypeParameter */: return bindTypeParameter(node); - case 156 /* Parameter */: + case 159 /* Parameter */: return bindParameter(node); - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return bindVariableDeclarationOrBindingElement(node); - case 191 /* BindingElement */: + case 195 /* BindingElement */: node.flowNode = currentFlow; return bindVariableDeclarationOrBindingElement(node); - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: return bindPropertyWorker(node); - case 281 /* PropertyAssignment */: - case 282 /* ShorthandPropertyAssignment */: + case 285 /* PropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 0 /* PropertyExcludes */); - case 284 /* EnumMember */: + case 288 /* EnumMember */: return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 900095 /* EnumMemberExcludes */); - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 167 /* IndexSignature */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 170 /* IndexSignature */: return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */); - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: // If this is an ObjectLiteralExpression method, then it sits in the same space // as other properties in the object literal. So we use SymbolFlags.PropertyExcludes // so that it will conflict with any other object literal members with the same // name. return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 0 /* PropertyExcludes */ : 103359 /* MethodExcludes */); - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: return bindFunctionDeclaration(node); - case 162 /* Constructor */: + case 165 /* Constructor */: return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */); - case 163 /* GetAccessor */: + case 166 /* GetAccessor */: return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 46015 /* GetAccessorExcludes */); - case 164 /* SetAccessor */: + case 167 /* SetAccessor */: return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 78783 /* SetAccessorExcludes */); - case 170 /* FunctionType */: - case 300 /* JSDocFunctionType */: - case 305 /* JSDocSignature */: - case 171 /* ConstructorType */: + case 173 /* FunctionType */: + case 304 /* JSDocFunctionType */: + case 309 /* JSDocSignature */: + case 174 /* ConstructorType */: return bindFunctionOrConstructorType(node); - case 173 /* TypeLiteral */: - case 304 /* JSDocTypeLiteral */: - case 186 /* MappedType */: + case 176 /* TypeLiteral */: + case 308 /* JSDocTypeLiteral */: + case 189 /* MappedType */: return bindAnonymousTypeWorker(node); - case 310 /* JSDocClassTag */: + case 315 /* JSDocClassTag */: return bindJSDocClassTag(node); - case 193 /* ObjectLiteralExpression */: + case 197 /* ObjectLiteralExpression */: return bindObjectLiteralExpression(node); - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: return bindFunctionExpression(node); - case 196 /* CallExpression */: + case 200 /* CallExpression */: var assignmentKind = ts.getAssignmentDeclarationKind(node); switch (assignmentKind) { case 7 /* ObjectDefinePropertyValue */: @@ -33032,65 +41315,65 @@ var ts; } break; // Members of classes, interfaces, and modules - case 214 /* ClassExpression */: - case 245 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 249 /* ClassDeclaration */: // All classes are automatically in strict mode in ES6. inStrictMode = true; return bindClassLikeDeclaration(node); - case 246 /* InterfaceDeclaration */: + case 250 /* InterfaceDeclaration */: return bindBlockScopedDeclaration(node, 64 /* Interface */, 788872 /* InterfaceExcludes */); - case 247 /* TypeAliasDeclaration */: + case 251 /* TypeAliasDeclaration */: return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 788968 /* TypeAliasExcludes */); - case 248 /* EnumDeclaration */: + case 252 /* EnumDeclaration */: return bindEnumDeclaration(node); - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: return bindModuleDeclaration(node); // Jsx-attributes - case 274 /* JsxAttributes */: + case 278 /* JsxAttributes */: return bindJsxAttributes(node); - case 273 /* JsxAttribute */: + case 277 /* JsxAttribute */: return bindJsxAttribute(node, 4 /* Property */, 0 /* PropertyExcludes */); // Imports and exports - case 253 /* ImportEqualsDeclaration */: - case 256 /* NamespaceImport */: - case 258 /* ImportSpecifier */: - case 263 /* ExportSpecifier */: + case 257 /* ImportEqualsDeclaration */: + case 260 /* NamespaceImport */: + case 262 /* ImportSpecifier */: + case 267 /* ExportSpecifier */: return declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */); - case 252 /* NamespaceExportDeclaration */: + case 256 /* NamespaceExportDeclaration */: return bindNamespaceExportDeclaration(node); - case 255 /* ImportClause */: + case 259 /* ImportClause */: return bindImportClause(node); - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: return bindExportDeclaration(node); - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: return bindExportAssignment(node); - case 290 /* SourceFile */: + case 294 /* SourceFile */: updateStrictModeStatementList(node.statements); return bindSourceFileIfExternalModule(); - case 223 /* Block */: + case 227 /* Block */: if (!ts.isFunctionLike(node.parent)) { return; } // falls through - case 250 /* ModuleBlock */: + case 254 /* ModuleBlock */: return updateStrictModeStatementList(node.statements); - case 317 /* JSDocParameterTag */: - if (node.parent.kind === 305 /* JSDocSignature */) { + case 322 /* JSDocParameterTag */: + if (node.parent.kind === 309 /* JSDocSignature */) { return bindParameter(node); } - if (node.parent.kind !== 304 /* JSDocTypeLiteral */) { + if (node.parent.kind !== 308 /* JSDocTypeLiteral */) { break; } // falls through - case 323 /* JSDocPropertyTag */: + case 328 /* JSDocPropertyTag */: var propTag = node; - var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 299 /* JSDocOptionalType */ ? + var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 303 /* JSDocOptionalType */ ? 4 /* Property */ | 16777216 /* Optional */ : 4 /* Property */; return declareSymbolAndAddToSymbolTable(propTag, flags, 0 /* PropertyExcludes */); - case 322 /* JSDocTypedefTag */: - case 315 /* JSDocCallbackTag */: - case 316 /* JSDocEnumTag */: + case 327 /* JSDocTypedefTag */: + case 320 /* JSDocCallbackTag */: + case 321 /* JSDocEnumTag */: return (delayedTypeAliases || (delayedTypeAliases = [])).push(node); } } @@ -33164,7 +41447,7 @@ var ts; else if (ts.isNamespaceExport(node.exportClause)) { // declareSymbol walks up parents to find name text, parent _must_ be set // but won't be set by the normal binder walk until `bindChildren` later on. - node.exportClause.parent = node; + ts.setParent(node.exportClause, node); declareSymbol(container.symbol.exports, container.symbol, node.exportClause, 2097152 /* Alias */, 2097152 /* AliasExcludes */); } } @@ -33246,8 +41529,8 @@ var ts; } var thisContainer = ts.getThisContainer(node, /*includeArrowFunctions*/ false); switch (thisContainer.kind) { - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: var constructorSymbol = thisContainer.symbol; // For `f.prototype.m = function() { this.x = 0; }`, `this.x = 0` should modify `f`'s members, not the function expression. if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 62 /* EqualsToken */) { @@ -33269,15 +41552,15 @@ var ts; addDeclarationToSymbol(constructorSymbol, constructorSymbol.valueDeclaration, 32 /* Class */); } break; - case 162 /* Constructor */: - case 159 /* PropertyDeclaration */: - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 165 /* Constructor */: + case 162 /* PropertyDeclaration */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: // this.foo assignment in a JavaScript class // Bind this property to the containing class var containingClass = thisContainer.parent; - var symbolTable = ts.hasModifier(thisContainer, 32 /* Static */) ? containingClass.symbol.exports : containingClass.symbol.members; + var symbolTable = ts.hasSyntacticModifier(thisContainer, 32 /* Static */) ? containingClass.symbol.exports : containingClass.symbol.members; if (ts.hasDynamicName(node)) { bindDynamicallyNamedThisPropertyAssignment(node, containingClass.symbol); } @@ -33285,7 +41568,7 @@ var ts; declareSymbol(symbolTable, containingClass.symbol, node, 4 /* Property */ | 67108864 /* Assignment */, 0 /* None */, /*isReplaceableByMethod*/ true); } break; - case 290 /* SourceFile */: + case 294 /* SourceFile */: // this.property = assignment in a source file -- declare symbol in exports for a module, in locals for a script if (ts.hasDynamicName(node)) { break; @@ -33307,15 +41590,14 @@ var ts; } function addLateBoundAssignmentDeclarationToSymbol(node, symbol) { if (symbol) { - var members = symbol.assignmentDeclarationMembers || (symbol.assignmentDeclarationMembers = ts.createMap()); - members.set("" + ts.getNodeId(node), node); + (symbol.assignmentDeclarationMembers || (symbol.assignmentDeclarationMembers = new ts.Map())).set(ts.getNodeId(node), node); } } function bindSpecialPropertyDeclaration(node) { - if (node.expression.kind === 104 /* ThisKeyword */) { + if (node.expression.kind === 107 /* ThisKeyword */) { bindThisPropertyAssignment(node); } - else if (ts.isBindableStaticAccessExpression(node) && node.parent.parent.kind === 290 /* SourceFile */) { + else if (ts.isBindableStaticAccessExpression(node) && node.parent.parent.kind === 294 /* SourceFile */) { if (ts.isPrototypeAccess(node.expression)) { bindPrototypePropertyAssignment(node, node.parent); } @@ -33326,8 +41608,8 @@ var ts; } /** For `x.prototype = { p, ... }`, declare members p,... if `x` is function/class/{}, or not declared. */ function bindPrototypeAssignment(node) { - node.left.parent = node; - node.right.parent = node; + ts.setParent(node.left, node); + ts.setParent(node.right, node); bindPropertyAssignment(node.left.expression, node.left, /*isPrototypeProperty*/ false, /*containerIsClass*/ true); } function bindObjectDefinePrototypeProperty(node) { @@ -33348,26 +41630,26 @@ var ts; var classPrototype = lhs.expression; var constructorFunction = classPrototype.expression; // Fix up parent pointers since we're going to use these nodes before we bind into them - lhs.parent = parent; - constructorFunction.parent = classPrototype; - classPrototype.parent = lhs; + ts.setParent(constructorFunction, classPrototype); + ts.setParent(classPrototype, lhs); + ts.setParent(lhs, parent); bindPropertyAssignment(constructorFunction, lhs, /*isPrototypeProperty*/ true, /*containerIsClass*/ true); } function bindObjectDefinePropertyAssignment(node) { var namespaceSymbol = lookupSymbolForPropertyAccess(node.arguments[0]); - var isToplevel = node.parent.parent.kind === 290 /* SourceFile */; + var isToplevel = node.parent.parent.kind === 294 /* SourceFile */; namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, node.arguments[0], isToplevel, /*isPrototypeProperty*/ false, /*containerIsClass*/ false); bindPotentiallyNewExpandoMemberToNamespace(node, namespaceSymbol, /*isPrototypeProperty*/ false); } function bindSpecialPropertyAssignment(node) { // Class declarations in Typescript do not allow property declarations - var parentSymbol = lookupSymbolForPropertyAccess(node.left.expression); + var parentSymbol = lookupSymbolForPropertyAccess(node.left.expression, container) || lookupSymbolForPropertyAccess(node.left.expression, blockScopeContainer); if (!ts.isInJSFile(node) && !ts.isFunctionSymbol(parentSymbol)) { return; } // Fix up parent pointers since we're going to use these nodes before we bind into them - node.left.parent = node; - node.right.parent = node; + ts.setParent(node.left, node); + ts.setParent(node.right, node); if (ts.isIdentifier(node.left.expression) && container === file && isExportsOrModuleExportsOrAlias(file, node.left.expression)) { // This can be an alias for the 'exports' or 'module.exports' names, e.g. // var util = module.exports; @@ -33389,10 +41671,13 @@ var ts; */ function bindStaticPropertyAssignment(node) { ts.Debug.assert(!ts.isIdentifier(node)); - node.expression.parent = node; + ts.setParent(node.expression, node); bindPropertyAssignment(node.expression, node, /*isPrototypeProperty*/ false, /*containerIsClass*/ false); } function bindPotentiallyMissingNamespaces(namespaceSymbol, entityName, isToplevel, isPrototypeProperty, containerIsClass) { + if ((namespaceSymbol === null || namespaceSymbol === void 0 ? void 0 : namespaceSymbol.flags) & 2097152 /* Alias */) { + return namespaceSymbol; + } if (isToplevel && !isPrototypeProperty) { // make symbols or add declarations for intermediate containers var flags_1 = 1536 /* Module */ | 67108864 /* Assignment */; @@ -33456,11 +41741,11 @@ var ts; } function isTopLevelNamespaceAssignment(propertyAccess) { return ts.isBinaryExpression(propertyAccess.parent) - ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 290 /* SourceFile */ - : propertyAccess.parent.parent.kind === 290 /* SourceFile */; + ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 294 /* SourceFile */ + : propertyAccess.parent.parent.kind === 294 /* SourceFile */; } function bindPropertyAssignment(name, propertyAccess, isPrototypeProperty, containerIsClass) { - var namespaceSymbol = lookupSymbolForPropertyAccess(name); + var namespaceSymbol = lookupSymbolForPropertyAccess(name, container) || lookupSymbolForPropertyAccess(name, blockScopeContainer); var isToplevel = isTopLevelNamespaceAssignment(propertyAccess); namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, propertyAccess.expression, isToplevel, isPrototypeProperty, containerIsClass); bindPotentiallyNewExpandoMemberToNamespace(propertyAccess, namespaceSymbol, isPrototypeProperty); @@ -33536,7 +41821,7 @@ var ts; } } function bindClassLikeDeclaration(node) { - if (node.kind === 245 /* ClassDeclaration */) { + if (node.kind === 249 /* ClassDeclaration */) { bindBlockScopedDeclaration(node, 32 /* Class */, 899503 /* ClassExcludes */); } else { @@ -33544,7 +41829,7 @@ var ts; bindAnonymousDeclaration(node, 32 /* Class */, bindingName); // Add name of class expression into the map for semantic classifier if (node.name) { - classifiableNames.set(node.name.escapedText, true); + classifiableNames.add(node.name.escapedText); } } var symbol = node.symbol; @@ -33561,7 +41846,7 @@ var ts; var symbolExport = symbol.exports.get(prototypeSymbol.escapedName); if (symbolExport) { if (node.name) { - node.name.parent = node; + ts.setParent(node.name, node); } file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0], ts.Diagnostics.Duplicate_identifier_0, ts.symbolName(prototypeSymbol))); } @@ -33599,7 +41884,7 @@ var ts; } } function bindParameter(node) { - if (node.kind === 317 /* JSDocParameterTag */ && container.kind !== 305 /* JSDocSignature */) { + if (node.kind === 322 /* JSDocParameterTag */ && container.kind !== 309 /* JSDocSignature */) { return; } if (inStrictMode && !(node.flags & 8388608 /* Ambient */)) { @@ -33676,7 +41961,7 @@ var ts; declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 526824 /* TypeParameterExcludes */); } } - else if (node.parent.kind === 181 /* InferType */) { + else if (node.parent.kind === 184 /* InferType */) { var container_2 = getInferTypeContainer(node.parent); if (container_2) { if (!container_2.locals) { @@ -33704,11 +41989,11 @@ var ts; if (currentFlow === unreachableFlow) { var reportError = // report error on all statements except empty ones - (ts.isStatementButNotDeclaration(node) && node.kind !== 224 /* EmptyStatement */) || + (ts.isStatementButNotDeclaration(node) && node.kind !== 228 /* EmptyStatement */) || // report error on class declarations - node.kind === 245 /* ClassDeclaration */ || + node.kind === 249 /* ClassDeclaration */ || // report error on instantiated modules or const-enums only modules if preserveConstEnums is set - (node.kind === 249 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)); + (node.kind === 253 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)); if (reportError) { currentFlow = reportedUnreachableFlow; if (!options.allowUnreachableCode) { @@ -33752,13 +42037,13 @@ var ts; } function isPurelyTypeDeclaration(s) { switch (s.kind) { - case 246 /* InterfaceDeclaration */: - case 247 /* TypeAliasDeclaration */: + case 250 /* InterfaceDeclaration */: + case 251 /* TypeAliasDeclaration */: return true; - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: return getModuleInstanceState(s) !== 1 /* Instantiated */; - case 248 /* EnumDeclaration */: - return ts.hasModifier(s, 2048 /* Const */); + case 252 /* EnumDeclaration */: + return ts.hasSyntacticModifier(s, 2048 /* Const */); default: return false; } @@ -33797,829 +42082,6 @@ var ts; } return container.symbol && container.symbol.exports && container.symbol.exports.get(name); } - /** - * Computes the transform flags for a node, given the transform flags of its subtree - * - * @param node The node to analyze - * @param subtreeFlags Transform flags computed for this node's subtree - */ - function computeTransformFlagsForNode(node, subtreeFlags) { - var kind = node.kind; - switch (kind) { - case 196 /* CallExpression */: - return computeCallExpression(node, subtreeFlags); - case 197 /* NewExpression */: - return computeNewExpression(node, subtreeFlags); - case 249 /* ModuleDeclaration */: - return computeModuleDeclaration(node, subtreeFlags); - case 200 /* ParenthesizedExpression */: - return computeParenthesizedExpression(node, subtreeFlags); - case 209 /* BinaryExpression */: - return computeBinaryExpression(node, subtreeFlags); - case 226 /* ExpressionStatement */: - return computeExpressionStatement(node, subtreeFlags); - case 156 /* Parameter */: - return computeParameter(node, subtreeFlags); - case 202 /* ArrowFunction */: - return computeArrowFunction(node, subtreeFlags); - case 201 /* FunctionExpression */: - return computeFunctionExpression(node, subtreeFlags); - case 244 /* FunctionDeclaration */: - return computeFunctionDeclaration(node, subtreeFlags); - case 242 /* VariableDeclaration */: - return computeVariableDeclaration(node, subtreeFlags); - case 243 /* VariableDeclarationList */: - return computeVariableDeclarationList(node, subtreeFlags); - case 225 /* VariableStatement */: - return computeVariableStatement(node, subtreeFlags); - case 238 /* LabeledStatement */: - return computeLabeledStatement(node, subtreeFlags); - case 245 /* ClassDeclaration */: - return computeClassDeclaration(node, subtreeFlags); - case 214 /* ClassExpression */: - return computeClassExpression(node, subtreeFlags); - case 279 /* HeritageClause */: - return computeHeritageClause(node, subtreeFlags); - case 280 /* CatchClause */: - return computeCatchClause(node, subtreeFlags); - case 216 /* ExpressionWithTypeArguments */: - return computeExpressionWithTypeArguments(node, subtreeFlags); - case 162 /* Constructor */: - return computeConstructor(node, subtreeFlags); - case 159 /* PropertyDeclaration */: - return computePropertyDeclaration(node, subtreeFlags); - case 161 /* MethodDeclaration */: - return computeMethod(node, subtreeFlags); - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - return computeAccessor(node, subtreeFlags); - case 253 /* ImportEqualsDeclaration */: - return computeImportEquals(node, subtreeFlags); - case 194 /* PropertyAccessExpression */: - return computePropertyAccess(node, subtreeFlags); - case 195 /* ElementAccessExpression */: - return computeElementAccess(node, subtreeFlags); - case 267 /* JsxSelfClosingElement */: - case 268 /* JsxOpeningElement */: - return computeJsxOpeningLikeElement(node, subtreeFlags); - default: - return computeOther(node, kind, subtreeFlags); - } - } - ts.computeTransformFlagsForNode = computeTransformFlagsForNode; - function computeCallExpression(node, subtreeFlags) { - var transformFlags = subtreeFlags; - var callee = ts.skipOuterExpressions(node.expression); - var expression = node.expression; - if (node.flags & 32 /* OptionalChain */) { - transformFlags |= 8 /* ContainsES2020 */; - } - if (node.typeArguments) { - transformFlags |= 1 /* AssertTypeScript */; - } - if (subtreeFlags & 8192 /* ContainsRestOrSpread */ || ts.isSuperOrSuperProperty(callee)) { - // If the this node contains a SpreadExpression, or is a super call, then it is an ES6 - // node. - transformFlags |= 256 /* AssertES2015 */; - if (ts.isSuperProperty(callee)) { - transformFlags |= 4096 /* ContainsLexicalThis */; - } - } - if (expression.kind === 96 /* ImportKeyword */) { - transformFlags |= 2097152 /* ContainsDynamicImport */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536879104 /* ArrayLiteralOrCallOrNewExcludes */; - } - function computeNewExpression(node, subtreeFlags) { - var transformFlags = subtreeFlags; - if (node.typeArguments) { - transformFlags |= 1 /* AssertTypeScript */; - } - if (subtreeFlags & 8192 /* ContainsRestOrSpread */) { - // If the this node contains a SpreadElementExpression then it is an ES6 - // node. - transformFlags |= 256 /* AssertES2015 */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536879104 /* ArrayLiteralOrCallOrNewExcludes */; - } - function computeJsxOpeningLikeElement(node, subtreeFlags) { - var transformFlags = subtreeFlags | 2 /* AssertJsx */; - if (node.typeArguments) { - transformFlags |= 1 /* AssertTypeScript */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536870912 /* NodeExcludes */; - } - function computeBinaryExpression(node, subtreeFlags) { - var transformFlags = subtreeFlags; - var operatorTokenKind = node.operatorToken.kind; - var leftKind = node.left.kind; - if (operatorTokenKind === 60 /* QuestionQuestionToken */) { - transformFlags |= 8 /* AssertES2020 */; - } - else if (operatorTokenKind === 62 /* EqualsToken */ && leftKind === 193 /* ObjectLiteralExpression */) { - // Destructuring object assignments with are ES2015 syntax - // and possibly ES2018 if they contain rest - transformFlags |= 32 /* AssertES2018 */ | 256 /* AssertES2015 */ | 1024 /* AssertDestructuringAssignment */; - } - else if (operatorTokenKind === 62 /* EqualsToken */ && leftKind === 192 /* ArrayLiteralExpression */) { - // Destructuring assignments are ES2015 syntax. - transformFlags |= 256 /* AssertES2015 */ | 1024 /* AssertDestructuringAssignment */; - } - else if (operatorTokenKind === 42 /* AsteriskAsteriskToken */ - || operatorTokenKind === 66 /* AsteriskAsteriskEqualsToken */) { - // Exponentiation is ES2016 syntax. - transformFlags |= 128 /* AssertES2016 */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536870912 /* NodeExcludes */; - } - function computeParameter(node, subtreeFlags) { - var transformFlags = subtreeFlags; - var name = node.name; - var initializer = node.initializer; - var dotDotDotToken = node.dotDotDotToken; - // The '?' token, type annotations, decorators, and 'this' parameters are TypeSCript - // syntax. - if (node.questionToken - || node.type - || (subtreeFlags & 2048 /* ContainsTypeScriptClassSyntax */ && ts.some(node.decorators)) - || ts.isThisIdentifier(name)) { - transformFlags |= 1 /* AssertTypeScript */; - } - // If a parameter has an accessibility modifier, then it is TypeScript syntax. - if (ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) { - transformFlags |= 1 /* AssertTypeScript */ | 2048 /* ContainsTypeScriptClassSyntax */; - } - // parameters with object rest destructuring are ES2018 syntax - if (subtreeFlags & 16384 /* ContainsObjectRestOrSpread */) { - transformFlags |= 32 /* AssertES2018 */; - } - // If a parameter has an initializer, a binding pattern or a dotDotDot token, then - // it is ES6 syntax and its container must emit default value assignments or parameter destructuring downlevel. - if (subtreeFlags & 131072 /* ContainsBindingPattern */ || initializer || dotDotDotToken) { - transformFlags |= 256 /* AssertES2015 */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536870912 /* ParameterExcludes */; - } - function computeParenthesizedExpression(node, subtreeFlags) { - var transformFlags = subtreeFlags; - var expression = node.expression; - var expressionKind = expression.kind; - // If the node is synthesized, it means the emitter put the parentheses there, - // not the user. If we didn't want them, the emitter would not have put them - // there. - if (expressionKind === 217 /* AsExpression */ - || expressionKind === 199 /* TypeAssertionExpression */) { - transformFlags |= 1 /* AssertTypeScript */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536870912 /* OuterExpressionExcludes */; - } - function computeClassDeclaration(node, subtreeFlags) { - var transformFlags; - if (ts.hasModifier(node, 2 /* Ambient */)) { - // An ambient declaration is TypeScript syntax. - transformFlags = 1 /* AssertTypeScript */; - } - else { - // A ClassDeclaration is ES6 syntax. - transformFlags = subtreeFlags | 256 /* AssertES2015 */; - // A class with a parameter property assignment or decorator is TypeScript syntax. - // An exported declaration may be TypeScript syntax, but is handled by the visitor - // for a namespace declaration. - if ((subtreeFlags & 2048 /* ContainsTypeScriptClassSyntax */) - || node.typeParameters) { - transformFlags |= 1 /* AssertTypeScript */; - } - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536905728 /* ClassExcludes */; - } - function computeClassExpression(node, subtreeFlags) { - // A ClassExpression is ES6 syntax. - var transformFlags = subtreeFlags | 256 /* AssertES2015 */; - // A class with a parameter property assignment or decorator is TypeScript syntax. - if (subtreeFlags & 2048 /* ContainsTypeScriptClassSyntax */ - || node.typeParameters) { - transformFlags |= 1 /* AssertTypeScript */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536905728 /* ClassExcludes */; - } - function computeHeritageClause(node, subtreeFlags) { - var transformFlags = subtreeFlags; - switch (node.token) { - case 90 /* ExtendsKeyword */: - // An `extends` HeritageClause is ES6 syntax. - transformFlags |= 256 /* AssertES2015 */; - break; - case 113 /* ImplementsKeyword */: - // An `implements` HeritageClause is TypeScript syntax. - transformFlags |= 1 /* AssertTypeScript */; - break; - default: - ts.Debug.fail("Unexpected token for heritage clause"); - break; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536870912 /* NodeExcludes */; - } - function computeCatchClause(node, subtreeFlags) { - var transformFlags = subtreeFlags; - if (!node.variableDeclaration) { - transformFlags |= 16 /* AssertES2019 */; - } - else if (ts.isBindingPattern(node.variableDeclaration.name)) { - transformFlags |= 256 /* AssertES2015 */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536887296 /* CatchClauseExcludes */; - } - function computeExpressionWithTypeArguments(node, subtreeFlags) { - // An ExpressionWithTypeArguments is ES6 syntax, as it is used in the - // extends clause of a class. - var transformFlags = subtreeFlags | 256 /* AssertES2015 */; - // If an ExpressionWithTypeArguments contains type arguments, then it - // is TypeScript syntax. - if (node.typeArguments) { - transformFlags |= 1 /* AssertTypeScript */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536870912 /* NodeExcludes */; - } - function computeConstructor(node, subtreeFlags) { - var transformFlags = subtreeFlags; - // TypeScript-specific modifiers and overloads are TypeScript syntax - if (ts.hasModifier(node, 2270 /* TypeScriptModifier */) - || !node.body) { - transformFlags |= 1 /* AssertTypeScript */; - } - // function declarations with object rest destructuring are ES2018 syntax - if (subtreeFlags & 16384 /* ContainsObjectRestOrSpread */) { - transformFlags |= 32 /* AssertES2018 */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~538923008 /* ConstructorExcludes */; - } - function computeMethod(node, subtreeFlags) { - // A MethodDeclaration is ES6 syntax. - var transformFlags = subtreeFlags | 256 /* AssertES2015 */; - // Decorators, TypeScript-specific modifiers, type parameters, type annotations, and - // overloads are TypeScript syntax. - if (node.decorators - || ts.hasModifier(node, 2270 /* TypeScriptModifier */) - || node.typeParameters - || node.type - || !node.body - || node.questionToken) { - transformFlags |= 1 /* AssertTypeScript */; - } - // function declarations with object rest destructuring are ES2018 syntax - if (subtreeFlags & 16384 /* ContainsObjectRestOrSpread */) { - transformFlags |= 32 /* AssertES2018 */; - } - // An async method declaration is ES2017 syntax. - if (ts.hasModifier(node, 256 /* Async */)) { - transformFlags |= node.asteriskToken ? 32 /* AssertES2018 */ : 64 /* AssertES2017 */; - } - if (node.asteriskToken) { - transformFlags |= 512 /* AssertGenerator */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return propagatePropertyNameFlags(node.name, transformFlags & ~538923008 /* MethodOrAccessorExcludes */); - } - function computeAccessor(node, subtreeFlags) { - var transformFlags = subtreeFlags; - // Decorators, TypeScript-specific modifiers, type annotations, and overloads are - // TypeScript syntax. - if (node.decorators - || ts.hasModifier(node, 2270 /* TypeScriptModifier */) - || node.type - || !node.body) { - transformFlags |= 1 /* AssertTypeScript */; - } - // function declarations with object rest destructuring are ES2018 syntax - if (subtreeFlags & 16384 /* ContainsObjectRestOrSpread */) { - transformFlags |= 32 /* AssertES2018 */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return propagatePropertyNameFlags(node.name, transformFlags & ~538923008 /* MethodOrAccessorExcludes */); - } - function computePropertyDeclaration(node, subtreeFlags) { - var transformFlags = subtreeFlags | 4194304 /* ContainsClassFields */; - // Decorators, TypeScript-specific modifiers, and type annotations are TypeScript syntax. - if (ts.some(node.decorators) || ts.hasModifier(node, 2270 /* TypeScriptModifier */) || node.type || node.questionToken || node.exclamationToken) { - transformFlags |= 1 /* AssertTypeScript */; - } - // Hoisted variables related to class properties should live within the TypeScript class wrapper. - if (ts.isComputedPropertyName(node.name) || (ts.hasStaticModifier(node) && node.initializer)) { - transformFlags |= 2048 /* ContainsTypeScriptClassSyntax */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return propagatePropertyNameFlags(node.name, transformFlags & ~536875008 /* PropertyExcludes */); - } - function computeFunctionDeclaration(node, subtreeFlags) { - var transformFlags; - var modifierFlags = ts.getModifierFlags(node); - var body = node.body; - if (!body || (modifierFlags & 2 /* Ambient */)) { - // An ambient declaration is TypeScript syntax. - // A FunctionDeclaration without a body is an overload and is TypeScript syntax. - transformFlags = 1 /* AssertTypeScript */; - } - else { - transformFlags = subtreeFlags | 1048576 /* ContainsHoistedDeclarationOrCompletion */; - // TypeScript-specific modifiers, type parameters, and type annotations are TypeScript - // syntax. - if (modifierFlags & 2270 /* TypeScriptModifier */ - || node.typeParameters - || node.type) { - transformFlags |= 1 /* AssertTypeScript */; - } - // An async function declaration is ES2017 syntax. - if (modifierFlags & 256 /* Async */) { - transformFlags |= node.asteriskToken ? 32 /* AssertES2018 */ : 64 /* AssertES2017 */; - } - // function declarations with object rest destructuring are ES2018 syntax - if (subtreeFlags & 16384 /* ContainsObjectRestOrSpread */) { - transformFlags |= 32 /* AssertES2018 */; - } - // If a FunctionDeclaration is generator function and is the body of a - // transformed async function, then this node can be transformed to a - // down-level generator. - // Currently we do not support transforming any other generator functions - // down level. - if (node.asteriskToken) { - transformFlags |= 512 /* AssertGenerator */; - } - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~538925056 /* FunctionExcludes */; - } - function computeFunctionExpression(node, subtreeFlags) { - var transformFlags = subtreeFlags; - // TypeScript-specific modifiers, type parameters, and type annotations are TypeScript - // syntax. - if (ts.hasModifier(node, 2270 /* TypeScriptModifier */) - || node.typeParameters - || node.type) { - transformFlags |= 1 /* AssertTypeScript */; - } - // An async function expression is ES2017 syntax. - if (ts.hasModifier(node, 256 /* Async */)) { - transformFlags |= node.asteriskToken ? 32 /* AssertES2018 */ : 64 /* AssertES2017 */; - } - // function expressions with object rest destructuring are ES2018 syntax - if (subtreeFlags & 16384 /* ContainsObjectRestOrSpread */) { - transformFlags |= 32 /* AssertES2018 */; - } - // If a FunctionExpression is generator function and is the body of a - // transformed async function, then this node can be transformed to a - // down-level generator. - if (node.asteriskToken) { - transformFlags |= 512 /* AssertGenerator */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~538925056 /* FunctionExcludes */; - } - function computeArrowFunction(node, subtreeFlags) { - // An ArrowFunction is ES6 syntax, and excludes markers that should not escape the scope of an ArrowFunction. - var transformFlags = subtreeFlags | 256 /* AssertES2015 */; - // TypeScript-specific modifiers, type parameters, and type annotations are TypeScript - // syntax. - if (ts.hasModifier(node, 2270 /* TypeScriptModifier */) - || node.typeParameters - || node.type) { - transformFlags |= 1 /* AssertTypeScript */; - } - // An async arrow function is ES2017 syntax. - if (ts.hasModifier(node, 256 /* Async */)) { - transformFlags |= 64 /* AssertES2017 */; - } - // arrow functions with object rest destructuring are ES2018 syntax - if (subtreeFlags & 16384 /* ContainsObjectRestOrSpread */) { - transformFlags |= 32 /* AssertES2018 */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~538920960 /* ArrowFunctionExcludes */; - } - function computePropertyAccess(node, subtreeFlags) { - var transformFlags = subtreeFlags; - if (node.flags & 32 /* OptionalChain */) { - transformFlags |= 8 /* ContainsES2020 */; - } - // If a PropertyAccessExpression starts with a super keyword, then it is - // ES6 syntax, and requires a lexical `this` binding. - if (node.expression.kind === 102 /* SuperKeyword */) { - // super inside of an async function requires hoisting the super access (ES2017). - // same for super inside of an async generator, which is ES2018. - transformFlags |= 64 /* ContainsES2017 */ | 32 /* ContainsES2018 */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536870912 /* PropertyAccessExcludes */; - } - function computeElementAccess(node, subtreeFlags) { - var transformFlags = subtreeFlags; - if (node.flags & 32 /* OptionalChain */) { - transformFlags |= 8 /* ContainsES2020 */; - } - // If an ElementAccessExpression starts with a super keyword, then it is - // ES6 syntax, and requires a lexical `this` binding. - if (node.expression.kind === 102 /* SuperKeyword */) { - // super inside of an async function requires hoisting the super access (ES2017). - // same for super inside of an async generator, which is ES2018. - transformFlags |= 64 /* ContainsES2017 */ | 32 /* ContainsES2018 */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536870912 /* PropertyAccessExcludes */; - } - function computeVariableDeclaration(node, subtreeFlags) { - var transformFlags = subtreeFlags; - transformFlags |= 256 /* AssertES2015 */ | 131072 /* ContainsBindingPattern */; // TODO(rbuckton): Why are these set unconditionally? - // A VariableDeclaration containing ObjectRest is ES2018 syntax - if (subtreeFlags & 16384 /* ContainsObjectRestOrSpread */) { - transformFlags |= 32 /* AssertES2018 */; - } - // Type annotations are TypeScript syntax. - if (node.type || node.exclamationToken) { - transformFlags |= 1 /* AssertTypeScript */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536870912 /* NodeExcludes */; - } - function computeVariableStatement(node, subtreeFlags) { - var transformFlags; - var declarationListTransformFlags = node.declarationList.transformFlags; - // An ambient declaration is TypeScript syntax. - if (ts.hasModifier(node, 2 /* Ambient */)) { - transformFlags = 1 /* AssertTypeScript */; - } - else { - transformFlags = subtreeFlags; - if (declarationListTransformFlags & 131072 /* ContainsBindingPattern */) { - transformFlags |= 256 /* AssertES2015 */; - } - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536870912 /* NodeExcludes */; - } - function computeLabeledStatement(node, subtreeFlags) { - var transformFlags = subtreeFlags; - // A labeled statement containing a block scoped binding *may* need to be transformed from ES6. - if (subtreeFlags & 65536 /* ContainsBlockScopedBinding */ - && ts.isIterationStatement(node, /*lookInLabeledStatements*/ true)) { - transformFlags |= 256 /* AssertES2015 */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536870912 /* NodeExcludes */; - } - function computeImportEquals(node, subtreeFlags) { - var transformFlags = subtreeFlags; - // An ImportEqualsDeclaration with a namespace reference is TypeScript. - if (!ts.isExternalModuleImportEqualsDeclaration(node)) { - transformFlags |= 1 /* AssertTypeScript */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536870912 /* NodeExcludes */; - } - function computeExpressionStatement(node, subtreeFlags) { - var transformFlags = subtreeFlags; - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~536870912 /* NodeExcludes */; - } - function computeModuleDeclaration(node, subtreeFlags) { - var transformFlags = 1 /* AssertTypeScript */; - var modifierFlags = ts.getModifierFlags(node); - if ((modifierFlags & 2 /* Ambient */) === 0) { - transformFlags |= subtreeFlags; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~537991168 /* ModuleExcludes */; - } - function computeVariableDeclarationList(node, subtreeFlags) { - var transformFlags = subtreeFlags | 1048576 /* ContainsHoistedDeclarationOrCompletion */; - if (subtreeFlags & 131072 /* ContainsBindingPattern */) { - transformFlags |= 256 /* AssertES2015 */; - } - // If a VariableDeclarationList is `let` or `const`, then it is ES6 syntax. - if (node.flags & 3 /* BlockScoped */) { - transformFlags |= 256 /* AssertES2015 */ | 65536 /* ContainsBlockScopedBinding */; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~537018368 /* VariableDeclarationListExcludes */; - } - function computeOther(node, kind, subtreeFlags) { - // Mark transformations needed for each node - var transformFlags = subtreeFlags; - var excludeFlags = 536870912 /* NodeExcludes */; - switch (kind) { - case 126 /* AsyncKeyword */: - // async is ES2017 syntax, but may be ES2018 syntax (for async generators) - transformFlags |= 32 /* AssertES2018 */ | 64 /* AssertES2017 */; - break; - case 206 /* AwaitExpression */: - // await is ES2017 syntax, but may be ES2018 syntax (for async generators) - transformFlags |= 32 /* AssertES2018 */ | 64 /* AssertES2017 */ | 524288 /* ContainsAwait */; - break; - case 199 /* TypeAssertionExpression */: - case 217 /* AsExpression */: - case 326 /* PartiallyEmittedExpression */: - // These nodes are TypeScript syntax. - transformFlags |= 1 /* AssertTypeScript */; - excludeFlags = 536870912 /* OuterExpressionExcludes */; - break; - case 119 /* PublicKeyword */: - case 117 /* PrivateKeyword */: - case 118 /* ProtectedKeyword */: - case 122 /* AbstractKeyword */: - case 130 /* DeclareKeyword */: - case 81 /* ConstKeyword */: - case 248 /* EnumDeclaration */: - case 284 /* EnumMember */: - case 218 /* NonNullExpression */: - case 138 /* ReadonlyKeyword */: - // These nodes are TypeScript syntax. - transformFlags |= 1 /* AssertTypeScript */; - break; - case 266 /* JsxElement */: - case 11 /* JsxText */: - case 269 /* JsxClosingElement */: - case 270 /* JsxFragment */: - case 271 /* JsxOpeningFragment */: - case 272 /* JsxClosingFragment */: - case 273 /* JsxAttribute */: - case 274 /* JsxAttributes */: - case 275 /* JsxSpreadAttribute */: - case 276 /* JsxExpression */: - // These nodes are Jsx syntax. - transformFlags |= 2 /* AssertJsx */; - break; - case 14 /* NoSubstitutionTemplateLiteral */: - case 15 /* TemplateHead */: - case 16 /* TemplateMiddle */: - case 17 /* TemplateTail */: - if (node.templateFlags) { - transformFlags |= 32 /* AssertES2018 */; - break; - } - // falls through - case 198 /* TaggedTemplateExpression */: - if (ts.hasInvalidEscape(node.template)) { - transformFlags |= 32 /* AssertES2018 */; - break; - } - // falls through - case 211 /* TemplateExpression */: - case 282 /* ShorthandPropertyAssignment */: - case 120 /* StaticKeyword */: - case 219 /* MetaProperty */: - // These nodes are ES6 syntax. - transformFlags |= 256 /* AssertES2015 */; - break; - case 10 /* StringLiteral */: - if (node.hasExtendedUnicodeEscape) { - transformFlags |= 256 /* AssertES2015 */; - } - break; - case 8 /* NumericLiteral */: - if (node.numericLiteralFlags & 384 /* BinaryOrOctalSpecifier */) { - transformFlags |= 256 /* AssertES2015 */; - } - break; - case 9 /* BigIntLiteral */: - transformFlags |= 4 /* AssertESNext */; - break; - case 232 /* ForOfStatement */: - // This node is either ES2015 syntax or ES2017 syntax (if it is a for-await-of). - if (node.awaitModifier) { - transformFlags |= 32 /* AssertES2018 */; - } - transformFlags |= 256 /* AssertES2015 */; - break; - case 212 /* YieldExpression */: - // This node is either ES2015 syntax (in a generator) or ES2017 syntax (in an async - // generator). - transformFlags |= 32 /* AssertES2018 */ | 256 /* AssertES2015 */ | 262144 /* ContainsYield */; - break; - case 125 /* AnyKeyword */: - case 140 /* NumberKeyword */: - case 151 /* BigIntKeyword */: - case 137 /* NeverKeyword */: - case 141 /* ObjectKeyword */: - case 143 /* StringKeyword */: - case 128 /* BooleanKeyword */: - case 144 /* SymbolKeyword */: - case 110 /* VoidKeyword */: - case 155 /* TypeParameter */: - case 158 /* PropertySignature */: - case 160 /* MethodSignature */: - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 167 /* IndexSignature */: - case 168 /* TypePredicate */: - case 169 /* TypeReference */: - case 170 /* FunctionType */: - case 171 /* ConstructorType */: - case 172 /* TypeQuery */: - case 173 /* TypeLiteral */: - case 174 /* ArrayType */: - case 175 /* TupleType */: - case 176 /* OptionalType */: - case 177 /* RestType */: - case 178 /* UnionType */: - case 179 /* IntersectionType */: - case 180 /* ConditionalType */: - case 181 /* InferType */: - case 182 /* ParenthesizedType */: - case 246 /* InterfaceDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 183 /* ThisType */: - case 184 /* TypeOperator */: - case 185 /* IndexedAccessType */: - case 186 /* MappedType */: - case 187 /* LiteralType */: - case 252 /* NamespaceExportDeclaration */: - // Types and signatures are TypeScript syntax, and exclude all other facts. - transformFlags = 1 /* AssertTypeScript */; - excludeFlags = -2 /* TypeExcludes */; - break; - case 154 /* ComputedPropertyName */: - // Even though computed property names are ES6, we don't treat them as such. - // This is so that they can flow through PropertyName transforms unaffected. - // Instead, we mark the container as ES6, so that it can properly handle the transform. - transformFlags |= 32768 /* ContainsComputedPropertyName */; - break; - case 213 /* SpreadElement */: - transformFlags |= 256 /* AssertES2015 */ | 8192 /* ContainsRestOrSpread */; - break; - case 283 /* SpreadAssignment */: - transformFlags |= 32 /* AssertES2018 */ | 16384 /* ContainsObjectRestOrSpread */; - break; - case 102 /* SuperKeyword */: - // This node is ES6 syntax. - transformFlags |= 256 /* AssertES2015 */; - excludeFlags = 536870912 /* OuterExpressionExcludes */; // must be set to persist `Super` - break; - case 104 /* ThisKeyword */: - // Mark this node and its ancestors as containing a lexical `this` keyword. - transformFlags |= 4096 /* ContainsLexicalThis */; - break; - case 189 /* ObjectBindingPattern */: - transformFlags |= 256 /* AssertES2015 */ | 131072 /* ContainsBindingPattern */; - if (subtreeFlags & 8192 /* ContainsRestOrSpread */) { - transformFlags |= 32 /* AssertES2018 */ | 16384 /* ContainsObjectRestOrSpread */; - } - excludeFlags = 536879104 /* BindingPatternExcludes */; - break; - case 190 /* ArrayBindingPattern */: - transformFlags |= 256 /* AssertES2015 */ | 131072 /* ContainsBindingPattern */; - excludeFlags = 536879104 /* BindingPatternExcludes */; - break; - case 191 /* BindingElement */: - transformFlags |= 256 /* AssertES2015 */; - if (node.dotDotDotToken) { - transformFlags |= 8192 /* ContainsRestOrSpread */; - } - break; - case 157 /* Decorator */: - // This node is TypeScript syntax, and marks its container as also being TypeScript syntax. - transformFlags |= 1 /* AssertTypeScript */ | 2048 /* ContainsTypeScriptClassSyntax */; - break; - case 193 /* ObjectLiteralExpression */: - excludeFlags = 536922112 /* ObjectLiteralExcludes */; - if (subtreeFlags & 32768 /* ContainsComputedPropertyName */) { - // If an ObjectLiteralExpression contains a ComputedPropertyName, then it - // is an ES6 node. - transformFlags |= 256 /* AssertES2015 */; - } - if (subtreeFlags & 16384 /* ContainsObjectRestOrSpread */) { - // If an ObjectLiteralExpression contains a spread element, then it - // is an ES2018 node. - transformFlags |= 32 /* AssertES2018 */; - } - break; - case 192 /* ArrayLiteralExpression */: - excludeFlags = 536879104 /* ArrayLiteralOrCallOrNewExcludes */; - break; - case 228 /* DoStatement */: - case 229 /* WhileStatement */: - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - // A loop containing a block scoped binding *may* need to be transformed from ES6. - if (subtreeFlags & 65536 /* ContainsBlockScopedBinding */) { - transformFlags |= 256 /* AssertES2015 */; - } - break; - case 290 /* SourceFile */: - break; - case 262 /* NamespaceExport */: - transformFlags |= 4 /* AssertESNext */; - break; - case 235 /* ReturnStatement */: - // Return statements may require an `await` in ES2018. - transformFlags |= 1048576 /* ContainsHoistedDeclarationOrCompletion */ | 32 /* AssertES2018 */; - break; - case 233 /* ContinueStatement */: - case 234 /* BreakStatement */: - transformFlags |= 1048576 /* ContainsHoistedDeclarationOrCompletion */; - break; - case 76 /* PrivateIdentifier */: - transformFlags |= 4194304 /* ContainsClassFields */; - break; - } - node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */; - return transformFlags & ~excludeFlags; - } - function propagatePropertyNameFlags(node, transformFlags) { - return transformFlags | (node.transformFlags & 4096 /* PropertyNamePropagatingFlags */); - } - /** - * Gets the transform flags to exclude when unioning the transform flags of a subtree. - * - * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`. - * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather - * than calling this function. - */ - function getTransformFlagsSubtreeExclusions(kind) { - if (kind >= 168 /* FirstTypeNode */ && kind <= 188 /* LastTypeNode */) { - return -2 /* TypeExcludes */; - } - switch (kind) { - case 196 /* CallExpression */: - case 197 /* NewExpression */: - case 192 /* ArrayLiteralExpression */: - return 536879104 /* ArrayLiteralOrCallOrNewExcludes */; - case 249 /* ModuleDeclaration */: - return 537991168 /* ModuleExcludes */; - case 156 /* Parameter */: - return 536870912 /* ParameterExcludes */; - case 202 /* ArrowFunction */: - return 538920960 /* ArrowFunctionExcludes */; - case 201 /* FunctionExpression */: - case 244 /* FunctionDeclaration */: - return 538925056 /* FunctionExcludes */; - case 243 /* VariableDeclarationList */: - return 537018368 /* VariableDeclarationListExcludes */; - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - return 536905728 /* ClassExcludes */; - case 162 /* Constructor */: - return 538923008 /* ConstructorExcludes */; - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - return 538923008 /* MethodOrAccessorExcludes */; - case 125 /* AnyKeyword */: - case 140 /* NumberKeyword */: - case 151 /* BigIntKeyword */: - case 137 /* NeverKeyword */: - case 143 /* StringKeyword */: - case 141 /* ObjectKeyword */: - case 128 /* BooleanKeyword */: - case 144 /* SymbolKeyword */: - case 110 /* VoidKeyword */: - case 155 /* TypeParameter */: - case 158 /* PropertySignature */: - case 160 /* MethodSignature */: - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 167 /* IndexSignature */: - case 246 /* InterfaceDeclaration */: - case 247 /* TypeAliasDeclaration */: - return -2 /* TypeExcludes */; - case 193 /* ObjectLiteralExpression */: - return 536922112 /* ObjectLiteralExcludes */; - case 280 /* CatchClause */: - return 536887296 /* CatchClauseExcludes */; - case 189 /* ObjectBindingPattern */: - case 190 /* ArrayBindingPattern */: - return 536879104 /* BindingPatternExcludes */; - case 199 /* TypeAssertionExpression */: - case 217 /* AsExpression */: - case 326 /* PartiallyEmittedExpression */: - case 200 /* ParenthesizedExpression */: - case 102 /* SuperKeyword */: - return 536870912 /* OuterExpressionExcludes */; - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: - return 536870912 /* PropertyAccessExcludes */; - default: - return 536870912 /* NodeExcludes */; - } - } - ts.getTransformFlagsSubtreeExclusions = getTransformFlagsSubtreeExclusions; - /** - * "Binds" JSDoc nodes in TypeScript code. - * Since we will never create symbols for JSDoc, we just set parent pointers instead. - */ - function setParentPointers(parent, child) { - child.parent = parent; - ts.forEachChild(child, function (grandchild) { return setParentPointers(child, grandchild); }); - } })(ts || (ts = {})); /** @internal */ var ts; @@ -34780,7 +42242,7 @@ var ts; // (their type resolved directly to the member deeply referenced) // So to get the intervening symbols, we need to check if there's a type // query node on any of the symbol's declarations and get symbols there - if (d.type && d.type.kind === 172 /* TypeQuery */) { + if (d.type && d.type.kind === 175 /* TypeQuery */) { var query = d.type; var entity = getResolvedSymbol(getFirstIdentifier(query.exprName)); visitSymbol(entity); @@ -34906,9 +42368,10 @@ var ts; TypeFacts[TypeFacts["UndefinedFacts"] = 9830144] = "UndefinedFacts"; TypeFacts[TypeFacts["NullFacts"] = 9363232] = "NullFacts"; TypeFacts[TypeFacts["EmptyObjectStrictFacts"] = 16318463] = "EmptyObjectStrictFacts"; + TypeFacts[TypeFacts["AllTypeofNE"] = 556800] = "AllTypeofNE"; TypeFacts[TypeFacts["EmptyObjectFacts"] = 16777215] = "EmptyObjectFacts"; })(TypeFacts || (TypeFacts = {})); - var typeofEQFacts = ts.createMapFromTemplate({ + var typeofEQFacts = new ts.Map(ts.getEntries({ string: 1 /* TypeofEQString */, number: 2 /* TypeofEQNumber */, bigint: 4 /* TypeofEQBigInt */, @@ -34917,8 +42380,8 @@ var ts; undefined: 65536 /* EQUndefined */, object: 32 /* TypeofEQObject */, function: 64 /* TypeofEQFunction */ - }); - var typeofNEFacts = ts.createMapFromTemplate({ + })); + var typeofNEFacts = new ts.Map(ts.getEntries({ string: 256 /* TypeofNEString */, number: 512 /* TypeofNENumber */, bigint: 1024 /* TypeofNEBigInt */, @@ -34927,7 +42390,7 @@ var ts; undefined: 524288 /* NEUndefined */, object: 8192 /* TypeofNEObject */, function: 16384 /* TypeofNEFunction */ - }); + })); var TypeSystemPropertyName; (function (TypeSystemPropertyName) { TypeSystemPropertyName[TypeSystemPropertyName["Type"] = 0] = "Type"; @@ -34937,6 +42400,7 @@ var ts; TypeSystemPropertyName[TypeSystemPropertyName["ImmediateBaseConstraint"] = 4] = "ImmediateBaseConstraint"; TypeSystemPropertyName[TypeSystemPropertyName["EnumTagType"] = 5] = "EnumTagType"; TypeSystemPropertyName[TypeSystemPropertyName["ResolvedTypeArguments"] = 6] = "ResolvedTypeArguments"; + TypeSystemPropertyName[TypeSystemPropertyName["ResolvedBaseTypes"] = 7] = "ResolvedBaseTypes"; })(TypeSystemPropertyName || (TypeSystemPropertyName = {})); var CheckMode; (function (CheckMode) { @@ -35041,13 +42505,13 @@ var ts; ts.isInstantiatedModule = isInstantiatedModule; function createTypeChecker(host, produceDiagnostics) { var getPackagesSet = ts.memoize(function () { - var set = ts.createMap(); + var set = new ts.Set(); host.getSourceFiles().forEach(function (sf) { if (!sf.resolvedModules) return; ts.forEachEntry(sf.resolvedModules, function (r) { if (r && r.packageId) - set.set(r.packageId.name, true); + set.add(r.packageId.name); }); }); return set; @@ -35125,8 +42589,8 @@ var ts; getMergedSymbol: getMergedSymbol, getDiagnostics: getDiagnostics, getGlobalDiagnostics: getGlobalDiagnostics, - getTypeOfSymbolAtLocation: function (symbol, location) { - location = ts.getParseTreeNode(location); + getTypeOfSymbolAtLocation: function (symbol, locationIn) { + var location = ts.getParseTreeNode(locationIn); return location ? getTypeOfSymbolAtLocation(symbol, location) : errorType; }, getSymbolsOfParameterPropertyDeclaration: function (parameterIn, parameterName) { @@ -35160,6 +42624,7 @@ var ts; }, getParameterType: getTypeAtPosition, getPromisedTypeOfPromise: getPromisedTypeOfPromise, + getAwaitedType: function (type) { return getAwaitedType(type); }, getReturnTypeOfSignature: getReturnTypeOfSignature, isNullableType: isNullableType, getNullableType: getNullableType, @@ -35174,17 +42639,17 @@ var ts; symbolToTypeParameterDeclarations: nodeBuilder.symbolToTypeParameterDeclarations, symbolToParameterDeclaration: nodeBuilder.symbolToParameterDeclaration, typeParameterToDeclaration: nodeBuilder.typeParameterToDeclaration, - getSymbolsInScope: function (location, meaning) { - location = ts.getParseTreeNode(location); + getSymbolsInScope: function (locationIn, meaning) { + var location = ts.getParseTreeNode(locationIn); return location ? getSymbolsInScope(location, meaning) : []; }, - getSymbolAtLocation: function (node) { - node = ts.getParseTreeNode(node); + getSymbolAtLocation: function (nodeIn) { + var node = ts.getParseTreeNode(nodeIn); // set ignoreErrors: true because any lookups invoked by the API shouldn't cause any new errors return node ? getSymbolAtLocation(node, /*ignoreErrors*/ true) : undefined; }, - getShorthandAssignmentValueSymbol: function (node) { - node = ts.getParseTreeNode(node); + getShorthandAssignmentValueSymbol: function (nodeIn) { + var node = ts.getParseTreeNode(nodeIn); return node ? getShorthandAssignmentValueSymbol(node) : undefined; }, getExportSpecifierLocalTargetSymbol: function (nodeIn) { @@ -35194,8 +42659,8 @@ var ts; getExportSymbolOfSymbol: function (symbol) { return getMergedSymbol(symbol.exportSymbol || symbol); }, - getTypeAtLocation: function (node) { - node = ts.getParseTreeNode(node); + getTypeAtLocation: function (nodeIn) { + var node = ts.getParseTreeNode(nodeIn); return node ? getTypeOfNode(node) : errorType; }, getTypeOfAssignmentPattern: function (nodeIn) { @@ -35296,9 +42761,9 @@ var ts; var declaration = ts.getParseTreeNode(declarationIn, ts.isFunctionLike); return declaration ? getSignatureFromDeclaration(declaration) : undefined; }, - isImplementationOfOverload: function (node) { - var parsed = ts.getParseTreeNode(node, ts.isFunctionLike); - return parsed ? isImplementationOfOverload(parsed) : undefined; + isImplementationOfOverload: function (nodeIn) { + var node = ts.getParseTreeNode(nodeIn, ts.isFunctionLike); + return node ? isImplementationOfOverload(node) : undefined; }, getImmediateAliasedSymbol: getImmediateAliasedSymbol, getAliasedSymbol: resolveAlias, @@ -35349,6 +42814,7 @@ var ts; getAllPossiblePropertiesOfTypes: getAllPossiblePropertiesOfTypes, getSuggestedSymbolForNonexistentProperty: getSuggestedSymbolForNonexistentProperty, getSuggestionForNonexistentProperty: getSuggestionForNonexistentProperty, + getSuggestedSymbolForNonexistentJSXAttribute: getSuggestedSymbolForNonexistentJSXAttribute, getSuggestedSymbolForNonexistentSymbol: function (location, name, meaning) { return getSuggestedSymbolForNonexistentSymbol(location, ts.escapeLeadingUnderscores(name), meaning); }, getSuggestionForNonexistentSymbol: function (location, name, meaning) { return getSuggestionForNonexistentSymbol(location, ts.escapeLeadingUnderscores(name), meaning); }, getSuggestedSymbolForNonexistentModule: getSuggestedSymbolForNonexistentModule, @@ -35361,19 +42827,21 @@ var ts; getJsxNamespace: function (n) { return ts.unescapeLeadingUnderscores(getJsxNamespace(n)); }, getAccessibleSymbolChain: getAccessibleSymbolChain, getTypePredicateOfSignature: getTypePredicateOfSignature, - resolveExternalModuleName: function (moduleSpecifier) { - return resolveExternalModuleName(moduleSpecifier, moduleSpecifier, /*ignoreErrors*/ true); + resolveExternalModuleName: function (moduleSpecifierIn) { + var moduleSpecifier = ts.getParseTreeNode(moduleSpecifierIn, ts.isExpression); + return moduleSpecifier && resolveExternalModuleName(moduleSpecifier, moduleSpecifier, /*ignoreErrors*/ true); }, resolveExternalModuleSymbol: resolveExternalModuleSymbol, - tryGetThisTypeAt: function (node, includeGlobalThis) { - node = ts.getParseTreeNode(node); + tryGetThisTypeAt: function (nodeIn, includeGlobalThis) { + var node = ts.getParseTreeNode(nodeIn); return node && tryGetThisTypeAt(node, includeGlobalThis); }, getTypeArgumentConstraint: function (nodeIn) { var node = ts.getParseTreeNode(nodeIn, ts.isTypeNode); return node && getTypeArgumentConstraint(node); }, - getSuggestionDiagnostics: function (file, ct) { + getSuggestionDiagnostics: function (fileIn, ct) { + var file = ts.getParseTreeNode(fileIn, ts.isSourceFile) || ts.Debug.fail("Could not determine parsed source file."); if (ts.skipTypeChecking(file, compilerOptions, host)) { return ts.emptyArray; } @@ -35417,14 +42885,14 @@ var ts; apparentArgumentCount = undefined; return res; } - var tupleTypes = ts.createMap(); - var unionTypes = ts.createMap(); - var intersectionTypes = ts.createMap(); - var literalTypes = ts.createMap(); - var indexedAccessTypes = ts.createMap(); - var substitutionTypes = ts.createMap(); + var tupleTypes = new ts.Map(); + var unionTypes = new ts.Map(); + var intersectionTypes = new ts.Map(); + var literalTypes = new ts.Map(); + var indexedAccessTypes = new ts.Map(); + var substitutionTypes = new ts.Map(); var evolvingArrayTypes = []; - var undefinedProperties = ts.createMap(); + var undefinedProperties = new ts.Map(); var unknownSymbol = createSymbol(4 /* Property */, "unknown"); var resolvingSymbol = createSymbol(0, "__resolving__" /* Resolving */); var anyType = createIntrinsicType(1 /* Any */, "any"); @@ -35479,7 +42947,7 @@ var ts; emptyTypeLiteralSymbol.members = ts.createSymbolTable(); var emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined); var emptyGenericType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined); - emptyGenericType.instantiations = ts.createMap(); + emptyGenericType.instantiations = new ts.Map(); var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined); // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes. @@ -35497,7 +42965,7 @@ var ts; var resolvingSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, anyType, /*resolvedTypePredicate*/ undefined, 0, 0 /* None */); var silentNeverSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, silentNeverType, /*resolvedTypePredicate*/ undefined, 0, 0 /* None */); var enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true); - var iterationTypesCache = ts.createMap(); // cache for common IterationTypes instances + var iterationTypesCache = new ts.Map(); // cache for common IterationTypes instances var noIterationTypes = { get yieldType() { return ts.Debug.fail("Not supported"); }, get returnType() { return ts.Debug.fail("Not supported"); }, @@ -35534,7 +43002,8 @@ var ts; }; /** Key is "/path/to/a.ts|/path/to/b.ts". */ var amalgamatedDuplicates; - var reverseMappedCache = ts.createMap(); + var reverseMappedCache = new ts.Map(); + var inInferTypeForHomomorphicMappedType = false; var ambientModulesCache; /** * List of every ambient module with a "*" wildcard. @@ -35583,7 +43052,7 @@ var ts; var deferredGlobalExtractSymbol; var deferredGlobalOmitSymbol; var deferredGlobalBigIntType; - var allPotentiallyUnusedIdentifiers = ts.createMap(); // key is file name + var allPotentiallyUnusedIdentifiers = new ts.Map(); // key is file name var flowLoopStart = 0; var flowLoopCount = 0; var sharedFlowCount = 0; @@ -35610,30 +43079,31 @@ var ts; var sharedFlowNodes = []; var sharedFlowTypes = []; var flowNodeReachable = []; + var flowNodePostSuper = []; var potentialThisCollisions = []; var potentialNewTargetCollisions = []; var potentialWeakMapCollisions = []; var awaitedTypeStack = []; var diagnostics = ts.createDiagnosticCollection(); var suggestionDiagnostics = ts.createDiagnosticCollection(); - var typeofTypesByName = ts.createMapFromTemplate({ + var typeofTypesByName = new ts.Map(ts.getEntries({ string: stringType, number: numberType, bigint: bigintType, boolean: booleanType, symbol: esSymbolType, undefined: undefinedType - }); + })); var typeofType = createTypeofType(); var _jsxNamespace; var _jsxFactoryEntity; var outofbandVarianceMarkerHandler; - var subtypeRelation = ts.createMap(); - var strictSubtypeRelation = ts.createMap(); - var assignableRelation = ts.createMap(); - var comparableRelation = ts.createMap(); - var identityRelation = ts.createMap(); - var enumRelation = ts.createMap(); + var subtypeRelation = new ts.Map(); + var strictSubtypeRelation = new ts.Map(); + var assignableRelation = new ts.Map(); + var comparableRelation = new ts.Map(); + var identityRelation = new ts.Map(); + var enumRelation = new ts.Map(); var builtinGlobals = ts.createSymbolTable(); builtinGlobals.set(undefinedSymbol.escapedName, undefinedSymbol); initializeTypeChecker(); @@ -35642,16 +43112,37 @@ var ts; if (location) { var file = ts.getSourceFileOfNode(location); if (file) { - if (file.localJsxNamespace) { - return file.localJsxNamespace; + if (ts.isJsxOpeningFragment(location)) { + if (file.localJsxFragmentNamespace) { + return file.localJsxFragmentNamespace; + } + var jsxFragmentPragma = file.pragmas.get("jsxfrag"); + if (jsxFragmentPragma) { + var chosenPragma = ts.isArray(jsxFragmentPragma) ? jsxFragmentPragma[0] : jsxFragmentPragma; + file.localJsxFragmentFactory = ts.parseIsolatedEntityName(chosenPragma.arguments.factory, languageVersion); + ts.visitNode(file.localJsxFragmentFactory, markAsSynthetic); + if (file.localJsxFragmentFactory) { + return file.localJsxFragmentNamespace = ts.getFirstIdentifier(file.localJsxFragmentFactory).escapedText; + } + } + var entity = getJsxFragmentFactoryEntity(location); + if (entity) { + file.localJsxFragmentFactory = entity; + return file.localJsxFragmentNamespace = ts.getFirstIdentifier(entity).escapedText; + } } - var jsxPragma = file.pragmas.get("jsx"); - if (jsxPragma) { - var chosenpragma = ts.isArray(jsxPragma) ? jsxPragma[0] : jsxPragma; - file.localJsxFactory = ts.parseIsolatedEntityName(chosenpragma.arguments.factory, languageVersion); - ts.visitNode(file.localJsxFactory, markAsSynthetic); - if (file.localJsxFactory) { - return file.localJsxNamespace = ts.getFirstIdentifier(file.localJsxFactory).escapedText; + else { + if (file.localJsxNamespace) { + return file.localJsxNamespace; + } + var jsxPragma = file.pragmas.get("jsx"); + if (jsxPragma) { + var chosenPragma = ts.isArray(jsxPragma) ? jsxPragma[0] : jsxPragma; + file.localJsxFactory = ts.parseIsolatedEntityName(chosenPragma.arguments.factory, languageVersion); + ts.visitNode(file.localJsxFactory, markAsSynthetic); + if (file.localJsxFactory) { + return file.localJsxNamespace = ts.getFirstIdentifier(file.localJsxFactory).escapedText; + } } } } @@ -35670,12 +43161,11 @@ var ts; } } if (!_jsxFactoryEntity) { - _jsxFactoryEntity = ts.createQualifiedName(ts.createIdentifier(ts.unescapeLeadingUnderscores(_jsxNamespace)), "createElement"); + _jsxFactoryEntity = ts.factory.createQualifiedName(ts.factory.createIdentifier(ts.unescapeLeadingUnderscores(_jsxNamespace)), "createElement"); } return _jsxNamespace; function markAsSynthetic(node) { - node.pos = -1; - node.end = -1; + ts.setTextRangePosEnd(node, -1, -1); return ts.visitEachChild(node, markAsSynthetic, ts.nullTransformationContext); } } @@ -35698,6 +43188,11 @@ var ts; return diagnostic; } } + function errorSkippedOn(key, location, message, arg0, arg1, arg2, arg3) { + var diagnostic = error(location, message, arg0, arg1, arg2, arg3); + diagnostic.skippedOn = key; + return diagnostic; + } function error(location, message, arg0, arg1, arg2, arg3) { var diagnostic = location ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3) @@ -35782,9 +43277,9 @@ var ts; if (symbol.constEnumOnlyModule) result.constEnumOnlyModule = true; if (symbol.members) - result.members = ts.cloneMap(symbol.members); + result.members = new ts.Map(symbol.members); if (symbol.exports) - result.exports = ts.cloneMap(symbol.exports); + result.exports = new ts.Map(symbol.exports); recordMergedSymbol(result, symbol); return result; } @@ -35856,7 +43351,7 @@ var ts; var firstFile_1 = ts.comparePaths(sourceSymbolFile.path, targetSymbolFile.path) === -1 /* LessThan */ ? sourceSymbolFile : targetSymbolFile; var secondFile_1 = firstFile_1 === sourceSymbolFile ? targetSymbolFile : sourceSymbolFile; var filesDuplicates = ts.getOrUpdate(amalgamatedDuplicates, firstFile_1.path + "|" + secondFile_1.path, function () { - return ({ firstFile: firstFile_1, secondFile: secondFile_1, conflictingSymbols: ts.createMap() }); + return ({ firstFile: firstFile_1, secondFile: secondFile_1, conflictingSymbols: new ts.Map() }); }); var conflictingSymbolInfo = ts.getOrUpdate(filesDuplicates.conflictingSymbols, symbolName_1, function () { return ({ isBlockScoped: isEitherBlockScoped_1, firstFileLocations: [], secondFileLocations: [] }); @@ -35885,7 +43380,7 @@ var ts; function addDuplicateDeclarationError(node, message, symbolName, relatedNodes) { var errorNode = (ts.getExpandoInitializer(node, /*isPrototypeAssignment*/ false) ? ts.getNameOfExpando(node) : ts.getNameOfDeclaration(node)) || node; var err = lookupOrIssueError(errorNode, message, symbolName); - var _loop_6 = function (relatedNode) { + var _loop_7 = function (relatedNode) { var adjustedNode = (ts.getExpandoInitializer(relatedNode, /*isPrototypeAssignment*/ false) ? ts.getNameOfExpando(relatedNode) : ts.getNameOfDeclaration(relatedNode)) || relatedNode; if (adjustedNode === errorNode) return "continue"; @@ -35898,13 +43393,13 @@ var ts; }; for (var _i = 0, _a = relatedNodes || ts.emptyArray; _i < _a.length; _i++) { var relatedNode = _a[_i]; - _loop_6(relatedNode); + _loop_7(relatedNode); } } function combineSymbolTables(first, second) { - if (!ts.hasEntries(first)) + if (!(first === null || first === void 0 ? void 0 : first.size)) return second; - if (!ts.hasEntries(second)) + if (!(second === null || second === void 0 ? void 0 : second.size)) return first; var combined = ts.createSymbolTable(); mergeSymbolTable(combined, first); @@ -35952,7 +43447,7 @@ var ts; if (ts.some(patternAmbientModules, function (module) { return mainModule_1 === module.symbol; })) { var merged = mergeSymbol(moduleAugmentation.symbol, mainModule_1, /*unidirectional*/ true); if (!patternAmbientModuleAugmentations) { - patternAmbientModuleAugmentations = ts.createMap(); + patternAmbientModuleAugmentations = new ts.Map(); } // moduleName will be a StringLiteral since this is not `declare global`. patternAmbientModuleAugmentations.set(moduleName.text, merged); @@ -36003,7 +43498,7 @@ var ts; return nodeLinks[nodeId] || (nodeLinks[nodeId] = new NodeLinks()); } function isGlobalSourceFile(node) { - return node.kind === 290 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node); + return node.kind === 294 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node); } function getSymbol(symbols, name, meaning) { if (meaning) { @@ -36046,7 +43541,7 @@ var ts; var declContainer = ts.getEnclosingBlockScopeContainer(declaration); if (declarationFile !== useFile) { if ((moduleKind && (declarationFile.externalModuleIndicator || useFile.externalModuleIndicator)) || - (!compilerOptions.outFile && !compilerOptions.out) || + (!ts.outFile(compilerOptions)) || isInTypeQuery(usage) || declaration.flags & 8388608 /* Ambient */) { // nodes are in different files and order cannot be determined @@ -36060,19 +43555,19 @@ var ts; var sourceFiles = host.getSourceFiles(); return sourceFiles.indexOf(declarationFile) <= sourceFiles.indexOf(useFile); } - if (declaration.pos <= usage.pos) { + if (declaration.pos <= usage.pos && !(ts.isPropertyDeclaration(declaration) && ts.isThisProperty(usage.parent) && !declaration.initializer && !declaration.exclamationToken)) { // declaration is before usage - if (declaration.kind === 191 /* BindingElement */) { + if (declaration.kind === 195 /* BindingElement */) { // still might be illegal if declaration and usage are both binding elements (eg var [a = b, b = b] = [1, 2]) - var errorBindingElement = ts.getAncestor(usage, 191 /* BindingElement */); + var errorBindingElement = ts.getAncestor(usage, 195 /* BindingElement */); if (errorBindingElement) { return ts.findAncestor(errorBindingElement, ts.isBindingElement) !== ts.findAncestor(declaration, ts.isBindingElement) || declaration.pos < errorBindingElement.pos; } // or it might be illegal if usage happens before parent variable is declared (eg var [a] = a) - return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 242 /* VariableDeclaration */), usage); + return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 246 /* VariableDeclaration */), usage); } - else if (declaration.kind === 242 /* VariableDeclaration */) { + else if (declaration.kind === 246 /* VariableDeclaration */) { // still might be illegal if usage is in the initializer of the variable declaration (eg var a = a) return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage); } @@ -36102,12 +43597,12 @@ var ts; // or if usage is in a type context: // 1. inside a type query (typeof in type position) // 2. inside a jsdoc comment - if (usage.parent.kind === 263 /* ExportSpecifier */ || (usage.parent.kind === 259 /* ExportAssignment */ && usage.parent.isExportEquals)) { + if (usage.parent.kind === 267 /* ExportSpecifier */ || (usage.parent.kind === 263 /* ExportAssignment */ && usage.parent.isExportEquals)) { // export specifiers do not use the variable, they only make it available for use return true; } // When resolving symbols for exports, the `usage` location passed in can be the export site directly - if (usage.kind === 259 /* ExportAssignment */ && usage.isExportEquals) { + if (usage.kind === 263 /* ExportAssignment */ && usage.isExportEquals) { return true; } if (!!(usage.flags & 4194304 /* JSDoc */) || isInTypeQuery(usage) || usageInTypeDeclaration()) { @@ -36129,9 +43624,9 @@ var ts; } function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) { switch (declaration.parent.parent.kind) { - case 225 /* VariableStatement */: - case 230 /* ForStatement */: - case 232 /* ForOfStatement */: + case 229 /* VariableStatement */: + case 234 /* ForStatement */: + case 236 /* ForOfStatement */: // variable statement/for/for-of statement case, // use site should not be inside variable declaration (initializer of declaration or binding element) if (isSameScopeDescendentOf(usage, declaration, declContainer)) { @@ -36152,16 +43647,16 @@ var ts; return true; } var initializerOfProperty = current.parent && - current.parent.kind === 159 /* PropertyDeclaration */ && + current.parent.kind === 162 /* PropertyDeclaration */ && current.parent.initializer === current; if (initializerOfProperty) { - if (ts.hasModifier(current.parent, 32 /* Static */)) { - if (declaration.kind === 161 /* MethodDeclaration */) { + if (ts.hasSyntacticModifier(current.parent, 32 /* Static */)) { + if (declaration.kind === 164 /* MethodDeclaration */) { return true; } } else { - var isDeclarationInstanceProperty = declaration.kind === 159 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */); + var isDeclarationInstanceProperty = declaration.kind === 162 /* PropertyDeclaration */ && !ts.hasSyntacticModifier(declaration, 32 /* Static */); if (!isDeclarationInstanceProperty || ts.getContainingClass(usage) !== ts.getContainingClass(declaration)) { return true; } @@ -36183,19 +43678,19 @@ var ts; return "quit"; } switch (node.kind) { - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: return true; - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: // even when stopping at any property declaration, they need to come from the same class return stopAtAnyPropertyDeclaration && (ts.isPropertyDeclaration(declaration) && node.parent === declaration.parent || ts.isParameterPropertyDeclaration(declaration, declaration.parent) && node.parent === declaration.parent.parent) ? "quit" : true; - case 223 /* Block */: + case 227 /* Block */: switch (node.parent.kind) { - case 163 /* GetAccessor */: - case 161 /* MethodDeclaration */: - case 164 /* SetAccessor */: + case 166 /* GetAccessor */: + case 164 /* MethodDeclaration */: + case 167 /* SetAccessor */: return true; default: return false; @@ -36231,18 +43726,18 @@ var ts; } function requiresScopeChangeWorker(node) { switch (node.kind) { - case 202 /* ArrowFunction */: - case 201 /* FunctionExpression */: - case 244 /* FunctionDeclaration */: - case 162 /* Constructor */: + case 206 /* ArrowFunction */: + case 205 /* FunctionExpression */: + case 248 /* FunctionDeclaration */: + case 165 /* Constructor */: // do not descend into these return false; - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 281 /* PropertyAssignment */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 285 /* PropertyAssignment */: return requiresScopeChangeWorker(node.name); - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: // static properties in classes introduce temporary variables if (ts.hasStaticModifier(node)) { return target < 99 /* ESNext */ || !compilerOptions.useDefineForClassFields; @@ -36296,12 +43791,12 @@ var ts; // - parameters are only in the scope of function body // This restriction does not apply to JSDoc comment types because they are parented // at a higher level than type parameters would normally be - if (meaning & result.flags & 788968 /* Type */ && lastLocation.kind !== 303 /* JSDocComment */) { + if (meaning & result.flags & 788968 /* Type */ && lastLocation.kind !== 307 /* JSDocComment */) { useResult = result.flags & 262144 /* TypeParameter */ // type parameters are visible in parameter list, return type and type parameter list ? lastLocation === location.type || - lastLocation.kind === 156 /* Parameter */ || - lastLocation.kind === 155 /* TypeParameter */ + lastLocation.kind === 159 /* Parameter */ || + lastLocation.kind === 158 /* TypeParameter */ // local types not visible outside the function body : false; } @@ -36316,13 +43811,13 @@ var ts; // however it is detected separately when checking initializers of parameters // to make sure that they reference no variables declared after them. useResult = - lastLocation.kind === 156 /* Parameter */ || + lastLocation.kind === 159 /* Parameter */ || (lastLocation === location.type && !!ts.findAncestor(result.valueDeclaration, ts.isParameter)); } } } - else if (location.kind === 180 /* ConditionalType */) { + else if (location.kind === 183 /* ConditionalType */) { // A type parameter declared using 'infer T' in a conditional type is visible only in // the true branch of the conditional type. useResult = lastLocation === location.trueType; @@ -36337,14 +43832,14 @@ var ts; } withinDeferredContext = withinDeferredContext || getIsDeferredContext(location, lastLocation); switch (location.kind) { - case 290 /* SourceFile */: + case 294 /* SourceFile */: if (!ts.isExternalOrCommonJsModule(location)) break; isInExternalModule = true; // falls through - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: var moduleExports = getSymbolOfNode(location).exports || emptySymbols; - if (location.kind === 290 /* SourceFile */ || (ts.isModuleDeclaration(location) && location.flags & 8388608 /* Ambient */ && !ts.isGlobalScopeAugmentation(location))) { + if (location.kind === 294 /* SourceFile */ || (ts.isModuleDeclaration(location) && location.flags & 8388608 /* Ambient */ && !ts.isGlobalScopeAugmentation(location))) { // It's an external module. First see if the module has an export default and if the local // name of that export default matches. if (result = moduleExports.get("default" /* Default */)) { @@ -36368,7 +43863,7 @@ var ts; var moduleExport = moduleExports.get(name); if (moduleExport && moduleExport.flags === 2097152 /* Alias */ && - (ts.getDeclarationOfKind(moduleExport, 263 /* ExportSpecifier */) || ts.getDeclarationOfKind(moduleExport, 262 /* NamespaceExport */))) { + (ts.getDeclarationOfKind(moduleExport, 267 /* ExportSpecifier */) || ts.getDeclarationOfKind(moduleExport, 266 /* NamespaceExport */))) { break; } } @@ -36382,19 +43877,19 @@ var ts; } } break; - case 248 /* EnumDeclaration */: + case 252 /* EnumDeclaration */: if (result = lookup(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) { break loop; } break; - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: // TypeScript 1.0 spec (April 2014): 8.4.1 // Initializer expressions for instance member variables are evaluated in the scope // of the class constructor body but are not permitted to reference parameters or // local variables of the constructor. This effectively means that entities from outer scopes // by the same name as a constructor parameter or local variable are inaccessible // in initializer expressions for instance member variables. - if (!ts.hasModifier(location, 32 /* Static */)) { + if (!ts.hasSyntacticModifier(location, 32 /* Static */)) { var ctor = findConstructorDeclaration(location.parent); if (ctor && ctor.locals) { if (lookup(ctor.locals, name, meaning & 111551 /* Value */)) { @@ -36404,9 +43899,9 @@ var ts; } } break; - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 246 /* InterfaceDeclaration */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 250 /* InterfaceDeclaration */: // The below is used to lookup type parameters within a class or interface, as they are added to the class/interface locals // These can never be latebound, so the symbol's raw members are sufficient. `getMembersOfNode` cannot be used, as it would // trigger resolving late-bound names, which we may already be in the process of doing while we're here! @@ -36416,7 +43911,7 @@ var ts; result = undefined; break; } - if (lastLocation && ts.hasModifier(lastLocation, 32 /* Static */)) { + if (lastLocation && ts.hasSyntacticModifier(lastLocation, 32 /* Static */)) { // TypeScript 1.0 spec (April 2014): 3.4.1 // The scope of a type parameter extends over the entire declaration with which the type // parameter list is associated, with the exception of static member declarations in classes. @@ -36425,7 +43920,7 @@ var ts; } break loop; } - if (location.kind === 214 /* ClassExpression */ && meaning & 32 /* Class */) { + if (location.kind === 218 /* ClassExpression */ && meaning & 32 /* Class */) { var className = location.name; if (className && name === className.escapedText) { result = location.symbol; @@ -36433,9 +43928,9 @@ var ts; } } break; - case 216 /* ExpressionWithTypeArguments */: + case 220 /* ExpressionWithTypeArguments */: // The type parameters of a class are not in scope in the base class expression. - if (lastLocation === location.expression && location.parent.token === 90 /* ExtendsKeyword */) { + if (lastLocation === location.expression && location.parent.token === 93 /* ExtendsKeyword */) { var container = location.parent.parent; if (ts.isClassLike(container) && (result = lookup(getSymbolOfNode(container).members, name, meaning & 788968 /* Type */))) { if (nameNotFoundMessage) { @@ -36453,9 +43948,9 @@ var ts; // [foo()]() { } // <-- Reference to T from class's own computed property // } // - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: grandparent = location.parent.parent; - if (ts.isClassLike(grandparent) || grandparent.kind === 246 /* InterfaceDeclaration */) { + if (ts.isClassLike(grandparent) || grandparent.kind === 250 /* InterfaceDeclaration */) { // A reference to this grandparent's type parameters would be an error if (result = lookup(getSymbolOfNode(grandparent).members, name, meaning & 788968 /* Type */)) { error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type); @@ -36463,24 +43958,24 @@ var ts; } } break; - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: // when targeting ES6 or higher there is no 'arguments' in an arrow function // for lower compile targets the resolved symbol is used to emit an error if (compilerOptions.target >= 2 /* ES2015 */) { break; } // falls through - case 161 /* MethodDeclaration */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 244 /* FunctionDeclaration */: + case 164 /* MethodDeclaration */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 248 /* FunctionDeclaration */: if (meaning & 3 /* Variable */ && name === "arguments") { result = argumentsSymbol; break loop; } break; - case 201 /* FunctionExpression */: + case 205 /* FunctionExpression */: if (meaning & 3 /* Variable */ && name === "arguments") { result = argumentsSymbol; break loop; @@ -36493,7 +43988,7 @@ var ts; } } break; - case 157 /* Decorator */: + case 160 /* Decorator */: // Decorators are resolved at the class declaration. Resolving at the parameter // or member would result in looking up locals in the method. // @@ -36502,7 +43997,7 @@ var ts; // method(@y x, y) {} // <-- decorator y should be resolved at the class declaration, not the parameter. // } // - if (location.parent && location.parent.kind === 156 /* Parameter */) { + if (location.parent && location.parent.kind === 159 /* Parameter */) { location = location.parent; } // @@ -36517,17 +44012,17 @@ var ts; // declare function y(x: T): any; // @param(1 as T) // <-- T should resolve to the type alias outside of class C // class C {} - if (location.parent && (ts.isClassElement(location.parent) || location.parent.kind === 245 /* ClassDeclaration */)) { + if (location.parent && (ts.isClassElement(location.parent) || location.parent.kind === 249 /* ClassDeclaration */)) { location = location.parent; } break; - case 322 /* JSDocTypedefTag */: - case 315 /* JSDocCallbackTag */: - case 316 /* JSDocEnumTag */: + case 327 /* JSDocTypedefTag */: + case 320 /* JSDocCallbackTag */: + case 321 /* JSDocEnumTag */: // js type aliases do not resolve names from their host, so skip past it location = ts.getJSDocHost(location); break; - case 156 /* Parameter */: + case 159 /* Parameter */: if (lastLocation && (lastLocation === location.initializer || lastLocation === location.name && ts.isBindingPattern(lastLocation))) { if (!associatedDeclarationForContainingInitializerOrBindingName) { @@ -36535,11 +44030,11 @@ var ts; } } break; - case 191 /* BindingElement */: + case 195 /* BindingElement */: if (lastLocation && (lastLocation === location.initializer || lastLocation === location.name && ts.isBindingPattern(lastLocation))) { var root = ts.getRootDeclaration(location); - if (root.kind === 156 /* Parameter */) { + if (root.kind === 159 /* Parameter */) { if (!associatedDeclarationForContainingInitializerOrBindingName) { associatedDeclarationForContainingInitializerOrBindingName = location; } @@ -36561,7 +44056,7 @@ var ts; } if (!result) { if (lastLocation) { - ts.Debug.assert(lastLocation.kind === 290 /* SourceFile */); + ts.Debug.assert(lastLocation.kind === 294 /* SourceFile */); if (lastLocation.commonJsModuleIndicator && name === "exports" && meaning & lastLocation.symbol.flags) { return lastLocation.symbol; } @@ -36678,28 +44173,28 @@ var ts; } } function getIsDeferredContext(location, lastLocation) { - if (location.kind !== 202 /* ArrowFunction */ && location.kind !== 201 /* FunctionExpression */) { + if (location.kind !== 206 /* ArrowFunction */ && location.kind !== 205 /* FunctionExpression */) { // initializers in instance property declaration of class like entities are executed in constructor and thus deferred return ts.isTypeQueryNode(location) || ((ts.isFunctionLikeDeclaration(location) || - (location.kind === 159 /* PropertyDeclaration */ && !ts.hasModifier(location, 32 /* Static */))) && (!lastLocation || lastLocation !== location.name)); // A name is evaluated within the enclosing scope - so it shouldn't count as deferred + (location.kind === 162 /* PropertyDeclaration */ && !ts.hasSyntacticModifier(location, 32 /* Static */))) && (!lastLocation || lastLocation !== location.name)); // A name is evaluated within the enclosing scope - so it shouldn't count as deferred } if (lastLocation && lastLocation === location.name) { return false; } // generator functions and async functions are not inlined in control flow when immediately invoked - if (location.asteriskToken || ts.hasModifier(location, 256 /* Async */)) { + if (location.asteriskToken || ts.hasSyntacticModifier(location, 256 /* Async */)) { return true; } return !ts.getImmediatelyInvokedFunctionExpression(location); } function isSelfReferenceLocation(node) { switch (node.kind) { - case 244 /* FunctionDeclaration */: - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: - case 248 /* EnumDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 249 /* ModuleDeclaration */: // For `namespace N { N; }` + case 248 /* FunctionDeclaration */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: + case 252 /* EnumDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 253 /* ModuleDeclaration */: // For `namespace N { N; }` return true; default: return false; @@ -36711,7 +44206,7 @@ var ts; function isTypeParameterSymbolDeclaredInContainer(symbol, container) { for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) { var decl = _a[_i]; - if (decl.kind === 155 /* TypeParameter */) { + if (decl.kind === 158 /* TypeParameter */) { var parent = ts.isJSDocTemplateTag(decl.parent) ? ts.getJSDocHost(decl.parent) : decl.parent; if (parent === container) { return !(ts.isJSDocTemplateTag(decl.parent) && ts.find(decl.parent.parent.tags, ts.isJSDocTypeAlias)); // TODO: GH#18217 @@ -36740,7 +44235,7 @@ var ts; } // No static member is present. // Check if we're in an instance method and look for a relevant instance member. - if (location === container && !ts.hasModifier(location, 32 /* Static */)) { + if (location === container && !ts.hasSyntacticModifier(location, 32 /* Static */)) { var instanceType = getDeclaredTypeOfSymbol(classSymbol).thisType; // TODO: GH#18217 if (getPropertyOfType(instanceType, name)) { error(errorLocation, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0, diagnosticName(nameArg)); @@ -36766,10 +44261,10 @@ var ts; */ function getEntityNameForExtendingInterface(node) { switch (node.kind) { - case 75 /* Identifier */: - case 194 /* PropertyAccessExpression */: + case 78 /* Identifier */: + case 198 /* PropertyAccessExpression */: return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined; - case 216 /* ExpressionWithTypeArguments */: + case 220 /* ExpressionWithTypeArguments */: if (ts.isEntityNameExpression(node.expression)) { return node.expression; } @@ -36813,7 +44308,7 @@ var ts; return name === "any" || name === "string" || name === "number" || name === "boolean" || name === "never" || name === "unknown"; } function checkAndReportErrorForExportingPrimitiveType(errorLocation, name) { - if (isPrimitiveTypeName(name) && errorLocation.parent.kind === 263 /* ExportSpecifier */) { + if (isPrimitiveTypeName(name) && errorLocation.parent.kind === 267 /* ExportSpecifier */) { error(errorLocation, ts.Diagnostics.Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module, name); return true; } @@ -36872,7 +44367,7 @@ var ts; return; } // Block-scoped variables cannot be used before their definition - var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 248 /* EnumDeclaration */); }); + var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 252 /* EnumDeclaration */); }); if (declaration === undefined) return ts.Debug.fail("checkResolvedBlockScopedVariable could not find block-scoped declaration"); if (!(declaration.flags & 8388608 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) { @@ -36890,7 +44385,7 @@ var ts; else { ts.Debug.assert(!!(result.flags & 128 /* ConstEnum */)); if (compilerOptions.preserveConstEnums) { - diagnosticMessage = error(errorLocation, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName); + diagnosticMessage = error(errorLocation, ts.Diagnostics.Enum_0_used_before_its_declaration, declarationName); } } if (diagnosticMessage) { @@ -36907,13 +44402,13 @@ var ts; } function getAnyImportSyntax(node) { switch (node.kind) { - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return node; - case 255 /* ImportClause */: + case 259 /* ImportClause */: return node.parent; - case 256 /* NamespaceImport */: + case 260 /* NamespaceImport */: return node.parent.parent; - case 258 /* ImportSpecifier */: + case 262 /* ImportSpecifier */: return node.parent.parent.parent; default: return undefined; @@ -36937,28 +44432,28 @@ var ts; * {name: } */ function isAliasSymbolDeclaration(node) { - return node.kind === 253 /* ImportEqualsDeclaration */ || - node.kind === 252 /* NamespaceExportDeclaration */ || - node.kind === 255 /* ImportClause */ && !!node.name || - node.kind === 256 /* NamespaceImport */ || - node.kind === 262 /* NamespaceExport */ || - node.kind === 258 /* ImportSpecifier */ || - node.kind === 263 /* ExportSpecifier */ || - node.kind === 259 /* ExportAssignment */ && ts.exportAssignmentIsAlias(node) || + return node.kind === 257 /* ImportEqualsDeclaration */ || + node.kind === 256 /* NamespaceExportDeclaration */ || + node.kind === 259 /* ImportClause */ && !!node.name || + node.kind === 260 /* NamespaceImport */ || + node.kind === 266 /* NamespaceExport */ || + node.kind === 262 /* ImportSpecifier */ || + node.kind === 267 /* ExportSpecifier */ || + node.kind === 263 /* ExportAssignment */ && ts.exportAssignmentIsAlias(node) || ts.isBinaryExpression(node) && ts.getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && ts.exportAssignmentIsAlias(node) || ts.isPropertyAccessExpression(node) && ts.isBinaryExpression(node.parent) && node.parent.left === node && node.parent.operatorToken.kind === 62 /* EqualsToken */ && isAliasableOrJsExpression(node.parent.right) || - node.kind === 282 /* ShorthandPropertyAssignment */ || - node.kind === 281 /* PropertyAssignment */ && isAliasableOrJsExpression(node.initializer); + node.kind === 286 /* ShorthandPropertyAssignment */ || + node.kind === 285 /* PropertyAssignment */ && isAliasableOrJsExpression(node.initializer); } function isAliasableOrJsExpression(e) { return ts.isAliasableExpression(e) || ts.isFunctionExpression(e) && isJSConstructor(e); } function getTargetOfImportEqualsDeclaration(node, dontResolveAlias) { - if (node.moduleReference.kind === 265 /* ExternalModuleReference */) { + if (node.moduleReference.kind === 269 /* ExternalModuleReference */) { var immediate = resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)); var resolved_4 = resolveExternalModuleSymbol(immediate); markSymbolOfAliasDeclarationIfTypeOnly(node, immediate, resolved_4, /*overwriteEmpty*/ false); @@ -36995,7 +44490,7 @@ var ts; return resolved; } function isSyntacticDefault(node) { - return ((ts.isExportAssignment(node) && !node.isExportEquals) || ts.hasModifier(node, 512 /* Default */) || ts.isExportSpecifier(node)); + return ((ts.isExportAssignment(node) && !node.isExportEquals) || ts.hasSyntacticModifier(node, 512 /* Default */) || ts.isExportSpecifier(node)); } function canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias) { if (!allowSyntheticDefaultImports) { @@ -37125,9 +44620,9 @@ var ts; if (valueSymbol.valueDeclaration) result.valueDeclaration = valueSymbol.valueDeclaration; if (typeSymbol.members) - result.members = ts.cloneMap(typeSymbol.members); + result.members = new ts.Map(typeSymbol.members); if (valueSymbol.exports) - result.exports = ts.cloneMap(valueSymbol.exports); + result.exports = new ts.Map(valueSymbol.exports); return result; } function getExportOfModule(symbol, specifier, dontResolveAlias) { @@ -37151,7 +44646,7 @@ var ts; function getExternalModuleMember(node, specifier, dontResolveAlias) { var _a; if (dontResolveAlias === void 0) { dontResolveAlias = false; } - var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier); // TODO: GH#18217 + var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier); var name = specifier.propertyName || specifier.name; var suppressInteropError = name.escapedText === "default" /* Default */ && !!(compilerOptions.allowSyntheticDefaultImports || compilerOptions.esModuleInterop); var targetSymbol = resolveESModuleSymbol(moduleSymbol, node.moduleSpecifier, dontResolveAlias, suppressInteropError); @@ -37296,28 +44791,28 @@ var ts; function getTargetOfAliasDeclaration(node, dontRecursivelyResolve) { if (dontRecursivelyResolve === void 0) { dontRecursivelyResolve = false; } switch (node.kind) { - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return getTargetOfImportEqualsDeclaration(node, dontRecursivelyResolve); - case 255 /* ImportClause */: + case 259 /* ImportClause */: return getTargetOfImportClause(node, dontRecursivelyResolve); - case 256 /* NamespaceImport */: + case 260 /* NamespaceImport */: return getTargetOfNamespaceImport(node, dontRecursivelyResolve); - case 262 /* NamespaceExport */: + case 266 /* NamespaceExport */: return getTargetOfNamespaceExport(node, dontRecursivelyResolve); - case 258 /* ImportSpecifier */: + case 262 /* ImportSpecifier */: return getTargetOfImportSpecifier(node, dontRecursivelyResolve); - case 263 /* ExportSpecifier */: + case 267 /* ExportSpecifier */: return getTargetOfExportSpecifier(node, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */, dontRecursivelyResolve); - case 259 /* ExportAssignment */: - case 209 /* BinaryExpression */: + case 263 /* ExportAssignment */: + case 213 /* BinaryExpression */: return getTargetOfExportAssignment(node, dontRecursivelyResolve); - case 252 /* NamespaceExportDeclaration */: + case 256 /* NamespaceExportDeclaration */: return getTargetOfNamespaceExportDeclaration(node, dontRecursivelyResolve); - case 282 /* ShorthandPropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: return resolveEntityName(node.name, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ true, dontRecursivelyResolve); - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: return getTargetOfPropertyAssignment(node, dontRecursivelyResolve); - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: return getTargetOfPropertyAccessExpression(node, dontRecursivelyResolve); default: return ts.Debug.fail(); @@ -37465,17 +44960,17 @@ var ts; // import a = |b|; // Namespace // import a = |b.c|; // Value, type, namespace // import a = |b.c|.d; // Namespace - if (entityName.kind === 75 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) { + if (entityName.kind === 78 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) { entityName = entityName.parent; } // Check for case 1 and 3 in the above example - if (entityName.kind === 75 /* Identifier */ || entityName.parent.kind === 153 /* QualifiedName */) { + if (entityName.kind === 78 /* Identifier */ || entityName.parent.kind === 156 /* QualifiedName */) { return resolveEntityName(entityName, 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias); } else { // Case 2 in above example // entityName.kind could be a QualifiedName or a Missing identifier - ts.Debug.assert(entityName.parent.kind === 253 /* ImportEqualsDeclaration */); + ts.Debug.assert(entityName.parent.kind === 257 /* ImportEqualsDeclaration */); return resolveEntityName(entityName, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias); } } @@ -37491,7 +44986,7 @@ var ts; } var namespaceMeaning = 1920 /* Namespace */ | (ts.isInJSFile(name) ? meaning & 111551 /* Value */ : 0); var symbol; - if (name.kind === 75 /* Identifier */) { + if (name.kind === 78 /* Identifier */) { var message = meaning === namespaceMeaning || ts.nodeIsSynthesized(name) ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(ts.getFirstIdentifier(name)); var symbolFromJSPrototype = ts.isInJSFile(name) && !ts.nodeIsSynthesized(name) ? resolveEntityNameFromAssignmentDeclaration(name, meaning) : undefined; symbol = getMergedSymbol(resolveName(location || name, name.escapedText, meaning, ignoreErrors || symbolFromJSPrototype ? undefined : message, name, /*isUse*/ true)); @@ -37499,9 +44994,9 @@ var ts; return getMergedSymbol(symbolFromJSPrototype); } } - else if (name.kind === 153 /* QualifiedName */ || name.kind === 194 /* PropertyAccessExpression */) { - var left = name.kind === 153 /* QualifiedName */ ? name.left : name.expression; - var right = name.kind === 153 /* QualifiedName */ ? name.right : name.name; + else if (name.kind === 156 /* QualifiedName */ || name.kind === 198 /* PropertyAccessExpression */) { + var left = name.kind === 156 /* QualifiedName */ ? name.left : name.expression; + var right = name.kind === 156 /* QualifiedName */ ? name.right : name.name; var namespace = resolveEntityName(left, namespaceMeaning, ignoreErrors, /*dontResolveAlias*/ false, location); if (!namespace || ts.nodeIsMissing(right)) { return undefined; @@ -37536,7 +45031,7 @@ var ts; throw ts.Debug.assertNever(name, "Unknown entity name kind."); } ts.Debug.assert((ts.getCheckFlags(symbol) & 1 /* Instantiated */) === 0, "Should never get an instantiated symbol here."); - if (!ts.nodeIsSynthesized(name) && ts.isEntityName(name) && (symbol.flags & 2097152 /* Alias */ || name.parent.kind === 259 /* ExportAssignment */)) { + if (!ts.nodeIsSynthesized(name) && ts.isEntityName(name) && (symbol.flags & 2097152 /* Alias */ || name.parent.kind === 263 /* ExportAssignment */)) { markSymbolOfAliasDeclarationIfTypeOnly(ts.getAliasDeclarationFromName(name), symbol, /*finalTarget*/ undefined, /*overwriteEmpty*/ true); } return (symbol.flags & meaning) || dontResolveAlias ? symbol : resolveAlias(symbol); @@ -37615,7 +45110,11 @@ var ts; } } function resolveExternalModuleName(location, moduleReferenceExpression, ignoreErrors) { - return resolveExternalModuleNameWorker(location, moduleReferenceExpression, ignoreErrors ? undefined : ts.Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations); + var isClassic = ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.Classic; + var errorMessage = isClassic ? + ts.Diagnostics.Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_node_or_to_add_aliases_to_the_paths_option + : ts.Diagnostics.Cannot_find_module_0_or_its_corresponding_type_declarations; + return resolveExternalModuleNameWorker(location, moduleReferenceExpression, ignoreErrors ? undefined : errorMessage); } function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError, isForAugmentation) { if (isForAugmentation === void 0) { isForAugmentation = false; } @@ -37758,7 +45257,7 @@ var ts; function resolveESModuleSymbol(moduleSymbol, referencingLocation, dontResolveAlias, suppressInteropError) { var symbol = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias); if (!dontResolveAlias && symbol) { - if (!suppressInteropError && !(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 290 /* SourceFile */)) { + if (!suppressInteropError && !(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 294 /* SourceFile */)) { var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop"; @@ -37787,9 +45286,9 @@ var ts; if (symbol.constEnumOnlyModule) result.constEnumOnlyModule = true; if (symbol.members) - result.members = ts.cloneMap(symbol.members); + result.members = new ts.Map(symbol.members); if (symbol.exports) - result.exports = ts.cloneMap(symbol.exports); + result.exports = new ts.Map(symbol.exports); var resolvedModuleType = resolveStructuredTypeMembers(moduleType); // Should already be resolved from the signature checks above result.type = createAnonymousType(result, resolvedModuleType.members, ts.emptyArray, ts.emptyArray, resolvedModuleType.stringIndexInfo, resolvedModuleType.numberIndexInfo); return result; @@ -37885,12 +45384,12 @@ var ts; if (!(symbol && symbol.exports && ts.pushIfUnique(visitedSymbols, symbol))) { return; } - var symbols = ts.cloneMap(symbol.exports); + var symbols = new ts.Map(symbol.exports); // All export * declarations are collected in an __export symbol by the binder var exportStars = symbol.exports.get("__export" /* ExportStar */); if (exportStars) { var nestedSymbols = ts.createSymbolTable(); - var lookupTable_1 = ts.createMap(); + var lookupTable_1 = new ts.Map(); for (var _i = 0, _a = exportStars.declarations; _i < _a.length; _i++) { var node = _a[_i]; var resolvedModule = resolveExternalModuleName(node, node.moduleSpecifier); @@ -37925,7 +45424,7 @@ var ts; } function getAlternativeContainingModules(symbol, enclosingDeclaration) { var containingFile = ts.getSourceFileOfNode(enclosingDeclaration); - var id = "" + getNodeId(containingFile); + var id = getNodeId(containingFile); var links = getSymbolLinks(symbol); var results; if (links.extendedContainersByFile && (results = links.extendedContainersByFile.get(id))) { @@ -37946,7 +45445,7 @@ var ts; results = ts.append(results, resolvedModule); } if (ts.length(results)) { - (links.extendedContainersByFile || (links.extendedContainersByFile = ts.createMap())).set(id, results); + (links.extendedContainersByFile || (links.extendedContainersByFile = new ts.Map())).set(id, results); return results; } } @@ -37971,16 +45470,17 @@ var ts; * Attempts to find the symbol corresponding to the container a symbol is in - usually this * is just its' `.parent`, but for locals, this value is `undefined` */ - function getContainersOfSymbol(symbol, enclosingDeclaration) { + function getContainersOfSymbol(symbol, enclosingDeclaration, meaning) { var container = getParentOfSymbol(symbol); // Type parameters end up in the `members` lists but are not externally visible if (container && !(symbol.flags & 262144 /* TypeParameter */)) { var additionalContainers = ts.mapDefined(container.declarations, fileSymbolIfFileSymbolExportEqualsContainer); var reexportContainers = enclosingDeclaration && getAlternativeContainingModules(symbol, enclosingDeclaration); + var objectLiteralContainer = getVariableDeclarationOfObjectLiteral(container, meaning); if (enclosingDeclaration && getAccessibleSymbolChain(container, enclosingDeclaration, 1920 /* Namespace */, /*externalOnly*/ false)) { - return ts.concatenate(ts.concatenate([container], additionalContainers), reexportContainers); // This order expresses a preference for the real container if it is in scope + return ts.append(ts.concatenate(ts.concatenate([container], additionalContainers), reexportContainers), objectLiteralContainer); // This order expresses a preference for the real container if it is in scope } - var res = ts.append(additionalContainers, container); + var res = ts.append(ts.append(additionalContainers, container), objectLiteralContainer); return ts.concatenate(res, reexportContainers); } var candidates = ts.mapDefined(symbol.declarations, function (d) { @@ -38003,6 +45503,17 @@ var ts; return container && getFileSymbolIfFileSymbolExportEqualsContainer(d, container); } } + function getVariableDeclarationOfObjectLiteral(symbol, meaning) { + // If we're trying to reference some object literal in, eg `var a = { x: 1 }`, the symbol for the literal, `__object`, is distinct + // from the symbol of the declaration it is being assigned to. Since we can use the declaration to refer to the literal, however, + // we'd like to make that connection here - potentially causing us to paint the declaration's visibility, and therefore the literal. + var firstDecl = !!ts.length(symbol.declarations) && ts.first(symbol.declarations); + if (meaning & 111551 /* Value */ && firstDecl && firstDecl.parent && ts.isVariableDeclaration(firstDecl.parent)) { + if (ts.isObjectLiteralExpression(firstDecl) && firstDecl === firstDecl.parent.initializer || ts.isTypeLiteralNode(firstDecl) && firstDecl === firstDecl.parent.type) { + return getSymbolOfNode(firstDecl.parent); + } + } + } function getFileSymbolIfFileSymbolExportEqualsContainer(d, container) { var fileSymbol = getExternalModuleContainer(d); var exported = fileSymbol && fileSymbol.exports && fileSymbol.exports.get("export=" /* ExportEquals */); @@ -38048,7 +45559,7 @@ var ts; var members = node.members; for (var _i = 0, members_3 = members; _i < members_3.length; _i++) { var member = members_3[_i]; - if (member.kind === 162 /* Constructor */ && ts.nodeIsPresent(member.body)) { + if (member.kind === 165 /* Constructor */ && ts.nodeIsPresent(member.body)) { return member; } } @@ -38127,7 +45638,7 @@ var ts; } function forEachSymbolTableInScope(enclosingDeclaration, callback) { var result; - var _loop_7 = function (location) { + var _loop_8 = function (location) { // Locals of a source file are not in scope (because they get merged into the global symbol table) if (location.locals && !isGlobalSourceFile(location)) { if (result = callback(location.locals)) { @@ -38135,12 +45646,12 @@ var ts; } } switch (location.kind) { - case 290 /* SourceFile */: + case 294 /* SourceFile */: if (!ts.isExternalOrCommonJsModule(location)) { break; } // falls through - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: var sym = getSymbolOfNode(location); // `sym` may not have exports if this module declaration is backed by the symbol for a `const` that's being rewritten // into a namespace - in such cases, it's best to just let the namespace appear empty (the const members couldn't have referred @@ -38149,9 +45660,9 @@ var ts; return { value: result }; } break; - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 246 /* InterfaceDeclaration */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 250 /* InterfaceDeclaration */: // Type parameters are bound into `members` lists so they can merge across declarations // This is troublesome, since in all other respects, they behave like locals :cries: // TODO: the below is shared with similar code in `resolveName` - in fact, rephrasing all this symbol @@ -38173,7 +45684,7 @@ var ts; } }; for (var location = enclosingDeclaration; location; location = location.parent) { - var state_2 = _loop_7(location); + var state_2 = _loop_8(location); if (typeof state_2 === "object") return state_2.value; } @@ -38184,11 +45695,11 @@ var ts; return rightMeaning === 111551 /* Value */ ? 111551 /* Value */ : 1920 /* Namespace */; } function getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, useOnlyExternalAliasing, visitedSymbolTablesMap) { - if (visitedSymbolTablesMap === void 0) { visitedSymbolTablesMap = ts.createMap(); } + if (visitedSymbolTablesMap === void 0) { visitedSymbolTablesMap = new ts.Map(); } if (!(symbol && !isPropertyOrMethodDeclarationSymbol(symbol))) { return undefined; } - var id = "" + getSymbolId(symbol); + var id = getSymbolId(symbol); var visitedSymbolTables = visitedSymbolTablesMap.get(id); if (!visitedSymbolTables) { visitedSymbolTablesMap.set(id, visitedSymbolTables = []); @@ -38234,7 +45745,7 @@ var ts; && (!useOnlyExternalAliasing || ts.some(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) // While exports are generally considered to be in scope, export-specifier declared symbols are _not_ // See similar comment in `resolveName` for details - && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 263 /* ExportSpecifier */))) { + && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 267 /* ExportSpecifier */))) { var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable); var candidate = getCandidateListForSymbol(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification); if (candidate) { @@ -38278,7 +45789,7 @@ var ts; return true; } // Qualify if the symbol from symbol table has same meaning as expected - symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 263 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable; + symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 267 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable; if (symbolFromSymbolTable.flags & meaning) { qualify = true; return true; @@ -38293,10 +45804,10 @@ var ts; for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) { var declaration = _a[_i]; switch (declaration.kind) { - case 159 /* PropertyDeclaration */: - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 162 /* PropertyDeclaration */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: continue; default: return false; @@ -38307,14 +45818,18 @@ var ts; return false; } function isTypeSymbolAccessible(typeSymbol, enclosingDeclaration) { - var access = isSymbolAccessible(typeSymbol, enclosingDeclaration, 788968 /* Type */, /*shouldComputeAliasesToMakeVisible*/ false); + var access = isSymbolAccessibleWorker(typeSymbol, enclosingDeclaration, 788968 /* Type */, /*shouldComputeAliasesToMakeVisible*/ false, /*allowModules*/ true); return access.accessibility === 0 /* Accessible */; } function isValueSymbolAccessible(typeSymbol, enclosingDeclaration) { - var access = isSymbolAccessible(typeSymbol, enclosingDeclaration, 111551 /* Value */, /*shouldComputeAliasesToMakeVisible*/ false); + var access = isSymbolAccessibleWorker(typeSymbol, enclosingDeclaration, 111551 /* Value */, /*shouldComputeAliasesToMakeVisible*/ false, /*allowModules*/ true); return access.accessibility === 0 /* Accessible */; } - function isAnySymbolAccessible(symbols, enclosingDeclaration, initialSymbol, meaning, shouldComputeAliasesToMakeVisible) { + function isSymbolAccessibleByFlags(typeSymbol, enclosingDeclaration, flags) { + var access = isSymbolAccessibleWorker(typeSymbol, enclosingDeclaration, flags, /*shouldComputeAliasesToMakeVisible*/ false, /*allowModules*/ false); + return access.accessibility === 0 /* Accessible */; + } + function isAnySymbolAccessible(symbols, enclosingDeclaration, initialSymbol, meaning, shouldComputeAliasesToMakeVisible, allowModules) { if (!ts.length(symbols)) return; var hadAccessibleChain; @@ -38330,7 +45845,7 @@ var ts; return hasAccessibleDeclarations; } } - else { + else if (allowModules) { if (ts.some(symbol.declarations, hasNonGlobalAugmentationExternalModuleSymbol)) { if (shouldComputeAliasesToMakeVisible) { earlyModuleBail = true; @@ -38358,17 +45873,8 @@ var ts; // we are going to see if c can be accessed in scope directly. // But it can't, hence the accessible is going to be undefined, but that doesn't mean m.c is inaccessible // It is accessible if the parent m is accessible because then m.c can be accessed through qualification - var containers = getContainersOfSymbol(symbol, enclosingDeclaration); - // If we're trying to reference some object literal in, eg `var a = { x: 1 }`, the symbol for the literal, `__object`, is distinct - // from the symbol of the declaration it is being assigned to. Since we can use the declaration to refer to the literal, however, - // we'd like to make that connection here - potentially causing us to paint the declaration's visibility, and therefore the literal. - var firstDecl = !!ts.length(symbol.declarations) && ts.first(symbol.declarations); - if (!ts.length(containers) && meaning & 111551 /* Value */ && firstDecl && ts.isObjectLiteralExpression(firstDecl)) { - if (firstDecl.parent && ts.isVariableDeclaration(firstDecl.parent) && firstDecl === firstDecl.parent.initializer) { - containers = [getSymbolOfNode(firstDecl.parent)]; - } - } - var parentResult = isAnySymbolAccessible(containers, enclosingDeclaration, initialSymbol, initialSymbol === symbol ? getQualifiedLeftMeaning(meaning) : meaning, shouldComputeAliasesToMakeVisible); + var containers = getContainersOfSymbol(symbol, enclosingDeclaration, meaning); + var parentResult = isAnySymbolAccessible(containers, enclosingDeclaration, initialSymbol, initialSymbol === symbol ? getQualifiedLeftMeaning(meaning) : meaning, shouldComputeAliasesToMakeVisible, allowModules); if (parentResult) { return parentResult; } @@ -38395,8 +45901,11 @@ var ts; * @param shouldComputeAliasToMakeVisible a boolean value to indicate whether to return aliases to be mark visible in case the symbol is accessible */ function isSymbolAccessible(symbol, enclosingDeclaration, meaning, shouldComputeAliasesToMakeVisible) { + return isSymbolAccessibleWorker(symbol, enclosingDeclaration, meaning, shouldComputeAliasesToMakeVisible, /*allowModules*/ true); + } + function isSymbolAccessibleWorker(symbol, enclosingDeclaration, meaning, shouldComputeAliasesToMakeVisible, allowModules) { if (symbol && enclosingDeclaration) { - var result = isAnySymbolAccessible([symbol], enclosingDeclaration, symbol, meaning, shouldComputeAliasesToMakeVisible); + var result = isAnySymbolAccessible([symbol], enclosingDeclaration, symbol, meaning, shouldComputeAliasesToMakeVisible, allowModules); if (result) { return result; } @@ -38427,14 +45936,14 @@ var ts; return node && getSymbolOfNode(node); } function hasExternalModuleSymbol(declaration) { - return ts.isAmbientModule(declaration) || (declaration.kind === 290 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration)); + return ts.isAmbientModule(declaration) || (declaration.kind === 294 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration)); } function hasNonGlobalAugmentationExternalModuleSymbol(declaration) { - return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 290 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration)); + return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 294 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration)); } function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) { var aliasesToMakeVisible; - if (!ts.every(ts.filter(symbol.declarations, function (d) { return d.kind !== 75 /* Identifier */; }), getIsDeclarationVisible)) { + if (!ts.every(ts.filter(symbol.declarations, function (d) { return d.kind !== 78 /* Identifier */; }), getIsDeclarationVisible)) { return undefined; } return { accessibility: 0 /* Accessible */, aliasesToMakeVisible: aliasesToMakeVisible }; @@ -38444,17 +45953,17 @@ var ts; // because these kind of aliases can be used to name types in declaration file var anyImportSyntax = getAnyImportSyntax(declaration); if (anyImportSyntax && - !ts.hasModifier(anyImportSyntax, 1 /* Export */) && // import clause without export + !ts.hasSyntacticModifier(anyImportSyntax, 1 /* Export */) && // import clause without export isDeclarationVisible(anyImportSyntax.parent)) { return addVisibleAlias(declaration, anyImportSyntax); } else if (ts.isVariableDeclaration(declaration) && ts.isVariableStatement(declaration.parent.parent) && - !ts.hasModifier(declaration.parent.parent, 1 /* Export */) && // unexported variable statement + !ts.hasSyntacticModifier(declaration.parent.parent, 1 /* Export */) && // unexported variable statement isDeclarationVisible(declaration.parent.parent.parent)) { return addVisibleAlias(declaration, declaration.parent.parent); } else if (ts.isLateVisibilityPaintedStatement(declaration) // unexported top-level statement - && !ts.hasModifier(declaration, 1 /* Export */) + && !ts.hasSyntacticModifier(declaration, 1 /* Export */) && isDeclarationVisible(declaration.parent)) { return addVisibleAlias(declaration, declaration); } @@ -38477,14 +45986,14 @@ var ts; function isEntityNameVisible(entityName, enclosingDeclaration) { // get symbol of the first identifier of the entityName var meaning; - if (entityName.parent.kind === 172 /* TypeQuery */ || + if (entityName.parent.kind === 175 /* TypeQuery */ || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent) || - entityName.parent.kind === 154 /* ComputedPropertyName */) { + entityName.parent.kind === 157 /* ComputedPropertyName */) { // Typeof value meaning = 111551 /* Value */ | 1048576 /* ExportValue */; } - else if (entityName.kind === 153 /* QualifiedName */ || entityName.kind === 194 /* PropertyAccessExpression */ || - entityName.parent.kind === 253 /* ImportEqualsDeclaration */) { + else if (entityName.kind === 156 /* QualifiedName */ || entityName.kind === 198 /* PropertyAccessExpression */ || + entityName.parent.kind === 257 /* ImportEqualsDeclaration */) { // Left identifier from type reference or TypeAlias // Entity name of the import declaration meaning = 1920 /* Namespace */; @@ -38495,6 +46004,9 @@ var ts; } var firstIdentifier = ts.getFirstIdentifier(entityName); var symbol = resolveName(enclosingDeclaration, firstIdentifier.escapedText, meaning, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false); + if (symbol && symbol.flags & 262144 /* TypeParameter */ && meaning & 788968 /* Type */) { + return { accessibility: 0 /* Accessible */ }; + } // Verify if the symbol is accessible return (symbol && hasVisibleDeclarations(symbol, /*shouldComputeAliasToMakeVisible*/ true)) || { accessibility: 1 /* NotAccessible */, @@ -38521,7 +46033,8 @@ var ts; return writer ? symbolToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(symbolToStringWorker); function symbolToStringWorker(writer) { var entity = builder(symbol, meaning, enclosingDeclaration, nodeFlags); // TODO: GH#18217 - var printer = ts.createPrinter({ removeComments: true }); + // add neverAsciiEscape for GH#39027 + var printer = (enclosingDeclaration === null || enclosingDeclaration === void 0 ? void 0 : enclosingDeclaration.kind) === 294 /* SourceFile */ ? ts.createPrinter({ removeComments: true, neverAsciiEscape: true }) : ts.createPrinter({ removeComments: true }); var sourceFile = enclosingDeclaration && ts.getSourceFileOfNode(enclosingDeclaration); printer.writeNode(4 /* Unspecified */, entity, /*sourceFile*/ sourceFile, writer); return writer; @@ -38533,10 +46046,10 @@ var ts; function signatureToStringWorker(writer) { var sigOutput; if (flags & 262144 /* WriteArrowStyleSignature */) { - sigOutput = kind === 1 /* Construct */ ? 171 /* ConstructorType */ : 170 /* FunctionType */; + sigOutput = kind === 1 /* Construct */ ? 174 /* ConstructorType */ : 173 /* FunctionType */; } else { - sigOutput = kind === 1 /* Construct */ ? 166 /* ConstructSignature */ : 165 /* CallSignature */; + sigOutput = kind === 1 /* Construct */ ? 169 /* ConstructSignature */ : 168 /* CallSignature */; } var sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */); var printer = ts.createPrinter({ removeComments: true, omitTrailingSemicolon: true }); @@ -38567,11 +46080,14 @@ var ts; var leftStr = symbolValueDeclarationIsContextSensitive(left.symbol) ? typeToString(left, left.symbol.valueDeclaration) : typeToString(left); var rightStr = symbolValueDeclarationIsContextSensitive(right.symbol) ? typeToString(right, right.symbol.valueDeclaration) : typeToString(right); if (leftStr === rightStr) { - leftStr = typeToString(left, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */); - rightStr = typeToString(right, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */); + leftStr = getTypeNameForErrorDisplay(left); + rightStr = getTypeNameForErrorDisplay(right); } return [leftStr, rightStr]; } + function getTypeNameForErrorDisplay(type) { + return typeToString(type, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */); + } function symbolValueDeclarationIsContextSensitive(symbol) { return symbol && symbol.valueDeclaration && ts.isExpression(symbol.valueDeclaration) && !isContextSensitive(symbol.valueDeclaration); } @@ -38585,7 +46101,7 @@ var ts; return withContext(enclosingDeclaration, flags, tracker, function (context) { return typeToTypeNodeHelper(type, context); }); }, indexInfoToIndexSignatureDeclaration: function (indexInfo, kind, enclosingDeclaration, flags, tracker) { - return withContext(enclosingDeclaration, flags, tracker, function (context) { return indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context); }); + return withContext(enclosingDeclaration, flags, tracker, function (context) { return indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context, /*typeNode*/ undefined); }); }, signatureToSignatureDeclaration: function (signature, kind, enclosingDeclaration, flags, tracker) { return withContext(enclosingDeclaration, flags, tracker, function (context) { return signatureToSignatureDeclarationHelper(signature, kind, context); }); @@ -38619,7 +46135,7 @@ var ts; getCommonSourceDirectory: !!host.getCommonSourceDirectory ? function () { return host.getCommonSourceDirectory(); } : function () { return ""; }, getSourceFiles: function () { return host.getSourceFiles(); }, getCurrentDirectory: function () { return host.getCurrentDirectory(); }, - getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks), + getSymlinkCache: ts.maybeBind(host, host.getSymlinkCache), useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames), redirectTargetsMap: host.redirectTargetsMap, getProjectReferenceRedirect: function (fileName) { return host.getProjectReferenceRedirect(fileName); }, @@ -38652,40 +46168,40 @@ var ts; return undefined; // TODO: GH#18217 } context.approximateLength += 3; - return ts.createKeywordTypeNode(125 /* AnyKeyword */); + return ts.factory.createKeywordTypeNode(128 /* AnyKeyword */); } if (!(context.flags & 536870912 /* NoTypeReduction */)) { type = getReducedType(type); } if (type.flags & 1 /* Any */) { context.approximateLength += 3; - return ts.createKeywordTypeNode(125 /* AnyKeyword */); + return ts.factory.createKeywordTypeNode(128 /* AnyKeyword */); } if (type.flags & 2 /* Unknown */) { - return ts.createKeywordTypeNode(148 /* UnknownKeyword */); + return ts.factory.createKeywordTypeNode(151 /* UnknownKeyword */); } if (type.flags & 4 /* String */) { context.approximateLength += 6; - return ts.createKeywordTypeNode(143 /* StringKeyword */); + return ts.factory.createKeywordTypeNode(146 /* StringKeyword */); } if (type.flags & 8 /* Number */) { context.approximateLength += 6; - return ts.createKeywordTypeNode(140 /* NumberKeyword */); + return ts.factory.createKeywordTypeNode(143 /* NumberKeyword */); } if (type.flags & 64 /* BigInt */) { context.approximateLength += 6; - return ts.createKeywordTypeNode(151 /* BigIntKeyword */); + return ts.factory.createKeywordTypeNode(154 /* BigIntKeyword */); } if (type.flags & 16 /* Boolean */) { context.approximateLength += 7; - return ts.createKeywordTypeNode(128 /* BooleanKeyword */); + return ts.factory.createKeywordTypeNode(131 /* BooleanKeyword */); } if (type.flags & 1024 /* EnumLiteral */ && !(type.flags & 1048576 /* Union */)) { var parentSymbol = getParentOfSymbol(type.symbol); var parentName = symbolToTypeNode(parentSymbol, context, 788968 /* Type */); var enumLiteralName = getDeclaredTypeOfSymbol(parentSymbol) === type ? parentName - : appendReferenceToType(parentName, ts.createTypeReferenceNode(ts.symbolName(type.symbol), /*typeArguments*/ undefined)); + : appendReferenceToType(parentName, ts.factory.createTypeReferenceNode(ts.symbolName(type.symbol), /*typeArguments*/ undefined)); return enumLiteralName; } if (type.flags & 1056 /* EnumLike */) { @@ -38693,20 +46209,20 @@ var ts; } if (type.flags & 128 /* StringLiteral */) { context.approximateLength += (type.value.length + 2); - return ts.createLiteralTypeNode(ts.setEmitFlags(ts.createLiteral(type.value, !!(context.flags & 268435456 /* UseSingleQuotesForStringLiteralType */)), 16777216 /* NoAsciiEscaping */)); + return ts.factory.createLiteralTypeNode(ts.setEmitFlags(ts.factory.createStringLiteral(type.value, !!(context.flags & 268435456 /* UseSingleQuotesForStringLiteralType */)), 16777216 /* NoAsciiEscaping */)); } if (type.flags & 256 /* NumberLiteral */) { var value = type.value; context.approximateLength += ("" + value).length; - return ts.createLiteralTypeNode(value < 0 ? ts.createPrefix(40 /* MinusToken */, ts.createLiteral(-value)) : ts.createLiteral(value)); + return ts.factory.createLiteralTypeNode(value < 0 ? ts.factory.createPrefixUnaryExpression(40 /* MinusToken */, ts.factory.createNumericLiteral(-value)) : ts.factory.createNumericLiteral(value)); } if (type.flags & 2048 /* BigIntLiteral */) { context.approximateLength += (ts.pseudoBigIntToString(type.value).length) + 1; - return ts.createLiteralTypeNode((ts.createLiteral(type.value))); + return ts.factory.createLiteralTypeNode((ts.factory.createBigIntLiteral(type.value))); } if (type.flags & 512 /* BooleanLiteral */) { context.approximateLength += type.intrinsicName.length; - return type.intrinsicName === "true" ? ts.createTrue() : ts.createFalse(); + return ts.factory.createLiteralTypeNode(type.intrinsicName === "true" ? ts.factory.createTrue() : ts.factory.createFalse()); } if (type.flags & 8192 /* UniqueESSymbol */) { if (!(context.flags & 1048576 /* AllowUniqueESSymbolType */)) { @@ -38719,31 +46235,31 @@ var ts; } } context.approximateLength += 13; - return ts.createTypeOperatorNode(147 /* UniqueKeyword */, ts.createKeywordTypeNode(144 /* SymbolKeyword */)); + return ts.factory.createTypeOperatorNode(150 /* UniqueKeyword */, ts.factory.createKeywordTypeNode(147 /* SymbolKeyword */)); } if (type.flags & 16384 /* Void */) { context.approximateLength += 4; - return ts.createKeywordTypeNode(110 /* VoidKeyword */); + return ts.factory.createKeywordTypeNode(113 /* VoidKeyword */); } if (type.flags & 32768 /* Undefined */) { context.approximateLength += 9; - return ts.createKeywordTypeNode(146 /* UndefinedKeyword */); + return ts.factory.createKeywordTypeNode(149 /* UndefinedKeyword */); } if (type.flags & 65536 /* Null */) { context.approximateLength += 4; - return ts.createKeywordTypeNode(100 /* NullKeyword */); + return ts.factory.createLiteralTypeNode(ts.factory.createNull()); } if (type.flags & 131072 /* Never */) { context.approximateLength += 5; - return ts.createKeywordTypeNode(137 /* NeverKeyword */); + return ts.factory.createKeywordTypeNode(140 /* NeverKeyword */); } if (type.flags & 4096 /* ESSymbol */) { context.approximateLength += 6; - return ts.createKeywordTypeNode(144 /* SymbolKeyword */); + return ts.factory.createKeywordTypeNode(147 /* SymbolKeyword */); } if (type.flags & 67108864 /* NonPrimitive */) { context.approximateLength += 6; - return ts.createKeywordTypeNode(141 /* ObjectKeyword */); + return ts.factory.createKeywordTypeNode(144 /* ObjectKeyword */); } if (isThisTypeParameter(type)) { if (context.flags & 4194304 /* InObjectTypeLiteral */) { @@ -38755,12 +46271,12 @@ var ts; } } context.approximateLength += 4; - return ts.createThis(); + return ts.factory.createThisTypeNode(); } if (!inTypeAlias && type.aliasSymbol && (context.flags & 16384 /* UseAliasDefinedOutsideCurrentScope */ || isTypeSymbolAccessible(type.aliasSymbol, context.enclosingDeclaration))) { var typeArgumentNodes = mapToTypeNodes(type.aliasTypeArguments, context); if (isReservedMemberName(type.aliasSymbol.escapedName) && !(type.aliasSymbol.flags & 32 /* Class */)) - return ts.createTypeReferenceNode(ts.createIdentifier(""), typeArgumentNodes); + return ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(""), typeArgumentNodes); return symbolToTypeNode(type.aliasSymbol, context, 788968 /* Type */, typeArgumentNodes); } var objectFlags = ts.getObjectFlags(type); @@ -38771,19 +46287,19 @@ var ts; if (type.flags & 262144 /* TypeParameter */ || objectFlags & 3 /* ClassOrInterface */) { if (type.flags & 262144 /* TypeParameter */ && ts.contains(context.inferTypeParameters, type)) { context.approximateLength += (ts.symbolName(type.symbol).length + 6); - return ts.createInferTypeNode(typeParameterToDeclarationWithConstraint(type, context, /*constraintNode*/ undefined)); + return ts.factory.createInferTypeNode(typeParameterToDeclarationWithConstraint(type, context, /*constraintNode*/ undefined)); } if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && type.flags & 262144 /* TypeParameter */ && !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration)) { var name = typeParameterToName(type, context); context.approximateLength += ts.idText(name).length; - return ts.createTypeReferenceNode(ts.createIdentifier(ts.idText(name)), /*typeArguments*/ undefined); + return ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(ts.idText(name)), /*typeArguments*/ undefined); } // Ignore constraint/default when creating a usage (as opposed to declaration) of a type parameter. return type.symbol ? symbolToTypeNode(type.symbol, context, 788968 /* Type */) - : ts.createTypeReferenceNode(ts.createIdentifier("?"), /*typeArguments*/ undefined); + : ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("?"), /*typeArguments*/ undefined); } if (type.flags & (1048576 /* Union */ | 2097152 /* Intersection */)) { var types = type.flags & 1048576 /* Union */ ? formatUnionTypes(type.types) : type.types; @@ -38792,7 +46308,7 @@ var ts; } var typeNodes = mapToTypeNodes(types, context, /*isBareList*/ true); if (typeNodes && typeNodes.length > 0) { - var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 178 /* UnionType */ : 179 /* IntersectionType */, typeNodes); + var unionOrIntersectionTypeNode = type.flags & 1048576 /* Union */ ? ts.factory.createUnionTypeNode(typeNodes) : ts.factory.createIntersectionTypeNode(typeNodes); return unionOrIntersectionTypeNode; } else { @@ -38811,13 +46327,13 @@ var ts; var indexedType = type.type; context.approximateLength += 6; var indexTypeNode = typeToTypeNodeHelper(indexedType, context); - return ts.createTypeOperatorNode(indexTypeNode); + return ts.factory.createTypeOperatorNode(137 /* KeyOfKeyword */, indexTypeNode); } if (type.flags & 8388608 /* IndexedAccess */) { var objectTypeNode = typeToTypeNodeHelper(type.objectType, context); var indexTypeNode = typeToTypeNodeHelper(type.indexType, context); context.approximateLength += 2; - return ts.createIndexedAccessTypeNode(objectTypeNode, indexTypeNode); + return ts.factory.createIndexedAccessTypeNode(objectTypeNode, indexTypeNode); } if (type.flags & 16777216 /* Conditional */) { var checkTypeNode = typeToTypeNodeHelper(type.checkType, context); @@ -38828,19 +46344,19 @@ var ts; var trueTypeNode = typeToTypeNodeOrCircularityElision(getTrueTypeFromConditionalType(type)); var falseTypeNode = typeToTypeNodeOrCircularityElision(getFalseTypeFromConditionalType(type)); context.approximateLength += 15; - return ts.createConditionalTypeNode(checkTypeNode, extendsTypeNode, trueTypeNode, falseTypeNode); + return ts.factory.createConditionalTypeNode(checkTypeNode, extendsTypeNode, trueTypeNode, falseTypeNode); } if (type.flags & 33554432 /* Substitution */) { return typeToTypeNodeHelper(type.baseType, context); } return ts.Debug.fail("Should be unreachable."); function typeToTypeNodeOrCircularityElision(type) { - var _a, _b; + var _a, _b, _c; if (type.flags & 1048576 /* Union */) { - if (context.visitedTypes && context.visitedTypes.has("" + getTypeId(type))) { + if ((_a = context.visitedTypes) === null || _a === void 0 ? void 0 : _a.has(getTypeId(type))) { if (!(context.flags & 131072 /* AllowAnonymousIdentifier */)) { context.encounteredError = true; - (_b = (_a = context.tracker) === null || _a === void 0 ? void 0 : _a.reportCyclicStructureError) === null || _b === void 0 ? void 0 : _b.call(_a); + (_c = (_b = context.tracker) === null || _b === void 0 ? void 0 : _b.reportCyclicStructureError) === null || _c === void 0 ? void 0 : _c.call(_b); } return createElidedInformationPlaceholder(context); } @@ -38850,25 +46366,26 @@ var ts; } function createMappedTypeNodeFromType(type) { ts.Debug.assert(!!(type.flags & 524288 /* Object */)); - var readonlyToken = type.declaration.readonlyToken ? ts.createToken(type.declaration.readonlyToken.kind) : undefined; - var questionToken = type.declaration.questionToken ? ts.createToken(type.declaration.questionToken.kind) : undefined; + var readonlyToken = type.declaration.readonlyToken ? ts.factory.createToken(type.declaration.readonlyToken.kind) : undefined; + var questionToken = type.declaration.questionToken ? ts.factory.createToken(type.declaration.questionToken.kind) : undefined; var appropriateConstraintTypeNode; if (isMappedTypeWithKeyofConstraintDeclaration(type)) { // We have a { [P in keyof T]: X } // We do this to ensure we retain the toplevel keyof-ness of the type which may be lost due to keyof distribution during `getConstraintTypeFromMappedType` - appropriateConstraintTypeNode = ts.createTypeOperatorNode(typeToTypeNodeHelper(getModifiersTypeFromMappedType(type), context)); + appropriateConstraintTypeNode = ts.factory.createTypeOperatorNode(137 /* KeyOfKeyword */, typeToTypeNodeHelper(getModifiersTypeFromMappedType(type), context)); } else { appropriateConstraintTypeNode = typeToTypeNodeHelper(getConstraintTypeFromMappedType(type), context); } var typeParameterNode = typeParameterToDeclarationWithConstraint(getTypeParameterFromMappedType(type), context, appropriateConstraintTypeNode); var templateTypeNode = typeToTypeNodeHelper(getTemplateTypeFromMappedType(type), context); - var mappedTypeNode = ts.createMappedTypeNode(readonlyToken, typeParameterNode, questionToken, templateTypeNode); + var mappedTypeNode = ts.factory.createMappedTypeNode(readonlyToken, typeParameterNode, questionToken, templateTypeNode); context.approximateLength += 10; return ts.setEmitFlags(mappedTypeNode, 1 /* SingleLine */); } function createAnonymousTypeNode(type) { - var typeId = "" + type.id; + var _a; + var typeId = type.id; var symbol = type.symbol; if (symbol) { if (isJSConstructor(symbol.valueDeclaration)) { @@ -38877,12 +46394,12 @@ var ts; return symbolToTypeNode(symbol, context, isInstanceType); } // Always use 'typeof T' for type of class, enum, and module objects - else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 214 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) || + else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 218 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) || symbol.flags & (384 /* Enum */ | 512 /* ValueModule */) || shouldWriteTypeOfFunctionSymbol()) { return symbolToTypeNode(symbol, context, 111551 /* Value */); } - else if (context.visitedTypes && context.visitedTypes.has(typeId)) { + else if ((_a = context.visitedTypes) === null || _a === void 0 ? void 0 : _a.has(typeId)) { // If type is an anonymous type literal in a type alias declaration, use type alias name var typeAlias = getTypeAliasForTypeLiteral(type); if (typeAlias) { @@ -38902,22 +46419,23 @@ var ts; return createTypeNodeFromObjectType(type); } function shouldWriteTypeOfFunctionSymbol() { + var _a; var isStaticMethodSymbol = !!(symbol.flags & 8192 /* Method */) && // typeof static method - ts.some(symbol.declarations, function (declaration) { return ts.hasModifier(declaration, 32 /* Static */); }); + ts.some(symbol.declarations, function (declaration) { return ts.hasSyntacticModifier(declaration, 32 /* Static */); }); var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) && (symbol.parent || // is exported function symbol ts.forEach(symbol.declarations, function (declaration) { - return declaration.parent.kind === 290 /* SourceFile */ || declaration.parent.kind === 250 /* ModuleBlock */; + return declaration.parent.kind === 294 /* SourceFile */ || declaration.parent.kind === 254 /* ModuleBlock */; })); if (isStaticMethodSymbol || isNonLocalFunctionSymbol) { // typeof is allowed only for static/non local functions - return (!!(context.flags & 4096 /* UseTypeOfFunction */) || (context.visitedTypes && context.visitedTypes.has(typeId))) && // it is type of the symbol uses itself recursively + return (!!(context.flags & 4096 /* UseTypeOfFunction */) || ((_a = context.visitedTypes) === null || _a === void 0 ? void 0 : _a.has(typeId))) && // it is type of the symbol uses itself recursively (!(context.flags & 8 /* UseStructuralFallback */) || isValueSymbolAccessible(symbol, context.enclosingDeclaration)); // And the build is going to succeed without visibility error or there is no structural fallback allowed } } } function visitAndTransformType(type, transform) { - var typeId = "" + type.id; + var typeId = type.id; var isConstructorObject = ts.getObjectFlags(type) & 16 /* Anonymous */ && type.symbol && type.symbol.flags & 32 /* Class */; var id = ts.getObjectFlags(type) & 4 /* Reference */ && type.node ? "N" + getNodeId(type.node) : type.symbol ? (isConstructorObject ? "+" : "") + getSymbolId(type.symbol) : @@ -38925,10 +46443,10 @@ var ts; // Since instantiations of the same anonymous type have the same symbol, tracking symbols instead // of types allows us to catch circular references to instantiations of the same anonymous type if (!context.visitedTypes) { - context.visitedTypes = ts.createMap(); + context.visitedTypes = new ts.Set(); } if (id && !context.symbolDepth) { - context.symbolDepth = ts.createMap(); + context.symbolDepth = new ts.Map(); } var depth; if (id) { @@ -38938,7 +46456,7 @@ var ts; } context.symbolDepth.set(id, depth + 1); } - context.visitedTypes.set(typeId, true); + context.visitedTypes.add(typeId); var result = transform(type); context.visitedTypes.delete(typeId); if (id) { @@ -38947,23 +46465,23 @@ var ts; return result; } function createTypeNodeFromObjectType(type) { - if (isGenericMappedType(type)) { + if (isGenericMappedType(type) || type.containsError) { return createMappedTypeNodeFromType(type); } var resolved = resolveStructuredTypeMembers(type); if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) { if (!resolved.callSignatures.length && !resolved.constructSignatures.length) { context.approximateLength += 2; - return ts.setEmitFlags(ts.createTypeLiteralNode(/*members*/ undefined), 1 /* SingleLine */); + return ts.setEmitFlags(ts.factory.createTypeLiteralNode(/*members*/ undefined), 1 /* SingleLine */); } if (resolved.callSignatures.length === 1 && !resolved.constructSignatures.length) { var signature = resolved.callSignatures[0]; - var signatureNode = signatureToSignatureDeclarationHelper(signature, 170 /* FunctionType */, context); + var signatureNode = signatureToSignatureDeclarationHelper(signature, 173 /* FunctionType */, context); return signatureNode; } if (resolved.constructSignatures.length === 1 && !resolved.callSignatures.length) { var signature = resolved.constructSignatures[0]; - var signatureNode = signatureToSignatureDeclarationHelper(signature, 171 /* ConstructorType */, context); + var signatureNode = signatureToSignatureDeclarationHelper(signature, 174 /* ConstructorType */, context); return signatureNode; } } @@ -38971,7 +46489,7 @@ var ts; context.flags |= 4194304 /* InObjectTypeLiteral */; var members = createTypeNodesFromResolvedType(resolved); context.flags = savedFlags; - var typeLiteralNode = ts.createTypeLiteralNode(members); + var typeLiteralNode = ts.factory.createTypeLiteralNode(members); context.approximateLength += 2; return ts.setEmitFlags(typeLiteralNode, (context.flags & 1024 /* MultilineObjectLiterals */) ? 0 : 1 /* SingleLine */); } @@ -38980,30 +46498,40 @@ var ts; if (type.target === globalArrayType || type.target === globalReadonlyArrayType) { if (context.flags & 2 /* WriteArrayAsGenericType */) { var typeArgumentNode = typeToTypeNodeHelper(typeArguments[0], context); - return ts.createTypeReferenceNode(type.target === globalArrayType ? "Array" : "ReadonlyArray", [typeArgumentNode]); + return ts.factory.createTypeReferenceNode(type.target === globalArrayType ? "Array" : "ReadonlyArray", [typeArgumentNode]); } var elementType = typeToTypeNodeHelper(typeArguments[0], context); - var arrayType = ts.createArrayTypeNode(elementType); - return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(138 /* ReadonlyKeyword */, arrayType); + var arrayType = ts.factory.createArrayTypeNode(elementType); + return type.target === globalArrayType ? arrayType : ts.factory.createTypeOperatorNode(141 /* ReadonlyKeyword */, arrayType); } else if (type.target.objectFlags & 8 /* Tuple */) { if (typeArguments.length > 0) { var arity = getTypeReferenceArity(type); var tupleConstituentNodes = mapToTypeNodes(typeArguments.slice(0, arity), context); - var hasRestElement = type.target.hasRestElement; if (tupleConstituentNodes) { - for (var i = type.target.minLength; i < Math.min(arity, tupleConstituentNodes.length); i++) { - tupleConstituentNodes[i] = hasRestElement && i === arity - 1 ? - ts.createRestTypeNode(ts.createArrayTypeNode(tupleConstituentNodes[i])) : - ts.createOptionalTypeNode(tupleConstituentNodes[i]); + if (type.target.labeledElementDeclarations) { + for (var i = 0; i < tupleConstituentNodes.length; i++) { + var flags = type.target.elementFlags[i]; + tupleConstituentNodes[i] = ts.factory.createNamedTupleMember(flags & 12 /* Variable */ ? ts.factory.createToken(25 /* DotDotDotToken */) : undefined, ts.factory.createIdentifier(ts.unescapeLeadingUnderscores(getTupleElementLabel(type.target.labeledElementDeclarations[i]))), flags & 2 /* Optional */ ? ts.factory.createToken(57 /* QuestionToken */) : undefined, flags & 4 /* Rest */ ? ts.factory.createArrayTypeNode(tupleConstituentNodes[i]) : + tupleConstituentNodes[i]); + } } - var tupleTypeNode = ts.createTupleTypeNode(tupleConstituentNodes); - return type.target.readonly ? ts.createTypeOperatorNode(138 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode; + else { + for (var i = 0; i < Math.min(arity, tupleConstituentNodes.length); i++) { + var flags = type.target.elementFlags[i]; + tupleConstituentNodes[i] = + flags & 12 /* Variable */ ? ts.factory.createRestTypeNode(flags & 4 /* Rest */ ? ts.factory.createArrayTypeNode(tupleConstituentNodes[i]) : tupleConstituentNodes[i]) : + flags & 2 /* Optional */ ? ts.factory.createOptionalTypeNode(tupleConstituentNodes[i]) : + tupleConstituentNodes[i]; + } + } + var tupleTypeNode = ts.setEmitFlags(ts.factory.createTupleTypeNode(tupleConstituentNodes), 1 /* SingleLine */); + return type.target.readonly ? ts.factory.createTypeOperatorNode(141 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode; } } if (context.encounteredError || (context.flags & 524288 /* AllowEmptyTuple */)) { - var tupleTypeNode = ts.createTupleTypeNode([]); - return type.target.readonly ? ts.createTypeOperatorNode(138 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode; + var tupleTypeNode = ts.setEmitFlags(ts.factory.createTupleTypeNode([]), 1 /* SingleLine */); + return type.target.readonly ? ts.factory.createTypeOperatorNode(141 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode; } context.encounteredError = true; return undefined; // TODO: GH#18217 @@ -39054,31 +46582,43 @@ var ts; function appendReferenceToType(root, ref) { if (ts.isImportTypeNode(root)) { // first shift type arguments - var innerParams = root.typeArguments; - if (root.qualifier) { - (ts.isIdentifier(root.qualifier) ? root.qualifier : root.qualifier.right).typeArguments = innerParams; + var typeArguments = root.typeArguments; + var qualifier = root.qualifier; + if (qualifier) { + if (ts.isIdentifier(qualifier)) { + qualifier = ts.factory.updateIdentifier(qualifier, typeArguments); + } + else { + qualifier = ts.factory.updateQualifiedName(qualifier, qualifier.left, ts.factory.updateIdentifier(qualifier.right, typeArguments)); + } } - root.typeArguments = ref.typeArguments; + typeArguments = ref.typeArguments; // then move qualifiers var ids = getAccessStack(ref); for (var _i = 0, ids_1 = ids; _i < ids_1.length; _i++) { var id = ids_1[_i]; - root.qualifier = root.qualifier ? ts.createQualifiedName(root.qualifier, id) : id; + qualifier = qualifier ? ts.factory.createQualifiedName(qualifier, id) : id; } - return root; + return ts.factory.updateImportTypeNode(root, root.argument, qualifier, typeArguments, root.isTypeOf); } else { // first shift type arguments - var innerParams = root.typeArguments; - (ts.isIdentifier(root.typeName) ? root.typeName : root.typeName.right).typeArguments = innerParams; - root.typeArguments = ref.typeArguments; + var typeArguments = root.typeArguments; + var typeName = root.typeName; + if (ts.isIdentifier(typeName)) { + typeName = ts.factory.updateIdentifier(typeName, typeArguments); + } + else { + typeName = ts.factory.updateQualifiedName(typeName, typeName.left, ts.factory.updateIdentifier(typeName.right, typeArguments)); + } + typeArguments = ref.typeArguments; // then move qualifiers var ids = getAccessStack(ref); for (var _a = 0, ids_2 = ids; _a < ids_2.length; _a++) { var id = ids_2[_a]; - root.typeName = ts.createQualifiedName(root.typeName, id); + typeName = ts.factory.createQualifiedName(typeName, id); } - return root; + return ts.factory.updateTypeReferenceNode(root, typeName, typeArguments); } } function getAccessStack(ref) { @@ -39093,30 +46633,29 @@ var ts; } function createTypeNodesFromResolvedType(resolvedType) { if (checkTruncationLength(context)) { - return [ts.createPropertySignature(/*modifiers*/ undefined, "...", /*questionToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined)]; + return [ts.factory.createPropertySignature(/*modifiers*/ undefined, "...", /*questionToken*/ undefined, /*type*/ undefined)]; } var typeElements = []; for (var _i = 0, _a = resolvedType.callSignatures; _i < _a.length; _i++) { var signature = _a[_i]; - typeElements.push(signatureToSignatureDeclarationHelper(signature, 165 /* CallSignature */, context)); + typeElements.push(signatureToSignatureDeclarationHelper(signature, 168 /* CallSignature */, context)); } for (var _b = 0, _c = resolvedType.constructSignatures; _b < _c.length; _b++) { var signature = _c[_b]; - typeElements.push(signatureToSignatureDeclarationHelper(signature, 166 /* ConstructSignature */, context)); + typeElements.push(signatureToSignatureDeclarationHelper(signature, 169 /* ConstructSignature */, context)); } if (resolvedType.stringIndexInfo) { var indexSignature = void 0; if (resolvedType.objectFlags & 2048 /* ReverseMapped */) { - indexSignature = indexInfoToIndexSignatureDeclarationHelper(createIndexInfo(anyType, resolvedType.stringIndexInfo.isReadonly, resolvedType.stringIndexInfo.declaration), 0 /* String */, context); - indexSignature.type = createElidedInformationPlaceholder(context); + indexSignature = indexInfoToIndexSignatureDeclarationHelper(createIndexInfo(anyType, resolvedType.stringIndexInfo.isReadonly, resolvedType.stringIndexInfo.declaration), 0 /* String */, context, createElidedInformationPlaceholder(context)); } else { - indexSignature = indexInfoToIndexSignatureDeclarationHelper(resolvedType.stringIndexInfo, 0 /* String */, context); + indexSignature = indexInfoToIndexSignatureDeclarationHelper(resolvedType.stringIndexInfo, 0 /* String */, context, /*typeNode*/ undefined); } typeElements.push(indexSignature); } if (resolvedType.numberIndexInfo) { - typeElements.push(indexInfoToIndexSignatureDeclarationHelper(resolvedType.numberIndexInfo, 1 /* Number */, context)); + typeElements.push(indexInfoToIndexSignatureDeclarationHelper(resolvedType.numberIndexInfo, 1 /* Number */, context, /*typeNode*/ undefined)); } var properties = resolvedType.properties; if (!properties) { @@ -39135,7 +46674,7 @@ var ts; } } if (checkTruncationLength(context) && (i + 2 < properties.length - 1)) { - typeElements.push(ts.createPropertySignature(/*modifiers*/ undefined, "... " + (properties.length - i) + " more ...", /*questionToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined)); + typeElements.push(ts.factory.createPropertySignature(/*modifiers*/ undefined, "... " + (properties.length - i) + " more ...", /*questionToken*/ undefined, /*type*/ undefined)); addPropertyToElementList(properties[properties.length - 1], context, typeElements); break; } @@ -39147,9 +46686,9 @@ var ts; function createElidedInformationPlaceholder(context) { context.approximateLength += 3; if (!(context.flags & 1 /* NoTruncation */)) { - return ts.createTypeReferenceNode(ts.createIdentifier("..."), /*typeArguments*/ undefined); + return ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("..."), /*typeArguments*/ undefined); } - return ts.createKeywordTypeNode(125 /* AnyKeyword */); + return ts.factory.createKeywordTypeNode(128 /* AnyKeyword */); } function addPropertyToElementList(propertySymbol, context, typeElements) { var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 8192 /* ReverseMapped */); @@ -39174,14 +46713,12 @@ var ts; context.enclosingDeclaration = saveEnclosingDeclaration; var propertyName = getPropertyNameNodeForSymbol(propertySymbol, context); context.approximateLength += (ts.symbolName(propertySymbol).length + 1); - var optionalToken = propertySymbol.flags & 16777216 /* Optional */ ? ts.createToken(57 /* QuestionToken */) : undefined; + var optionalToken = propertySymbol.flags & 16777216 /* Optional */ ? ts.factory.createToken(57 /* QuestionToken */) : undefined; if (propertySymbol.flags & (16 /* Function */ | 8192 /* Method */) && !getPropertiesOfObjectType(propertyType).length && !isReadonlySymbol(propertySymbol)) { var signatures = getSignaturesOfType(filterType(propertyType, function (t) { return !(t.flags & 32768 /* Undefined */); }), 0 /* Call */); for (var _i = 0, signatures_1 = signatures; _i < signatures_1.length; _i++) { var signature = signatures_1[_i]; - var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 160 /* MethodSignature */, context); - methodDeclaration.name = propertyName; - methodDeclaration.questionToken = optionalToken; + var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 163 /* MethodSignature */, context, { name: propertyName, questionToken: optionalToken }); typeElements.push(preserveCommentsOn(methodDeclaration)); } } @@ -39193,20 +46730,19 @@ var ts; propertyTypeNode = createElidedInformationPlaceholder(context); } else { - propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : ts.createKeywordTypeNode(125 /* AnyKeyword */); + propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : ts.factory.createKeywordTypeNode(128 /* AnyKeyword */); } context.flags = savedFlags; - var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(138 /* ReadonlyKeyword */)] : undefined; + var modifiers = isReadonlySymbol(propertySymbol) ? [ts.factory.createToken(141 /* ReadonlyKeyword */)] : undefined; if (modifiers) { context.approximateLength += 9; } - var propertySignature = ts.createPropertySignature(modifiers, propertyName, optionalToken, propertyTypeNode, - /*initializer*/ undefined); + var propertySignature = ts.factory.createPropertySignature(modifiers, propertyName, optionalToken, propertyTypeNode); typeElements.push(preserveCommentsOn(propertySignature)); } function preserveCommentsOn(node) { - if (ts.some(propertySymbol.declarations, function (d) { return d.kind === 323 /* JSDocPropertyTag */; })) { - var d = ts.find(propertySymbol.declarations, function (d) { return d.kind === 323 /* JSDocPropertyTag */; }); + if (ts.some(propertySymbol.declarations, function (d) { return d.kind === 328 /* JSDocPropertyTag */; })) { + var d = ts.find(propertySymbol.declarations, function (d) { return d.kind === 328 /* JSDocPropertyTag */; }); var commentText = d.comment; if (commentText) { ts.setSyntheticLeadingComments(node, [{ kind: 3 /* MultiLineCommentTrivia */, text: "*\n * " + commentText.replace(/\n/g, "\n * ") + "\n ", pos: -1, end: -1, hasTrailingNewLine: true }]); @@ -39223,12 +46759,12 @@ var ts; if (ts.some(types)) { if (checkTruncationLength(context)) { if (!isBareList) { - return [ts.createTypeReferenceNode("...", /*typeArguments*/ undefined)]; + return [ts.factory.createTypeReferenceNode("...", /*typeArguments*/ undefined)]; } else if (types.length > 2) { return [ typeToTypeNodeHelper(types[0], context), - ts.createTypeReferenceNode("... " + (types.length - 2) + " more ...", /*typeArguments*/ undefined), + ts.factory.createTypeReferenceNode("... " + (types.length - 2) + " more ...", /*typeArguments*/ undefined), typeToTypeNodeHelper(types[types.length - 1], context) ]; } @@ -39236,25 +46772,25 @@ var ts; var mayHaveNameCollisions = !(context.flags & 64 /* UseFullyQualifiedType */); /** Map from type reference identifier text to [type, index in `result` where the type node is] */ var seenNames = mayHaveNameCollisions ? ts.createUnderscoreEscapedMultiMap() : undefined; - var result_3 = []; + var result_4 = []; var i = 0; for (var _i = 0, types_1 = types; _i < types_1.length; _i++) { var type = types_1[_i]; i++; if (checkTruncationLength(context) && (i + 2 < types.length - 1)) { - result_3.push(ts.createTypeReferenceNode("... " + (types.length - i) + " more ...", /*typeArguments*/ undefined)); + result_4.push(ts.factory.createTypeReferenceNode("... " + (types.length - i) + " more ...", /*typeArguments*/ undefined)); var typeNode_1 = typeToTypeNodeHelper(types[types.length - 1], context); if (typeNode_1) { - result_3.push(typeNode_1); + result_4.push(typeNode_1); } break; } context.approximateLength += 2; // Account for whitespace + separator var typeNode = typeToTypeNodeHelper(type, context); if (typeNode) { - result_3.push(typeNode); + result_4.push(typeNode); if (seenNames && ts.isIdentifierTypeReference(typeNode)) { - seenNames.add(typeNode.typeName.escapedText, [type, result_3.length - 1]); + seenNames.add(typeNode.typeName.escapedText, [type, result_4.length - 1]); } } } @@ -39276,13 +46812,13 @@ var ts; })) { for (var _i = 0, types_2 = types; _i < types_2.length; _i++) { var _a = types_2[_i], type = _a[0], resultIndex = _a[1]; - result_3[resultIndex] = typeToTypeNodeHelper(type, context); + result_4[resultIndex] = typeToTypeNodeHelper(type, context); } } }); context.flags = saveContextFlags; } - return result_3; + return result_4; } } function typesAreSameReference(a, b) { @@ -39290,24 +46826,27 @@ var ts; || !!a.symbol && a.symbol === b.symbol || !!a.aliasSymbol && a.aliasSymbol === b.aliasSymbol; } - function indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context) { + function indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context, typeNode) { var name = ts.getNameFromIndexInfo(indexInfo) || "x"; - var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 143 /* StringKeyword */ : 140 /* NumberKeyword */); - var indexingParameter = ts.createParameter( + var indexerTypeNode = ts.factory.createKeywordTypeNode(kind === 0 /* String */ ? 146 /* StringKeyword */ : 143 /* NumberKeyword */); + var indexingParameter = ts.factory.createParameterDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name, /*questionToken*/ undefined, indexerTypeNode, /*initializer*/ undefined); - var typeNode = typeToTypeNodeHelper(indexInfo.type || anyType, context); + if (!typeNode) { + typeNode = typeToTypeNodeHelper(indexInfo.type || anyType, context); + } if (!indexInfo.type && !(context.flags & 2097152 /* AllowEmptyIndexInfoType */)) { context.encounteredError = true; } context.approximateLength += (name.length + 4); - return ts.createIndexSignature( - /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(138 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode); + return ts.factory.createIndexSignature( + /*decorators*/ undefined, indexInfo.isReadonly ? [ts.factory.createToken(141 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode); } - function signatureToSignatureDeclarationHelper(signature, kind, context, privateSymbolVisitor, bundledImports) { + function signatureToSignatureDeclarationHelper(signature, kind, context, options) { + var _a, _b, _c, _d; var suppressAny = context.flags & 256 /* SuppressAnyReturnType */; if (suppressAny) context.flags &= ~256 /* SuppressAnyReturnType */; // suppress only toplevel `any`s @@ -39319,7 +46858,7 @@ var ts; else { typeParameters = signature.typeParameters && signature.typeParameters.map(function (parameter) { return typeParameterToDeclaration(parameter, context); }); } - var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 162 /* Constructor */, privateSymbolVisitor, bundledImports); }); + var parameters = getExpandedParameters(signature, /*skipUnionExpanding*/ true)[0].map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 165 /* Constructor */, options === null || options === void 0 ? void 0 : options.privateSymbolVisitor, options === null || options === void 0 ? void 0 : options.bundledImports); }); if (signature.thisParameter) { var thisParameter = symbolToParameterDeclaration(signature.thisParameter, context); parameters.unshift(thisParameter); @@ -39328,25 +46867,43 @@ var ts; var typePredicate = getTypePredicateOfSignature(signature); if (typePredicate) { var assertsModifier = typePredicate.kind === 2 /* AssertsThis */ || typePredicate.kind === 3 /* AssertsIdentifier */ ? - ts.createToken(124 /* AssertsKeyword */) : + ts.factory.createToken(127 /* AssertsKeyword */) : undefined; var parameterName = typePredicate.kind === 1 /* Identifier */ || typePredicate.kind === 3 /* AssertsIdentifier */ ? - ts.setEmitFlags(ts.createIdentifier(typePredicate.parameterName), 16777216 /* NoAsciiEscaping */) : - ts.createThisTypeNode(); + ts.setEmitFlags(ts.factory.createIdentifier(typePredicate.parameterName), 16777216 /* NoAsciiEscaping */) : + ts.factory.createThisTypeNode(); var typeNode = typePredicate.type && typeToTypeNodeHelper(typePredicate.type, context); - returnTypeNode = ts.createTypePredicateNodeWithModifier(assertsModifier, parameterName, typeNode); + returnTypeNode = ts.factory.createTypePredicateNode(assertsModifier, parameterName, typeNode); } else { var returnType = getReturnTypeOfSignature(signature); if (returnType && !(suppressAny && isTypeAny(returnType))) { - returnTypeNode = serializeReturnTypeForSignature(context, returnType, signature, privateSymbolVisitor, bundledImports); + returnTypeNode = serializeReturnTypeForSignature(context, returnType, signature, options === null || options === void 0 ? void 0 : options.privateSymbolVisitor, options === null || options === void 0 ? void 0 : options.bundledImports); } else if (!suppressAny) { - returnTypeNode = ts.createKeywordTypeNode(125 /* AnyKeyword */); + returnTypeNode = ts.factory.createKeywordTypeNode(128 /* AnyKeyword */); } } context.approximateLength += 3; // Usually a signature contributes a few more characters than this, but 3 is the minimum - return ts.createSignatureDeclaration(kind, typeParameters, parameters, returnTypeNode, typeArguments); + var node = kind === 168 /* CallSignature */ ? ts.factory.createCallSignature(typeParameters, parameters, returnTypeNode) : + kind === 169 /* ConstructSignature */ ? ts.factory.createConstructSignature(typeParameters, parameters, returnTypeNode) : + kind === 163 /* MethodSignature */ ? ts.factory.createMethodSignature(options === null || options === void 0 ? void 0 : options.modifiers, (_a = options === null || options === void 0 ? void 0 : options.name) !== null && _a !== void 0 ? _a : ts.factory.createIdentifier(""), options === null || options === void 0 ? void 0 : options.questionToken, typeParameters, parameters, returnTypeNode) : + kind === 164 /* MethodDeclaration */ ? ts.factory.createMethodDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, /*asteriskToken*/ undefined, (_b = options === null || options === void 0 ? void 0 : options.name) !== null && _b !== void 0 ? _b : ts.factory.createIdentifier(""), /*questionToken*/ undefined, typeParameters, parameters, returnTypeNode, /*body*/ undefined) : + kind === 165 /* Constructor */ ? ts.factory.createConstructorDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, parameters, /*body*/ undefined) : + kind === 166 /* GetAccessor */ ? ts.factory.createGetAccessorDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, (_c = options === null || options === void 0 ? void 0 : options.name) !== null && _c !== void 0 ? _c : ts.factory.createIdentifier(""), parameters, returnTypeNode, /*body*/ undefined) : + kind === 167 /* SetAccessor */ ? ts.factory.createSetAccessorDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, (_d = options === null || options === void 0 ? void 0 : options.name) !== null && _d !== void 0 ? _d : ts.factory.createIdentifier(""), parameters, /*body*/ undefined) : + kind === 170 /* IndexSignature */ ? ts.factory.createIndexSignature(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, parameters, returnTypeNode) : + kind === 304 /* JSDocFunctionType */ ? ts.factory.createJSDocFunctionType(parameters, returnTypeNode) : + kind === 173 /* FunctionType */ ? ts.factory.createFunctionTypeNode(typeParameters, parameters, returnTypeNode !== null && returnTypeNode !== void 0 ? returnTypeNode : ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(""))) : + kind === 174 /* ConstructorType */ ? ts.factory.createConstructorTypeNode(typeParameters, parameters, returnTypeNode !== null && returnTypeNode !== void 0 ? returnTypeNode : ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(""))) : + kind === 248 /* FunctionDeclaration */ ? ts.factory.createFunctionDeclaration(/*decorators*/ undefined, options === null || options === void 0 ? void 0 : options.modifiers, /*asteriskToken*/ undefined, (options === null || options === void 0 ? void 0 : options.name) ? ts.cast(options.name, ts.isIdentifier) : ts.factory.createIdentifier(""), typeParameters, parameters, returnTypeNode, /*body*/ undefined) : + kind === 205 /* FunctionExpression */ ? ts.factory.createFunctionExpression(options === null || options === void 0 ? void 0 : options.modifiers, /*asteriskToken*/ undefined, (options === null || options === void 0 ? void 0 : options.name) ? ts.cast(options.name, ts.isIdentifier) : ts.factory.createIdentifier(""), typeParameters, parameters, returnTypeNode, ts.factory.createBlock([])) : + kind === 206 /* ArrowFunction */ ? ts.factory.createArrowFunction(options === null || options === void 0 ? void 0 : options.modifiers, typeParameters, parameters, returnTypeNode, /*equalsGreaterThanToken*/ undefined, ts.factory.createBlock([])) : + ts.Debug.assertNever(kind); + if (typeArguments) { + node.typeArguments = ts.factory.createNodeArray(typeArguments); + } + return node; } function typeParameterToDeclarationWithConstraint(type, context, constraintNode) { var savedContextFlags = context.flags; @@ -39355,7 +46912,7 @@ var ts; var defaultParameter = getDefaultFromTypeParameter(type); var defaultParameterNode = defaultParameter && typeToTypeNodeHelper(defaultParameter, context); context.flags = savedContextFlags; - return ts.createTypeParameterDeclaration(name, constraintNode, defaultParameterNode); + return ts.factory.createTypeParameterDeclaration(name, constraintNode, defaultParameterNode); } function typeParameterToDeclaration(type, context, constraint) { if (constraint === void 0) { constraint = getConstraintOfTypeParameter(type); } @@ -39363,27 +46920,30 @@ var ts; return typeParameterToDeclarationWithConstraint(type, context, constraintNode); } function symbolToParameterDeclaration(parameterSymbol, context, preserveModifierFlags, privateSymbolVisitor, bundledImports) { - var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 156 /* Parameter */); + var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 159 /* Parameter */); if (!parameterDeclaration && !ts.isTransientSymbol(parameterSymbol)) { - parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 317 /* JSDocParameterTag */); + parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 322 /* JSDocParameterTag */); } var parameterType = getTypeOfSymbol(parameterSymbol); if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) { parameterType = getOptionalType(parameterType); } + if ((context.flags & 1073741824 /* NoUndefinedOptionalParameterType */) && parameterDeclaration && !ts.isJSDocParameterTag(parameterDeclaration) && isOptionalUninitializedParameter(parameterDeclaration)) { + parameterType = getTypeWithFacts(parameterType, 524288 /* NEUndefined */); + } var parameterTypeNode = serializeTypeForDeclaration(context, parameterType, parameterSymbol, context.enclosingDeclaration, privateSymbolVisitor, bundledImports); - var modifiers = !(context.flags & 8192 /* OmitParameterModifiers */) && preserveModifierFlags && parameterDeclaration && parameterDeclaration.modifiers ? parameterDeclaration.modifiers.map(ts.getSynthesizedClone) : undefined; + var modifiers = !(context.flags & 8192 /* OmitParameterModifiers */) && preserveModifierFlags && parameterDeclaration && parameterDeclaration.modifiers ? parameterDeclaration.modifiers.map(ts.factory.cloneNode) : undefined; var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 32768 /* RestParameter */; - var dotDotDotToken = isRest ? ts.createToken(25 /* DotDotDotToken */) : undefined; + var dotDotDotToken = isRest ? ts.factory.createToken(25 /* DotDotDotToken */) : undefined; var name = parameterDeclaration ? parameterDeclaration.name ? - parameterDeclaration.name.kind === 75 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) : - parameterDeclaration.name.kind === 153 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) : + parameterDeclaration.name.kind === 78 /* Identifier */ ? ts.setEmitFlags(ts.factory.cloneNode(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) : + parameterDeclaration.name.kind === 156 /* QualifiedName */ ? ts.setEmitFlags(ts.factory.cloneNode(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) : cloneBindingName(parameterDeclaration.name) : ts.symbolName(parameterSymbol) : ts.symbolName(parameterSymbol); var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* OptionalParameter */; - var questionToken = isOptional ? ts.createToken(57 /* QuestionToken */) : undefined; - var parameterNode = ts.createParameter( + var questionToken = isOptional ? ts.factory.createToken(57 /* QuestionToken */) : undefined; + var parameterNode = ts.factory.createParameterDeclaration( /*decorators*/ undefined, modifiers, dotDotDotToken, name, questionToken, parameterTypeNode, /*initializer*/ undefined); context.approximateLength += ts.symbolName(parameterSymbol).length + 3; @@ -39395,11 +46955,14 @@ var ts; trackComputedName(node.expression, context.enclosingDeclaration, context); } var visited = ts.visitEachChild(node, elideInitializerAndSetEmitFlags, ts.nullTransformationContext, /*nodesVisitor*/ undefined, elideInitializerAndSetEmitFlags); - var clone = ts.nodeIsSynthesized(visited) ? visited : ts.getSynthesizedClone(visited); - if (clone.kind === 191 /* BindingElement */) { - clone.initializer = undefined; + if (ts.isBindingElement(visited)) { + visited = ts.factory.updateBindingElement(visited, visited.dotDotDotToken, visited.propertyName, visited.name, + /*initializer*/ undefined); } - return ts.setEmitFlags(clone, 1 /* SingleLine */ | 16777216 /* NoAsciiEscaping */); + if (!ts.nodeIsSynthesized(visited)) { + visited = ts.factory.cloneNode(visited); + } + return ts.setEmitFlags(visited, 1 /* SingleLine */ | 16777216 /* NoAsciiEscaping */); } } } @@ -39436,7 +46999,7 @@ var ts; if (!accessibleSymbolChain || needsQualification(accessibleSymbolChain[0], context.enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) { // Go up and add our parent. - var parents_1 = getContainersOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol, context.enclosingDeclaration); + var parents_1 = getContainersOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol, context.enclosingDeclaration, meaning); if (ts.length(parents_1)) { parentSpecifiers = parents_1.map(function (symbol) { return ts.some(symbol.declarations, hasNonGlobalAugmentationExternalModuleSymbol) @@ -39501,18 +47064,19 @@ var ts; var typeParameterNodes; var targetSymbol = getTargetSymbol(symbol); if (targetSymbol.flags & (32 /* Class */ | 64 /* Interface */ | 524288 /* TypeAlias */)) { - typeParameterNodes = ts.createNodeArray(ts.map(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), function (tp) { return typeParameterToDeclaration(tp, context); })); + typeParameterNodes = ts.factory.createNodeArray(ts.map(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), function (tp) { return typeParameterToDeclaration(tp, context); })); } return typeParameterNodes; } function lookupTypeParameterNodes(chain, index, context) { + var _a; ts.Debug.assert(chain && 0 <= index && index < chain.length); var symbol = chain[index]; - var symbolId = "" + getSymbolId(symbol); - if (context.typeParameterSymbolList && context.typeParameterSymbolList.get(symbolId)) { + var symbolId = getSymbolId(symbol); + if ((_a = context.typeParameterSymbolList) === null || _a === void 0 ? void 0 : _a.has(symbolId)) { return undefined; } - (context.typeParameterSymbolList || (context.typeParameterSymbolList = ts.createMap())).set(symbolId, true); + (context.typeParameterSymbolList || (context.typeParameterSymbolList = new ts.Set())).add(symbolId); var typeParameterNodes; if (context.flags & 512 /* WriteTypeParametersInQualifiedName */ && index < (chain.length - 1)) { var parentSymbol = symbol; @@ -39537,11 +47101,12 @@ var ts; return top; } function getSpecifierForModuleSymbol(symbol, context) { - var file = ts.getDeclarationOfKind(symbol, 290 /* SourceFile */); + var _a; + var file = ts.getDeclarationOfKind(symbol, 294 /* SourceFile */); if (!file) { var equivalentFileSymbol = ts.firstDefined(symbol.declarations, function (d) { return getFileSymbolIfFileSymbolExportEqualsContainer(d, symbol); }); if (equivalentFileSymbol) { - file = ts.getDeclarationOfKind(equivalentFileSymbol, 290 /* SourceFile */); + file = ts.getDeclarationOfKind(equivalentFileSymbol, 294 /* SourceFile */); } } if (file && file.moduleName !== undefined) { @@ -39573,7 +47138,7 @@ var ts; var links = getSymbolLinks(symbol); var specifier = links.specifierCache && links.specifierCache.get(contextFile.path); if (!specifier) { - var isBundle_1 = (compilerOptions.out || compilerOptions.outFile); + var isBundle_1 = !!ts.outFile(compilerOptions); // For declaration bundles, we need to generate absolute paths relative to the common source dir for imports, // just like how the declaration emitter does for the ambient module declarations - we can easily accomplish this // using the `baseUrl` compiler option (which we would otherwise never use in declaration emit) and a non-relative @@ -39581,7 +47146,7 @@ var ts; var moduleResolverHost = context.tracker.moduleResolverHost; var specifierCompilerOptions = isBundle_1 ? __assign(__assign({}, compilerOptions), { baseUrl: moduleResolverHost.getCommonSourceDirectory() }) : compilerOptions; specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" })); - links.specifierCache = links.specifierCache || ts.createMap(); + (_a = links.specifierCache) !== null && _a !== void 0 ? _a : (links.specifierCache = new ts.Map()); links.specifierCache.set(contextFile.path, specifier); } return specifier; @@ -39602,7 +47167,7 @@ var ts; context.tracker.reportLikelyUnsafeImportRequiredError(specifier); } } - var lit = ts.createLiteralTypeNode(ts.createLiteral(specifier)); + var lit = ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(specifier)); if (context.tracker.trackExternalModuleSymbolOfImportTypeNode) context.tracker.trackExternalModuleSymbolOfImportTypeNode(chain[0]); context.approximateLength += specifier.length + 10; // specifier + import("") @@ -39611,12 +47176,12 @@ var ts; var lastId = ts.isIdentifier(nonRootParts) ? nonRootParts : nonRootParts.right; lastId.typeArguments = undefined; } - return ts.createImportTypeNode(lit, nonRootParts, typeParameterNodes, isTypeOf); + return ts.factory.createImportTypeNode(lit, nonRootParts, typeParameterNodes, isTypeOf); } else { var splitNode = getTopmostIndexedAccessType(nonRootParts); var qualifier = splitNode.objectType.typeName; - return ts.createIndexedAccessTypeNode(ts.createImportTypeNode(lit, qualifier, typeParameterNodes, isTypeOf), splitNode.indexType); + return ts.factory.createIndexedAccessTypeNode(ts.factory.createImportTypeNode(lit, qualifier, typeParameterNodes, isTypeOf), splitNode.indexType); } } var entityName = createAccessFromSymbolChain(chain, chain.length - 1, 0); @@ -39624,13 +47189,13 @@ var ts; return entityName; // Indexed accesses can never be `typeof` } if (isTypeOf) { - return ts.createTypeQueryNode(entityName); + return ts.factory.createTypeQueryNode(entityName); } else { var lastId = ts.isIdentifier(entityName) ? entityName : entityName.right; var lastTypeArgs = lastId.typeArguments; lastId.typeArguments = undefined; - return ts.createTypeReferenceNode(entityName, lastTypeArgs); + return ts.factory.createTypeReferenceNode(entityName, lastTypeArgs); } function createAccessFromSymbolChain(chain, index, stopper) { var typeParameterNodes = index === (chain.length - 1) ? overrideTypeArguments : lookupTypeParameterNodes(chain, index, context); @@ -39664,20 +47229,20 @@ var ts; // Should use an indexed access var LHS = createAccessFromSymbolChain(chain, index - 1, stopper); if (ts.isIndexedAccessTypeNode(LHS)) { - return ts.createIndexedAccessTypeNode(LHS, ts.createLiteralTypeNode(ts.createLiteral(symbolName))); + return ts.factory.createIndexedAccessTypeNode(LHS, ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(symbolName))); } else { - return ts.createIndexedAccessTypeNode(ts.createTypeReferenceNode(LHS, typeParameterNodes), ts.createLiteralTypeNode(ts.createLiteral(symbolName))); + return ts.factory.createIndexedAccessTypeNode(ts.factory.createTypeReferenceNode(LHS, typeParameterNodes), ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(symbolName))); } } - var identifier = ts.setEmitFlags(ts.createIdentifier(symbolName, typeParameterNodes), 16777216 /* NoAsciiEscaping */); + var identifier = ts.setEmitFlags(ts.factory.createIdentifier(symbolName, typeParameterNodes), 16777216 /* NoAsciiEscaping */); identifier.symbol = symbol; if (index > stopper) { var LHS = createAccessFromSymbolChain(chain, index - 1, stopper); if (!ts.isEntityName(LHS)) { return ts.Debug.fail("Impossible construct - an export of an indexed access cannot be reachable"); } - return ts.createQualifiedName(LHS, identifier); + return ts.factory.createQualifiedName(LHS, identifier); } return identifier; } @@ -39693,29 +47258,30 @@ var ts; return false; } function typeParameterToName(type, context) { + var _a; if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && context.typeParameterNames) { - var cached = context.typeParameterNames.get("" + getTypeId(type)); + var cached = context.typeParameterNames.get(getTypeId(type)); if (cached) { return cached; } } var result = symbolToName(type.symbol, context, 788968 /* Type */, /*expectsIdentifier*/ true); - if (!(result.kind & 75 /* Identifier */)) { - return ts.createIdentifier("(Missing type parameter)"); + if (!(result.kind & 78 /* Identifier */)) { + return ts.factory.createIdentifier("(Missing type parameter)"); } if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */) { var rawtext = result.escapedText; var i = 0; var text = rawtext; - while ((context.typeParameterNamesByText && context.typeParameterNamesByText.get(text)) || typeParameterShadowsNameInScope(text, context, type)) { + while (((_a = context.typeParameterNamesByText) === null || _a === void 0 ? void 0 : _a.has(text)) || typeParameterShadowsNameInScope(text, context, type)) { i++; text = rawtext + "_" + i; } if (text !== rawtext) { - result = ts.createIdentifier(text, result.typeArguments); + result = ts.factory.createIdentifier(text, result.typeArguments); } - (context.typeParameterNames || (context.typeParameterNames = ts.createMap())).set("" + getTypeId(type), result); - (context.typeParameterNamesByText || (context.typeParameterNamesByText = ts.createMap())).set(result.escapedText, true); + (context.typeParameterNames || (context.typeParameterNames = new ts.Map())).set(getTypeId(type), result); + (context.typeParameterNamesByText || (context.typeParameterNamesByText = new ts.Set())).add(result.escapedText); } return result; } @@ -39737,9 +47303,9 @@ var ts; if (index === 0) { context.flags ^= 16777216 /* InInitialEntityName */; } - var identifier = ts.setEmitFlags(ts.createIdentifier(symbolName, typeParameterNodes), 16777216 /* NoAsciiEscaping */); + var identifier = ts.setEmitFlags(ts.factory.createIdentifier(symbolName, typeParameterNodes), 16777216 /* NoAsciiEscaping */); identifier.symbol = symbol; - return index > 0 ? ts.createQualifiedName(createEntityNameFromSymbolChain(chain, index - 1), identifier) : identifier; + return index > 0 ? ts.factory.createQualifiedName(createEntityNameFromSymbolChain(chain, index - 1), identifier) : identifier; } } function symbolToExpression(symbol, context, meaning) { @@ -39757,15 +47323,15 @@ var ts; } var firstChar = symbolName.charCodeAt(0); if (ts.isSingleOrDoubleQuote(firstChar) && ts.some(symbol.declarations, hasNonGlobalAugmentationExternalModuleSymbol)) { - return ts.createLiteral(getSpecifierForModuleSymbol(symbol, context)); + return ts.factory.createStringLiteral(getSpecifierForModuleSymbol(symbol, context)); } var canUsePropertyAccess = firstChar === 35 /* hash */ ? symbolName.length > 1 && ts.isIdentifierStart(symbolName.charCodeAt(1), languageVersion) : ts.isIdentifierStart(firstChar, languageVersion); if (index === 0 || canUsePropertyAccess) { - var identifier = ts.setEmitFlags(ts.createIdentifier(symbolName, typeParameterNodes), 16777216 /* NoAsciiEscaping */); + var identifier = ts.setEmitFlags(ts.factory.createIdentifier(symbolName, typeParameterNodes), 16777216 /* NoAsciiEscaping */); identifier.symbol = symbol; - return index > 0 ? ts.createPropertyAccess(createExpressionFromSymbolChain(chain, index - 1), identifier) : identifier; + return index > 0 ? ts.factory.createPropertyAccessExpression(createExpressionFromSymbolChain(chain, index - 1), identifier) : identifier; } else { if (firstChar === 91 /* openBracket */) { @@ -39774,27 +47340,28 @@ var ts; } var expression = void 0; if (ts.isSingleOrDoubleQuote(firstChar)) { - expression = ts.createLiteral(symbolName.substring(1, symbolName.length - 1).replace(/\\./g, function (s) { return s.substring(1); })); - expression.singleQuote = firstChar === 39 /* singleQuote */; + expression = ts.factory.createStringLiteral(symbolName + .substring(1, symbolName.length - 1) + .replace(/\\./g, function (s) { return s.substring(1); }), firstChar === 39 /* singleQuote */); } else if (("" + +symbolName) === symbolName) { - expression = ts.createLiteral(+symbolName); + expression = ts.factory.createNumericLiteral(+symbolName); } if (!expression) { - expression = ts.setEmitFlags(ts.createIdentifier(symbolName, typeParameterNodes), 16777216 /* NoAsciiEscaping */); + expression = ts.setEmitFlags(ts.factory.createIdentifier(symbolName, typeParameterNodes), 16777216 /* NoAsciiEscaping */); expression.symbol = symbol; } - return ts.createElementAccess(createExpressionFromSymbolChain(chain, index - 1), expression); + return ts.factory.createElementAccessExpression(createExpressionFromSymbolChain(chain, index - 1), expression); } } } + function isStringNamed(d) { + var name = ts.getNameOfDeclaration(d); + return !!name && ts.isStringLiteral(name); + } function isSingleQuotedStringNamed(d) { var name = ts.getNameOfDeclaration(d); - if (name && ts.isStringLiteral(name) && (name.singleQuote || - (!ts.nodeIsSynthesized(name) && ts.startsWith(ts.getTextOfNode(name, /*includeTrivia*/ false), "'")))) { - return true; - } - return false; + return !!(name && ts.isStringLiteral(name) && (name.singleQuote || !ts.nodeIsSynthesized(name) && ts.startsWith(ts.getTextOfNode(name, /*includeTrivia*/ false), "'"))); } function getPropertyNameNodeForSymbol(symbol, context) { var singleQuote = !!ts.length(symbol.declarations) && ts.every(symbol.declarations, isSingleQuotedStringNamed); @@ -39803,10 +47370,11 @@ var ts; return fromNameType; } if (ts.isKnownSymbol(symbol)) { - return ts.createComputedPropertyName(ts.createPropertyAccess(ts.createIdentifier("Symbol"), symbol.escapedName.substr(3))); + return ts.factory.createComputedPropertyName(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("Symbol"), symbol.escapedName.substr(3))); } var rawName = ts.unescapeLeadingUnderscores(symbol.escapedName); - return createPropertyNameNodeForIdentifierOrLiteral(rawName, singleQuote); + var stringNamed = !!ts.length(symbol.declarations) && ts.every(symbol.declarations, isStringNamed); + return createPropertyNameNodeForIdentifierOrLiteral(rawName, stringNamed, singleQuote); } // See getNameForSymbolFromNameType for a stringy equivalent function getPropertyNameNodeForSymbolFromNameType(symbol, context, singleQuote) { @@ -39815,20 +47383,22 @@ var ts; if (nameType.flags & 384 /* StringOrNumberLiteral */) { var name = "" + nameType.value; if (!ts.isIdentifierText(name, compilerOptions.target) && !isNumericLiteralName(name)) { - return ts.createLiteral(name, !!singleQuote); + return ts.factory.createStringLiteral(name, !!singleQuote); } if (isNumericLiteralName(name) && ts.startsWith(name, "-")) { - return ts.createComputedPropertyName(ts.createLiteral(+name)); + return ts.factory.createComputedPropertyName(ts.factory.createNumericLiteral(+name)); } return createPropertyNameNodeForIdentifierOrLiteral(name); } if (nameType.flags & 8192 /* UniqueESSymbol */) { - return ts.createComputedPropertyName(symbolToExpression(nameType.symbol, context, 111551 /* Value */)); + return ts.factory.createComputedPropertyName(symbolToExpression(nameType.symbol, context, 111551 /* Value */)); } } } - function createPropertyNameNodeForIdentifierOrLiteral(name, singleQuote) { - return ts.isIdentifierText(name, compilerOptions.target) ? ts.createIdentifier(name) : ts.createLiteral(isNumericLiteralName(name) && +name >= 0 ? +name : name, !!singleQuote); + function createPropertyNameNodeForIdentifierOrLiteral(name, stringNamed, singleQuote) { + return ts.isIdentifierText(name, compilerOptions.target) ? ts.factory.createIdentifier(name) : + !stringNamed && isNumericLiteralName(name) && +name >= 0 ? ts.factory.createNumericLiteral(+name) : + ts.factory.createStringLiteral(name, !!singleQuote); } function cloneNodeBuilderContext(context) { var initial = __assign({}, context); @@ -39845,13 +47415,13 @@ var ts; // export const x: (x: T) => T // export const y: (x: T_1) => T_1 if (initial.typeParameterNames) { - initial.typeParameterNames = ts.cloneMap(initial.typeParameterNames); + initial.typeParameterNames = new ts.Map(initial.typeParameterNames); } if (initial.typeParameterNamesByText) { - initial.typeParameterNamesByText = ts.cloneMap(initial.typeParameterNamesByText); + initial.typeParameterNamesByText = new ts.Set(initial.typeParameterNamesByText); } if (initial.typeParameterSymbolList) { - initial.typeParameterSymbolList = ts.cloneMap(initial.typeParameterSymbolList); + initial.typeParameterSymbolList = new ts.Set(initial.typeParameterSymbolList); } return initial; } @@ -39872,9 +47442,9 @@ var ts; // try to reuse the existing annotation var existing = ts.getEffectiveTypeAnnotationNode(declWithExistingAnnotation); if (getTypeFromTypeNode(existing) === type && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) { - var result_4 = serializeExistingTypeNode(context, existing, includePrivateSymbol, bundled); - if (result_4) { - return result_4; + var result_5 = serializeExistingTypeNode(context, existing, includePrivateSymbol, bundled); + if (result_5) { + return result_5; } } } @@ -39905,49 +47475,49 @@ var ts; cancellationToken.throwIfCancellationRequested(); } var hadError = false; + var file = ts.getSourceFileOfNode(existing); var transformed = ts.visitNode(existing, visitExistingNodeTreeSymbols); if (hadError) { return undefined; } - return transformed === existing ? ts.getMutableClone(existing) : transformed; + return transformed === existing ? ts.setTextRange(ts.factory.cloneNode(existing), existing) : transformed; function visitExistingNodeTreeSymbols(node) { var _a, _b; // We don't _actually_ support jsdoc namepath types, emit `any` instead - if (ts.isJSDocAllType(node) || node.kind === 302 /* JSDocNamepathType */) { - return ts.createKeywordTypeNode(125 /* AnyKeyword */); + if (ts.isJSDocAllType(node) || node.kind === 306 /* JSDocNamepathType */) { + return ts.factory.createKeywordTypeNode(128 /* AnyKeyword */); } if (ts.isJSDocUnknownType(node)) { - return ts.createKeywordTypeNode(148 /* UnknownKeyword */); + return ts.factory.createKeywordTypeNode(151 /* UnknownKeyword */); } if (ts.isJSDocNullableType(node)) { - return ts.createUnionTypeNode([ts.visitNode(node.type, visitExistingNodeTreeSymbols), ts.createKeywordTypeNode(100 /* NullKeyword */)]); + return ts.factory.createUnionTypeNode([ts.visitNode(node.type, visitExistingNodeTreeSymbols), ts.factory.createLiteralTypeNode(ts.factory.createNull())]); } if (ts.isJSDocOptionalType(node)) { - return ts.createUnionTypeNode([ts.visitNode(node.type, visitExistingNodeTreeSymbols), ts.createKeywordTypeNode(146 /* UndefinedKeyword */)]); + return ts.factory.createUnionTypeNode([ts.visitNode(node.type, visitExistingNodeTreeSymbols), ts.factory.createKeywordTypeNode(149 /* UndefinedKeyword */)]); } if (ts.isJSDocNonNullableType(node)) { return ts.visitNode(node.type, visitExistingNodeTreeSymbols); } if (ts.isJSDocVariadicType(node)) { - return ts.createArrayTypeNode(ts.visitNode(node.type, visitExistingNodeTreeSymbols)); + return ts.factory.createArrayTypeNode(ts.visitNode(node.type, visitExistingNodeTreeSymbols)); } if (ts.isJSDocTypeLiteral(node)) { - return ts.createTypeLiteralNode(ts.map(node.jsDocPropertyTags, function (t) { + return ts.factory.createTypeLiteralNode(ts.map(node.jsDocPropertyTags, function (t) { var name = ts.isIdentifier(t.name) ? t.name : t.name.right; var typeViaParent = getTypeOfPropertyOfType(getTypeFromTypeNode(node), name.escapedText); var overrideTypeNode = typeViaParent && t.typeExpression && getTypeFromTypeNode(t.typeExpression.type) !== typeViaParent ? typeToTypeNodeHelper(typeViaParent, context) : undefined; - return ts.createPropertySignature( - /*modifiers*/ undefined, name, t.typeExpression && ts.isJSDocOptionalType(t.typeExpression.type) ? ts.createToken(57 /* QuestionToken */) : undefined, overrideTypeNode || (t.typeExpression && ts.visitNode(t.typeExpression.type, visitExistingNodeTreeSymbols)) || ts.createKeywordTypeNode(125 /* AnyKeyword */), - /*initializer*/ undefined); + return ts.factory.createPropertySignature( + /*modifiers*/ undefined, name, t.typeExpression && ts.isJSDocOptionalType(t.typeExpression.type) ? ts.factory.createToken(57 /* QuestionToken */) : undefined, overrideTypeNode || (t.typeExpression && ts.visitNode(t.typeExpression.type, visitExistingNodeTreeSymbols)) || ts.factory.createKeywordTypeNode(128 /* AnyKeyword */)); })); } if (ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "") { - return ts.setOriginalNode(ts.createKeywordTypeNode(125 /* AnyKeyword */), node); + return ts.setOriginalNode(ts.factory.createKeywordTypeNode(128 /* AnyKeyword */), node); } if ((ts.isExpressionWithTypeArguments(node) || ts.isTypeReferenceNode(node)) && ts.isJSDocIndexSignature(node)) { - return ts.createTypeLiteralNode([ts.createIndexSignature( + return ts.factory.createTypeLiteralNode([ts.factory.createIndexSignature( /*decorators*/ undefined, - /*modifiers*/ undefined, [ts.createParameter( + /*modifiers*/ undefined, [ts.factory.createParameterDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdotToken*/ undefined, "x", @@ -39956,23 +47526,23 @@ var ts; if (ts.isJSDocFunctionType(node)) { if (ts.isJSDocConstructSignature(node)) { var newTypeNode_1; - return ts.createConstructorTypeNode(ts.visitNodes(node.typeParameters, visitExistingNodeTreeSymbols), ts.mapDefined(node.parameters, function (p, i) { return p.name && ts.isIdentifier(p.name) && p.name.escapedText === "new" ? (newTypeNode_1 = p.type, undefined) : ts.createParameter( + return ts.factory.createConstructorTypeNode(ts.visitNodes(node.typeParameters, visitExistingNodeTreeSymbols), ts.mapDefined(node.parameters, function (p, i) { return p.name && ts.isIdentifier(p.name) && p.name.escapedText === "new" ? (newTypeNode_1 = p.type, undefined) : ts.factory.createParameterDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, getEffectiveDotDotDotForParameter(p), p.name || getEffectiveDotDotDotForParameter(p) ? "args" : "arg" + i, p.questionToken, ts.visitNode(p.type, visitExistingNodeTreeSymbols), - /*initializer*/ undefined); }), ts.visitNode(newTypeNode_1 || node.type, visitExistingNodeTreeSymbols)); + /*modifiers*/ undefined, getEffectiveDotDotDotForParameter(p), getNameForJSDocFunctionParameter(p, i), p.questionToken, ts.visitNode(p.type, visitExistingNodeTreeSymbols), + /*initializer*/ undefined); }), ts.visitNode(newTypeNode_1 || node.type, visitExistingNodeTreeSymbols) || ts.factory.createKeywordTypeNode(128 /* AnyKeyword */)); } else { - return ts.createFunctionTypeNode(ts.visitNodes(node.typeParameters, visitExistingNodeTreeSymbols), ts.map(node.parameters, function (p, i) { return ts.createParameter( + return ts.factory.createFunctionTypeNode(ts.visitNodes(node.typeParameters, visitExistingNodeTreeSymbols), ts.map(node.parameters, function (p, i) { return ts.factory.createParameterDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, getEffectiveDotDotDotForParameter(p), p.name || getEffectiveDotDotDotForParameter(p) ? "args" : "arg" + i, p.questionToken, ts.visitNode(p.type, visitExistingNodeTreeSymbols), - /*initializer*/ undefined); }), ts.visitNode(node.type, visitExistingNodeTreeSymbols)); + /*modifiers*/ undefined, getEffectiveDotDotDotForParameter(p), getNameForJSDocFunctionParameter(p, i), p.questionToken, ts.visitNode(p.type, visitExistingNodeTreeSymbols), + /*initializer*/ undefined); }), ts.visitNode(node.type, visitExistingNodeTreeSymbols) || ts.factory.createKeywordTypeNode(128 /* AnyKeyword */)); } } - if (ts.isTypeReferenceNode(node) && ts.isInJSDoc(node) && (getIntendedTypeFromJSDocTypeReference(node) || unknownSymbol === resolveTypeReferenceName(getTypeReferenceName(node), 788968 /* Type */, /*ignoreErrors*/ true))) { + if (ts.isTypeReferenceNode(node) && ts.isInJSDoc(node) && (!existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(node, getTypeFromTypeNode(node)) || getIntendedTypeFromJSDocTypeReference(node) || unknownSymbol === resolveTypeReferenceName(getTypeReferenceName(node), 788968 /* Type */, /*ignoreErrors*/ true))) { return ts.setOriginalNode(typeToTypeNodeHelper(getTypeFromTypeNode(node), context), node); } if (ts.isLiteralImportTypeNode(node)) { - return ts.updateImportTypeNode(node, ts.updateLiteralTypeNode(node.argument, rewriteModuleSpecifier(node, node.argument.literal)), node.qualifier, ts.visitNodes(node.typeArguments, visitExistingNodeTreeSymbols, ts.isTypeNode), node.isTypeOf); + return ts.factory.updateImportTypeNode(node, ts.factory.updateLiteralTypeNode(node.argument, rewriteModuleSpecifier(node, node.argument.literal)), node.qualifier, ts.visitNodes(node.typeArguments, visitExistingNodeTreeSymbols, ts.isTypeNode), node.isTypeOf); } if (ts.isEntityName(node) || ts.isEntityNameExpression(node)) { var leftmost = ts.getFirstIdentifier(node); @@ -39990,15 +47560,24 @@ var ts; includePrivateSymbol === null || includePrivateSymbol === void 0 ? void 0 : includePrivateSymbol(sym); } if (ts.isIdentifier(node)) { - var name = sym.flags & 262144 /* TypeParameter */ ? typeParameterToName(getDeclaredTypeOfSymbol(sym), context) : ts.getMutableClone(node); + var name = sym.flags & 262144 /* TypeParameter */ ? typeParameterToName(getDeclaredTypeOfSymbol(sym), context) : ts.factory.cloneNode(node); name.symbol = sym; // for quickinfo, which uses identifier symbol information return ts.setEmitFlags(ts.setOriginalNode(name, node), 16777216 /* NoAsciiEscaping */); } } } + if (file && ts.isTupleTypeNode(node) && (ts.getLineAndCharacterOfPosition(file, node.pos).line === ts.getLineAndCharacterOfPosition(file, node.end).line)) { + ts.setEmitFlags(node, 1 /* SingleLine */); + } return ts.visitEachChild(node, visitExistingNodeTreeSymbols, ts.nullTransformationContext); function getEffectiveDotDotDotForParameter(p) { - return p.dotDotDotToken || (p.type && ts.isJSDocVariadicType(p.type) ? ts.createToken(25 /* DotDotDotToken */) : undefined); + return p.dotDotDotToken || (p.type && ts.isJSDocVariadicType(p.type) ? ts.factory.createToken(25 /* DotDotDotToken */) : undefined); + } + /** Note that `new:T` parameters are not handled, but should be before calling this function. */ + function getNameForJSDocFunctionParameter(p, index) { + return p.name && ts.isIdentifier(p.name) && p.name.escapedText === "this" ? "this" + : getEffectiveDotDotDotForParameter(p) ? "args" + : "arg" + index; } function rewriteModuleSpecifier(parent, lit) { if (bundled) { @@ -40012,7 +47591,7 @@ var ts; getCommonSourceDirectory: function () { return context.tracker.moduleResolverHost.getCommonSourceDirectory(); } }; var newName = ts.getResolvedExternalModuleName(resolverHost, targetFile); - return ts.createLiteral(newName); + return ts.factory.createStringLiteral(newName); } } } @@ -40029,8 +47608,8 @@ var ts; } } function symbolTableToDeclarationStatements(symbolTable, context, bundled) { - var serializePropertySymbolForClass = makeSerializePropertySymbol(ts.createProperty, 161 /* MethodDeclaration */, /*useAcessors*/ true); - var serializePropertySymbolForInterfaceWorker = makeSerializePropertySymbol(function (_decorators, mods, name, question, type, initializer) { return ts.createPropertySignature(mods, name, question, type, initializer); }, 160 /* MethodSignature */, /*useAcessors*/ false); + var serializePropertySymbolForClass = makeSerializePropertySymbol(ts.factory.createPropertyDeclaration, 164 /* MethodDeclaration */, /*useAcessors*/ true); + var serializePropertySymbolForInterfaceWorker = makeSerializePropertySymbol(function (_decorators, mods, name, question, type) { return ts.factory.createPropertySignature(mods, name, question, type); }, 163 /* MethodSignature */, /*useAcessors*/ false); // TODO: Use `setOriginalNode` on original declaration names where possible so these declarations see some kind of // declaration mapping // We save the enclosing declaration off here so it's not adjusted by well-meaning declaration @@ -40038,10 +47617,10 @@ var ts; // we're trying to emit from later on) var enclosingDeclaration = context.enclosingDeclaration; var results = []; - var visitedSymbols = ts.createMap(); - var deferredPrivates; + var visitedSymbols = new ts.Set(); + var deferredPrivatesStack = []; var oldcontext = context; - context = __assign(__assign({}, oldcontext), { usedSymbolNames: ts.createMap(), remappedSymbolNames: ts.createMap(), tracker: __assign(__assign({}, oldcontext.tracker), { trackSymbol: function (sym, decl, meaning) { + context = __assign(__assign({}, oldcontext), { usedSymbolNames: new ts.Set(oldcontext.usedSymbolNames), remappedSymbolNames: new ts.Map(), tracker: __assign(__assign({}, oldcontext.tracker), { trackSymbol: function (sym, decl, meaning) { var accessibleResult = isSymbolAccessible(sym, decl, meaning, /*computeALiases*/ false); if (accessibleResult.accessibility === 0 /* Accessible */) { // Lookup the root symbol of the chain of refs we'll use to access it and serialize it @@ -40054,11 +47633,6 @@ var ts; oldcontext.tracker.trackSymbol(sym, decl, meaning); } } }) }); - if (oldcontext.usedSymbolNames) { - oldcontext.usedSymbolNames.forEach(function (_, name) { - context.usedSymbolNames.set(name, true); - }); - } ts.forEachEntry(symbolTable, function (symbol, name) { var baseName = ts.unescapeLeadingUnderscores(name); void getInternalSymbolName(symbol, baseName); // Called to cache values into `usedSymbolNames` and `remappedSymbolNames` @@ -40073,7 +47647,7 @@ var ts; visitSymbolTable(symbolTable); return mergeRedundantStatements(results); function isIdentifierAndNotUndefined(node) { - return !!node && node.kind === 75 /* Identifier */; + return !!node && node.kind === 78 /* Identifier */; } function getNamesOfDeclaration(statement) { if (ts.isVariableStatement(statement)) { @@ -40083,24 +47657,32 @@ var ts; } function flattenExportAssignedNamespace(statements) { var exportAssignment = ts.find(statements, ts.isExportAssignment); - var ns = ts.find(statements, ts.isModuleDeclaration); + var nsIndex = ts.findIndex(statements, ts.isModuleDeclaration); + var ns = nsIndex !== -1 ? statements[nsIndex] : undefined; if (ns && exportAssignment && exportAssignment.isExportEquals && ts.isIdentifier(exportAssignment.expression) && ts.isIdentifier(ns.name) && ts.idText(ns.name) === ts.idText(exportAssignment.expression) && ns.body && ts.isModuleBlock(ns.body)) { // Pass 0: Correct situations where a module has both an `export = ns` and multiple top-level exports by stripping the export modifiers from // the top-level exports and exporting them in the targeted ns, as can occur when a js file has both typedefs and `module.export` assignments - var excessExports = ts.filter(statements, function (s) { return !!(ts.getModifierFlags(s) & 1 /* Export */); }); + var excessExports = ts.filter(statements, function (s) { return !!(ts.getEffectiveModifierFlags(s) & 1 /* Export */); }); + var name_2 = ns.name; + var body = ns.body; if (ts.length(excessExports)) { - ns.body.statements = ts.createNodeArray(__spreadArrays(ns.body.statements, [ts.createExportDeclaration( + ns = ts.factory.updateModuleDeclaration(ns, ns.decorators, ns.modifiers, ns.name, body = ts.factory.updateModuleBlock(body, ts.factory.createNodeArray(__spreadArrays(ns.body.statements, [ts.factory.createExportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createNamedExports(ts.map(ts.flatMap(excessExports, function (e) { return getNamesOfDeclaration(e); }), function (id) { return ts.createExportSpecifier(/*alias*/ undefined, id); })), - /*moduleSpecifier*/ undefined)])); + /*modifiers*/ undefined, + /*isTypeOnly*/ false, ts.factory.createNamedExports(ts.map(ts.flatMap(excessExports, function (e) { return getNamesOfDeclaration(e); }), function (id) { return ts.factory.createExportSpecifier(/*alias*/ undefined, id); })), + /*moduleSpecifier*/ undefined)])))); + statements = __spreadArrays(statements.slice(0, nsIndex), [ns], statements.slice(nsIndex + 1)); } // Pass 1: Flatten `export namespace _exports {} export = _exports;` so long as the `export=` only points at a single namespace declaration - if (!ts.find(statements, function (s) { return s !== ns && ts.nodeHasName(s, ns.name); })) { + if (!ts.find(statements, function (s) { return s !== ns && ts.nodeHasName(s, name_2); })) { results = []; - ts.forEach(ns.body.statements, function (s) { - addResult(s, 0 /* None */); // Recalculates the ambient (and export, if applicable from above) flag + // If the namespace contains no export assignments or declarations, and no declarations flagged with `export`, then _everything_ is exported - + // to respect this as the top level, we need to add an `export` modifier to everything + var mixinExportFlag_1 = !ts.some(body.statements, function (s) { return ts.hasSyntacticModifier(s, 1 /* Export */) || ts.isExportAssignment(s) || ts.isExportDeclaration(s); }); + ts.forEach(body.statements, function (s) { + addResult(s, mixinExportFlag_1 ? 1 /* Export */ : 0 /* None */); // Recalculates the ambient (and export, if applicable from above) flag }); statements = __spreadArrays(ts.filter(statements, function (s) { return s !== ns && s !== exportAssignment; }), results); } @@ -40112,9 +47694,10 @@ var ts; var exports = ts.filter(statements, function (d) { return ts.isExportDeclaration(d) && !d.moduleSpecifier && !!d.exportClause && ts.isNamedExports(d.exportClause); }); if (ts.length(exports) > 1) { var nonExports = ts.filter(statements, function (d) { return !ts.isExportDeclaration(d) || !!d.moduleSpecifier || !d.exportClause; }); - statements = __spreadArrays(nonExports, [ts.createExportDeclaration( + statements = __spreadArrays(nonExports, [ts.factory.createExportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createNamedExports(ts.flatMap(exports, function (e) { return ts.cast(e.exportClause, ts.isNamedExports).elements; })), + /*modifiers*/ undefined, + /*isTypeOnly*/ false, ts.factory.createNamedExports(ts.flatMap(exports, function (e) { return ts.cast(e.exportClause, ts.isNamedExports).elements; })), /*moduleSpecifier*/ undefined)]); } // Pass 2b: Also combine all `export {} from "..."` declarations as needed @@ -40122,19 +47705,20 @@ var ts; if (ts.length(reexports) > 1) { var groups = ts.group(reexports, function (decl) { return ts.isStringLiteral(decl.moduleSpecifier) ? ">" + decl.moduleSpecifier.text : ">"; }); if (groups.length !== reexports.length) { - var _loop_8 = function (group_1) { + var _loop_9 = function (group_1) { if (group_1.length > 1) { // remove group members from statements and then merge group members and add back to statements statements = __spreadArrays(ts.filter(statements, function (s) { return group_1.indexOf(s) === -1; }), [ - ts.createExportDeclaration( + ts.factory.createExportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createNamedExports(ts.flatMap(group_1, function (e) { return ts.cast(e.exportClause, ts.isNamedExports).elements; })), group_1[0].moduleSpecifier) + /*modifiers*/ undefined, + /*isTypeOnly*/ false, ts.factory.createNamedExports(ts.flatMap(group_1, function (e) { return ts.cast(e.exportClause, ts.isNamedExports).elements; })), group_1[0].moduleSpecifier) ]); } }; for (var _i = 0, groups_1 = groups; _i < groups_1.length; _i++) { var group_1 = groups_1[_i]; - _loop_8(group_1); + _loop_9(group_1); } } } @@ -40142,27 +47726,31 @@ var ts; } function inlineExportModifiers(statements) { // Pass 3: Move all `export {}`'s to `export` modifiers where possible - var exportDecl = ts.find(statements, function (d) { return ts.isExportDeclaration(d) && !d.moduleSpecifier && !!d.exportClause; }); - if (exportDecl && exportDecl.exportClause && ts.isNamedExports(exportDecl.exportClause)) { + var index = ts.findIndex(statements, function (d) { return ts.isExportDeclaration(d) && !d.moduleSpecifier && !!d.exportClause && ts.isNamedExports(d.exportClause); }); + if (index >= 0) { + var exportDecl = statements[index]; var replacements = ts.mapDefined(exportDecl.exportClause.elements, function (e) { if (!e.propertyName) { // export {name} - look thru `statements` for `name`, and if all results can take an `export` modifier, do so and filter it - var associated = ts.filter(statements, function (s) { return ts.nodeHasName(s, e.name); }); - if (ts.length(associated) && ts.every(associated, canHaveExportModifier)) { - ts.forEach(associated, addExportModifier); + var indices = ts.indicesOf(statements); + var associatedIndices = ts.filter(indices, function (i) { return ts.nodeHasName(statements[i], e.name); }); + if (ts.length(associatedIndices) && ts.every(associatedIndices, function (i) { return canHaveExportModifier(statements[i]); })) { + for (var _i = 0, associatedIndices_1 = associatedIndices; _i < associatedIndices_1.length; _i++) { + var index_1 = associatedIndices_1[_i]; + statements[index_1] = addExportModifier(statements[index_1]); + } return undefined; } } return e; }); if (!ts.length(replacements)) { - // all clauses removed, filter the export declaration - statements = ts.filter(statements, function (s) { return s !== exportDecl; }); + // all clauses removed, remove the export declaration + ts.orderedRemoveItemAt(statements, index); } else { // some items filtered, others not - update the export declaration - // (mutating because why not, we're building a whole new tree here anyway) - exportDecl.exportClause.elements = ts.createNodeArray(replacements); + statements[index] = ts.factory.updateExportDeclaration(exportDecl, exportDecl.decorators, exportDecl.modifiers, exportDecl.isTypeOnly, ts.factory.updateNamedExports(exportDecl.exportClause, replacements), exportDecl.moduleSpecifier); } } return statements; @@ -40176,7 +47764,7 @@ var ts; if (enclosingDeclaration && ((ts.isSourceFile(enclosingDeclaration) && ts.isExternalOrCommonJsModule(enclosingDeclaration)) || ts.isModuleDeclaration(enclosingDeclaration)) && (!ts.some(statements, ts.isExternalModuleIndicator) || (!ts.hasScopeMarker(statements) && ts.some(statements, ts.needsScopeMarker)))) { - statements.push(ts.createEmptyExports()); + statements.push(ts.createEmptyExports(ts.factory)); } return statements; } @@ -40189,15 +47777,17 @@ var ts; ts.isInterfaceDeclaration(node) || isTypeDeclaration(node); } - function addExportModifier(statement) { - var flags = (ts.getModifierFlags(statement) | 1 /* Export */) & ~2 /* Ambient */; - statement.modifiers = ts.createNodeArray(ts.createModifiersFromModifierFlags(flags)); - statement.modifierFlagsCache = 0; + function addExportModifier(node) { + var flags = (ts.getEffectiveModifierFlags(node) | 1 /* Export */) & ~2 /* Ambient */; + return ts.factory.updateModifiers(node, flags); + } + function removeExportModifier(node) { + var flags = ts.getEffectiveModifierFlags(node) & ~1 /* Export */; + return ts.factory.updateModifiers(node, flags); } function visitSymbolTable(symbolTable, suppressNewPrivateContext, propertyAsAlias) { - var oldDeferredPrivates = deferredPrivates; if (!suppressNewPrivateContext) { - deferredPrivates = ts.createMap(); + deferredPrivatesStack.push(new ts.Map()); } symbolTable.forEach(function (symbol) { serializeSymbol(symbol, /*isPrivate*/ false, !!propertyAsAlias); @@ -40206,20 +47796,20 @@ var ts; // deferredPrivates will be filled up by visiting the symbol table // And will continue to iterate as elements are added while visited `deferredPrivates` // (As that's how a map iterator is defined to work) - deferredPrivates.forEach(function (symbol) { + deferredPrivatesStack[deferredPrivatesStack.length - 1].forEach(function (symbol) { serializeSymbol(symbol, /*isPrivate*/ true, !!propertyAsAlias); }); + deferredPrivatesStack.pop(); } - deferredPrivates = oldDeferredPrivates; } function serializeSymbol(symbol, isPrivate, propertyAsAlias) { // cache visited list based on merged symbol, since we want to use the unmerged top-level symbol, but // still skip reserializing it if we encounter the merged product later on var visitedSym = getMergedSymbol(symbol); - if (visitedSymbols.has("" + getSymbolId(visitedSym))) { + if (visitedSymbols.has(getSymbolId(visitedSym))) { return; // Already printed } - visitedSymbols.set("" + getSymbolId(visitedSym), true); + visitedSymbols.add(getSymbolId(visitedSym)); // Only actually serialize symbols within the correct enclosing declaration, otherwise do nothing with the out-of-context symbol var skipMembershipCheck = !isPrivate; // We only call this on exported symbols when we know they're in the correct scope if (skipMembershipCheck || (!!ts.length(symbol.declarations) && ts.some(symbol.declarations, function (d) { return !!ts.findAncestor(d, function (n) { return n === enclosingDeclaration; }); }))) { @@ -40242,7 +47832,7 @@ var ts; function serializeSymbolWorker(symbol, isPrivate, propertyAsAlias) { var symbolName = ts.unescapeLeadingUnderscores(symbol.escapedName); var isDefault = symbol.escapedName === "default" /* Default */; - if (!(context.flags & 131072 /* AllowAnonymousIdentifier */) && ts.isStringANonContextualKeyword(symbolName) && !isDefault) { + if (isPrivate && !(context.flags & 131072 /* AllowAnonymousIdentifier */) && ts.isStringANonContextualKeyword(symbolName) && !isDefault) { // Oh no. We cannot use this symbol's name as it's name... It's likely some jsdoc had an invalid name like `export` or `default` :( context.encounteredError = true; // TODO: Issue error via symbol tracker? @@ -40250,7 +47840,9 @@ var ts; } var needsPostExportDefault = isDefault && !!(symbol.flags & -113 /* ExportDoesNotSupportDefaultModifier */ || (symbol.flags & 16 /* Function */ && ts.length(getPropertiesOfType(getTypeOfSymbol(symbol))))) && !(symbol.flags & 2097152 /* Alias */); // An alias symbol should preclude needing to make an alias ourselves - if (needsPostExportDefault) { + var needsExportDeclaration = !needsPostExportDefault && !isPrivate && ts.isStringANonContextualKeyword(symbolName) && !isDefault; + // `serializeVariableOrProperty` will handle adding the export declaration if it is run (since `getInternalSymbolName` will create the name mapping), so we need to ensuer we unset `needsExportDeclaration` if it is + if (needsPostExportDefault || needsExportDeclaration) { isPrivate = true; } var modifierFlags = (!isPrivate ? 1 /* Export */ : 0) | (isDefault && !needsPostExportDefault ? 512 /* Default */ : 0); @@ -40271,7 +47863,66 @@ var ts; && !(symbol.flags & 4194304 /* Prototype */) && !(symbol.flags & 32 /* Class */) && !isConstMergedWithNSPrintableAsSignatureMerge) { - serializeVariableOrProperty(symbol, symbolName, isPrivate, needsPostExportDefault, propertyAsAlias, modifierFlags); + if (propertyAsAlias) { + var createdExport = serializeMaybeAliasAssignment(symbol); + if (createdExport) { + needsExportDeclaration = false; + needsPostExportDefault = false; + } + } + else { + var type = getTypeOfSymbol(symbol); + var localName = getInternalSymbolName(symbol, symbolName); + if (!(symbol.flags & 16 /* Function */) && isTypeRepresentableAsFunctionNamespaceMerge(type, symbol)) { + // If the type looks like a function declaration + ns could represent it, and it's type is sourced locally, rewrite it into a function declaration + ns + serializeAsFunctionNamespaceMerge(type, symbol, localName, modifierFlags); + } + else { + // A Class + Property merge is made for a `module.exports.Member = class {}`, and it doesn't serialize well as either a class _or_ a property symbol - in fact, _it behaves like an alias!_ + // `var` is `FunctionScopedVariable`, `const` and `let` are `BlockScopedVariable`, and `module.exports.thing =` is `Property` + var flags = !(symbol.flags & 2 /* BlockScopedVariable */) ? undefined + : isConstVariable(symbol) ? 2 /* Const */ + : 1 /* Let */; + var name = (needsPostExportDefault || !(symbol.flags & 4 /* Property */)) ? localName : getUnusedName(localName, symbol); + var textRange = symbol.declarations && ts.find(symbol.declarations, function (d) { return ts.isVariableDeclaration(d); }); + if (textRange && ts.isVariableDeclarationList(textRange.parent) && textRange.parent.declarations.length === 1) { + textRange = textRange.parent.parent; + } + var statement = ts.setTextRange(ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([ + ts.factory.createVariableDeclaration(name, /*exclamationToken*/ undefined, serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled)) + ], flags)), textRange); + addResult(statement, name !== localName ? modifierFlags & ~1 /* Export */ : modifierFlags); + if (name !== localName && !isPrivate) { + // We rename the variable declaration we generate for Property symbols since they may have a name which + // conflicts with a local declaration. For example, given input: + // ``` + // function g() {} + // module.exports.g = g + // ``` + // In such a situation, we have a local variable named `g`, and a separate exported variable named `g`. + // Naively, we would emit + // ``` + // function g() {} + // export const g: typeof g; + // ``` + // That's obviously incorrect - the `g` in the type annotation needs to refer to the local `g`, but + // the export declaration shadows it. + // To work around that, we instead write + // ``` + // function g() {} + // const g_1: typeof g; + // export { g_1 as g }; + // ``` + // To create an export named `g` that does _not_ shadow the local `g` + addResult(ts.factory.createExportDeclaration( + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*isTypeOnly*/ false, ts.factory.createNamedExports([ts.factory.createExportSpecifier(name, localName)])), 0 /* None */); + needsExportDeclaration = false; + needsPostExportDefault = false; + } + } + } } if (symbol.flags & 384 /* Enum */) { serializeEnum(symbol, symbolName, modifierFlags); @@ -40307,47 +47958,63 @@ var ts; var resolvedModule = resolveExternalModuleName(node, node.moduleSpecifier); if (!resolvedModule) continue; - addResult(ts.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*exportClause*/ undefined, ts.createLiteral(getSpecifierForModuleSymbol(resolvedModule, context))), 0 /* None */); + addResult(ts.factory.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*isTypeOnly*/ false, /*exportClause*/ undefined, ts.factory.createStringLiteral(getSpecifierForModuleSymbol(resolvedModule, context))), 0 /* None */); } } if (needsPostExportDefault) { - addResult(ts.createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, /*isExportAssignment*/ false, ts.createIdentifier(getInternalSymbolName(symbol, symbolName))), 0 /* None */); + addResult(ts.factory.createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, /*isExportAssignment*/ false, ts.factory.createIdentifier(getInternalSymbolName(symbol, symbolName))), 0 /* None */); + } + else if (needsExportDeclaration) { + addResult(ts.factory.createExportDeclaration( + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*isTypeOnly*/ false, ts.factory.createNamedExports([ts.factory.createExportSpecifier(getInternalSymbolName(symbol, symbolName), symbolName)])), 0 /* None */); } } function includePrivateSymbol(symbol) { if (ts.some(symbol.declarations, ts.isParameterDeclaration)) return; - ts.Debug.assertIsDefined(deferredPrivates); + ts.Debug.assertIsDefined(deferredPrivatesStack[deferredPrivatesStack.length - 1]); getUnusedName(ts.unescapeLeadingUnderscores(symbol.escapedName), symbol); // Call to cache unique name for symbol - deferredPrivates.set("" + getSymbolId(symbol), symbol); + // Blanket moving (import) aliases into the root private context should work, since imports are not valid within namespaces + // (so they must have been in the root to begin with if they were real imports) cjs `require` aliases (an upcoming feature) + // will throw a wrench in this, since those may have been nested, but we'll need to synthesize them in the outer scope + // anyway, as that's the only place the import they translate to is valid. In such a case, we might need to use a unique name + // for the moved import; which hopefully the above `getUnusedName` call should produce. + var isExternalImportAlias = !!(symbol.flags & 2097152 /* Alias */) && !ts.some(symbol.declarations, function (d) { + return !!ts.findAncestor(d, ts.isExportDeclaration) || + ts.isNamespaceExport(d) || + (ts.isImportEqualsDeclaration(d) && !ts.isExternalModuleReference(d.moduleReference)); + }); + deferredPrivatesStack[isExternalImportAlias ? 0 : (deferredPrivatesStack.length - 1)].set(getSymbolId(symbol), symbol); } function isExportingScope(enclosingDeclaration) { return ((ts.isSourceFile(enclosingDeclaration) && (ts.isExternalOrCommonJsModule(enclosingDeclaration) || ts.isJsonSourceFile(enclosingDeclaration))) || (ts.isAmbientModule(enclosingDeclaration) && !ts.isGlobalScopeAugmentation(enclosingDeclaration))); } // Prepends a `declare` and/or `export` modifier if the context requires it, and then adds `node` to `result` and returns `node` - // Note: This _mutates_ `node` without using `updateNode` - the assumption being that all nodes should be manufactured fresh by the node builder function addResult(node, additionalModifierFlags) { - var newModifierFlags = 0 /* None */; - if (additionalModifierFlags & 1 /* Export */ && - enclosingDeclaration && - isExportingScope(enclosingDeclaration) && - canHaveExportModifier(node)) { - // Classes, namespaces, variables, functions, interfaces, and types should all be `export`ed in a module context if not private - newModifierFlags |= 1 /* Export */; - } - if (addingDeclare && !(newModifierFlags & 1 /* Export */) && - (!enclosingDeclaration || !(enclosingDeclaration.flags & 8388608 /* Ambient */)) && - (ts.isEnumDeclaration(node) || ts.isVariableStatement(node) || ts.isFunctionDeclaration(node) || ts.isClassDeclaration(node) || ts.isModuleDeclaration(node))) { - // Classes, namespaces, variables, enums, and functions all need `declare` modifiers to be valid in a declaration file top-level scope - newModifierFlags |= 2 /* Ambient */; - } - if ((additionalModifierFlags & 512 /* Default */) && (ts.isClassDeclaration(node) || ts.isInterfaceDeclaration(node) || ts.isFunctionDeclaration(node))) { - newModifierFlags |= 512 /* Default */; - } - if (newModifierFlags) { - node.modifiers = ts.createNodeArray(ts.createModifiersFromModifierFlags(newModifierFlags | ts.getModifierFlags(node))); - node.modifierFlagsCache = 0; // Reset computed flags cache + if (ts.canHaveModifiers(node)) { + var newModifierFlags = 0 /* None */; + if (additionalModifierFlags & 1 /* Export */ && + context.enclosingDeclaration && + (isExportingScope(context.enclosingDeclaration) || ts.isModuleDeclaration(context.enclosingDeclaration)) && + canHaveExportModifier(node)) { + // Classes, namespaces, variables, functions, interfaces, and types should all be `export`ed in a module context if not private + newModifierFlags |= 1 /* Export */; + } + if (addingDeclare && !(newModifierFlags & 1 /* Export */) && + (!context.enclosingDeclaration || !(context.enclosingDeclaration.flags & 8388608 /* Ambient */)) && + (ts.isEnumDeclaration(node) || ts.isVariableStatement(node) || ts.isFunctionDeclaration(node) || ts.isClassDeclaration(node) || ts.isModuleDeclaration(node))) { + // Classes, namespaces, variables, enums, and functions all need `declare` modifiers to be valid in a declaration file top-level scope + newModifierFlags |= 2 /* Ambient */; + } + if ((additionalModifierFlags & 512 /* Default */) && (ts.isClassDeclaration(node) || ts.isInterfaceDeclaration(node) || ts.isFunctionDeclaration(node))) { + newModifierFlags |= 512 /* Default */; + } + if (newModifierFlags) { + node = ts.factory.updateModifiers(node, newModifierFlags | ts.getEffectiveModifierFlags(node)); + } } results.push(node); } @@ -40359,7 +48026,7 @@ var ts; var commentText = jsdocAliasDecl ? jsdocAliasDecl.comment || jsdocAliasDecl.parent.comment : undefined; var oldFlags = context.flags; context.flags |= 8388608 /* InTypeAlias */; - addResult(ts.setSyntheticLeadingComments(ts.createTypeAliasDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, getInternalSymbolName(symbol, symbolName), typeParamDecls, typeToTypeNodeHelper(aliasType, context)), !commentText ? [] : [{ kind: 3 /* MultiLineCommentTrivia */, text: "*\n * " + commentText.replace(/\n/g, "\n * ") + "\n ", pos: -1, end: -1, hasTrailingNewLine: true }]), modifierFlags); + addResult(ts.setSyntheticLeadingComments(ts.factory.createTypeAliasDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, getInternalSymbolName(symbol, symbolName), typeParamDecls, typeToTypeNodeHelper(aliasType, context)), !commentText ? [] : [{ kind: 3 /* MultiLineCommentTrivia */, text: "*\n * " + commentText.replace(/\n/g, "\n * ") + "\n ", pos: -1, end: -1, hasTrailingNewLine: true }]), modifierFlags); context.flags = oldFlags; } function serializeInterface(symbol, symbolName, modifierFlags) { @@ -40369,11 +48036,11 @@ var ts; var baseTypes = getBaseTypes(interfaceType); var baseType = ts.length(baseTypes) ? getIntersectionType(baseTypes) : undefined; var members = ts.flatMap(getPropertiesOfType(interfaceType), function (p) { return serializePropertySymbolForInterface(p, baseType); }); - var callSignatures = serializeSignatures(0 /* Call */, interfaceType, baseType, 165 /* CallSignature */); - var constructSignatures = serializeSignatures(1 /* Construct */, interfaceType, baseType, 166 /* ConstructSignature */); + var callSignatures = serializeSignatures(0 /* Call */, interfaceType, baseType, 168 /* CallSignature */); + var constructSignatures = serializeSignatures(1 /* Construct */, interfaceType, baseType, 169 /* ConstructSignature */); var indexSignatures = serializeIndexSignatures(interfaceType, baseType); - var heritageClauses = !ts.length(baseTypes) ? undefined : [ts.createHeritageClause(90 /* ExtendsKeyword */, ts.mapDefined(baseTypes, function (b) { return trySerializeAsTypeReference(b); }))]; - addResult(ts.createInterfaceDeclaration( + var heritageClauses = !ts.length(baseTypes) ? undefined : [ts.factory.createHeritageClause(93 /* ExtendsKeyword */, ts.mapDefined(baseTypes, function (b) { return trySerializeAsTypeReference(b, 111551 /* Value */); }))]; + addResult(ts.factory.createInterfaceDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, getInternalSymbolName(symbol, symbolName), typeParamDecls, heritageClauses, __spreadArrays(indexSignatures, constructSignatures, callSignatures, members)), modifierFlags); } @@ -40399,9 +48066,10 @@ var ts; if (ts.length(mergedMembers)) { var containingFile_1 = ts.getSourceFileOfNode(context.enclosingDeclaration); var localName = getInternalSymbolName(symbol, symbolName); - var nsBody = ts.createModuleBlock([ts.createExportDeclaration( + var nsBody = ts.factory.createModuleBlock([ts.factory.createExportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createNamedExports(ts.mapDefined(ts.filter(mergedMembers, function (n) { return n.escapedName !== "export=" /* ExportEquals */; }), function (s) { + /*modifiers*/ undefined, + /*isTypeOnly*/ false, ts.factory.createNamedExports(ts.mapDefined(ts.filter(mergedMembers, function (n) { return n.escapedName !== "export=" /* ExportEquals */; }), function (s) { var _a, _b; var name = ts.unescapeLeadingUnderscores(s.escapedName); var localName = getInternalSymbolName(s, name); @@ -40413,86 +48081,32 @@ var ts; var target = aliasDecl && getTargetOfAliasDeclaration(aliasDecl, /*dontRecursivelyResolve*/ true); includePrivateSymbol(target || s); var targetName = target ? getInternalSymbolName(target, ts.unescapeLeadingUnderscores(target.escapedName)) : localName; - return ts.createExportSpecifier(name === targetName ? undefined : targetName, name); + return ts.factory.createExportSpecifier(name === targetName ? undefined : targetName, name); })))]); - addResult(ts.createModuleDeclaration( + addResult(ts.factory.createModuleDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createIdentifier(localName), nsBody, 16 /* Namespace */), 0 /* None */); + /*modifiers*/ undefined, ts.factory.createIdentifier(localName), nsBody, 16 /* Namespace */), 0 /* None */); } } function serializeEnum(symbol, symbolName, modifierFlags) { - addResult(ts.createEnumDeclaration( - /*decorators*/ undefined, ts.createModifiersFromModifierFlags(isConstEnumSymbol(symbol) ? 2048 /* Const */ : 0), getInternalSymbolName(symbol, symbolName), ts.map(ts.filter(getPropertiesOfType(getTypeOfSymbol(symbol)), function (p) { return !!(p.flags & 8 /* EnumMember */); }), function (p) { + addResult(ts.factory.createEnumDeclaration( + /*decorators*/ undefined, ts.factory.createModifiersFromModifierFlags(isConstEnumSymbol(symbol) ? 2048 /* Const */ : 0), getInternalSymbolName(symbol, symbolName), ts.map(ts.filter(getPropertiesOfType(getTypeOfSymbol(symbol)), function (p) { return !!(p.flags & 8 /* EnumMember */); }), function (p) { // TODO: Handle computed names // I hate that to get the initialized value we need to walk back to the declarations here; but there's no // other way to get the possible const value of an enum member that I'm aware of, as the value is cached // _on the declaration_, not on the declaration's symbol... - var initializedValue = p.declarations && p.declarations[0] && ts.isEnumMember(p.declarations[0]) && getConstantValue(p.declarations[0]); - return ts.createEnumMember(ts.unescapeLeadingUnderscores(p.escapedName), initializedValue === undefined ? undefined : ts.createLiteral(initializedValue)); + var initializedValue = p.declarations && p.declarations[0] && ts.isEnumMember(p.declarations[0]) ? getConstantValue(p.declarations[0]) : undefined; + return ts.factory.createEnumMember(ts.unescapeLeadingUnderscores(p.escapedName), initializedValue === undefined ? undefined : + typeof initializedValue === "string" ? ts.factory.createStringLiteral(initializedValue) : + ts.factory.createNumericLiteral(initializedValue)); })), modifierFlags); } - function serializeVariableOrProperty(symbol, symbolName, isPrivate, needsPostExportDefault, propertyAsAlias, modifierFlags) { - if (propertyAsAlias) { - serializeMaybeAliasAssignment(symbol); - } - else { - var type = getTypeOfSymbol(symbol); - var localName = getInternalSymbolName(symbol, symbolName); - if (!(symbol.flags & 16 /* Function */) && isTypeRepresentableAsFunctionNamespaceMerge(type, symbol)) { - // If the type looks like a function declaration + ns could represent it, and it's type is sourced locally, rewrite it into a function declaration + ns - serializeAsFunctionNamespaceMerge(type, symbol, localName, modifierFlags); - } - else { - // A Class + Property merge is made for a `module.exports.Member = class {}`, and it doesn't serialize well as either a class _or_ a property symbol - in fact, _it behaves like an alias!_ - // `var` is `FunctionScopedVariable`, `const` and `let` are `BlockScopedVariable`, and `module.exports.thing =` is `Property` - var flags = !(symbol.flags & 2 /* BlockScopedVariable */) ? undefined - : isConstVariable(symbol) ? 2 /* Const */ - : 1 /* Let */; - var name = (needsPostExportDefault || !(symbol.flags & 4 /* Property */)) ? localName : getUnusedName(localName, symbol); - var textRange = symbol.declarations && ts.find(symbol.declarations, function (d) { return ts.isVariableDeclaration(d); }); - if (textRange && ts.isVariableDeclarationList(textRange.parent) && textRange.parent.declarations.length === 1) { - textRange = textRange.parent.parent; - } - var statement = ts.setTextRange(ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(name, serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled)) - ], flags)), textRange); - addResult(statement, name !== localName ? modifierFlags & ~1 /* Export */ : modifierFlags); - if (name !== localName && !isPrivate) { - // We rename the variable declaration we generate for Property symbols since they may have a name which - // conflicts with a local declaration. For example, given input: - // ``` - // function g() {} - // module.exports.g = g - // ``` - // In such a situation, we have a local variable named `g`, and a separate exported variable named `g`. - // Naively, we would emit - // ``` - // function g() {} - // export const g: typeof g; - // ``` - // That's obviously incorrect - the `g` in the type annotation needs to refer to the local `g`, but - // the export declaration shadows it. - // To work around that, we instead write - // ``` - // function g() {} - // const g_1: typeof g; - // export { g_1 as g }; - // ``` - // To create an export named `g` that does _not_ shadow the local `g` - addResult(ts.createExportDeclaration( - /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createNamedExports([ts.createExportSpecifier(name, localName)])), 0 /* None */); - } - } - } - } function serializeAsFunctionNamespaceMerge(type, symbol, localName, modifierFlags) { var signatures = getSignaturesOfType(type, 0 /* Call */); for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) { var sig = signatures_2[_i]; // Each overload becomes a separate function declaration, in order - var decl = signatureToSignatureDeclarationHelper(sig, 244 /* FunctionDeclaration */, context, includePrivateSymbol, bundled); - decl.name = ts.createIdentifier(localName); + var decl = signatureToSignatureDeclarationHelper(sig, 248 /* FunctionDeclaration */, context, { name: ts.factory.createIdentifier(localName), privateSymbolVisitor: includePrivateSymbol, bundledImports: bundled }); // for expressions assigned to `var`s, use the `var` as the text range addResult(ts.setTextRange(decl, sig.declaration && ts.isVariableDeclaration(sig.declaration.parent) && sig.declaration.parent.parent || sig.declaration), modifierFlags); } @@ -40525,9 +48139,9 @@ var ts; // possible to encounter a situation where a type has members from both the current file and other files - in those situations, // emit akin to the above would be needed. // Add a namespace - var fakespace = ts.createModuleDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createIdentifier(localName), ts.createModuleBlock([]), 16 /* Namespace */); - fakespace.flags ^= 8 /* Synthesized */; // unset synthesized so it is usable as an enclosing declaration - fakespace.parent = enclosingDeclaration; + // Create namespace as non-synthetic so it is usable as an enclosing declaration + var fakespace = ts.parseNodeFactory.createModuleDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.factory.createIdentifier(localName), ts.factory.createModuleBlock([]), 16 /* Namespace */); + ts.setParent(fakespace, enclosingDeclaration); fakespace.locals = ts.createSymbolTable(props); fakespace.symbol = props[0].parent; var oldResults = results; @@ -40543,26 +48157,33 @@ var ts; addingDeclare = oldAddingDeclare; var declarations = results; results = oldResults; - fakespace.flags ^= 8 /* Synthesized */; // reset synthesized - fakespace.parent = undefined; - fakespace.locals = undefined; - fakespace.symbol = undefined; - fakespace.body = ts.createModuleBlock(declarations); + // replace namespace with synthetic version + var defaultReplaced = ts.map(declarations, function (d) { return ts.isExportAssignment(d) && !d.isExportEquals && ts.isIdentifier(d.expression) ? ts.factory.createExportDeclaration( + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*isTypeOnly*/ false, ts.factory.createNamedExports([ts.factory.createExportSpecifier(d.expression, ts.factory.createIdentifier("default" /* Default */))])) : d; }); + var exportModifierStripped = ts.every(defaultReplaced, function (d) { return ts.hasSyntacticModifier(d, 1 /* Export */); }) ? ts.map(defaultReplaced, removeExportModifier) : defaultReplaced; + fakespace = ts.factory.updateModuleDeclaration(fakespace, fakespace.decorators, fakespace.modifiers, fakespace.name, ts.factory.createModuleBlock(exportModifierStripped)); addResult(fakespace, modifierFlags); // namespaces can never be default exported } } function isNamespaceMember(p) { - return !(p.flags & 4194304 /* Prototype */ || p.escapedName === "prototype" || p.valueDeclaration && ts.isClassLike(p.valueDeclaration.parent)); + return !!(p.flags & (788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */)) || + !(p.flags & 4194304 /* Prototype */ || p.escapedName === "prototype" || p.valueDeclaration && ts.isClassLike(p.valueDeclaration.parent)); } function serializeAsClass(symbol, localName, modifierFlags) { + var _a; var localParams = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol); var typeParamDecls = ts.map(localParams, function (p) { return typeParameterToDeclaration(p, context); }); var classType = getDeclaredTypeOfClassOrInterface(symbol); var baseTypes = getBaseTypes(classType); - var implementsTypes = getImplementsTypes(classType); + var implementsExpressions = ts.mapDefined(getImplementsTypes(classType), serializeImplementedType); var staticType = getTypeOfSymbol(symbol); - var staticBaseType = getBaseConstructorTypeOfClass(staticType); - var heritageClauses = __spreadArrays(!ts.length(baseTypes) ? [] : [ts.createHeritageClause(90 /* ExtendsKeyword */, ts.map(baseTypes, function (b) { return serializeBaseType(b, staticBaseType, localName); }))], !ts.length(implementsTypes) ? [] : [ts.createHeritageClause(113 /* ImplementsKeyword */, ts.map(implementsTypes, function (b) { return serializeBaseType(b, staticBaseType, localName); }))]); + var isClass = !!((_a = staticType.symbol) === null || _a === void 0 ? void 0 : _a.valueDeclaration) && ts.isClassLike(staticType.symbol.valueDeclaration); + var staticBaseType = isClass + ? getBaseConstructorTypeOfClass(staticType) + : anyType; + var heritageClauses = __spreadArrays(!ts.length(baseTypes) ? [] : [ts.factory.createHeritageClause(93 /* ExtendsKeyword */, ts.map(baseTypes, function (b) { return serializeBaseType(b, staticBaseType, localName); }))], !ts.length(implementsExpressions) ? [] : [ts.factory.createHeritageClause(116 /* ImplementsKeyword */, implementsExpressions)]); var symbolProps = getNonInterhitedProperties(classType, baseTypes, getPropertiesOfType(classType)); var publicSymbolProps = ts.filter(symbolProps, function (s) { // `valueDeclaration` could be undefined if inherited from @@ -40580,9 +48201,9 @@ var ts; }); // Boil down all private properties into a single one. var privateProperties = hasPrivateIdentifier ? - [ts.createProperty( + [ts.factory.createPropertyDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createPrivateIdentifier("#private"), + /*modifiers*/ undefined, ts.factory.createPrivateIdentifier("#private"), /*questionOrExclamationToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined)] : @@ -40590,16 +48211,18 @@ var ts; var publicProperties = ts.flatMap(publicSymbolProps, function (p) { return serializePropertySymbolForClass(p, /*isStatic*/ false, baseTypes[0]); }); // Consider static members empty if symbol also has function or module meaning - function namespacey emit will handle statics var staticMembers = ts.flatMap(ts.filter(getPropertiesOfType(staticType), function (p) { return !(p.flags & 4194304 /* Prototype */) && p.escapedName !== "prototype" && !isNamespaceMember(p); }), function (p) { return serializePropertySymbolForClass(p, /*isStatic*/ true, staticBaseType); }); - var constructors = serializeSignatures(1 /* Construct */, staticType, baseTypes[0], 162 /* Constructor */); - for (var _i = 0, constructors_1 = constructors; _i < constructors_1.length; _i++) { - var c = constructors_1[_i]; - // A constructor's return type and type parameters are supposed to be controlled by the enclosing class declaration - // `signatureToSignatureDeclarationHelper` appends them regardless, so for now we delete them here - c.type = undefined; - c.typeParameters = undefined; - } + // When we encounter an `X.prototype.y` assignment in a JS file, we bind `X` as a class regardless as to whether + // the value is ever initialized with a class or function-like value. For cases where `X` could never be + // created via `new`, we will inject a `private constructor()` declaration to indicate it is not createable. + var isNonConstructableClassLikeInJsFile = !isClass && + !!symbol.valueDeclaration && + ts.isInJSFile(symbol.valueDeclaration) && + !ts.some(getSignaturesOfType(staticType, 1 /* Construct */)); + var constructors = isNonConstructableClassLikeInJsFile ? + [ts.factory.createConstructorDeclaration(/*decorators*/ undefined, ts.factory.createModifiersFromModifierFlags(8 /* Private */), [], /*body*/ undefined)] : + serializeSignatures(1 /* Construct */, staticType, baseTypes[0], 165 /* Constructor */); var indexSignatures = serializeIndexSignatures(classType, baseTypes[0]); - addResult(ts.setTextRange(ts.createClassDeclaration( + addResult(ts.setTextRange(ts.factory.createClassDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, localName, typeParamDecls, heritageClauses, __spreadArrays(indexSignatures, staticMembers, constructors, publicProperties, privateProperties)), symbol.declarations && ts.filter(symbol.declarations, function (d) { return ts.isClassDeclaration(d) || ts.isClassExpression(d); })[0]), modifierFlags); } @@ -40622,61 +48245,64 @@ var ts; var targetName = getInternalSymbolName(target, verbatimTargetName); includePrivateSymbol(target); // the target may be within the same scope - attempt to serialize it first switch (node.kind) { - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: // Could be a local `import localName = ns.member` or // an external `import localName = require("whatever")` var isLocalImport = !(target.flags & 512 /* ValueModule */); - addResult(ts.createImportEqualsDeclaration( + addResult(ts.factory.createImportEqualsDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createIdentifier(localName), isLocalImport + /*modifiers*/ undefined, ts.factory.createIdentifier(localName), isLocalImport ? symbolToName(target, context, 67108863 /* All */, /*expectsIdentifier*/ false) - : ts.createExternalModuleReference(ts.createLiteral(getSpecifierForModuleSymbol(symbol, context)))), isLocalImport ? modifierFlags : 0 /* None */); + : ts.factory.createExternalModuleReference(ts.factory.createStringLiteral(getSpecifierForModuleSymbol(symbol, context)))), isLocalImport ? modifierFlags : 0 /* None */); break; - case 252 /* NamespaceExportDeclaration */: + case 256 /* NamespaceExportDeclaration */: // export as namespace foo // TODO: Not part of a file's local or export symbol tables // Is bound into file.symbol.globalExports instead, which we don't currently traverse - addResult(ts.createNamespaceExportDeclaration(ts.idText(node.name)), 0 /* None */); + addResult(ts.factory.createNamespaceExportDeclaration(ts.idText(node.name)), 0 /* None */); break; - case 255 /* ImportClause */: - addResult(ts.createImportDeclaration( + case 259 /* ImportClause */: + addResult(ts.factory.createImportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createImportClause(ts.createIdentifier(localName), /*namedBindings*/ undefined), + /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, ts.factory.createIdentifier(localName), /*namedBindings*/ undefined), // We use `target.parent || target` below as `target.parent` is unset when the target is a module which has been export assigned // And then made into a default by the `esModuleInterop` or `allowSyntheticDefaultImports` flag // In such cases, the `target` refers to the module itself already - ts.createLiteral(getSpecifierForModuleSymbol(target.parent || target, context))), 0 /* None */); + ts.factory.createStringLiteral(getSpecifierForModuleSymbol(target.parent || target, context))), 0 /* None */); break; - case 256 /* NamespaceImport */: - addResult(ts.createImportDeclaration( + case 260 /* NamespaceImport */: + addResult(ts.factory.createImportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createImportClause(/*importClause*/ undefined, ts.createNamespaceImport(ts.createIdentifier(localName))), ts.createLiteral(getSpecifierForModuleSymbol(target, context))), 0 /* None */); + /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, /*importClause*/ undefined, ts.factory.createNamespaceImport(ts.factory.createIdentifier(localName))), ts.factory.createStringLiteral(getSpecifierForModuleSymbol(target, context))), 0 /* None */); break; - case 262 /* NamespaceExport */: - addResult(ts.createExportDeclaration( + case 266 /* NamespaceExport */: + addResult(ts.factory.createExportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createNamespaceExport(ts.createIdentifier(localName)), ts.createLiteral(getSpecifierForModuleSymbol(target, context))), 0 /* None */); + /*modifiers*/ undefined, + /*isTypeOnly*/ false, ts.factory.createNamespaceExport(ts.factory.createIdentifier(localName)), ts.factory.createStringLiteral(getSpecifierForModuleSymbol(target, context))), 0 /* None */); break; - case 258 /* ImportSpecifier */: - addResult(ts.createImportDeclaration( + case 262 /* ImportSpecifier */: + addResult(ts.factory.createImportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createImportClause(/*importClause*/ undefined, ts.createNamedImports([ - ts.createImportSpecifier(localName !== verbatimTargetName ? ts.createIdentifier(verbatimTargetName) : undefined, ts.createIdentifier(localName)) - ])), ts.createLiteral(getSpecifierForModuleSymbol(target.parent || target, context))), 0 /* None */); + /*modifiers*/ undefined, ts.factory.createImportClause( + /*isTypeOnly*/ false, + /*importClause*/ undefined, ts.factory.createNamedImports([ + ts.factory.createImportSpecifier(localName !== verbatimTargetName ? ts.factory.createIdentifier(verbatimTargetName) : undefined, ts.factory.createIdentifier(localName)) + ])), ts.factory.createStringLiteral(getSpecifierForModuleSymbol(target.parent || target, context))), 0 /* None */); break; - case 263 /* ExportSpecifier */: + case 267 /* ExportSpecifier */: // does not use localName because the symbol name in this case refers to the name in the exports table, // which we must exactly preserve var specifier = node.parent.parent.moduleSpecifier; // targetName is only used when the target is local, as otherwise the target is an alias that points at // another file - serializeExportSpecifier(ts.unescapeLeadingUnderscores(symbol.escapedName), specifier ? verbatimTargetName : targetName, specifier && ts.isStringLiteralLike(specifier) ? ts.createLiteral(specifier.text) : undefined); + serializeExportSpecifier(ts.unescapeLeadingUnderscores(symbol.escapedName), specifier ? verbatimTargetName : targetName, specifier && ts.isStringLiteralLike(specifier) ? ts.factory.createStringLiteral(specifier.text) : undefined); break; - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: serializeMaybeAliasAssignment(symbol); break; - case 209 /* BinaryExpression */: - case 194 /* PropertyAccessExpression */: + case 213 /* BinaryExpression */: + case 198 /* PropertyAccessExpression */: // Could be best encoded as though an export specifier or as though an export assignment // If name is default or export=, do an export assignment // Otherwise do an export specifier @@ -40692,13 +48318,17 @@ var ts; } } function serializeExportSpecifier(localName, targetName, specifier) { - addResult(ts.createExportDeclaration( + addResult(ts.factory.createExportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createNamedExports([ts.createExportSpecifier(localName !== targetName ? targetName : undefined, localName)]), specifier), 0 /* None */); + /*modifiers*/ undefined, + /*isTypeOnly*/ false, ts.factory.createNamedExports([ts.factory.createExportSpecifier(localName !== targetName ? targetName : undefined, localName)]), specifier), 0 /* None */); } + /** + * Returns `true` if an export assignment or declaration was produced for the symbol + */ function serializeMaybeAliasAssignment(symbol) { if (symbol.flags & 4194304 /* Prototype */) { - return; + return false; } var name = ts.unescapeLeadingUnderscores(symbol.escapedName); var isExportEquals = name === "export=" /* ExportEquals */; @@ -40729,7 +48359,7 @@ var ts; var oldTrack = context.tracker.trackSymbol; context.tracker.trackSymbol = ts.noop; if (isExportAssignment) { - results.push(ts.createExportAssignment( + results.push(ts.factory.createExportAssignment( /*decorators*/ undefined, /*modifiers*/ undefined, isExportEquals, symbolToExpression(target, context, 67108863 /* All */))); } @@ -40744,13 +48374,14 @@ var ts; else { // serialize as `import _Ref = t.arg.et; export { _Ref as name }` var varName = getUnusedName(name, symbol); - addResult(ts.createImportEqualsDeclaration( + addResult(ts.factory.createImportEqualsDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createIdentifier(varName), symbolToName(target, context, 67108863 /* All */, /*expectsIdentifier*/ false)), 0 /* None */); + /*modifiers*/ undefined, ts.factory.createIdentifier(varName), symbolToName(target, context, 67108863 /* All */, /*expectsIdentifier*/ false)), 0 /* None */); serializeExportSpecifier(name, varName); } } context.tracker.trackSymbol = oldTrack; + return true; } else { // serialize as an anonymous property declaration @@ -40763,19 +48394,22 @@ var ts; serializeAsFunctionNamespaceMerge(typeToSerialize, symbol, varName, isExportAssignment ? 0 /* None */ : 1 /* Export */); } else { - var statement = ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(varName, serializeTypeForDeclaration(context, typeToSerialize, symbol, enclosingDeclaration, includePrivateSymbol, bundled)) + var statement = ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([ + ts.factory.createVariableDeclaration(varName, /*exclamationToken*/ undefined, serializeTypeForDeclaration(context, typeToSerialize, symbol, enclosingDeclaration, includePrivateSymbol, bundled)) ], 2 /* Const */)); addResult(statement, name === varName ? 1 /* Export */ : 0 /* None */); } if (isExportAssignment) { - results.push(ts.createExportAssignment( + results.push(ts.factory.createExportAssignment( /*decorators*/ undefined, - /*modifiers*/ undefined, isExportEquals, ts.createIdentifier(varName))); + /*modifiers*/ undefined, isExportEquals, ts.factory.createIdentifier(varName))); + return true; } else if (name !== varName) { serializeExportSpecifier(name, varName); + return true; } + return false; } } function isTypeRepresentableAsFunctionNamespaceMerge(typeToSerialize, hostSymbol) { @@ -40792,7 +48426,7 @@ var ts; !(typeToSerialize.symbol && ts.some(typeToSerialize.symbol.declarations, function (d) { return ts.getSourceFileOfNode(d) !== ctxSrc; })) && !ts.some(getPropertiesOfType(typeToSerialize), function (p) { return isLateBoundName(p.escapedName); }) && !ts.some(getPropertiesOfType(typeToSerialize), function (p) { return ts.some(p.declarations, function (d) { return ts.getSourceFileOfNode(d) !== ctxSrc; }); }) && - ts.every(getPropertiesOfType(typeToSerialize), function (p) { return ts.isIdentifierText(ts.symbolName(p), languageVersion) && !ts.isStringAKeyword(ts.symbolName(p)); }); + ts.every(getPropertiesOfType(typeToSerialize), function (p) { return ts.isIdentifierText(ts.symbolName(p), languageVersion); }); } function makeSerializePropertySymbol(createProperty, methodKind, useAccessors) { return function serializePropertySymbol(p, isStatic, baseType) { @@ -40816,8 +48450,8 @@ var ts; if (p.flags & 98304 /* Accessor */ && useAccessors) { var result = []; if (p.flags & 65536 /* SetAccessor */) { - result.push(ts.setTextRange(ts.createSetAccessor( - /*decorators*/ undefined, ts.createModifiersFromModifierFlags(flag), name, [ts.createParameter( + result.push(ts.setTextRange(ts.factory.createSetAccessorDeclaration( + /*decorators*/ undefined, ts.factory.createModifiersFromModifierFlags(flag), name, [ts.factory.createParameterDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "arg", @@ -40826,8 +48460,8 @@ var ts; } if (p.flags & 32768 /* GetAccessor */) { var isPrivate_1 = modifierFlags & 8 /* Private */; - result.push(ts.setTextRange(ts.createGetAccessor( - /*decorators*/ undefined, ts.createModifiersFromModifierFlags(flag), name, [], isPrivate_1 ? undefined : serializeTypeForDeclaration(context, getTypeOfSymbol(p), p, enclosingDeclaration, includePrivateSymbol, bundled), + result.push(ts.setTextRange(ts.factory.createGetAccessorDeclaration( + /*decorators*/ undefined, ts.factory.createModifiersFromModifierFlags(flag), name, [], isPrivate_1 ? undefined : serializeTypeForDeclaration(context, getTypeOfSymbol(p), p, enclosingDeclaration, includePrivateSymbol, bundled), /*body*/ undefined), ts.find(p.declarations, ts.isGetAccessor) || firstPropertyLikeDecl)); } return result; @@ -40836,7 +48470,7 @@ var ts; // If this happens, we assume the accessor takes priority, as it imposes more constraints else if (p.flags & (4 /* Property */ | 3 /* Variable */)) { return ts.setTextRange(createProperty( - /*decorators*/ undefined, ts.createModifiersFromModifierFlags((isReadonlySymbol(p) ? 64 /* Readonly */ : 0) | flag), name, p.flags & 16777216 /* Optional */ ? ts.createToken(57 /* QuestionToken */) : undefined, isPrivate ? undefined : serializeTypeForDeclaration(context, getTypeOfSymbol(p), p, enclosingDeclaration, includePrivateSymbol, bundled), + /*decorators*/ undefined, ts.factory.createModifiersFromModifierFlags((isReadonlySymbol(p) ? 64 /* Readonly */ : 0) | flag), name, p.flags & 16777216 /* Optional */ ? ts.factory.createToken(57 /* QuestionToken */) : undefined, isPrivate ? undefined : serializeTypeForDeclaration(context, getTypeOfSymbol(p), p, enclosingDeclaration, includePrivateSymbol, bundled), // TODO: https://github.com/microsoft/TypeScript/pull/32372#discussion_r328386357 // interface members can't have initializers, however class members _can_ /*initializer*/ undefined), ts.find(p.declarations, ts.or(ts.isPropertyDeclaration, ts.isVariableDeclaration)) || firstPropertyLikeDecl); @@ -40846,7 +48480,7 @@ var ts; var signatures = getSignaturesOfType(type, 0 /* Call */); if (flag & 8 /* Private */) { return ts.setTextRange(createProperty( - /*decorators*/ undefined, ts.createModifiersFromModifierFlags((isReadonlySymbol(p) ? 64 /* Readonly */ : 0) | flag), name, p.flags & 16777216 /* Optional */ ? ts.createToken(57 /* QuestionToken */) : undefined, + /*decorators*/ undefined, ts.factory.createModifiersFromModifierFlags((isReadonlySymbol(p) ? 64 /* Readonly */ : 0) | flag), name, p.flags & 16777216 /* Optional */ ? ts.factory.createToken(57 /* QuestionToken */) : undefined, /*type*/ undefined, /*initializer*/ undefined), ts.find(p.declarations, ts.isFunctionLikeDeclaration) || signatures[0] && signatures[0].declaration || p.declarations[0]); } @@ -40854,14 +48488,11 @@ var ts; for (var _i = 0, signatures_3 = signatures; _i < signatures_3.length; _i++) { var sig = signatures_3[_i]; // Each overload becomes a separate method declaration, in order - var decl = signatureToSignatureDeclarationHelper(sig, methodKind, context); - decl.name = name; // TODO: Clone - if (flag) { - decl.modifiers = ts.createNodeArray(ts.createModifiersFromModifierFlags(flag)); - } - if (p.flags & 16777216 /* Optional */) { - decl.questionToken = ts.createToken(57 /* QuestionToken */); - } + var decl = signatureToSignatureDeclarationHelper(sig, methodKind, context, { + name: name, + questionToken: p.flags & 16777216 /* Optional */ ? ts.factory.createToken(57 /* QuestionToken */) : undefined, + modifiers: flag ? ts.factory.createModifiersFromModifierFlags(flag) : undefined + }); results_1.push(ts.setTextRange(decl, sig.declaration)); } return results_1; @@ -40902,12 +48533,12 @@ var ts; for (var _i = 0, signatures_4 = signatures; _i < signatures_4.length; _i++) { var s = signatures_4[_i]; if (s.declaration) { - privateProtected |= ts.getSelectedModifierFlags(s.declaration, 8 /* Private */ | 16 /* Protected */); + privateProtected |= ts.getSelectedEffectiveModifierFlags(s.declaration, 8 /* Private */ | 16 /* Protected */); } } if (privateProtected) { - return [ts.setTextRange(ts.createConstructor( - /*decorators*/ undefined, ts.createModifiersFromModifierFlags(privateProtected), + return [ts.setTextRange(ts.factory.createConstructorDeclaration( + /*decorators*/ undefined, ts.factory.createModifiersFromModifierFlags(privateProtected), /*parameters*/ [], /*body*/ undefined), signatures[0].declaration)]; } @@ -40935,43 +48566,54 @@ var ts; } } } - results.push(indexInfoToIndexSignatureDeclarationHelper(info, type, context)); + results.push(indexInfoToIndexSignatureDeclarationHelper(info, type, context, /*typeNode*/ undefined)); } } return results; } function serializeBaseType(t, staticType, rootName) { - var ref = trySerializeAsTypeReference(t); + var ref = trySerializeAsTypeReference(t, 111551 /* Value */); if (ref) { return ref; } var tempName = getUnusedName(rootName + "_base"); - var statement = ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(tempName, typeToTypeNodeHelper(staticType, context)) + var statement = ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([ + ts.factory.createVariableDeclaration(tempName, /*exclamationToken*/ undefined, typeToTypeNodeHelper(staticType, context)) ], 2 /* Const */)); addResult(statement, 0 /* None */); - return ts.createExpressionWithTypeArguments(/*typeArgs*/ undefined, ts.createIdentifier(tempName)); + return ts.factory.createExpressionWithTypeArguments(ts.factory.createIdentifier(tempName), /*typeArgs*/ undefined); } - function trySerializeAsTypeReference(t) { + function trySerializeAsTypeReference(t, flags) { var typeArgs; var reference; // We don't use `isValueSymbolAccessible` below. since that considers alternative containers (like modules) // which we can't write out in a syntactically valid way as an expression - if (t.target && getAccessibleSymbolChain(t.target.symbol, enclosingDeclaration, 111551 /* Value */, /*useOnlyExternalAliasing*/ false)) { + if (t.target && isSymbolAccessibleByFlags(t.target.symbol, enclosingDeclaration, flags)) { typeArgs = ts.map(getTypeArguments(t), function (t) { return typeToTypeNodeHelper(t, context); }); reference = symbolToExpression(t.target.symbol, context, 788968 /* Type */); } - else if (t.symbol && getAccessibleSymbolChain(t.symbol, enclosingDeclaration, 111551 /* Value */, /*useOnlyExternalAliasing*/ false)) { + else if (t.symbol && isSymbolAccessibleByFlags(t.symbol, enclosingDeclaration, flags)) { reference = symbolToExpression(t.symbol, context, 788968 /* Type */); } if (reference) { - return ts.createExpressionWithTypeArguments(typeArgs, reference); + return ts.factory.createExpressionWithTypeArguments(reference, typeArgs); + } + } + function serializeImplementedType(t) { + var ref = trySerializeAsTypeReference(t, 788968 /* Type */); + if (ref) { + return ref; + } + if (t.symbol) { + return ts.factory.createExpressionWithTypeArguments(symbolToExpression(t.symbol, context, 788968 /* Type */), /*typeArgs*/ undefined); } } function getUnusedName(input, symbol) { - if (symbol) { - if (context.remappedSymbolNames.has("" + getSymbolId(symbol))) { - return context.remappedSymbolNames.get("" + getSymbolId(symbol)); + var _a, _b; + var id = symbol ? getSymbolId(symbol) : undefined; + if (id) { + if (context.remappedSymbolNames.has(id)) { + return context.remappedSymbolNames.get(id); } } if (symbol) { @@ -40979,13 +48621,13 @@ var ts; } var i = 0; var original = input; - while (context.usedSymbolNames.has(input)) { + while ((_a = context.usedSymbolNames) === null || _a === void 0 ? void 0 : _a.has(input)) { i++; input = original + "_" + i; } - context.usedSymbolNames.set(input, true); - if (symbol) { - context.remappedSymbolNames.set("" + getSymbolId(symbol), input); + (_b = context.usedSymbolNames) === null || _b === void 0 ? void 0 : _b.add(input); + if (id) { + context.remappedSymbolNames.set(id, input); } return input; } @@ -41007,12 +48649,13 @@ var ts; return localName; } function getInternalSymbolName(symbol, localName) { - if (context.remappedSymbolNames.has("" + getSymbolId(symbol))) { - return context.remappedSymbolNames.get("" + getSymbolId(symbol)); + var id = getSymbolId(symbol); + if (context.remappedSymbolNames.has(id)) { + return context.remappedSymbolNames.get(id); } localName = getNameCandidateWorker(symbol, localName); // The result of this is going to be used as the symbol's name - lock it in, so `getUnusedName` will also pick it up - context.remappedSymbolNames.set("" + getSymbolId(symbol), localName); + context.remappedSymbolNames.set(id, localName); return localName; } } @@ -41021,7 +48664,7 @@ var ts; if (flags === void 0) { flags = 16384 /* UseAliasDefinedOutsideCurrentScope */; } return writer ? typePredicateToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(typePredicateToStringWorker); function typePredicateToStringWorker(writer) { - var predicate = ts.createTypePredicateNodeWithModifier(typePredicate.kind === 2 /* AssertsThis */ || typePredicate.kind === 3 /* AssertsIdentifier */ ? ts.createToken(124 /* AssertsKeyword */) : undefined, typePredicate.kind === 1 /* Identifier */ || typePredicate.kind === 3 /* AssertsIdentifier */ ? ts.createIdentifier(typePredicate.parameterName) : ts.createThisTypeNode(), typePredicate.type && nodeBuilder.typeToTypeNode(typePredicate.type, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */) // TODO: GH#18217 + var predicate = ts.factory.createTypePredicateNode(typePredicate.kind === 2 /* AssertsThis */ || typePredicate.kind === 3 /* AssertsIdentifier */ ? ts.factory.createToken(127 /* AssertsKeyword */) : undefined, typePredicate.kind === 1 /* Identifier */ || typePredicate.kind === 3 /* AssertsIdentifier */ ? ts.factory.createIdentifier(typePredicate.parameterName) : ts.factory.createThisTypeNode(), typePredicate.type && nodeBuilder.typeToTypeNode(typePredicate.type, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */) // TODO: GH#18217 ); var printer = ts.createPrinter({ removeComments: true }); var sourceFile = enclosingDeclaration && ts.getSourceFileOfNode(enclosingDeclaration); @@ -41067,8 +48710,8 @@ var ts; } function getTypeAliasForTypeLiteral(type) { if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) { - var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 182 /* ParenthesizedType */; }); - if (node.kind === 247 /* TypeAliasDeclaration */) { + var node = ts.walkUpParenthesizedTypes(type.symbol.declarations[0].parent); + if (node.kind === 251 /* TypeAliasDeclaration */) { return getSymbolOfNode(node); } } @@ -41076,11 +48719,11 @@ var ts; } function isTopLevelInExternalModuleAugmentation(node) { return node && node.parent && - node.parent.kind === 250 /* ModuleBlock */ && + node.parent.kind === 254 /* ModuleBlock */ && ts.isExternalModuleAugmentation(node.parent.parent); } function isDefaultBindingContext(location) { - return location.kind === 290 /* SourceFile */ || ts.isAmbientModule(location); + return location.kind === 294 /* SourceFile */ || ts.isAmbientModule(location); } function getNameOfSymbolFromNameType(symbol, context) { var nameType = getSymbolLinks(symbol).nameType; @@ -41119,12 +48762,12 @@ var ts; } if (symbol.declarations && symbol.declarations.length) { var declaration = ts.firstDefined(symbol.declarations, function (d) { return ts.getNameOfDeclaration(d) ? d : undefined; }); // Try using a declaration with a name, first - var name_2 = declaration && ts.getNameOfDeclaration(declaration); - if (declaration && name_2) { + var name_3 = declaration && ts.getNameOfDeclaration(declaration); + if (declaration && name_3) { if (ts.isCallExpression(declaration) && ts.isBindableObjectDefinePropertyCall(declaration)) { return ts.symbolName(symbol); } - if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 4096 /* Late */)) { + if (ts.isComputedPropertyName(name_3) && !(ts.getCheckFlags(symbol) & 4096 /* Late */)) { var nameType = getSymbolLinks(symbol).nameType; if (nameType && nameType.flags & 384 /* StringOrNumberLiteral */) { // Computed property name isn't late bound, but has a well-known name type - use name type to generate a symbol name @@ -41134,22 +48777,22 @@ var ts; } } } - return ts.declarationNameToString(name_2); + return ts.declarationNameToString(name_3); } if (!declaration) { declaration = symbol.declarations[0]; // Declaration may be nameless, but we'll try anyway } - if (declaration.parent && declaration.parent.kind === 242 /* VariableDeclaration */) { + if (declaration.parent && declaration.parent.kind === 246 /* VariableDeclaration */) { return ts.declarationNameToString(declaration.parent.name); } switch (declaration.kind) { - case 214 /* ClassExpression */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 218 /* ClassExpression */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: if (context && !context.encounteredError && !(context.flags & 131072 /* AllowAnonymousIdentifier */)) { context.encounteredError = true; } - return declaration.kind === 214 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)"; + return declaration.kind === 218 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)"; } } var name = getNameOfSymbolFromNameType(symbol, context); @@ -41166,28 +48809,28 @@ var ts; return false; function determineIfDeclarationIsVisible() { switch (node.kind) { - case 315 /* JSDocCallbackTag */: - case 322 /* JSDocTypedefTag */: - case 316 /* JSDocEnumTag */: + case 320 /* JSDocCallbackTag */: + case 327 /* JSDocTypedefTag */: + case 321 /* JSDocEnumTag */: // Top-level jsdoc type aliases are considered exported // First parent is comment node, second is hosting declaration or token; we only care about those tokens or declarations whose parent is a source file return !!(node.parent && node.parent.parent && node.parent.parent.parent && ts.isSourceFile(node.parent.parent.parent)); - case 191 /* BindingElement */: + case 195 /* BindingElement */: return isDeclarationVisible(node.parent.parent); - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: if (ts.isBindingPattern(node.name) && !node.name.elements.length) { // If the binding pattern is empty, this variable declaration is not visible return false; } // falls through - case 249 /* ModuleDeclaration */: - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 244 /* FunctionDeclaration */: - case 248 /* EnumDeclaration */: - case 253 /* ImportEqualsDeclaration */: + case 253 /* ModuleDeclaration */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 248 /* FunctionDeclaration */: + case 252 /* EnumDeclaration */: + case 257 /* ImportEqualsDeclaration */: // external module augmentation is always visible if (ts.isExternalModuleAugmentation(node)) { return true; @@ -41195,54 +48838,55 @@ var ts; var parent = getDeclarationContainer(node); // If the node is not exported or it is not ambient module element (except import declaration) if (!(ts.getCombinedModifierFlags(node) & 1 /* Export */) && - !(node.kind !== 253 /* ImportEqualsDeclaration */ && parent.kind !== 290 /* SourceFile */ && parent.flags & 8388608 /* Ambient */)) { + !(node.kind !== 257 /* ImportEqualsDeclaration */ && parent.kind !== 294 /* SourceFile */ && parent.flags & 8388608 /* Ambient */)) { return isGlobalSourceFile(parent); } // Exported members/ambient module elements (exception import declaration) are visible if parent is visible return isDeclarationVisible(parent); - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - if (ts.hasModifier(node, 8 /* Private */ | 16 /* Protected */)) { + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + if (ts.hasEffectiveModifier(node, 8 /* Private */ | 16 /* Protected */)) { // Private/protected properties/methods are not visible return false; } // Public properties/methods are visible if its parents are visible, so: // falls through - case 162 /* Constructor */: - case 166 /* ConstructSignature */: - case 165 /* CallSignature */: - case 167 /* IndexSignature */: - case 156 /* Parameter */: - case 250 /* ModuleBlock */: - case 170 /* FunctionType */: - case 171 /* ConstructorType */: - case 173 /* TypeLiteral */: - case 169 /* TypeReference */: - case 174 /* ArrayType */: - case 175 /* TupleType */: - case 178 /* UnionType */: - case 179 /* IntersectionType */: - case 182 /* ParenthesizedType */: + case 165 /* Constructor */: + case 169 /* ConstructSignature */: + case 168 /* CallSignature */: + case 170 /* IndexSignature */: + case 159 /* Parameter */: + case 254 /* ModuleBlock */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: + case 176 /* TypeLiteral */: + case 172 /* TypeReference */: + case 177 /* ArrayType */: + case 178 /* TupleType */: + case 181 /* UnionType */: + case 182 /* IntersectionType */: + case 185 /* ParenthesizedType */: + case 191 /* NamedTupleMember */: return isDeclarationVisible(node.parent); // Default binding, import specifier and namespace import is visible // only on demand so by default it is not visible - case 255 /* ImportClause */: - case 256 /* NamespaceImport */: - case 258 /* ImportSpecifier */: + case 259 /* ImportClause */: + case 260 /* NamespaceImport */: + case 262 /* ImportSpecifier */: return false; // Type parameters are always visible - case 155 /* TypeParameter */: + case 158 /* TypeParameter */: // Source file and namespace export are always visible // falls through - case 290 /* SourceFile */: - case 252 /* NamespaceExportDeclaration */: + case 294 /* SourceFile */: + case 256 /* NamespaceExportDeclaration */: return true; // Export assignments do not create name bindings outside the module - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: return false; default: return false; @@ -41251,17 +48895,17 @@ var ts; } function collectLinkedAliases(node, setVisibility) { var exportSymbol; - if (node.parent && node.parent.kind === 259 /* ExportAssignment */) { + if (node.parent && node.parent.kind === 263 /* ExportAssignment */) { exportSymbol = resolveName(node, node.escapedText, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, node, /*isUse*/ false); } - else if (node.parent.kind === 263 /* ExportSpecifier */) { + else if (node.parent.kind === 267 /* ExportSpecifier */) { exportSymbol = getTargetOfExportSpecifier(node.parent, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */); } var result; var visited; if (exportSymbol) { - visited = ts.createMap(); - visited.set("" + getSymbolId(exportSymbol), true); + visited = new ts.Set(); + visited.add(getSymbolId(exportSymbol)); buildVisibleNodeList(exportSymbol.declarations); } return result; @@ -41280,10 +48924,10 @@ var ts; var internalModuleReference = declaration.moduleReference; var firstIdentifier = ts.getFirstIdentifier(internalModuleReference); var importSymbol = resolveName(declaration, firstIdentifier.escapedText, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */, undefined, undefined, /*isUse*/ false); - var id = importSymbol && "" + getSymbolId(importSymbol); - if (importSymbol && !visited.has(id)) { - visited.set(id, true); - buildVisibleNodeList(importSymbol.declarations); + if (importSymbol && visited) { + if (ts.tryAddToSet(visited, getSymbolId(importSymbol))) { + buildVisibleNodeList(importSymbol.declarations); + } } } }); @@ -41342,6 +48986,8 @@ var ts; return !!target.immediateBaseConstraint; case 6 /* ResolvedTypeArguments */: return !!target.resolvedTypeArguments; + case 7 /* ResolvedBaseTypes */: + return !!target.baseTypesResolved; } return ts.Debug.assertNever(propertyName); } @@ -41357,12 +49003,12 @@ var ts; function getDeclarationContainer(node) { return ts.findAncestor(ts.getRootDeclaration(node), function (node) { switch (node.kind) { - case 242 /* VariableDeclaration */: - case 243 /* VariableDeclarationList */: - case 258 /* ImportSpecifier */: - case 257 /* NamedImports */: - case 256 /* NamespaceImport */: - case 255 /* ImportClause */: + case 246 /* VariableDeclaration */: + case 247 /* VariableDeclarationList */: + case 262 /* ImportSpecifier */: + case 261 /* NamedImports */: + case 260 /* NamespaceImport */: + case 259 /* ImportClause */: return false; default: return true; @@ -41446,13 +49092,10 @@ var ts; if (parentAccess && parentAccess.flowNode) { var propName = getDestructuringPropertyName(node); if (propName) { - var result = ts.createNode(195 /* ElementAccessExpression */, node.pos, node.end); - result.parent = node; - result.expression = parentAccess; - var literal = ts.createNode(10 /* StringLiteral */, node.pos, node.end); - literal.parent = result; - literal.text = propName; - result.argumentExpression = literal; + var literal = ts.setTextRange(ts.parseNodeFactory.createStringLiteral(propName), node); + var result = ts.setTextRange(ts.parseNodeFactory.createElementAccessExpression(parentAccess, literal), node); + ts.setParent(literal, result); + ts.setParent(result, node); result.flowNode = parentAccess.flowNode; return result; } @@ -41461,23 +49104,23 @@ var ts; function getParentElementAccess(node) { var ancestor = node.parent.parent; switch (ancestor.kind) { - case 191 /* BindingElement */: - case 281 /* PropertyAssignment */: + case 195 /* BindingElement */: + case 285 /* PropertyAssignment */: return getSyntheticElementAccess(ancestor); - case 192 /* ArrayLiteralExpression */: + case 196 /* ArrayLiteralExpression */: return getSyntheticElementAccess(node.parent); - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return ancestor.initializer; - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return ancestor.right; } } function getDestructuringPropertyName(node) { var parent = node.parent; - if (node.kind === 191 /* BindingElement */ && parent.kind === 189 /* ObjectBindingPattern */) { + if (node.kind === 195 /* BindingElement */ && parent.kind === 193 /* ObjectBindingPattern */) { return getLiteralPropertyNameText(node.propertyName || node.name); } - if (node.kind === 281 /* PropertyAssignment */ || node.kind === 282 /* ShorthandPropertyAssignment */) { + if (node.kind === 285 /* PropertyAssignment */ || node.kind === 286 /* ShorthandPropertyAssignment */) { return getLiteralPropertyNameText(node.name); } return "" + parent.elements.indexOf(node); @@ -41503,7 +49146,7 @@ var ts; parentType = getTypeWithFacts(parentType, 524288 /* NEUndefined */); } var type; - if (pattern.kind === 189 /* ObjectBindingPattern */) { + if (pattern.kind === 193 /* ObjectBindingPattern */) { if (declaration.dotDotDotToken) { parentType = getReducedType(parentType); if (parentType.flags & 2 /* Unknown */ || !isValidSpreadType(parentType)) { @@ -41532,17 +49175,17 @@ var ts; // present (aka the tuple element property). This call also checks that the parentType is in // fact an iterable or array (depending on target language). var elementType = checkIteratedTypeOrElementType(65 /* Destructuring */, parentType, undefinedType, pattern); - var index_1 = pattern.elements.indexOf(declaration); + var index_2 = pattern.elements.indexOf(declaration); if (declaration.dotDotDotToken) { // If the parent is a tuple type, the rest element has a tuple type of the // remaining tuple element types. Otherwise, the rest element has an array type with same // element type as the parent type. type = everyType(parentType, isTupleType) ? - mapType(parentType, function (t) { return sliceTupleType(t, index_1); }) : + mapType(parentType, function (t) { return sliceTupleType(t, index_2); }) : createArrayType(elementType); } else if (isArrayLikeType(parentType)) { - var indexType = getLiteralType(index_1); + var indexType = getLiteralType(index_2); var accessFlags = hasDefaultValue(declaration) ? 8 /* NoTupleBoundsCheck */ : 0; var declaredType = getConstraintForLocation(getIndexedAccessTypeOrUndefined(parentType, indexType, declaration.name, accessFlags) || errorType, declaration.name); type = getFlowTypeOfDestructuring(declaration, declaredType); @@ -41572,11 +49215,11 @@ var ts; } function isNullOrUndefined(node) { var expr = ts.skipParentheses(node); - return expr.kind === 100 /* NullKeyword */ || expr.kind === 75 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol; + return expr.kind === 103 /* NullKeyword */ || expr.kind === 78 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol; } function isEmptyArrayLiteral(node) { var expr = ts.skipParentheses(node); - return expr.kind === 192 /* ArrayLiteralExpression */ && expr.elements.length === 0; + return expr.kind === 196 /* ArrayLiteralExpression */ && expr.elements.length === 0; } function addOptionality(type, optional) { if (optional === void 0) { optional = true; } @@ -41586,11 +49229,11 @@ var ts; function getTypeForVariableLikeDeclaration(declaration, includeOptionality) { // A variable declared in a for..in statement is of type string, or of type keyof T when the // right hand expression is of a type parameter type. - if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 231 /* ForInStatement */) { + if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 235 /* ForInStatement */) { var indexType = getIndexType(getNonNullableTypeIfNeeded(checkExpression(declaration.parent.parent.expression))); return indexType.flags & (262144 /* TypeParameter */ | 4194304 /* Index */) ? getExtractStringType(indexType) : stringType; } - if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 232 /* ForOfStatement */) { + if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 236 /* ForOfStatement */) { // checkRightHandSideOfForOf will return undefined if the for-of expression type was // missing properties/signatures required to get its iteratedType (like // [Symbol.iterator] or next). This may be because we accessed properties from anyType, @@ -41602,6 +49245,7 @@ var ts; return getTypeForBindingElement(declaration); } var isOptional = includeOptionality && (ts.isParameter(declaration) && isJSDocOptionalParameter(declaration) + || isOptionalJSDocPropertyLikeTag(declaration) || !ts.isBindingElement(declaration) && !ts.isVariableDeclaration(declaration) && !!declaration.questionToken); // Use type from type annotation if one is present var declaredType = tryGetTypeFromEffectiveTypeNode(declaration); @@ -41609,7 +49253,7 @@ var ts; return addOptionality(declaredType, isOptional); } if ((noImplicitAny || ts.isInJSFile(declaration)) && - declaration.kind === 242 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) && + ts.isVariableDeclaration(declaration) && !ts.isBindingPattern(declaration.name) && !(ts.getCombinedModifierFlags(declaration) & 1 /* Export */) && !(declaration.flags & 8388608 /* Ambient */)) { // If --noImplicitAny is on or the declaration is in a Javascript file, // use control flow tracked 'any' type for non-ambient, non-exported var or let variables with no @@ -41623,11 +49267,11 @@ var ts; return autoArrayType; } } - if (declaration.kind === 156 /* Parameter */) { + if (ts.isParameter(declaration)) { var func = declaration.parent; // For a parameter of a set accessor, use the type of the get accessor if one is present - if (func.kind === 164 /* SetAccessor */ && !hasNonBindableDynamicName(func)) { - var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 163 /* GetAccessor */); + if (func.kind === 167 /* SetAccessor */ && !hasNonBindableDynamicName(func)) { + var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 166 /* GetAccessor */); if (getter) { var getterSignature = getSignatureFromDeclaration(getter); var thisParameter = getAccessorThisParameter(func); @@ -41642,7 +49286,9 @@ var ts; if (ts.isInJSFile(declaration)) { var typeTag = ts.getJSDocType(func); if (typeTag && ts.isFunctionTypeNode(typeTag)) { - return getTypeAtPosition(getSignatureFromDeclaration(typeTag), func.parameters.indexOf(declaration)); + var signature = getSignatureFromDeclaration(typeTag); + var pos = func.parameters.indexOf(declaration); + return declaration.dotDotDotToken ? getRestTypeAtPosition(signature, pos) : getTypeAtPosition(signature, pos); } } // Use contextual parameter type if one is available @@ -41651,18 +49297,27 @@ var ts; return addOptionality(type, isOptional); } } - else if (ts.isInJSFile(declaration)) { - var containerObjectType = getJSContainerObjectType(declaration, getSymbolOfNode(declaration), ts.getDeclaredExpandoInitializer(declaration)); - if (containerObjectType) { - return containerObjectType; - } - } // Use the type of the initializer expression if one is present and the declaration is // not a parameter of a contextually typed function - if (declaration.initializer) { + if (ts.hasOnlyExpressionInitializer(declaration) && !!declaration.initializer) { + if (ts.isInJSFile(declaration) && !ts.isParameter(declaration)) { + var containerObjectType = getJSContainerObjectType(declaration, getSymbolOfNode(declaration), ts.getDeclaredExpandoInitializer(declaration)); + if (containerObjectType) { + return containerObjectType; + } + } var type = widenTypeInferredFromInitializer(declaration, checkDeclarationInitializer(declaration)); return addOptionality(type, isOptional); } + if (ts.isPropertyDeclaration(declaration) && !ts.hasStaticModifier(declaration) && (noImplicitAny || ts.isInJSFile(declaration))) { + // We have a property declaration with no type annotation or initializer, in noImplicitAny mode or a .js file. + // Use control flow analysis of this.xxx assignments in the constructor to determine the type of the property. + var constructor = findConstructorDeclaration(declaration.parent); + var type = constructor ? getFlowTypeInConstructor(declaration.symbol, constructor) : + ts.getEffectiveModifierFlags(declaration) & 2 /* Ambient */ ? getTypeOfPropertyInBaseClass(declaration.symbol) : + undefined; + return type && addOptionality(type, isOptional); + } if (ts.isJsxAttribute(declaration)) { // if JSX attribute doesn't have initializer, by default the attribute will have boolean value of true. // I.e is sugar for @@ -41676,6 +49331,56 @@ var ts; // No type specified and nothing can be inferred return undefined; } + function isConstructorDeclaredProperty(symbol) { + // A property is considered a constructor declared property when all declaration sites are this.xxx assignments, + // when no declaration sites have JSDoc type annotations, and when at least one declaration site is in the body of + // a class constructor. + if (symbol.valueDeclaration && ts.isBinaryExpression(symbol.valueDeclaration)) { + var links = getSymbolLinks(symbol); + if (links.isConstructorDeclaredProperty === undefined) { + links.isConstructorDeclaredProperty = !!getDeclaringConstructor(symbol) && ts.every(symbol.declarations, function (declaration) { + return ts.isBinaryExpression(declaration) && + ts.getAssignmentDeclarationKind(declaration) === 4 /* ThisProperty */ && + (declaration.left.kind !== 199 /* ElementAccessExpression */ || ts.isStringOrNumericLiteralLike(declaration.left.argumentExpression)) && + !getAnnotatedTypeForAssignmentDeclaration(/*declaredType*/ undefined, declaration, symbol, declaration); + }); + } + return links.isConstructorDeclaredProperty; + } + return false; + } + function isAutoTypedProperty(symbol) { + // A property is auto-typed when its declaration has no type annotation or initializer and we're in + // noImplicitAny mode or a .js file. + var declaration = symbol.valueDeclaration; + return declaration && ts.isPropertyDeclaration(declaration) && !ts.getEffectiveTypeAnnotationNode(declaration) && + !declaration.initializer && (noImplicitAny || ts.isInJSFile(declaration)); + } + function getDeclaringConstructor(symbol) { + for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) { + var declaration = _a[_i]; + var container = ts.getThisContainer(declaration, /*includeArrowFunctions*/ false); + if (container && (container.kind === 165 /* Constructor */ || isJSConstructor(container))) { + return container; + } + } + } + function getFlowTypeInConstructor(symbol, constructor) { + var reference = ts.factory.createPropertyAccessExpression(ts.factory.createThis(), ts.unescapeLeadingUnderscores(symbol.escapedName)); + ts.setParent(reference.expression, reference); + ts.setParent(reference, constructor); + reference.flowNode = constructor.returnFlowNode; + var flowType = getFlowTypeOfProperty(reference, symbol); + if (noImplicitAny && (flowType === autoType || flowType === autoArrayType)) { + error(symbol.valueDeclaration, ts.Diagnostics.Member_0_implicitly_has_an_1_type, symbolToString(symbol), typeToString(flowType)); + } + // We don't infer a type if assignments are only null or undefined. + return everyType(flowType, isNullableType) ? undefined : convertAutoToAny(flowType); + } + function getFlowTypeOfProperty(reference, prop) { + var initialType = prop && (!isAutoTypedProperty(prop) || ts.getEffectiveModifierFlags(prop.valueDeclaration) & 2 /* Ambient */) && getTypeOfPropertyInBaseClass(prop) || undefinedType; + return getFlowTypeOfReference(reference, autoType, initialType); + } function getWidenedTypeForAssignmentDeclaration(symbol, resolvedSymbol) { // function/class/{} initializers are themselves containers, so they won't merge in the same way as other initializers var container = ts.getAssignedExpandoInitializer(symbol.valueDeclaration); @@ -41687,52 +49392,60 @@ var ts; var containerObjectType = getJSContainerObjectType(symbol.valueDeclaration, symbol, container); return containerObjectType || getWidenedLiteralType(checkExpressionCached(container)); } + var type; var definedInConstructor = false; var definedInMethod = false; - var jsdocType; - var types; - for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) { - var declaration = _a[_i]; - var expression = (ts.isBinaryExpression(declaration) || ts.isCallExpression(declaration)) ? declaration : - ts.isAccessExpression(declaration) ? ts.isBinaryExpression(declaration.parent) ? declaration.parent : declaration : - undefined; - if (!expression) { - continue; // Non-assignment declaration merged in (eg, an Identifier to mark the thing as a namespace) - skip over it and pull type info from elsewhere - } - var kind = ts.isAccessExpression(expression) - ? ts.getAssignmentDeclarationPropertyAccessKind(expression) - : ts.getAssignmentDeclarationKind(expression); - if (kind === 4 /* ThisProperty */) { - if (isDeclarationInConstructor(expression)) { - definedInConstructor = true; - } - else { - definedInMethod = true; - } - } - if (!ts.isCallExpression(expression)) { - jsdocType = getAnnotatedTypeForAssignmentDeclaration(jsdocType, expression, symbol, declaration); - } - if (!jsdocType) { - (types || (types = [])).push((ts.isBinaryExpression(expression) || ts.isCallExpression(expression)) ? getInitializerTypeFromAssignmentDeclaration(symbol, resolvedSymbol, expression, kind) : neverType); - } + // We use control flow analysis to determine the type of the property if the property qualifies as a constructor + // declared property and the resulting control flow type isn't just undefined or null. + if (isConstructorDeclaredProperty(symbol)) { + type = getFlowTypeInConstructor(symbol, getDeclaringConstructor(symbol)); } - var type = jsdocType; if (!type) { - if (!ts.length(types)) { - return errorType; // No types from any declarations :( - } - var constructorTypes = definedInConstructor ? getConstructorDefinedThisAssignmentTypes(types, symbol.declarations) : undefined; - // use only the constructor types unless they were only assigned null | undefined (including widening variants) - if (definedInMethod) { - var propType = getTypeOfAssignmentDeclarationPropertyOfBaseType(symbol); - if (propType) { - (constructorTypes || (constructorTypes = [])).push(propType); - definedInConstructor = true; + var jsdocType = void 0; + var types = void 0; + for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) { + var declaration = _a[_i]; + var expression = (ts.isBinaryExpression(declaration) || ts.isCallExpression(declaration)) ? declaration : + ts.isAccessExpression(declaration) ? ts.isBinaryExpression(declaration.parent) ? declaration.parent : declaration : + undefined; + if (!expression) { + continue; // Non-assignment declaration merged in (eg, an Identifier to mark the thing as a namespace) - skip over it and pull type info from elsewhere + } + var kind = ts.isAccessExpression(expression) + ? ts.getAssignmentDeclarationPropertyAccessKind(expression) + : ts.getAssignmentDeclarationKind(expression); + if (kind === 4 /* ThisProperty */) { + if (isDeclarationInConstructor(expression)) { + definedInConstructor = true; + } + else { + definedInMethod = true; + } + } + if (!ts.isCallExpression(expression)) { + jsdocType = getAnnotatedTypeForAssignmentDeclaration(jsdocType, expression, symbol, declaration); + } + if (!jsdocType) { + (types || (types = [])).push((ts.isBinaryExpression(expression) || ts.isCallExpression(expression)) ? getInitializerTypeFromAssignmentDeclaration(symbol, resolvedSymbol, expression, kind) : neverType); } } - var sourceTypes = ts.some(constructorTypes, function (t) { return !!(t.flags & ~98304 /* Nullable */); }) ? constructorTypes : types; // TODO: GH#18217 - type = getUnionType(sourceTypes, 2 /* Subtype */); + type = jsdocType; + if (!type) { + if (!ts.length(types)) { + return errorType; // No types from any declarations :( + } + var constructorTypes = definedInConstructor ? getConstructorDefinedThisAssignmentTypes(types, symbol.declarations) : undefined; + // use only the constructor types unless they were only assigned null | undefined (including widening variants) + if (definedInMethod) { + var propType = getTypeOfPropertyInBaseClass(symbol); + if (propType) { + (constructorTypes || (constructorTypes = [])).push(propType); + definedInConstructor = true; + } + } + var sourceTypes = ts.some(constructorTypes, function (t) { return !!(t.flags & ~98304 /* Nullable */); }) ? constructorTypes : types; // TODO: GH#18217 + type = getUnionType(sourceTypes, 2 /* Subtype */); + } } var widened = getWidenedType(addOptionality(type, definedInMethod && !definedInConstructor)); if (filterType(widened, function (t) { return !!(t.flags & ~98304 /* Nullable */); }) === neverType) { @@ -41742,19 +49455,20 @@ var ts; return widened; } function getJSContainerObjectType(decl, symbol, init) { + var _a, _b; if (!ts.isInJSFile(decl) || !init || !ts.isObjectLiteralExpression(init) || init.properties.length) { return undefined; } var exports = ts.createSymbolTable(); while (ts.isBinaryExpression(decl) || ts.isPropertyAccessExpression(decl)) { var s_2 = getSymbolOfNode(decl); - if (s_2 && ts.hasEntries(s_2.exports)) { + if ((_a = s_2 === null || s_2 === void 0 ? void 0 : s_2.exports) === null || _a === void 0 ? void 0 : _a.size) { mergeSymbolTable(exports, s_2.exports); } decl = ts.isBinaryExpression(decl) ? decl.parent : decl.parent.parent; } var s = getSymbolOfNode(decl); - if (s && ts.hasEntries(s.exports)) { + if ((_b = s === null || s === void 0 ? void 0 : s.exports) === null || _b === void 0 ? void 0 : _b.size) { mergeSymbolTable(exports, s.exports); } var type = createAnonymousType(symbol, exports, ts.emptyArray, ts.emptyArray, undefined, undefined); @@ -41824,7 +49538,7 @@ var ts; var _a; var exportedMember = members_4.get(name); if (exportedMember && exportedMember !== s) { - if (s.flags & 111551 /* Value */) { + if (s.flags & 111551 /* Value */ && exportedMember.flags & 111551 /* Value */) { // If the member has an additional value-like declaration, union the types from the two declarations, // but issue an error if they occurred in two different files. The purpose is to support a JS file with // a pattern like: @@ -41867,16 +49581,16 @@ var ts; } function containsSameNamedThisProperty(thisProperty, expression) { return ts.isPropertyAccessExpression(thisProperty) - && thisProperty.expression.kind === 104 /* ThisKeyword */ + && thisProperty.expression.kind === 107 /* ThisKeyword */ && ts.forEachChildRecursively(expression, function (n) { return isMatchingReference(thisProperty, n); }); } function isDeclarationInConstructor(expression) { var thisContainer = ts.getThisContainer(expression, /*includeArrowFunctions*/ false); // Properties defined in a constructor (or base constructor, or javascript constructor function) don't get undefined added. // Function expressions that are assigned to the prototype count as methods. - return thisContainer.kind === 162 /* Constructor */ || - thisContainer.kind === 244 /* FunctionDeclaration */ || - (thisContainer.kind === 201 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent)); + return thisContainer.kind === 165 /* Constructor */ || + thisContainer.kind === 248 /* FunctionDeclaration */ || + (thisContainer.kind === 205 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent)); } function getConstructorDefinedThisAssignmentTypes(types, declarations) { ts.Debug.assert(types.length === declarations.length); @@ -41887,20 +49601,6 @@ var ts; return expression && isDeclarationInConstructor(expression); }); } - /** check for definition in base class if any declaration is in a class */ - function getTypeOfAssignmentDeclarationPropertyOfBaseType(property) { - var parentDeclaration = ts.forEach(property.declarations, function (d) { - var parent = ts.getThisContainer(d, /*includeArrowFunctions*/ false).parent; - return ts.isClassLike(parent) && parent; - }); - if (parentDeclaration) { - var classType = getDeclaredTypeOfSymbol(getSymbolOfNode(parentDeclaration)); - var baseClassType = classType && getBaseTypes(classType)[0]; - if (baseClassType) { - return getTypeOfPropertyOfType(baseClassType, property.escapedName); - } - } - } // Return the type implied by a binding pattern element. This is the type of the initializer of the element if // one is present. Otherwise, if the element is itself a binding pattern, it is the type implied by the binding // pattern. Otherwise, it is the type any. @@ -41960,13 +49660,14 @@ var ts; function getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors) { var elements = pattern.elements; var lastElement = ts.lastOrUndefined(elements); - var hasRestElement = !!(lastElement && lastElement.kind === 191 /* BindingElement */ && lastElement.dotDotDotToken); - if (elements.length === 0 || elements.length === 1 && hasRestElement) { + var restElement = lastElement && lastElement.kind === 195 /* BindingElement */ && lastElement.dotDotDotToken ? lastElement : undefined; + if (elements.length === 0 || elements.length === 1 && restElement) { return languageVersion >= 2 /* ES2015 */ ? createIterableType(anyType) : anyArrayType; } var elementTypes = ts.map(elements, function (e) { return ts.isOmittedExpression(e) ? anyType : getTypeFromBindingElement(e, includePatternInType, reportErrors); }); - var minLength = ts.findLastIndex(elements, function (e) { return !ts.isOmittedExpression(e) && !hasDefaultValue(e); }, elements.length - (hasRestElement ? 2 : 1)) + 1; - var result = createTupleType(elementTypes, minLength, hasRestElement); + var minLength = ts.findLastIndex(elements, function (e) { return !(e === restElement || ts.isOmittedExpression(e) || hasDefaultValue(e)); }, elements.length - 1) + 1; + var elementFlags = ts.map(elements, function (e, i) { return e === restElement ? 4 /* Rest */ : i >= minLength ? 2 /* Optional */ : 1 /* Required */; }); + var result = createTupleType(elementTypes, elementFlags); if (includePatternInType) { result = cloneTypeReference(result); result.pattern = pattern; @@ -41984,7 +49685,7 @@ var ts; function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) { if (includePatternInType === void 0) { includePatternInType = false; } if (reportErrors === void 0) { reportErrors = false; } - return pattern.kind === 189 /* ObjectBindingPattern */ + return pattern.kind === 193 /* ObjectBindingPattern */ ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors) : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors); } @@ -42023,7 +49724,7 @@ var ts; } function declarationBelongsToPrivateAmbientMember(declaration) { var root = ts.getRootDeclaration(declaration); - var memberDeclaration = root.kind === 156 /* Parameter */ ? root.parent : root; + var memberDeclaration = root.kind === 159 /* Parameter */ ? root.parent : root; return isPrivateWithinAmbient(memberDeclaration); } function tryGetTypeFromEffectiveTypeNode(declaration) { @@ -42063,7 +49764,12 @@ var ts; // Handle catch clause variables var declaration = symbol.valueDeclaration; if (ts.isCatchClauseVariableDeclarationOrBindingElement(declaration)) { - return anyType; + var decl = declaration; + if (!decl.type) + return anyType; + var type_1 = getTypeOfNode(decl.type); + // an errorType will make `checkTryStatement` issue an error + return isTypeAny(type_1) || type_1 === unknownType ? type_1 : errorType; } // Handle export default expressions if (ts.isSourceFile(declaration) && ts.isJsonSourceFile(declaration)) { @@ -42081,7 +49787,7 @@ var ts; return reportCircularityError(symbol); } var type; - if (declaration.kind === 259 /* ExportAssignment */) { + if (declaration.kind === 263 /* ExportAssignment */) { type = widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration); } else if (ts.isBinaryExpression(declaration) || @@ -42089,8 +49795,7 @@ var ts; (ts.isCallExpression(declaration) || (ts.isPropertyAccessExpression(declaration) || ts.isBindableStaticElementAccessExpression(declaration)) && ts.isBinaryExpression(declaration.parent)))) { type = getWidenedTypeForAssignmentDeclaration(symbol); } - else if (ts.isJSDocPropertyLikeTag(declaration) - || ts.isPropertyAccessExpression(declaration) + else if (ts.isPropertyAccessExpression(declaration) || ts.isElementAccessExpression(declaration) || ts.isIdentifier(declaration) || ts.isStringLiteralLike(declaration) @@ -42124,7 +49829,8 @@ var ts; || ts.isPropertyDeclaration(declaration) || ts.isPropertySignature(declaration) || ts.isVariableDeclaration(declaration) - || ts.isBindingElement(declaration)) { + || ts.isBindingElement(declaration) + || ts.isJSDocPropertyLikeTag(declaration)) { type = getWidenedTypeForVariableLikeDeclaration(declaration, /*includeOptionality*/ true); } // getTypeOfSymbol dispatches some JS merges incorrectly because their symbol flags are not mutually exclusive. @@ -42152,7 +49858,7 @@ var ts; } function getAnnotatedAccessorTypeNode(accessor) { if (accessor) { - if (accessor.kind === 163 /* GetAccessor */) { + if (accessor.kind === 166 /* GetAccessor */) { var getterTypeAnnotation = ts.getEffectiveReturnTypeNode(accessor); return getterTypeAnnotation; } @@ -42186,15 +49892,15 @@ var ts; if (!popTypeResolution()) { type = anyType; if (noImplicitAny) { - var getter = ts.getDeclarationOfKind(symbol, 163 /* GetAccessor */); + var getter = ts.getDeclarationOfKind(symbol, 166 /* GetAccessor */); error(getter, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol)); } } return type; } function resolveTypeOfAccessors(symbol) { - var getter = ts.getDeclarationOfKind(symbol, 163 /* GetAccessor */); - var setter = ts.getDeclarationOfKind(symbol, 164 /* SetAccessor */); + var getter = ts.getDeclarationOfKind(symbol, 166 /* GetAccessor */); + var setter = ts.getDeclarationOfKind(symbol, 167 /* SetAccessor */); if (getter && ts.isInJSFile(getter)) { var jsDocType = getTypeForDeclarationFromJSDocComment(getter); if (jsDocType) { @@ -42262,9 +49968,9 @@ var ts; if (symbol.flags & 1536 /* Module */ && ts.isShorthandAmbientModuleSymbol(symbol)) { return anyType; } - else if (declaration && (declaration.kind === 209 /* BinaryExpression */ || + else if (declaration && (declaration.kind === 213 /* BinaryExpression */ || ts.isAccessExpression(declaration) && - declaration.parent.kind === 209 /* BinaryExpression */)) { + declaration.parent.kind === 213 /* BinaryExpression */)) { return getWidenedTypeForAssignmentDeclaration(symbol); } else if (symbol.flags & 512 /* ValueModule */ && declaration && ts.isSourceFile(declaration) && declaration.commonJsModuleIndicator) { @@ -42274,11 +49980,11 @@ var ts; return errorType; } var exportEquals = getMergedSymbol(symbol.exports.get("export=" /* ExportEquals */)); - var type_1 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule); + var type_2 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule); if (!popTypeResolution()) { return reportCircularityError(symbol); } - return type_1; + return type_2; } } var type = createObjectType(16 /* Anonymous */, symbol); @@ -42331,7 +50037,7 @@ var ts; return errorType; } // Check if variable has initializer that circularly references the variable itself - if (noImplicitAny && (declaration.kind !== 156 /* Parameter */ || declaration.initializer)) { + if (noImplicitAny && (declaration.kind !== 159 /* Parameter */ || declaration.initializer)) { error(symbol.valueDeclaration, ts.Diagnostics._0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer, symbolToString(symbol)); } // Circularities could also result from parameters in function expressions that end up @@ -42430,48 +50136,54 @@ var ts; return undefined; } switch (node.kind) { - case 225 /* VariableStatement */: - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 246 /* InterfaceDeclaration */: - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 160 /* MethodSignature */: - case 170 /* FunctionType */: - case 171 /* ConstructorType */: - case 300 /* JSDocFunctionType */: - case 244 /* FunctionDeclaration */: - case 161 /* MethodDeclaration */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: - case 247 /* TypeAliasDeclaration */: - case 321 /* JSDocTemplateTag */: - case 322 /* JSDocTypedefTag */: - case 316 /* JSDocEnumTag */: - case 315 /* JSDocCallbackTag */: - case 186 /* MappedType */: - case 180 /* ConditionalType */: + case 229 /* VariableStatement */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 250 /* InterfaceDeclaration */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 163 /* MethodSignature */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: + case 304 /* JSDocFunctionType */: + case 248 /* FunctionDeclaration */: + case 164 /* MethodDeclaration */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 251 /* TypeAliasDeclaration */: + case 326 /* JSDocTemplateTag */: + case 327 /* JSDocTypedefTag */: + case 321 /* JSDocEnumTag */: + case 320 /* JSDocCallbackTag */: + case 189 /* MappedType */: + case 183 /* ConditionalType */: var outerTypeParameters = getOuterTypeParameters(node, includeThisTypes); - if (node.kind === 186 /* MappedType */) { + if (node.kind === 189 /* MappedType */) { return ts.append(outerTypeParameters, getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter))); } - else if (node.kind === 180 /* ConditionalType */) { + else if (node.kind === 183 /* ConditionalType */) { return ts.concatenate(outerTypeParameters, getInferTypeParameters(node)); } - else if (node.kind === 225 /* VariableStatement */ && !ts.isInJSFile(node)) { + else if (node.kind === 229 /* VariableStatement */ && !ts.isInJSFile(node)) { break; } var outerAndOwnTypeParameters = appendTypeParameters(outerTypeParameters, ts.getEffectiveTypeParameterDeclarations(node)); var thisType = includeThisTypes && - (node.kind === 245 /* ClassDeclaration */ || node.kind === 214 /* ClassExpression */ || node.kind === 246 /* InterfaceDeclaration */ || isJSConstructor(node)) && + (node.kind === 249 /* ClassDeclaration */ || node.kind === 218 /* ClassExpression */ || node.kind === 250 /* InterfaceDeclaration */ || isJSConstructor(node)) && getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType; return thisType ? ts.append(outerAndOwnTypeParameters, thisType) : outerAndOwnTypeParameters; + case 322 /* JSDocParameterTag */: + var paramSymbol = ts.getParameterSymbolFromJSDoc(node); + if (paramSymbol) { + node = paramSymbol.valueDeclaration; + } + break; } } } // The outer type parameters are those defined by enclosing generic classes, methods, or functions. function getOuterTypeParametersOfClassOrInterface(symbol) { - var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 246 /* InterfaceDeclaration */); + var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 250 /* InterfaceDeclaration */); ts.Debug.assert(!!declaration, "Class was missing valueDeclaration -OR- non-class had no interface declarations"); return getOuterTypeParameters(declaration); } @@ -42481,9 +50193,9 @@ var ts; var result; for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) { var node = _a[_i]; - if (node.kind === 246 /* InterfaceDeclaration */ || - node.kind === 245 /* ClassDeclaration */ || - node.kind === 214 /* ClassExpression */ || + if (node.kind === 250 /* InterfaceDeclaration */ || + node.kind === 249 /* ClassDeclaration */ || + node.kind === 218 /* ClassExpression */ || isJSConstructor(node) || ts.isTypeAlias(node)) { var declaration = node; @@ -42604,25 +50316,43 @@ var ts; } return resolvedImplementsTypes; } + function reportCircularBaseType(node, type) { + error(node, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, 2 /* WriteArrayAsGenericType */)); + } function getBaseTypes(type) { - if (!type.resolvedBaseTypes) { - if (type.objectFlags & 8 /* Tuple */) { - type.resolvedBaseTypes = [createArrayType(getUnionType(type.typeParameters || ts.emptyArray), type.readonly)]; - } - else if (type.symbol.flags & (32 /* Class */ | 64 /* Interface */)) { - if (type.symbol.flags & 32 /* Class */) { - resolveBaseTypesOfClass(type); + if (!type.baseTypesResolved) { + if (pushTypeResolution(type, 7 /* ResolvedBaseTypes */)) { + if (type.objectFlags & 8 /* Tuple */) { + type.resolvedBaseTypes = [getTupleBaseType(type)]; } - if (type.symbol.flags & 64 /* Interface */) { - resolveBaseTypesOfInterface(type); + else if (type.symbol.flags & (32 /* Class */ | 64 /* Interface */)) { + if (type.symbol.flags & 32 /* Class */) { + resolveBaseTypesOfClass(type); + } + if (type.symbol.flags & 64 /* Interface */) { + resolveBaseTypesOfInterface(type); + } + } + else { + ts.Debug.fail("type must be class or interface"); + } + if (!popTypeResolution()) { + for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) { + var declaration = _a[_i]; + if (declaration.kind === 249 /* ClassDeclaration */ || declaration.kind === 250 /* InterfaceDeclaration */) { + reportCircularBaseType(declaration, type); + } + } } } - else { - ts.Debug.fail("type must be class or interface"); - } + type.baseTypesResolved = true; } return type.resolvedBaseTypes; } + function getTupleBaseType(type) { + var elementTypes = ts.sameMap(type.typeParameters, function (t, i) { return type.elementFlags[i] & 8 /* Variadic */ ? getIndexedAccessType(t, numberType) : t; }); + return createArrayType(getUnionType(elementTypes || ts.emptyArray), type.readonly); + } function resolveBaseTypesOfClass(type) { type.resolvedBaseTypes = ts.resolvingEmptyArray; var baseConstructorType = getApparentType(getBaseConstructorTypeOfClass(type)); @@ -42704,7 +50434,7 @@ var ts; type.resolvedBaseTypes = type.resolvedBaseTypes || ts.emptyArray; for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) { var declaration = _a[_i]; - if (declaration.kind === 246 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) { + if (declaration.kind === 250 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) { for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) { var node = _c[_b]; var baseType = getReducedType(getTypeFromTypeNode(node)); @@ -42719,7 +50449,7 @@ var ts; } } else { - error(declaration, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, 2 /* WriteArrayAsGenericType */)); + reportCircularBaseType(declaration, type); } } else { @@ -42740,7 +50470,7 @@ var ts; function isThislessInterface(symbol) { for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) { var declaration = _a[_i]; - if (declaration.kind === 246 /* InterfaceDeclaration */) { + if (declaration.kind === 250 /* InterfaceDeclaration */) { if (declaration.flags & 128 /* ContainsThis */) { return false; } @@ -42783,7 +50513,7 @@ var ts; type.typeParameters = ts.concatenate(outerTypeParameters, localTypeParameters); type.outerTypeParameters = outerTypeParameters; type.localTypeParameters = localTypeParameters; - type.instantiations = ts.createMap(); + type.instantiations = new ts.Map(); type.instantiations.set(getTypeListId(type.typeParameters), type); type.target = type; type.resolvedTypeArguments = type.typeParameters; @@ -42812,7 +50542,7 @@ var ts; // Initialize the instantiation cache for generic type aliases. The declared type corresponds to // an instantiation of the type alias with the type parameters supplied as type arguments. links.typeParameters = typeParameters; - links.instantiations = ts.createMap(); + links.instantiations = new ts.Map(); links.instantiations.set(getTypeListId(typeParameters), type); } } @@ -42828,7 +50558,7 @@ var ts; if (ts.isStringLiteralLike(expr)) { return true; } - else if (expr.kind === 209 /* BinaryExpression */) { + else if (expr.kind === 213 /* BinaryExpression */) { return isStringConcatExpression(expr.left) && isStringConcatExpression(expr.right); } return false; @@ -42843,12 +50573,12 @@ var ts; case 8 /* NumericLiteral */: case 14 /* NoSubstitutionTemplateLiteral */: return true; - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: return expr.operator === 40 /* MinusToken */ && expr.operand.kind === 8 /* NumericLiteral */; - case 75 /* Identifier */: + case 78 /* Identifier */: return ts.nodeIsMissing(expr) || !!getSymbolOfNode(member.parent).exports.get(expr.escapedText); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return isStringConcatExpression(expr); default: return false; @@ -42862,7 +50592,7 @@ var ts; var hasNonLiteralMember = false; for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) { var declaration = _a[_i]; - if (declaration.kind === 248 /* EnumDeclaration */) { + if (declaration.kind === 252 /* EnumDeclaration */) { for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) { var member = _c[_b]; if (member.initializer && ts.isStringLiteralLike(member.initializer)) { @@ -42889,7 +50619,7 @@ var ts; var memberTypeList = []; for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) { var declaration = _a[_i]; - if (declaration.kind === 248 /* EnumDeclaration */) { + if (declaration.kind === 252 /* EnumDeclaration */) { for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) { var member = _c[_b]; var value = getEnumMemberValue(member); @@ -42961,23 +50691,22 @@ var ts; */ function isThislessType(node) { switch (node.kind) { - case 125 /* AnyKeyword */: - case 148 /* UnknownKeyword */: - case 143 /* StringKeyword */: - case 140 /* NumberKeyword */: - case 151 /* BigIntKeyword */: - case 128 /* BooleanKeyword */: - case 144 /* SymbolKeyword */: - case 141 /* ObjectKeyword */: - case 110 /* VoidKeyword */: - case 146 /* UndefinedKeyword */: - case 100 /* NullKeyword */: - case 137 /* NeverKeyword */: - case 187 /* LiteralType */: + case 128 /* AnyKeyword */: + case 151 /* UnknownKeyword */: + case 146 /* StringKeyword */: + case 143 /* NumberKeyword */: + case 154 /* BigIntKeyword */: + case 131 /* BooleanKeyword */: + case 147 /* SymbolKeyword */: + case 144 /* ObjectKeyword */: + case 113 /* VoidKeyword */: + case 149 /* UndefinedKeyword */: + case 140 /* NeverKeyword */: + case 190 /* LiteralType */: return true; - case 174 /* ArrayType */: + case 177 /* ArrayType */: return isThislessType(node.elementType); - case 169 /* TypeReference */: + case 172 /* TypeReference */: return !node.typeArguments || node.typeArguments.every(isThislessType); } return false; @@ -43003,7 +50732,7 @@ var ts; function isThislessFunctionLikeDeclaration(node) { var returnType = ts.getEffectiveReturnTypeNode(node); var typeParameters = ts.getEffectiveTypeParameterDeclarations(node); - return (node.kind === 162 /* Constructor */ || (!!returnType && isThislessType(returnType))) && + return (node.kind === 165 /* Constructor */ || (!!returnType && isThislessType(returnType))) && node.parameters.every(isThislessVariableLikeDeclaration) && typeParameters.every(isThislessTypeParameter); } @@ -43019,14 +50748,14 @@ var ts; var declaration = symbol.declarations[0]; if (declaration) { switch (declaration.kind) { - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: return isThislessVariableLikeDeclaration(declaration); - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return isThislessFunctionLikeDeclaration(declaration); } } @@ -43052,7 +50781,7 @@ var ts; } } function isStaticPrivateIdentifierProperty(s) { - return !!s.valueDeclaration && ts.isPrivateIdentifierPropertyDeclaration(s.valueDeclaration) && ts.hasModifier(s.valueDeclaration, 32 /* Static */); + return !!s.valueDeclaration && ts.isPrivateIdentifierPropertyDeclaration(s.valueDeclaration) && ts.hasSyntacticModifier(s.valueDeclaration, 32 /* Static */); } function resolveDeclaredMembers(type) { if (!type.declaredProperties) { @@ -43200,9 +50929,9 @@ var ts; // If we have an existing early-bound member, combine its declarations so that we can // report an error at each declaration. var declarations = earlySymbol ? ts.concatenate(earlySymbol.declarations, lateSymbol.declarations) : lateSymbol.declarations; - var name_3 = !(type.flags & 8192 /* UniqueESSymbol */) && ts.unescapeLeadingUnderscores(memberName) || ts.declarationNameToString(declName); - ts.forEach(declarations, function (declaration) { return error(ts.getNameOfDeclaration(declaration) || declaration, ts.Diagnostics.Property_0_was_also_declared_here, name_3); }); - error(declName || decl, ts.Diagnostics.Duplicate_property_0, name_3); + var name_4 = !(type.flags & 8192 /* UniqueESSymbol */) && ts.unescapeLeadingUnderscores(memberName) || ts.declarationNameToString(declName); + ts.forEach(declarations, function (declaration) { return error(ts.getNameOfDeclaration(declaration) || declaration, ts.Diagnostics.Property_0_was_also_declared_here, name_4); }); + error(declName || decl, ts.Diagnostics.Duplicate_property_0, name_4); lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */); } lateSymbol.nameType = type; @@ -43380,7 +51109,7 @@ var ts; } function cloneSignature(sig) { var result = createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, - /*resolvedTypePredicate*/ undefined, sig.minArgumentCount, sig.flags & 3 /* PropagatingFlags */); + /*resolvedTypePredicate*/ undefined, sig.minArgumentCount, sig.flags & 19 /* PropagatingFlags */); result.target = sig.target; result.mapper = sig.mapper; result.unionSignatures = sig.unionSignatures; @@ -43410,27 +51139,34 @@ var ts; result.flags |= callChainFlags; return result; } - function getExpandedParameters(sig) { + function getExpandedParameters(sig, skipUnionExpanding) { if (signatureHasRestParameter(sig)) { var restIndex_1 = sig.parameters.length - 1; - var restParameter = sig.parameters[restIndex_1]; - var restType = getTypeOfSymbol(restParameter); + var restType = getTypeOfSymbol(sig.parameters[restIndex_1]); if (isTupleType(restType)) { - var elementTypes = getTypeArguments(restType); - var minLength_1 = restType.target.minLength; - var tupleRestIndex_1 = restType.target.hasRestElement ? elementTypes.length - 1 : -1; - var restParams = ts.map(elementTypes, function (t, i) { - var name = getParameterNameAtPosition(sig, restIndex_1 + i); - var checkFlags = i === tupleRestIndex_1 ? 32768 /* RestParameter */ : - i >= minLength_1 ? 16384 /* OptionalParameter */ : 0; - var symbol = createSymbol(1 /* FunctionScopedVariable */, name, checkFlags); - symbol.type = i === tupleRestIndex_1 ? createArrayType(t) : t; - return symbol; - }); - return ts.concatenate(sig.parameters.slice(0, restIndex_1), restParams); + return [expandSignatureParametersWithTupleMembers(restType, restIndex_1)]; + } + else if (!skipUnionExpanding && restType.flags & 1048576 /* Union */ && ts.every(restType.types, isTupleType)) { + return ts.map(restType.types, function (t) { return expandSignatureParametersWithTupleMembers(t, restIndex_1); }); } } - return sig.parameters; + return [sig.parameters]; + function expandSignatureParametersWithTupleMembers(restType, restIndex) { + var elementTypes = getTypeArguments(restType); + var associatedNames = restType.target.labeledElementDeclarations; + var restParams = ts.map(elementTypes, function (t, i) { + // Lookup the label from the individual tuple passed in before falling back to the signature `rest` parameter name + var tupleLabelName = !!associatedNames && getTupleElementLabel(associatedNames[i]); + var name = tupleLabelName || getParameterNameAtPosition(sig, restIndex + i, restType); + var flags = restType.target.elementFlags[i]; + var checkFlags = flags & 12 /* Variable */ ? 32768 /* RestParameter */ : + flags & 2 /* Optional */ ? 16384 /* OptionalParameter */ : 0; + var symbol = createSymbol(1 /* FunctionScopedVariable */, name, checkFlags); + symbol.type = flags & 4 /* Rest */ ? createArrayType(t) : t; + return symbol; + }); + return ts.concatenate(sig.parameters.slice(0, restIndex), restParams); + } } function getDefaultConstructSignatures(classType) { var baseConstructorType = getBaseConstructorTypeOfClass(classType); @@ -43533,7 +51269,7 @@ var ts; // signatures from the type, whose ordering would be non-obvious) var masterList = signatureLists[indexWithLengthOverOne !== undefined ? indexWithLengthOverOne : 0]; var results = masterList.slice(); - var _loop_9 = function (signatures) { + var _loop_10 = function (signatures) { if (signatures !== masterList) { var signature_1 = signatures[0]; ts.Debug.assert(!!signature_1, "getUnionSignatures bails early on empty signature lists and should not have empty lists on second pass"); @@ -43545,7 +51281,7 @@ var ts; }; for (var _b = 0, signatureLists_1 = signatureLists; _b < signatureLists_1.length; _b++) { var signatures = signatureLists_1[_b]; - var state_3 = _loop_9(signatures); + var state_3 = _loop_10(signatures); if (state_3 === "break") break; } @@ -43602,7 +51338,7 @@ var ts; var minArgCount = Math.max(left.minArgumentCount, right.minArgumentCount); var result = createSignature(declaration, left.typeParameters || right.typeParameters, thisParam, params, /*resolvedReturnType*/ undefined, - /*resolvedTypePredicate*/ undefined, minArgCount, (left.flags | right.flags) & 3 /* PropagatingFlags */); + /*resolvedTypePredicate*/ undefined, minArgCount, (left.flags | right.flags) & 19 /* PropagatingFlags */); result.unionSignatures = ts.concatenate(left.unionSignatures || [left], [right]); return result; } @@ -43669,7 +51405,7 @@ var ts; var types = type.types; var mixinFlags = findMixins(types); var mixinCount = ts.countWhere(mixinFlags, function (b) { return b; }); - var _loop_10 = function (i) { + var _loop_11 = function (i) { var t = type.types[i]; // When an intersection type contains mixin constructor types, the construct signatures from // those types are discarded and their return types are mixed into the return types of all @@ -43692,19 +51428,19 @@ var ts; numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1 /* Number */)); }; for (var i = 0; i < types.length; i++) { - _loop_10(i); + _loop_11(i); } setStructuredTypeMembers(type, emptySymbols, callSignatures || ts.emptyArray, constructSignatures || ts.emptyArray, stringIndexInfo, numberIndexInfo); } function appendSignatures(signatures, newSignatures) { - var _loop_11 = function (sig) { + var _loop_12 = function (sig) { if (!signatures || ts.every(signatures, function (s) { return !compareSignaturesIdentical(s, sig, /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false, compareTypesIdentical); })) { signatures = ts.append(signatures, sig); } }; for (var _i = 0, newSignatures_1 = newSignatures; _i < newSignatures_1.length; _i++) { var sig = newSignatures_1[_i]; - _loop_11(sig); + _loop_12(sig); } return signatures; } @@ -43738,7 +51474,7 @@ var ts; if (symbol.exports) { members = getExportsOfSymbol(symbol); if (symbol === globalThisSymbol) { - var varsOnly_1 = ts.createMap(); + var varsOnly_1 = new ts.Map(); members.forEach(function (p) { if (!(p.flags & 418 /* BlockScoped */)) { varsOnly_1.set(p.escapedName, p); @@ -43775,7 +51511,7 @@ var ts; var constructSignatures = symbol.members ? getSignaturesOfSymbol(symbol.members.get("__constructor" /* Constructor */)) : ts.emptyArray; if (symbol.flags & 16 /* Function */) { constructSignatures = ts.addRange(constructSignatures.slice(), ts.mapDefined(type.callSignatures, function (sig) { return isJSConstructor(sig.declaration) ? - createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, classType_1, /*resolvedTypePredicate*/ undefined, sig.minArgumentCount, sig.flags & 3 /* PropagatingFlags */) : + createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, classType_1, /*resolvedTypePredicate*/ undefined, sig.minArgumentCount, sig.flags & 19 /* PropagatingFlags */) : undefined; })); } if (!constructSignatures.length) { @@ -43813,7 +51549,8 @@ var ts; return type; } if (type.flags & 4194304 /* Index */) { - return getIndexType(getApparentType(type.type)); + var t = getApparentType(type.type); + return isGenericTupleType(t) ? getKnownKeysOfTupleType(t) : getIndexType(t); } if (type.flags & 16777216 /* Conditional */) { if (type.root.isDistributive) { @@ -43874,21 +51611,31 @@ var ts; // Otherwise, for type string create a string index signature. if (isTypeUsableAsPropertyName(t)) { var propName = getPropertyNameFromType(t); - var modifiersProp = getPropertyOfType(modifiersType, propName); - var isOptional = !!(templateModifiers & 4 /* IncludeOptional */ || - !(templateModifiers & 8 /* ExcludeOptional */) && modifiersProp && modifiersProp.flags & 16777216 /* Optional */); - var isReadonly = !!(templateModifiers & 1 /* IncludeReadonly */ || - !(templateModifiers & 2 /* ExcludeReadonly */) && modifiersProp && isReadonlySymbol(modifiersProp)); - var stripOptional = strictNullChecks && !isOptional && modifiersProp && modifiersProp.flags & 16777216 /* Optional */; - var prop = createSymbol(4 /* Property */ | (isOptional ? 16777216 /* Optional */ : 0), propName, 262144 /* Mapped */ | (isReadonly ? 8 /* Readonly */ : 0) | (stripOptional ? 524288 /* StripOptional */ : 0)); - prop.mappedType = type; - prop.mapper = templateMapper; - if (modifiersProp) { - prop.syntheticOrigin = modifiersProp; - prop.declarations = modifiersProp.declarations; + // String enum members from separate enums with identical values + // are distinct types with the same property name. Make the resulting + // property symbol's name type be the union of those enum member types. + var existingProp = members.get(propName); + if (existingProp) { + existingProp.nameType = getUnionType([existingProp.nameType, t]); + existingProp.mapper = appendTypeMapping(type.mapper, typeParameter, existingProp.nameType); + } + else { + var modifiersProp = getPropertyOfType(modifiersType, propName); + var isOptional = !!(templateModifiers & 4 /* IncludeOptional */ || + !(templateModifiers & 8 /* ExcludeOptional */) && modifiersProp && modifiersProp.flags & 16777216 /* Optional */); + var isReadonly = !!(templateModifiers & 1 /* IncludeReadonly */ || + !(templateModifiers & 2 /* ExcludeReadonly */) && modifiersProp && isReadonlySymbol(modifiersProp)); + var stripOptional = strictNullChecks && !isOptional && modifiersProp && modifiersProp.flags & 16777216 /* Optional */; + var prop = createSymbol(4 /* Property */ | (isOptional ? 16777216 /* Optional */ : 0), propName, 262144 /* Mapped */ | (isReadonly ? 8 /* Readonly */ : 0) | (stripOptional ? 524288 /* StripOptional */ : 0)); + prop.mappedType = type; + if (modifiersProp) { + prop.syntheticOrigin = modifiersProp; + prop.declarations = modifiersProp.declarations; + } + prop.nameType = t; + prop.mapper = templateMapper; + members.set(propName, prop); } - prop.nameType = t; - members.set(propName, prop); } else if (t.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 32 /* Enum */)) { var propType = instantiateType(templateType, templateMapper); @@ -43904,6 +51651,7 @@ var ts; function getTypeOfMappedSymbol(symbol) { if (!symbol.type) { if (!pushTypeResolution(symbol, 0 /* Type */)) { + symbol.mappedType.containsError = true; return errorType; } var templateType = getTemplateTypeFromMappedType(symbol.mappedType.target || symbol.mappedType); @@ -43942,8 +51690,8 @@ var ts; } function isMappedTypeWithKeyofConstraintDeclaration(type) { var constraintDeclaration = getConstraintDeclarationForMappedType(type); // TODO: GH#18217 - return constraintDeclaration.kind === 184 /* TypeOperator */ && - constraintDeclaration.operator === 134 /* KeyOfKeyword */; + return constraintDeclaration.kind === 187 /* TypeOperator */ && + constraintDeclaration.operator === 137 /* KeyOfKeyword */; } function getModifiersTypeFromMappedType(type) { if (!type.modifiersType) { @@ -44280,8 +52028,8 @@ var ts; var types = t.types; var baseTypes = []; for (var _i = 0, types_7 = types; _i < types_7.length; _i++) { - var type_2 = types_7[_i]; - var baseType = getBaseConstraint(type_2); + var type_3 = types_7[_i]; + var baseType = getBaseConstraint(type_3); if (baseType) { baseTypes.push(baseType); } @@ -44394,7 +52142,7 @@ var ts; // Since getApparentType may return a non-reduced union or intersection type, we need to perform // type reduction both before and after obtaining the apparent type. For example, given a type parameter // 'T extends A | B', the type 'T & X' becomes 'A & X | B & X' after obtaining the apparent type, and - // that type may need futher reduction to remove empty intersections. + // that type may need further reduction to remove empty intersections. return getReducedType(getApparentType(getReducedType(type))); } function createUnionOrIntersectionProperty(containingType, name) { @@ -44424,10 +52172,10 @@ var ts; } else if (prop !== singleProp) { if (!propSet) { - propSet = ts.createMap(); - propSet.set("" + getSymbolId(singleProp), singleProp); + propSet = new ts.Map(); + propSet.set(getSymbolId(singleProp), singleProp); } - var id = "" + getSymbolId(prop); + var id = getSymbolId(prop); if (!propSet.has(id)) { propSet.set(id, prop); } @@ -44705,10 +52453,10 @@ var ts; function isJSDocOptionalParameter(node) { return ts.isInJSFile(node) && ( // node.type should only be a JSDocOptionalType when node is a parameter of a JSDocFunctionType - node.type && node.type.kind === 299 /* JSDocOptionalType */ + node.type && node.type.kind === 303 /* JSDocOptionalType */ || ts.getJSDocParameterTags(node).some(function (_a) { var isBracketed = _a.isBracketed, typeExpression = _a.typeExpression; - return isBracketed || !!typeExpression && typeExpression.type.kind === 299 /* JSDocOptionalType */; + return isBracketed || !!typeExpression && typeExpression.type.kind === 303 /* JSDocOptionalType */; })); } function tryFindAmbientModule(moduleName, withAugmentations) { @@ -44720,7 +52468,7 @@ var ts; return symbol && withAugmentations ? getMergedSymbol(symbol) : symbol; } function isOptionalParameter(node) { - if (ts.hasQuestionToken(node) || isOptionalJSDocParameterTag(node) || isJSDocOptionalParameter(node)) { + if (ts.hasQuestionToken(node) || isOptionalJSDocPropertyLikeTag(node) || isJSDocOptionalParameter(node)) { return true; } if (node.initializer) { @@ -44737,12 +52485,12 @@ var ts; } return false; } - function isOptionalJSDocParameterTag(node) { - if (!ts.isJSDocParameterTag(node)) { + function isOptionalJSDocPropertyLikeTag(node) { + if (!ts.isJSDocPropertyLikeTag(node)) { return false; } var isBracketed = node.isBracketed, typeExpression = node.typeExpression; - return isBracketed || !!typeExpression && typeExpression.type.kind === 299 /* JSDocOptionalType */; + return isBracketed || !!typeExpression && typeExpression.type.kind === 303 /* JSDocOptionalType */; } function createTypePredicate(kind, parameterName, parameterIndex, type) { return { kind: kind, parameterName: parameterName, parameterIndex: parameterIndex, type: type }; @@ -44824,11 +52572,11 @@ var ts; else { parameters.push(paramSymbol); } - if (type && type.kind === 187 /* LiteralType */) { + if (type && type.kind === 190 /* LiteralType */) { flags |= 2 /* HasLiteralTypes */; } // Record a new minimum argument count if this is not an optional parameter - var isOptionalParameter_1 = isOptionalJSDocParameterTag(param) || + var isOptionalParameter_1 = isOptionalJSDocPropertyLikeTag(param) || param.initializer || param.questionToken || param.dotDotDotToken || iife && parameters.length > iife.arguments.length && !type || isJSDocOptionalParameter(param); @@ -44837,16 +52585,16 @@ var ts; } } // If only one accessor includes a this-type annotation, the other behaves as if it had the same type annotation - if ((declaration.kind === 163 /* GetAccessor */ || declaration.kind === 164 /* SetAccessor */) && + if ((declaration.kind === 166 /* GetAccessor */ || declaration.kind === 167 /* SetAccessor */) && !hasNonBindableDynamicName(declaration) && (!hasThisParameter || !thisParameter)) { - var otherKind = declaration.kind === 163 /* GetAccessor */ ? 164 /* SetAccessor */ : 163 /* GetAccessor */; + var otherKind = declaration.kind === 166 /* GetAccessor */ ? 167 /* SetAccessor */ : 166 /* GetAccessor */; var other = ts.getDeclarationOfKind(getSymbolOfNode(declaration), otherKind); if (other) { thisParameter = getAnnotatedAccessorThisParameter(other); } } - var classType = declaration.kind === 162 /* Constructor */ ? + var classType = declaration.kind === 165 /* Constructor */ ? getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol)) : undefined; var typeParameters = classType ? classType.localTypeParameters : getTypeParametersFromDeclaration(declaration); @@ -44909,13 +52657,13 @@ var ts; if (!node) return false; switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return node.escapedText === "arguments" && ts.isExpressionNode(node); - case 159 /* PropertyDeclaration */: - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - return node.name.kind === 154 /* ComputedPropertyName */ + case 162 /* PropertyDeclaration */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + return node.name.kind === 157 /* ComputedPropertyName */ && traverse(node.name); default: return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse); @@ -44987,7 +52735,7 @@ var ts; function createTypePredicateFromTypePredicateNode(node, signature) { var parameterName = node.parameterName; var type = node.type && getTypeFromTypeNode(node.type); - return parameterName.kind === 183 /* ThisType */ ? + return parameterName.kind === 186 /* ThisType */ ? createTypePredicate(node.assertsModifier ? 2 /* AssertsThis */ : 0 /* This */, /*parameterName*/ undefined, /*parameterIndex*/ undefined, type) : createTypePredicate(node.assertsModifier ? 3 /* AssertsIdentifier */ : 1 /* Identifier */, parameterName.escapedText, ts.findIndex(signature.parameters, function (p) { return p.escapedName === parameterName.escapedText; }), type); } @@ -45030,7 +52778,7 @@ var ts; return signature.resolvedReturnType; } function getReturnTypeFromAnnotation(declaration) { - if (declaration.kind === 162 /* Constructor */) { + if (declaration.kind === 165 /* Constructor */) { return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol)); } if (ts.isJSDocConstructSignature(declaration)) { @@ -45040,12 +52788,12 @@ var ts; if (typeNode) { return getTypeFromTypeNode(typeNode); } - if (declaration.kind === 163 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) { + if (declaration.kind === 166 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) { var jsDocType = ts.isInJSFile(declaration) && getTypeForDeclarationFromJSDocComment(declaration); if (jsDocType) { return jsDocType; } - var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 164 /* SetAccessor */); + var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 167 /* SetAccessor */); var setterType = getAnnotatedAccessorType(setter); if (setterType) { return setterType; @@ -45082,7 +52830,7 @@ var ts; return instantiatedSignature; } function getSignatureInstantiationWithoutFillingInTypeArguments(signature, typeArguments) { - var instantiations = signature.instantiations || (signature.instantiations = ts.createMap()); + var instantiations = signature.instantiations || (signature.instantiations = new ts.Map()); var id = getTypeListId(typeArguments); var instantiation = instantiations.get(id); if (!instantiation) { @@ -45135,7 +52883,7 @@ var ts; // will result in a different declaration kind. if (!signature.isolatedSignatureType) { var kind = signature.declaration ? signature.declaration.kind : 0 /* Unknown */; - var isConstructor = kind === 162 /* Constructor */ || kind === 166 /* ConstructSignature */ || kind === 171 /* ConstructorType */; + var isConstructor = kind === 165 /* Constructor */ || kind === 169 /* ConstructSignature */ || kind === 174 /* ConstructorType */; var type = createObjectType(16 /* Anonymous */); type.members = emptySymbols; type.properties = ts.emptyArray; @@ -45149,7 +52897,7 @@ var ts; return symbol.members.get("__index" /* Index */); } function getIndexDeclarationOfSymbol(symbol, kind) { - var syntaxKind = kind === 1 /* Number */ ? 140 /* NumberKeyword */ : 143 /* StringKeyword */; + var syntaxKind = kind === 1 /* Number */ ? 143 /* NumberKeyword */ : 146 /* StringKeyword */; var indexSymbol = getIndexSymbol(symbol); if (indexSymbol) { for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) { @@ -45171,7 +52919,7 @@ var ts; function getIndexInfoOfSymbol(symbol, kind) { var declaration = getIndexDeclarationOfSymbol(symbol, kind); if (declaration) { - return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType, ts.hasModifier(declaration, 64 /* Readonly */), declaration); + return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType, ts.hasEffectiveModifier(declaration, 64 /* Readonly */), declaration); } return undefined; } @@ -45183,13 +52931,13 @@ var ts; if (typeParameter.symbol) { for (var _i = 0, _a = typeParameter.symbol.declarations; _i < _a.length; _i++) { var declaration = _a[_i]; - if (declaration.parent.kind === 181 /* InferType */) { + if (declaration.parent.kind === 184 /* InferType */) { // When an 'infer T' declaration is immediately contained in a type reference node // (such as 'Foo'), T's constraint is inferred from the constraint of the // corresponding type parameter in 'Foo'. When multiple 'infer T' declarations are // present, we form an intersection of the inferred constraint types. var grandParent = declaration.parent.parent; - if (grandParent.kind === 169 /* TypeReference */) { + if (grandParent.kind === 172 /* TypeReference */) { var typeReference = grandParent; var typeParameters = getTypeParametersForTypeReference(typeReference); if (typeParameters) { @@ -45212,9 +52960,11 @@ var ts; } } } - // When an 'infer T' declaration is immediately contained in a rest parameter - // declaration, we infer an 'unknown[]' constraint. - else if (grandParent.kind === 156 /* Parameter */ && grandParent.dotDotDotToken) { + // When an 'infer T' declaration is immediately contained in a rest parameter declaration, a rest type + // or a named rest tuple element, we infer an 'unknown[]' constraint. + else if (grandParent.kind === 159 /* Parameter */ && grandParent.dotDotDotToken || + grandParent.kind === 180 /* RestType */ || + grandParent.kind === 191 /* NamedTupleMember */ && grandParent.dotDotDotToken) { inferences = ts.append(inferences, createArrayType(unknownType)); } } @@ -45239,7 +52989,7 @@ var ts; if (type.flags & 1 /* Any */ && type !== errorType) { // Allow errorType to propegate to keep downstream errors suppressed // use keyofConstraintType as the base constraint for mapped type key constraints (unknown isn;t assignable to that, but `any` was), // use unknown otherwise - type = constraintDeclaration.parent.parent.kind === 186 /* MappedType */ ? keyofConstraintType : unknownType; + type = constraintDeclaration.parent.parent.kind === 189 /* MappedType */ ? keyofConstraintType : unknownType; } typeParameter.constraint = type; } @@ -45248,7 +52998,7 @@ var ts; return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint; } function getParentSymbolOfTypeParameter(typeParameter) { - var tp = ts.getDeclarationOfKind(typeParameter.symbol, 155 /* TypeParameter */); + var tp = ts.getDeclarationOfKind(typeParameter.symbol, 158 /* TypeParameter */); var host = ts.isJSDocTemplateTag(tp.parent) ? ts.getHostSignatureFromJSDoc(tp.parent) : tp.parent; return host && getSymbolOfNode(host); } @@ -45328,17 +53078,15 @@ var ts; } var node = type.node; var typeArguments = !node ? ts.emptyArray : - node.kind === 169 /* TypeReference */ ? ts.concatenate(type.target.outerTypeParameters, getEffectiveTypeArguments(node, type.target.localTypeParameters)) : - node.kind === 174 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] : - ts.map(node.elementTypes, getTypeFromTypeNode); + node.kind === 172 /* TypeReference */ ? ts.concatenate(type.target.outerTypeParameters, getEffectiveTypeArguments(node, type.target.localTypeParameters)) : + node.kind === 177 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] : + ts.map(node.elements, getTypeFromTypeNode); if (popTypeResolution()) { type.resolvedTypeArguments = type.mapper ? instantiateTypes(typeArguments, type.mapper) : typeArguments; } else { type.resolvedTypeArguments = ((_b = type.target.localTypeParameters) === null || _b === void 0 ? void 0 : _b.map(function () { return errorType; })) || ts.emptyArray; - error(type.node || currentNode, type.target.symbol - ? ts.Diagnostics.Type_arguments_for_0_circularly_reference_themselves - : ts.Diagnostics.Tuple_type_arguments_circularly_reference_themselves, type.target.symbol && symbolToString(type.target.symbol)); + error(type.node || currentNode, type.target.symbol ? ts.Diagnostics.Type_arguments_for_0_circularly_reference_themselves : ts.Diagnostics.Tuple_type_arguments_circularly_reference_themselves, type.target.symbol && symbolToString(type.target.symbol)); } } return type.resolvedTypeArguments; @@ -45373,7 +53121,7 @@ var ts; return errorType; } } - if (node.kind === 169 /* TypeReference */ && isDeferredTypeReferenceNode(node, ts.length(node.typeArguments) !== typeParameters.length)) { + if (node.kind === 172 /* TypeReference */ && isDeferredTypeReferenceNode(node, ts.length(node.typeArguments) !== typeParameters.length)) { return createDeferredTypeReference(type, node, /*mapper*/ undefined); } // In a type reference, the outer type parameters of the referenced class or interface are automatically @@ -45418,9 +53166,9 @@ var ts; } function getTypeReferenceName(node) { switch (node.kind) { - case 169 /* TypeReference */: + case 172 /* TypeReference */: return node.typeName; - case 216 /* ExpressionWithTypeArguments */: + case 220 /* ExpressionWithTypeArguments */: // We only support expressions that are simple qualified names. For other // expressions this produces undefined. var expr = node.expression; @@ -45487,7 +53235,7 @@ var ts; } isRequireAlias = ts.isCallExpression(expr) && ts.isRequireCall(expr, /*requireStringLiteralLikeArgument*/ true) && !!valueType.symbol; } - var isImportTypeWithQualifier = node.kind === 188 /* ImportType */ && node.qualifier; + var isImportTypeWithQualifier = node.kind === 192 /* ImportType */ && node.qualifier; // valueType might not have a symbol, eg, {import('./b').STRING_LITERAL} if (valueType.symbol && (isRequireAlias || isImportTypeWithQualifier)) { typeType = getTypeReferenceType(node, valueType.symbol); @@ -45513,18 +53261,18 @@ var ts; return result; } function isUnaryTupleTypeNode(node) { - return node.kind === 175 /* TupleType */ && node.elementTypes.length === 1; + return node.kind === 178 /* TupleType */ && node.elements.length === 1; } function getImpliedConstraint(type, checkNode, extendsNode) { - return isUnaryTupleTypeNode(checkNode) && isUnaryTupleTypeNode(extendsNode) ? getImpliedConstraint(type, checkNode.elementTypes[0], extendsNode.elementTypes[0]) : + return isUnaryTupleTypeNode(checkNode) && isUnaryTupleTypeNode(extendsNode) ? getImpliedConstraint(type, checkNode.elements[0], extendsNode.elements[0]) : getActualTypeVariable(getTypeFromTypeNode(checkNode)) === type ? getTypeFromTypeNode(extendsNode) : undefined; } function getConditionalFlowTypeOfType(type, node) { var constraints; - while (node && !ts.isStatement(node) && node.kind !== 303 /* JSDocComment */) { + while (node && !ts.isStatement(node) && node.kind !== 307 /* JSDocComment */) { var parent = node.parent; - if (parent.kind === 180 /* ConditionalType */ && node === parent.trueType) { + if (parent.kind === 183 /* ConditionalType */ && node === parent.trueType) { var constraint = getImpliedConstraint(type, parent.checkType, parent.extendsType); if (constraint) { constraints = ts.append(constraints, constraint); @@ -45535,7 +53283,7 @@ var ts; return constraints ? getSubstitutionType(type, getIntersectionType(ts.append(constraints, type))) : type; } function isJSDocTypeReference(node) { - return !!(node.flags & 4194304 /* JSDoc */) && (node.kind === 169 /* TypeReference */ || node.kind === 188 /* ImportType */); + return !!(node.flags & 4194304 /* JSDoc */) && (node.kind === 172 /* TypeReference */ || node.kind === 192 /* ImportType */); } function checkNoTypeArguments(node, symbol) { if (node.typeArguments) { @@ -45648,9 +53396,9 @@ var ts; for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) { var declaration = declarations_3[_i]; switch (declaration.kind) { - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: - case 248 /* EnumDeclaration */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: + case 252 /* EnumDeclaration */: return declaration; } } @@ -45769,21 +53517,38 @@ var ts; function createArrayType(elementType, readonly) { return createTypeFromGenericGlobalType(readonly ? globalReadonlyArrayType : globalArrayType, [elementType]); } + function getTupleElementFlags(node) { + switch (node.kind) { + case 179 /* OptionalType */: + return 2 /* Optional */; + case 180 /* RestType */: + return getRestTypeElementFlags(node); + case 191 /* NamedTupleMember */: + return node.questionToken ? 2 /* Optional */ : + node.dotDotDotToken ? getRestTypeElementFlags(node) : + 1 /* Required */; + default: + return 1 /* Required */; + } + } + function getRestTypeElementFlags(node) { + return getArrayElementTypeNode(node.type) ? 4 /* Rest */ : 8 /* Variadic */; + } function getArrayOrTupleTargetType(node) { var readonly = isReadonlyTypeOperator(node.parent); - if (node.kind === 174 /* ArrayType */ || node.elementTypes.length === 1 && node.elementTypes[0].kind === 177 /* RestType */) { + var elementType = getArrayElementTypeNode(node); + if (elementType) { return readonly ? globalReadonlyArrayType : globalArrayType; } - var lastElement = ts.lastOrUndefined(node.elementTypes); - var restElement = lastElement && lastElement.kind === 177 /* RestType */ ? lastElement : undefined; - var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 176 /* OptionalType */ && n !== restElement; }) + 1; - return getTupleTypeOfArity(node.elementTypes.length, minLength, !!restElement, readonly, /*associatedNames*/ undefined); + var elementFlags = ts.map(node.elements, getTupleElementFlags); + var missingName = ts.some(node.elements, function (e) { return e.kind !== 191 /* NamedTupleMember */; }); + return getTupleTargetType(elementFlags, readonly, /*associatedNames*/ missingName ? undefined : node.elements); } // Return true if the given type reference node is directly aliased or if it needs to be deferred // because it is possibly contained in a circular chain of eagerly resolved types. function isDeferredTypeReferenceNode(node, hasDefaultTypeArguments) { - return !!getAliasSymbolForTypeNode(node) || isResolvedByTypeAlias(node) && (node.kind === 174 /* ArrayType */ ? mayResolveTypeAlias(node.elementType) : - node.kind === 175 /* TupleType */ ? ts.some(node.elementTypes, mayResolveTypeAlias) : + return !!getAliasSymbolForTypeNode(node) || isResolvedByTypeAlias(node) && (node.kind === 177 /* ArrayType */ ? mayResolveTypeAlias(node.elementType) : + node.kind === 178 /* TupleType */ ? ts.some(node.elements, mayResolveTypeAlias) : hasDefaultTypeArguments || ts.some(node.typeArguments, mayResolveTypeAlias)); } // Return true when the given node is transitively contained in type constructs that eagerly @@ -45792,17 +53557,18 @@ var ts; function isResolvedByTypeAlias(node) { var parent = node.parent; switch (parent.kind) { - case 182 /* ParenthesizedType */: - case 169 /* TypeReference */: - case 178 /* UnionType */: - case 179 /* IntersectionType */: - case 185 /* IndexedAccessType */: - case 180 /* ConditionalType */: - case 184 /* TypeOperator */: - case 174 /* ArrayType */: - case 175 /* TupleType */: + case 185 /* ParenthesizedType */: + case 191 /* NamedTupleMember */: + case 172 /* TypeReference */: + case 181 /* UnionType */: + case 182 /* IntersectionType */: + case 188 /* IndexedAccessType */: + case 183 /* ConditionalType */: + case 187 /* TypeOperator */: + case 177 /* ArrayType */: + case 178 /* TupleType */: return isResolvedByTypeAlias(parent); - case 247 /* TypeAliasDeclaration */: + case 251 /* TypeAliasDeclaration */: return true; } return false; @@ -45811,27 +53577,28 @@ var ts; // of a type alias. function mayResolveTypeAlias(node) { switch (node.kind) { - case 169 /* TypeReference */: + case 172 /* TypeReference */: return isJSDocTypeReference(node) || !!(resolveTypeReferenceName(node.typeName, 788968 /* Type */).flags & 524288 /* TypeAlias */); - case 172 /* TypeQuery */: + case 175 /* TypeQuery */: return true; - case 184 /* TypeOperator */: - return node.operator !== 147 /* UniqueKeyword */ && mayResolveTypeAlias(node.type); - case 182 /* ParenthesizedType */: - case 176 /* OptionalType */: - case 299 /* JSDocOptionalType */: - case 297 /* JSDocNullableType */: - case 298 /* JSDocNonNullableType */: - case 294 /* JSDocTypeExpression */: + case 187 /* TypeOperator */: + return node.operator !== 150 /* UniqueKeyword */ && mayResolveTypeAlias(node.type); + case 185 /* ParenthesizedType */: + case 179 /* OptionalType */: + case 191 /* NamedTupleMember */: + case 303 /* JSDocOptionalType */: + case 301 /* JSDocNullableType */: + case 302 /* JSDocNonNullableType */: + case 298 /* JSDocTypeExpression */: return mayResolveTypeAlias(node.type); - case 177 /* RestType */: - return node.type.kind !== 174 /* ArrayType */ || mayResolveTypeAlias(node.type.elementType); - case 178 /* UnionType */: - case 179 /* IntersectionType */: + case 180 /* RestType */: + return node.type.kind !== 177 /* ArrayType */ || mayResolveTypeAlias(node.type.elementType); + case 181 /* UnionType */: + case 182 /* IntersectionType */: return ts.some(node.types, mayResolveTypeAlias); - case 185 /* IndexedAccessType */: + case 188 /* IndexedAccessType */: return mayResolveTypeAlias(node.objectType) || mayResolveTypeAlias(node.indexType); - case 180 /* ConditionalType */: + case 183 /* ConditionalType */: return mayResolveTypeAlias(node.checkType) || mayResolveTypeAlias(node.extendsType) || mayResolveTypeAlias(node.trueType) || mayResolveTypeAlias(node.falseType); } @@ -45844,19 +53611,40 @@ var ts; if (target === emptyGenericType) { links.resolvedType = emptyObjectType; } - else if (isDeferredTypeReferenceNode(node)) { - links.resolvedType = node.kind === 175 /* TupleType */ && node.elementTypes.length === 0 ? target : + else if (!(node.kind === 178 /* TupleType */ && ts.some(node.elements, function (e) { return !!(getTupleElementFlags(e) & 8 /* Variadic */); })) && isDeferredTypeReferenceNode(node)) { + links.resolvedType = node.kind === 178 /* TupleType */ && node.elements.length === 0 ? target : createDeferredTypeReference(target, node, /*mapper*/ undefined); } else { - var elementTypes = node.kind === 174 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] : ts.map(node.elementTypes, getTypeFromTypeNode); - links.resolvedType = createTypeReference(target, elementTypes); + var elementTypes = node.kind === 177 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] : ts.map(node.elements, getTypeFromTypeNode); + links.resolvedType = createNormalizedTypeReference(target, elementTypes); } } return links.resolvedType; } function isReadonlyTypeOperator(node) { - return ts.isTypeOperatorNode(node) && node.operator === 138 /* ReadonlyKeyword */; + return ts.isTypeOperatorNode(node) && node.operator === 141 /* ReadonlyKeyword */; + } + function createTupleType(elementTypes, elementFlags, readonly, namedMemberDeclarations) { + if (readonly === void 0) { readonly = false; } + var tupleTarget = getTupleTargetType(elementFlags || ts.map(elementTypes, function (_) { return 1 /* Required */; }), readonly, namedMemberDeclarations); + return tupleTarget === emptyGenericType ? emptyObjectType : + elementTypes.length ? createNormalizedTypeReference(tupleTarget, elementTypes) : + tupleTarget; + } + function getTupleTargetType(elementFlags, readonly, namedMemberDeclarations) { + if (elementFlags.length === 1 && elementFlags[0] & 4 /* Rest */) { + // [...X[]] is equivalent to just X[] + return readonly ? globalReadonlyArrayType : globalArrayType; + } + var key = ts.map(elementFlags, function (f) { return f & 1 /* Required */ ? "#" : f & 2 /* Optional */ ? "?" : f & 4 /* Rest */ ? "." : "*"; }).join() + + (readonly ? "R" : "") + + (namedMemberDeclarations && namedMemberDeclarations.length ? "," + ts.map(namedMemberDeclarations, getNodeId).join(",") : ""); + var type = tupleTypes.get(key); + if (!type) { + tupleTypes.set(key, type = createTupleTargetType(elementFlags, readonly, namedMemberDeclarations)); + } + return type; } // We represent tuple types as type references to synthesized generic interface types created by // this function. The types are of the form: @@ -45865,32 +53653,43 @@ var ts; // // Note that the generic type created by this function has no symbol associated with it. The same // is true for each of the synthesized type parameters. - function createTupleTypeOfArity(arity, minLength, hasRestElement, readonly, associatedNames) { + function createTupleTargetType(elementFlags, readonly, namedMemberDeclarations) { + var arity = elementFlags.length; + var minLength = ts.findLastIndex(elementFlags, function (f) { return !!(f & (1 /* Required */ | 8 /* Variadic */)); }) + 1; var typeParameters; var properties = []; - var maxLength = hasRestElement ? arity - 1 : arity; + var combinedFlags = 0; if (arity) { typeParameters = new Array(arity); for (var i = 0; i < arity; i++) { var typeParameter = typeParameters[i] = createTypeParameter(); - if (i < maxLength) { - var property = createSymbol(4 /* Property */ | (i >= minLength ? 16777216 /* Optional */ : 0), "" + i, readonly ? 8 /* Readonly */ : 0); + var flags = elementFlags[i]; + combinedFlags |= flags; + if (!(combinedFlags & 12 /* Variable */)) { + var property = createSymbol(4 /* Property */ | (flags & 2 /* Optional */ ? 16777216 /* Optional */ : 0), "" + i, readonly ? 8 /* Readonly */ : 0); + property.tupleLabelDeclaration = namedMemberDeclarations === null || namedMemberDeclarations === void 0 ? void 0 : namedMemberDeclarations[i]; property.type = typeParameter; properties.push(property); } } } - var literalTypes = []; - for (var i = minLength; i <= maxLength; i++) - literalTypes.push(getLiteralType(i)); + var fixedLength = properties.length; var lengthSymbol = createSymbol(4 /* Property */, "length"); - lengthSymbol.type = hasRestElement ? numberType : getUnionType(literalTypes); + if (combinedFlags & 12 /* Variable */) { + lengthSymbol.type = numberType; + } + else { + var literalTypes_1 = []; + for (var i = minLength; i <= arity; i++) + literalTypes_1.push(getLiteralType(i)); + lengthSymbol.type = getUnionType(literalTypes_1); + } properties.push(lengthSymbol); var type = createObjectType(8 /* Tuple */ | 4 /* Reference */); type.typeParameters = typeParameters; type.outerTypeParameters = undefined; type.localTypeParameters = typeParameters; - type.instantiations = ts.createMap(); + type.instantiations = new ts.Map(); type.instantiations.set(getTypeListId(type.typeParameters), type); type.target = type; type.resolvedTypeArguments = type.typeParameters; @@ -45902,38 +53701,113 @@ var ts; type.declaredConstructSignatures = ts.emptyArray; type.declaredStringIndexInfo = undefined; type.declaredNumberIndexInfo = undefined; + type.elementFlags = elementFlags; type.minLength = minLength; - type.hasRestElement = hasRestElement; + type.fixedLength = fixedLength; + type.hasRestElement = !!(combinedFlags & 12 /* Variable */); + type.combinedFlags = combinedFlags; type.readonly = readonly; - type.associatedNames = associatedNames; + type.labeledElementDeclarations = namedMemberDeclarations; return type; } - function getTupleTypeOfArity(arity, minLength, hasRestElement, readonly, associatedNames) { - var key = arity + (hasRestElement ? "+" : ",") + minLength + (readonly ? "R" : "") + (associatedNames && associatedNames.length ? "," + associatedNames.join(",") : ""); - var type = tupleTypes.get(key); - if (!type) { - tupleTypes.set(key, type = createTupleTypeOfArity(arity, minLength, hasRestElement, readonly, associatedNames)); - } - return type; + function createNormalizedTypeReference(target, typeArguments) { + return target.objectFlags & 8 /* Tuple */ && target.combinedFlags & 8 /* Variadic */ ? + createNormalizedTupleType(target, typeArguments) : + createTypeReference(target, typeArguments); } - function createTupleType(elementTypes, minLength, hasRestElement, readonly, associatedNames) { - if (minLength === void 0) { minLength = elementTypes.length; } - if (hasRestElement === void 0) { hasRestElement = false; } - if (readonly === void 0) { readonly = false; } - var arity = elementTypes.length; - if (arity === 1 && hasRestElement) { - return createArrayType(elementTypes[0], readonly); + function createNormalizedTupleType(target, elementTypes) { + var _a, _b, _c; + // Transform [A, ...(X | Y | Z)] into [A, ...X] | [A, ...Y] | [A, ...Z] + var unionIndex = ts.findIndex(elementTypes, function (t, i) { return !!(target.elementFlags[i] & 8 /* Variadic */ && t.flags & (131072 /* Never */ | 1048576 /* Union */)); }); + if (unionIndex >= 0) { + return mapType(elementTypes[unionIndex], function (t) { return createNormalizedTupleType(target, ts.replaceElement(elementTypes, unionIndex, t)); }); + } + // If there are no variadic elements with non-generic types, just create a type reference with the same target type. + var spreadIndex = ts.findIndex(elementTypes, function (t, i) { return !!(target.elementFlags[i] & 8 /* Variadic */) && !(t.flags & 58982400 /* InstantiableNonPrimitive */) && !isGenericMappedType(t); }); + if (spreadIndex < 0) { + return createTypeReference(target, elementTypes); + } + // We have non-generic variadic elements that need normalization. + var expandedTypes = []; + var expandedFlags = []; + var expandedDeclarations = []; + var optionalIndex = -1; + var restTypes; + var _loop_13 = function (i) { + var type = elementTypes[i]; + var flags = target.elementFlags[i]; + if (flags & 8 /* Variadic */) { + if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) { + // Generic variadic elements stay as they are (except following a rest element). + addElementOrRest(type, 8 /* Variadic */, (_a = target.labeledElementDeclarations) === null || _a === void 0 ? void 0 : _a[i]); + } + else if (isTupleType(type)) { + // Spread variadic elements with tuple types into the resulting tuple. + ts.forEach(getTypeArguments(type), function (t, n) { var _a; return addElementOrRest(t, type.target.elementFlags[n], (_a = type.target.labeledElementDeclarations) === null || _a === void 0 ? void 0 : _a[n]); }); + } + else { + // Treat everything else as an array type and create a rest element. + addElementOrRest(isArrayLikeType(type) && getIndexTypeOfType(type, 1 /* Number */) || errorType, 4 /* Rest */, (_b = target.labeledElementDeclarations) === null || _b === void 0 ? void 0 : _b[i]); + } + } + else { + // Copy other element kinds with no change. + addElementOrRest(type, flags, (_c = target.labeledElementDeclarations) === null || _c === void 0 ? void 0 : _c[i]); + } + }; + for (var i = 0; i < elementTypes.length; i++) { + _loop_13(i); + } + if (restTypes) { + // Create a union of the collected rest element types. + expandedTypes[expandedTypes.length - 1] = getUnionType(restTypes); + } + var tupleTarget = getTupleTargetType(expandedFlags, target.readonly, expandedDeclarations); + return tupleTarget === emptyGenericType ? emptyObjectType : + expandedFlags.length ? createTypeReference(tupleTarget, expandedTypes) : + tupleTarget; + function addElementOrRest(type, flags, declaration) { + if (restTypes) { + // A rest element was previously added, so simply collect the type of this element. + restTypes.push(flags & 8 /* Variadic */ ? getIndexedAccessType(type, numberType) : type); + } + else { + if (flags & 1 /* Required */ && optionalIndex >= 0) { + // Turn preceding optional elements into required elements + for (var i = optionalIndex; i < expandedFlags.length; i++) { + if (expandedFlags[i] & 2 /* Optional */) + expandedFlags[i] = 1 /* Required */; + } + optionalIndex = -1; + } + else if (flags & 2 /* Optional */ && optionalIndex < 0) { + optionalIndex = expandedFlags.length; + } + else if (flags & 4 /* Rest */) { + // Start collecting element types when a rest element is added. + restTypes = [type]; + } + expandedTypes.push(type); + expandedFlags.push(flags); + if (expandedDeclarations && declaration) { + expandedDeclarations.push(declaration); + } + else { + expandedDeclarations = undefined; + } + } } - var tupleType = getTupleTypeOfArity(arity, minLength, arity > 0 && hasRestElement, readonly, associatedNames); - return elementTypes.length ? createTypeReference(tupleType, elementTypes) : tupleType; } - function sliceTupleType(type, index) { - var tuple = type.target; - if (tuple.hasRestElement) { - // don't slice off rest element - index = Math.min(index, getTypeReferenceArity(type) - 1); - } - return createTupleType(getTypeArguments(type).slice(index), Math.max(0, tuple.minLength - index), tuple.hasRestElement, tuple.readonly, tuple.associatedNames && tuple.associatedNames.slice(index)); + function sliceTupleType(type, index, endSkipCount) { + if (endSkipCount === void 0) { endSkipCount = 0; } + var target = type.target; + var endIndex = getTypeReferenceArity(type) - endSkipCount; + return index > target.fixedLength ? getRestArrayTypeOfTupleType(type) || createTupleType(ts.emptyArray) : + createTupleType(getTypeArguments(type).slice(index, endIndex), target.elementFlags.slice(index, endIndex), + /*readonly*/ false, target.labeledElementDeclarations && target.labeledElementDeclarations.slice(index, endIndex)); + } + function getKnownKeysOfTupleType(type) { + return getUnionType(ts.append(ts.arrayOf(type.target.fixedLength, function (i) { return getLiteralType("" + i); }), getIndexType(type.target.readonly ? globalReadonlyArrayType : globalArrayType))); } function getTypeFromOptionalTypeNode(node) { var type = getTypeFromTypeNode(node.type); @@ -46305,7 +54179,7 @@ var ts; // Also, unlike union types, the order of the constituent types is preserved in order that overload resolution // for intersections of types with signatures can be deterministic. function getIntersectionType(types, aliasSymbol, aliasTypeArguments) { - var typeMembershipMap = ts.createMap(); + var typeMembershipMap = new ts.Map(); var includes = addTypesToIntersection(typeMembershipMap, 0, types); var typeSet = ts.arrayFrom(typeMembershipMap.values()); // An intersection type is considered empty if it contains @@ -46447,7 +54321,7 @@ var ts; type = getReducedType(type); return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) : type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) : - maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */) ? getIndexTypeForGenericType(type, stringsOnly) : + type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericTupleType(type) ? getIndexTypeForGenericType(type, stringsOnly) : ts.getObjectFlags(type) & 32 /* Mapped */ ? filterType(getConstraintTypeFromMappedType(type), function (t) { return !(noIndexSignatures && t.flags & (1 /* Any */ | 4 /* String */)); }) : type === wildcardType ? wildcardType : type.flags & 2 /* Unknown */ ? neverType : @@ -46472,15 +54346,15 @@ var ts; var links = getNodeLinks(node); if (!links.resolvedType) { switch (node.operator) { - case 134 /* KeyOfKeyword */: + case 137 /* KeyOfKeyword */: links.resolvedType = getIndexType(getTypeFromTypeNode(node.type)); break; - case 147 /* UniqueKeyword */: - links.resolvedType = node.type.kind === 144 /* SymbolKeyword */ + case 150 /* UniqueKeyword */: + links.resolvedType = node.type.kind === 147 /* SymbolKeyword */ ? getESSymbolLikeTypeForNode(ts.walkUpParenthesizedTypes(node.parent)) : errorType; break; - case 138 /* ReadonlyKeyword */: + case 141 /* ReadonlyKeyword */: links.resolvedType = getTypeFromTypeNode(node.type); break; default: @@ -46525,7 +54399,7 @@ var ts; return false; } function getPropertyNameFromIndex(indexType, accessNode) { - var accessExpression = accessNode && accessNode.kind === 195 /* ElementAccessExpression */ ? accessNode : undefined; + var accessExpression = accessNode && accessNode.kind === 199 /* ElementAccessExpression */ ? accessNode : undefined; return isTypeUsableAsPropertyName(indexType) ? getPropertyNameFromType(indexType) : accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, /*reportError*/ false) ? @@ -46535,14 +54409,24 @@ var ts; ts.getPropertyNameForPropertyNameNode(accessNode) : undefined; } - function getPropertyTypeForIndexType(originalObjectType, objectType, indexType, fullIndexType, suppressNoImplicitAnyError, accessNode, accessFlags) { - var accessExpression = accessNode && accessNode.kind === 195 /* ElementAccessExpression */ ? accessNode : undefined; + function isUncalledFunctionReference(node, symbol) { + return !(symbol.flags & (16 /* Function */ | 8192 /* Method */)) + || !ts.isCallLikeExpression(ts.findAncestor(node, function (n) { return !ts.isAccessExpression(n); }) || node.parent) + && ts.every(symbol.declarations, function (d) { return !ts.isFunctionLike(d) || !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); }); + } + function getPropertyTypeForIndexType(originalObjectType, objectType, indexType, fullIndexType, suppressNoImplicitAnyError, accessNode, accessFlags, reportDeprecated) { + var _a, _b; + var accessExpression = accessNode && accessNode.kind === 199 /* ElementAccessExpression */ ? accessNode : undefined; var propName = accessNode && ts.isPrivateIdentifier(accessNode) ? undefined : getPropertyNameFromIndex(indexType, accessNode); if (propName !== undefined) { var prop = getPropertyOfType(objectType, propName); if (prop) { + if (reportDeprecated && accessNode && ((_a = prop.valueDeclaration) === null || _a === void 0 ? void 0 : _a.flags) & 134217728 /* Deprecated */ && isUncalledFunctionReference(accessNode, prop)) { + var deprecatedNode = (_b = accessExpression === null || accessExpression === void 0 ? void 0 : accessExpression.argumentExpression) !== null && _b !== void 0 ? _b : (ts.isIndexedAccessTypeNode(accessNode) ? accessNode.indexType : accessNode); + errorOrSuggestion(/* isError */ false, deprecatedNode, ts.Diagnostics._0_is_deprecated, propName); + } if (accessExpression) { - markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 104 /* ThisKeyword */); + markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 107 /* ThisKeyword */); if (isAssignmentToReadonlyEntity(accessExpression, prop, ts.getAssignmentTargetKind(accessExpression))) { error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, symbolToString(prop)); return undefined; @@ -46550,6 +54434,9 @@ var ts; if (accessFlags & 4 /* CacheSymbol */) { getNodeLinks(accessNode).resolvedSymbol = prop; } + if (isThisPropertyAccessInConstructor(accessExpression, prop)) { + return autoType; + } } var propType = getTypeOfSymbol(prop); return accessExpression && ts.getAssignmentTargetKind(accessExpression) !== 1 /* Definite */ ? @@ -46673,9 +54560,9 @@ var ts; } } function getIndexNodeForAccessExpression(accessNode) { - return accessNode.kind === 195 /* ElementAccessExpression */ ? accessNode.argumentExpression : - accessNode.kind === 185 /* IndexedAccessType */ ? accessNode.indexType : - accessNode.kind === 154 /* ComputedPropertyName */ ? accessNode.expression : + return accessNode.kind === 199 /* ElementAccessExpression */ ? accessNode.argumentExpression : + accessNode.kind === 188 /* IndexedAccessType */ ? accessNode.indexType : + accessNode.kind === 157 /* ComputedPropertyName */ ? accessNode.expression : accessNode; } function isGenericObjectType(type) { @@ -46686,7 +54573,7 @@ var ts; } return !!(type.objectFlags & 8388608 /* IsGenericObjectType */); } - return !!(type.flags & 58982400 /* InstantiableNonPrimitive */) || isGenericMappedType(type); + return !!(type.flags & 58982400 /* InstantiableNonPrimitive */) || isGenericMappedType(type) || isGenericTupleType(type); } function isGenericIndexType(type) { if (type.flags & 3145728 /* UnionOrIntersection */) { @@ -46760,6 +54647,15 @@ var ts; } // So ultimately (reading): // ((A & B) | C)[K1 | K2] -> ((A & B) | C)[K1] | ((A & B) | C)[K2] -> (A & B)[K1] | C[K1] | (A & B)[K2] | C[K2] -> (A[K1] & B[K1]) | C[K1] | (A[K2] & B[K2]) | C[K2] + // A generic tuple type indexed by a number exists only when the index type doesn't select a + // fixed element. We simplify to either the combined type of all elements (when the index type + // the actual number type) or to the combined type of all non-fixed elements. + if (isGenericTupleType(objectType) && indexType.flags & 296 /* NumberLike */) { + var elementType = getElementTypeOfSliceOfTupleType(objectType, indexType.flags & 8 /* Number */ ? 0 : objectType.target.fixedLength, /*endSkipCount*/ 0, writing); + if (elementType) { + return type[cache] = elementType; + } + } // If the object type is a mapped type { [P in K]: E }, where K is generic, instantiate E using a mapper // that substitutes the index type for P. For example, for an index access { [P in K]: Box }[X], we // construct the type Box. @@ -46806,6 +54702,18 @@ var ts; function getIndexedAccessType(objectType, indexType, accessNode, aliasSymbol, aliasTypeArguments) { return getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, 0 /* None */, aliasSymbol, aliasTypeArguments) || (accessNode ? errorType : unknownType); } + function indexTypeLessThan(indexType, limit) { + return everyType(indexType, function (t) { + if (t.flags & 384 /* StringOrNumberLiteral */) { + var propName = getPropertyNameFromType(t); + if (isNumericLiteralName(propName)) { + var index = +propName; + return index >= 0 && index < limit; + } + } + return false; + }); + } function getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, accessFlags, aliasSymbol, aliasTypeArguments) { if (accessFlags === void 0) { accessFlags = 0 /* None */; } if (objectType === wildcardType || indexType === wildcardType) { @@ -46816,12 +54724,15 @@ var ts; if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) { indexType = stringType; } - // If the index type is generic, or if the object type is generic and doesn't originate in an expression, - // we are performing a higher-order index access where we cannot meaningfully access the properties of the - // object type. Note that for a generic T and a non-generic K, we eagerly resolve T[K] if it originates in - // an expression. This is to preserve backwards compatibility. For example, an element access 'this["foo"]' - // has always been resolved eagerly using the constraint type of 'this' at the given location. - if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 185 /* IndexedAccessType */) && isGenericObjectType(objectType)) { + // If the index type is generic, or if the object type is generic and doesn't originate in an expression and + // the operation isn't exclusively indexing the fixed (non-variadic) portion of a tuple type, we are performing + // a higher-order index access where we cannot meaningfully access the properties of the object type. Note that + // for a generic T and a non-generic K, we eagerly resolve T[K] if it originates in an expression. This is to + // preserve backwards compatibility. For example, an element access 'this["foo"]' has always been resolved + // eagerly using the constraint type of 'this' at the given location. + if (isGenericIndexType(indexType) || (accessNode && accessNode.kind !== 188 /* IndexedAccessType */ ? + isGenericTupleType(objectType) && !indexTypeLessThan(indexType, objectType.target.fixedLength) : + isGenericObjectType(objectType) && !(isTupleType(objectType) && indexTypeLessThan(indexType, objectType.target.fixedLength)))) { if (objectType.flags & 3 /* AnyOrUnknown */) { return objectType; } @@ -46860,7 +54771,7 @@ var ts; } return accessFlags & 2 /* Writing */ ? getIntersectionType(propTypes, aliasSymbol, aliasTypeArguments) : getUnionType(propTypes, 1 /* Literal */, aliasSymbol, aliasTypeArguments); } - return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, /* supressNoImplicitAnyError */ false, accessNode, accessFlags | 4 /* CacheSymbol */); + return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, /* supressNoImplicitAnyError */ false, accessNode, accessFlags | 4 /* CacheSymbol */, /* reportDeprecated */ true); } function getTypeFromIndexedAccessTypeNode(node) { var links = getNodeLinks(node); @@ -46903,7 +54814,7 @@ var ts; function getConditionalType(root, mapper) { var result; var extraTypes; - var _loop_12 = function () { + var _loop_14 = function () { var checkType = instantiateType(root.checkType, mapper); var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType); var extendsType = instantiateType(root.extendsType, mapper); @@ -46921,7 +54832,7 @@ var ts; // We don't want inferences from constraints as they may cause us to eagerly resolve the // conditional type instead of deferring resolution. Also, we always want strict function // types rules (i.e. proper contravariance) for inferences. - inferTypes(context.inferences, checkType, extendsType, 128 /* NoConstraints */ | 256 /* AlwaysStrict */); + inferTypes(context.inferences, checkType, extendsType, 256 /* NoConstraints */ | 512 /* AlwaysStrict */); } combinedMapper = mergeTypeMappers(mapper, context.mapper); } @@ -46977,7 +54888,7 @@ var ts; // types of the form 'A extends B ? X : C extends D ? Y : E extends F ? Z : ...' as a single construct for // purposes of resolution. This means such types aren't subject to the instatiation depth limiter. while (true) { - var state_4 = _loop_12(); + var state_4 = _loop_14(); if (typeof state_4 === "object") return state_4.value; if (state_4 === "break") @@ -47028,7 +54939,7 @@ var ts; }; links.resolvedType = getConditionalType(root, /*mapper*/ undefined); if (outerTypeParameters) { - root.instantiations = ts.createMap(); + root.instantiations = new ts.Map(); root.instantiations.set(getTypeListId(outerTypeParameters), links.resolvedType); } } @@ -47135,7 +55046,7 @@ var ts; } function getAliasSymbolForTypeNode(node) { var host = node.parent; - while (ts.isParenthesizedTypeNode(host) || ts.isTypeOperatorNode(host) && host.operator === 138 /* ReadonlyKeyword */) { + while (ts.isParenthesizedTypeNode(host) || ts.isTypeOperatorNode(host) && host.operator === 141 /* ReadonlyKeyword */) { host = host.parent; } return ts.isTypeAlias(host) ? getSymbolOfNode(host) : undefined; @@ -47244,7 +55155,7 @@ var ts; return getIntersectionType([left, right]); } var members = ts.createSymbolTable(); - var skippedPrivateMembers = ts.createUnderscoreEscapedMap(); + var skippedPrivateMembers = new ts.Set(); var stringIndexInfo; var numberIndexInfo; if (left === emptyObjectType) { @@ -47259,7 +55170,7 @@ var ts; for (var _i = 0, _a = getPropertiesOfType(right); _i < _a.length; _i++) { var rightProp = _a[_i]; if (ts.getDeclarationModifierFlagsFromSymbol(rightProp) & (8 /* Private */ | 16 /* Protected */)) { - skippedPrivateMembers.set(rightProp.escapedName, true); + skippedPrivateMembers.add(rightProp.escapedName); } else if (isSpreadableProperty(rightProp)) { members.set(rightProp.escapedName, getSpreadSymbol(rightProp, readonly)); @@ -47359,6 +55270,9 @@ var ts; return type; } function getTypeFromLiteralTypeNode(node) { + if (node.literal.kind === 103 /* NullKeyword */) { + return nullType; + } var links = getNodeLinks(node); if (!links.resolvedType) { links.resolvedType = getRegularTypeOfLiteralType(checkExpression(node.literal)); @@ -47382,8 +55296,8 @@ var ts; function getThisType(node) { var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false); var parent = container && container.parent; - if (parent && (ts.isClassLike(parent) || parent.kind === 246 /* InterfaceDeclaration */)) { - if (!ts.hasModifier(container, 32 /* Static */) && + if (parent && (ts.isClassLike(parent) || parent.kind === 250 /* InterfaceDeclaration */)) { + if (!ts.hasSyntacticModifier(container, 32 /* Static */) && (!ts.isConstructorDeclaration(container) || ts.isNodeDescendantOf(node, container.body))) { return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType; } @@ -47412,94 +55326,127 @@ var ts; } return links.resolvedType; } + function getTypeFromRestTypeNode(node) { + return getTypeFromTypeNode(getArrayElementTypeNode(node.type) || node.type); + } + function getArrayElementTypeNode(node) { + switch (node.kind) { + case 185 /* ParenthesizedType */: + return getArrayElementTypeNode(node.type); + case 178 /* TupleType */: + if (node.elements.length === 1) { + node = node.elements[0]; + if (node.kind === 180 /* RestType */ || node.kind === 191 /* NamedTupleMember */ && node.dotDotDotToken) { + return getArrayElementTypeNode(node.type); + } + } + break; + case 177 /* ArrayType */: + return node.elementType; + } + return undefined; + } + function getTypeFromNamedTupleTypeNode(node) { + var links = getNodeLinks(node); + return links.resolvedType || (links.resolvedType = + node.dotDotDotToken ? getTypeFromRestTypeNode(node) : + node.questionToken && strictNullChecks ? getOptionalType(getTypeFromTypeNode(node.type)) : + getTypeFromTypeNode(node.type)); + } function getTypeFromTypeNode(node) { return getConditionalFlowTypeOfType(getTypeFromTypeNodeWorker(node), node); } function getTypeFromTypeNodeWorker(node) { switch (node.kind) { - case 125 /* AnyKeyword */: - case 295 /* JSDocAllType */: - case 296 /* JSDocUnknownType */: + case 128 /* AnyKeyword */: + case 299 /* JSDocAllType */: + case 300 /* JSDocUnknownType */: return anyType; - case 148 /* UnknownKeyword */: + case 151 /* UnknownKeyword */: return unknownType; - case 143 /* StringKeyword */: + case 146 /* StringKeyword */: return stringType; - case 140 /* NumberKeyword */: + case 143 /* NumberKeyword */: return numberType; - case 151 /* BigIntKeyword */: + case 154 /* BigIntKeyword */: return bigintType; - case 128 /* BooleanKeyword */: + case 131 /* BooleanKeyword */: return booleanType; - case 144 /* SymbolKeyword */: + case 147 /* SymbolKeyword */: return esSymbolType; - case 110 /* VoidKeyword */: + case 113 /* VoidKeyword */: return voidType; - case 146 /* UndefinedKeyword */: + case 149 /* UndefinedKeyword */: return undefinedType; - case 100 /* NullKeyword */: + case 103 /* NullKeyword */: + // TODO(rbuckton): `NullKeyword` is no longer a `TypeNode`, but we defensively allow it here because of incorrect casts in the Language Service. return nullType; - case 137 /* NeverKeyword */: + case 140 /* NeverKeyword */: return neverType; - case 141 /* ObjectKeyword */: + case 144 /* ObjectKeyword */: return node.flags & 131072 /* JavaScriptFile */ && !noImplicitAny ? anyType : nonPrimitiveType; - case 183 /* ThisType */: - case 104 /* ThisKeyword */: + case 186 /* ThisType */: + case 107 /* ThisKeyword */: + // TODO(rbuckton): `ThisKeyword` is no longer a `TypeNode`, but we defensively allow it here because of incorrect casts in the Language Service and because of `isPartOfTypeNode`. return getTypeFromThisTypeNode(node); - case 187 /* LiteralType */: + case 190 /* LiteralType */: return getTypeFromLiteralTypeNode(node); - case 169 /* TypeReference */: + case 172 /* TypeReference */: return getTypeFromTypeReference(node); - case 168 /* TypePredicate */: + case 171 /* TypePredicate */: return node.assertsModifier ? voidType : booleanType; - case 216 /* ExpressionWithTypeArguments */: + case 220 /* ExpressionWithTypeArguments */: return getTypeFromTypeReference(node); - case 172 /* TypeQuery */: + case 175 /* TypeQuery */: return getTypeFromTypeQueryNode(node); - case 174 /* ArrayType */: - case 175 /* TupleType */: + case 177 /* ArrayType */: + case 178 /* TupleType */: return getTypeFromArrayOrTupleTypeNode(node); - case 176 /* OptionalType */: + case 179 /* OptionalType */: return getTypeFromOptionalTypeNode(node); - case 178 /* UnionType */: + case 181 /* UnionType */: return getTypeFromUnionTypeNode(node); - case 179 /* IntersectionType */: + case 182 /* IntersectionType */: return getTypeFromIntersectionTypeNode(node); - case 297 /* JSDocNullableType */: + case 301 /* JSDocNullableType */: return getTypeFromJSDocNullableTypeNode(node); - case 299 /* JSDocOptionalType */: + case 303 /* JSDocOptionalType */: return addOptionality(getTypeFromTypeNode(node.type)); - case 182 /* ParenthesizedType */: - case 298 /* JSDocNonNullableType */: - case 294 /* JSDocTypeExpression */: + case 191 /* NamedTupleMember */: + return getTypeFromNamedTupleTypeNode(node); + case 185 /* ParenthesizedType */: + case 302 /* JSDocNonNullableType */: + case 298 /* JSDocTypeExpression */: return getTypeFromTypeNode(node.type); - case 177 /* RestType */: - return getElementTypeOfArrayType(getTypeFromTypeNode(node.type)) || errorType; - case 301 /* JSDocVariadicType */: + case 180 /* RestType */: + return getTypeFromRestTypeNode(node); + case 305 /* JSDocVariadicType */: return getTypeFromJSDocVariadicType(node); - case 170 /* FunctionType */: - case 171 /* ConstructorType */: - case 173 /* TypeLiteral */: - case 304 /* JSDocTypeLiteral */: - case 300 /* JSDocFunctionType */: - case 305 /* JSDocSignature */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: + case 176 /* TypeLiteral */: + case 308 /* JSDocTypeLiteral */: + case 304 /* JSDocFunctionType */: + case 309 /* JSDocSignature */: return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node); - case 184 /* TypeOperator */: + case 187 /* TypeOperator */: return getTypeFromTypeOperatorNode(node); - case 185 /* IndexedAccessType */: + case 188 /* IndexedAccessType */: return getTypeFromIndexedAccessTypeNode(node); - case 186 /* MappedType */: + case 189 /* MappedType */: return getTypeFromMappedTypeNode(node); - case 180 /* ConditionalType */: + case 183 /* ConditionalType */: return getTypeFromConditionalTypeNode(node); - case 181 /* InferType */: + case 184 /* InferType */: return getTypeFromInferTypeNode(node); - case 188 /* ImportType */: + case 192 /* ImportType */: return getTypeFromImportTypeNode(node); - // This function assumes that an identifier or qualified name is a type expression - // Callers should first ensure this by calling isTypeNode - case 75 /* Identifier */: - case 153 /* QualifiedName */: + // This function assumes that an identifier, qualified name, or property access expression is a type expression + // Callers should first ensure this by calling `isPartOfTypeNode` + // TODO(rbuckton): These aren't valid TypeNodes, but we treat them as such because of `isPartOfTypeNode`, which returns `true` for things that aren't `TypeNode`s. + case 78 /* Identifier */: + case 156 /* QualifiedName */: + case 198 /* PropertyAccessExpression */: var symbol = getSymbolAtLocation(node); return symbol ? getDeclaredTypeOfSymbol(symbol) : errorType; default: @@ -47618,7 +55565,7 @@ var ts; // See GH#17600. var result = createSignature(signature.declaration, freshTypeParameters, signature.thisParameter && instantiateSymbol(signature.thisParameter, mapper), instantiateList(signature.parameters, mapper, instantiateSymbol), /*resolvedReturnType*/ undefined, - /*resolvedTypePredicate*/ undefined, signature.minArgumentCount, signature.flags & 3 /* PropagatingFlags */); + /*resolvedTypePredicate*/ undefined, signature.minArgumentCount, signature.flags & 19 /* PropagatingFlags */); result.target = signature; result.mapper = mapper; return result; @@ -47654,36 +55601,26 @@ var ts; } function getObjectTypeInstantiation(type, mapper) { var target = type.objectFlags & 64 /* Instantiated */ ? type.target : type; - var node = type.objectFlags & 4 /* Reference */ ? type.node : type.symbol.declarations[0]; - var links = getNodeLinks(node); + var declaration = type.objectFlags & 4 /* Reference */ ? type.node : type.symbol.declarations[0]; + var links = getNodeLinks(declaration); var typeParameters = links.outerTypeParameters; if (!typeParameters) { // The first time an anonymous type is instantiated we compute and store a list of the type // parameters that are in scope (and therefore potentially referenced). For type literals that // aren't the right hand side of a generic type alias declaration we optimize by reducing the // set of type parameters to those that are possibly referenced in the literal. - var declaration_1 = node; - if (ts.isInJSFile(declaration_1)) { - var paramTag = ts.findAncestor(declaration_1, ts.isJSDocParameterTag); - if (paramTag) { - var paramSymbol = ts.getParameterSymbolFromJSDoc(paramTag); - if (paramSymbol) { - declaration_1 = paramSymbol.valueDeclaration; - } - } - } - var outerTypeParameters = getOuterTypeParameters(declaration_1, /*includeThisTypes*/ true); - if (isJSConstructor(declaration_1)) { - var templateTagParameters = getTypeParametersFromDeclaration(declaration_1); + var outerTypeParameters = getOuterTypeParameters(declaration, /*includeThisTypes*/ true); + if (isJSConstructor(declaration)) { + var templateTagParameters = getTypeParametersFromDeclaration(declaration); outerTypeParameters = ts.addRange(outerTypeParameters, templateTagParameters); } typeParameters = outerTypeParameters || ts.emptyArray; typeParameters = (target.objectFlags & 4 /* Reference */ || target.symbol.flags & 2048 /* TypeLiteral */) && !target.aliasTypeArguments ? - ts.filter(typeParameters, function (tp) { return isTypeParameterPossiblyReferenced(tp, declaration_1); }) : + ts.filter(typeParameters, function (tp) { return isTypeParameterPossiblyReferenced(tp, declaration); }) : typeParameters; links.outerTypeParameters = typeParameters; if (typeParameters.length) { - links.instantiations = ts.createMap(); + links.instantiations = new ts.Map(); links.instantiations.set(getTypeListId(typeParameters), target); } } @@ -47707,9 +55644,9 @@ var ts; return type; } function maybeTypeParameterReference(node) { - return !(node.kind === 153 /* QualifiedName */ || - node.parent.kind === 169 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName || - node.parent.kind === 188 /* ImportType */ && node.parent.typeArguments && node === node.parent.qualifier); + return !(node.kind === 156 /* QualifiedName */ || + node.parent.kind === 172 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName || + node.parent.kind === 192 /* ImportType */ && node.parent.typeArguments && node === node.parent.qualifier); } function isTypeParameterPossiblyReferenced(tp, node) { // If the type parameter doesn't have exactly one declaration, if there are invening statement blocks @@ -47718,7 +55655,7 @@ var ts; if (tp.symbol && tp.symbol.declarations && tp.symbol.declarations.length === 1) { var container = tp.symbol.declarations[0].parent; for (var n = node; n !== container; n = n.parent) { - if (!n || n.kind === 223 /* Block */ || n.kind === 180 /* ConditionalType */ && ts.forEachChild(n.extendsType, containsReference)) { + if (!n || n.kind === 227 /* Block */ || n.kind === 183 /* ConditionalType */ && ts.forEachChild(n.extendsType, containsReference)) { return true; } } @@ -47727,12 +55664,12 @@ var ts; return true; function containsReference(node) { switch (node.kind) { - case 183 /* ThisType */: + case 186 /* ThisType */: return !!tp.isThisType; - case 75 /* Identifier */: + case 78 /* Identifier */: return !tp.isThisType && ts.isPartOfTypeNode(node) && maybeTypeParameterReference(node) && getTypeFromTypeNodeWorker(node) === tp; // use worker because we're looking for === equality - case 172 /* TypeQuery */: + case 175 /* TypeQuery */: return true; } return !!ts.forEachChild(node, containsReference); @@ -47765,6 +55702,9 @@ var ts; if (typeVariable !== mappedTypeVariable) { return mapType(getReducedType(mappedTypeVariable), function (t) { if (t.flags & (3 /* AnyOrUnknown */ | 58982400 /* InstantiableNonPrimitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && t !== wildcardType && t !== errorType) { + if (isGenericTupleType(t)) { + return instantiateMappedGenericTupleType(t, type, typeVariable, mapper); + } var replacementMapper = prependTypeMapping(typeVariable, t, mapper); return isArrayType(t) ? instantiateMappedArrayType(t, type, replacementMapper) : isTupleType(t) ? instantiateMappedTupleType(t, type, replacementMapper) : @@ -47779,23 +55719,39 @@ var ts; function getModifiedReadonlyState(state, modifiers) { return modifiers & 1 /* IncludeReadonly */ ? true : modifiers & 2 /* ExcludeReadonly */ ? false : state; } + function instantiateMappedGenericTupleType(tupleType, mappedType, typeVariable, mapper) { + // When a tuple type is generic (i.e. when it contains variadic elements), we want to eagerly map the + // non-generic elements and defer mapping the generic elements. In order to facilitate this, we transform + // M<[A, B?, ...T, ...C[]] into [...M<[A]>, ...M<[B?]>, ...M, ...M] and then rely on tuple type + // normalization to resolve the non-generic parts of the resulting tuple. + var elementFlags = tupleType.target.elementFlags; + var elementTypes = ts.map(getTypeArguments(tupleType), function (t, i) { + var singleton = elementFlags[i] & 8 /* Variadic */ ? t : + elementFlags[i] & 4 /* Rest */ ? createArrayType(t) : + createTupleType([t], [elementFlags[i]]); + // The singleton is never a generic tuple type, so it is safe to recurse here. + return instantiateMappedType(mappedType, prependTypeMapping(typeVariable, singleton, mapper)); + }); + var newReadonly = getModifiedReadonlyState(tupleType.target.readonly, getMappedTypeModifiers(mappedType)); + return createTupleType(elementTypes, ts.map(elementTypes, function (_) { return 8 /* Variadic */; }), newReadonly); + } function instantiateMappedArrayType(arrayType, mappedType, mapper) { var elementType = instantiateMappedTypeTemplate(mappedType, numberType, /*isOptional*/ true, mapper); return elementType === errorType ? errorType : createArrayType(elementType, getModifiedReadonlyState(isReadonlyArrayType(arrayType), getMappedTypeModifiers(mappedType))); } function instantiateMappedTupleType(tupleType, mappedType, mapper) { - var minLength = tupleType.target.minLength; + var elementFlags = tupleType.target.elementFlags; var elementTypes = ts.map(getTypeArguments(tupleType), function (_, i) { - return instantiateMappedTypeTemplate(mappedType, getLiteralType("" + i), i >= minLength, mapper); + return instantiateMappedTypeTemplate(mappedType, getLiteralType("" + i), !!(elementFlags[i] & 2 /* Optional */), mapper); }); var modifiers = getMappedTypeModifiers(mappedType); - var newMinLength = modifiers & 4 /* IncludeOptional */ ? 0 : - modifiers & 8 /* ExcludeOptional */ ? getTypeReferenceArity(tupleType) - (tupleType.target.hasRestElement ? 1 : 0) : - minLength; + var newTupleModifiers = modifiers & 4 /* IncludeOptional */ ? ts.map(elementFlags, function (f) { return f & 1 /* Required */ ? 2 /* Optional */ : f; }) : + modifiers & 8 /* ExcludeOptional */ ? ts.map(elementFlags, function (f) { return f & 2 /* Optional */ ? 1 /* Required */ : f; }) : + elementFlags; var newReadonly = getModifiedReadonlyState(tupleType.target.readonly, modifiers); return ts.contains(elementTypes, errorType) ? errorType : - createTupleType(elementTypes, newMinLength, tupleType.target.hasRestElement, newReadonly, tupleType.target.associatedNames); + createTupleType(elementTypes, newTupleModifiers, newReadonly, tupleType.target.labeledElementDeclarations); } function instantiateMappedTypeTemplate(type, key, isOptional, mapper) { var templateMapper = appendTypeMapping(mapper, getTypeParameterFromMappedType(type), key); @@ -47854,7 +55810,7 @@ var ts; return getConditionalType(root, mapper); } function instantiateType(type, mapper) { - if (!type || !mapper) { + if (!(type && mapper && couldContainTypeVariables(type))) { return type; } if (instantiationDepth === 50 || instantiationCount >= 5000000) { @@ -47888,37 +55844,23 @@ var ts; } if (flags & 524288 /* Object */) { var objectFlags = type.objectFlags; - if (objectFlags & 16 /* Anonymous */) { - // If the anonymous type originates in a declaration of a function, method, class, or - // interface, in an object type literal, or in an object literal expression, we may need - // to instantiate the type because it might reference a type parameter. - return couldContainTypeVariables(type) ? - getObjectTypeInstantiation(type, mapper) : type; - } - if (objectFlags & 32 /* Mapped */) { - return getObjectTypeInstantiation(type, mapper); - } - if (objectFlags & 4 /* Reference */) { - if (type.node) { - return getObjectTypeInstantiation(type, mapper); + if (objectFlags & (4 /* Reference */ | 16 /* Anonymous */ | 32 /* Mapped */)) { + if (objectFlags & 4 /* Reference */ && !(type.node)) { + var resolvedTypeArguments = type.resolvedTypeArguments; + var newTypeArguments = instantiateTypes(resolvedTypeArguments, mapper); + return newTypeArguments !== resolvedTypeArguments ? createNormalizedTypeReference(type.target, newTypeArguments) : type; } - var resolvedTypeArguments = type.resolvedTypeArguments; - var newTypeArguments = instantiateTypes(resolvedTypeArguments, mapper); - return newTypeArguments !== resolvedTypeArguments ? createTypeReference(type.target, newTypeArguments) : type; + return getObjectTypeInstantiation(type, mapper); } return type; } - if ((flags & 2097152 /* Intersection */) || (flags & 1048576 /* Union */ && !(flags & 131068 /* Primitive */))) { - if (!couldContainTypeVariables(type)) { - return type; - } + if (flags & 3145728 /* UnionOrIntersection */) { var types = type.types; var newTypes = instantiateTypes(types, mapper); - return newTypes === types - ? type - : (flags & 2097152 /* Intersection */) - ? getIntersectionType(newTypes, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper)) - : getUnionType(newTypes, 1 /* Literal */, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper)); + return newTypes === types ? type : + flags & 2097152 /* Intersection */ ? + getIntersectionType(newTypes, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper)) : + getUnionType(newTypes, 1 /* Literal */, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper)); } if (flags & 4194304 /* Index */) { return getIndexType(instantiateType(type.type, mapper)); @@ -47970,35 +55912,35 @@ var ts; // Returns true if the given expression contains (at any level of nesting) a function or arrow expression // that is subject to contextual typing. function isContextSensitive(node) { - ts.Debug.assert(node.kind !== 161 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node)); + ts.Debug.assert(node.kind !== 164 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node)); switch (node.kind) { - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: - case 161 /* MethodDeclaration */: - case 244 /* FunctionDeclaration */: // Function declarations can have context when annotated with a jsdoc @type + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 164 /* MethodDeclaration */: + case 248 /* FunctionDeclaration */: // Function declarations can have context when annotated with a jsdoc @type return isContextSensitiveFunctionLikeDeclaration(node); - case 193 /* ObjectLiteralExpression */: + case 197 /* ObjectLiteralExpression */: return ts.some(node.properties, isContextSensitive); - case 192 /* ArrayLiteralExpression */: + case 196 /* ArrayLiteralExpression */: return ts.some(node.elements, isContextSensitive); - case 210 /* ConditionalExpression */: + case 214 /* ConditionalExpression */: return isContextSensitive(node.whenTrue) || isContextSensitive(node.whenFalse); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return (node.operatorToken.kind === 56 /* BarBarToken */ || node.operatorToken.kind === 60 /* QuestionQuestionToken */) && (isContextSensitive(node.left) || isContextSensitive(node.right)); - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: return isContextSensitive(node.initializer); - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return isContextSensitive(node.expression); - case 274 /* JsxAttributes */: + case 278 /* JsxAttributes */: return ts.some(node.properties, isContextSensitive) || ts.isJsxOpeningElement(node.parent) && ts.some(node.parent.parent.children, isContextSensitive); - case 273 /* JsxAttribute */: { + case 277 /* JsxAttribute */: { // If there is no initializer, JSX attribute has a boolean value of true which is not context sensitive. var initializer = node.initializer; return !!initializer && isContextSensitive(initializer); } - case 276 /* JsxExpression */: { + case 280 /* JsxExpression */: { // It is possible to that node.expression is undefined (e.g
) var expression = node.expression; return !!expression && isContextSensitive(expression); @@ -48017,7 +55959,7 @@ var ts; if (ts.some(node.parameters, function (p) { return !ts.getEffectiveTypeAnnotationNode(p); })) { return true; } - if (node.kind !== 202 /* ArrowFunction */) { + if (node.kind !== 206 /* ArrowFunction */) { // If the first parameter is not an explicit 'this' parameter, then the function has // an implicit 'this' parameter which is subject to contextual typing. var parameter = ts.firstOrUndefined(node.parameters); @@ -48030,7 +55972,7 @@ var ts; } function hasContextSensitiveReturnExpression(node) { // TODO(anhans): A block should be context-sensitive if it has a context-sensitive return value. - return !node.typeParameters && !ts.getEffectiveReturnTypeNode(node) && !!node.body && node.body.kind !== 223 /* Block */ && isContextSensitive(node.body); + return !node.typeParameters && !ts.getEffectiveReturnTypeNode(node) && !!node.body && node.body.kind !== 227 /* Block */ && isContextSensitive(node.body); } function isContextSensitiveFunctionOrObjectLiteralMethod(func) { return (ts.isInJSFile(func) && ts.isFunctionDeclaration(func) || isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) && @@ -48133,23 +56075,23 @@ var ts; return true; } switch (node.kind) { - case 276 /* JsxExpression */: - case 200 /* ParenthesizedExpression */: + case 280 /* JsxExpression */: + case 204 /* ParenthesizedExpression */: return elaborateError(node.expression, source, target, relation, headMessage, containingMessageChain, errorOutputContainer); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: switch (node.operatorToken.kind) { case 62 /* EqualsToken */: case 27 /* CommaToken */: return elaborateError(node.right, source, target, relation, headMessage, containingMessageChain, errorOutputContainer); } break; - case 193 /* ObjectLiteralExpression */: + case 197 /* ObjectLiteralExpression */: return elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer); - case 192 /* ArrayLiteralExpression */: + case 196 /* ArrayLiteralExpression */: return elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer); - case 274 /* JsxAttributes */: + case 278 /* JsxAttributes */: return elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer); - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: return elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer); } return false; @@ -48349,7 +56291,7 @@ var ts; } function getElaborationElementForJsxChild(child, nameType, getInvalidTextDiagnostic) { switch (child.kind) { - case 276 /* JsxExpression */: + case 280 /* JsxExpression */: // child is of the type of the expression return { errorNode: child, innerExpression: child.expression, nameType: nameType }; case 11 /* JsxText */: @@ -48358,9 +56300,9 @@ var ts; } // child is a string return { errorNode: child, innerExpression: undefined, nameType: nameType, errorMessage: getInvalidTextDiagnostic() }; - case 266 /* JsxElement */: - case 267 /* JsxSelfClosingElement */: - case 270 /* JsxFragment */: + case 270 /* JsxElement */: + case 271 /* JsxSelfClosingElement */: + case 274 /* JsxFragment */: // child is of type JSX.Element return { errorNode: child, innerExpression: child, nameType: nameType }; default: @@ -48511,11 +56453,11 @@ var ts; } _b = prop.kind; switch (_b) { - case 164 /* SetAccessor */: return [3 /*break*/, 2]; - case 163 /* GetAccessor */: return [3 /*break*/, 2]; - case 161 /* MethodDeclaration */: return [3 /*break*/, 2]; - case 282 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2]; - case 281 /* PropertyAssignment */: return [3 /*break*/, 4]; + case 167 /* SetAccessor */: return [3 /*break*/, 2]; + case 166 /* GetAccessor */: return [3 /*break*/, 2]; + case 164 /* MethodDeclaration */: return [3 /*break*/, 2]; + case 286 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2]; + case 285 /* PropertyAssignment */: return [3 /*break*/, 4]; } return [3 /*break*/, 6]; case 2: return [4 /*yield*/, { errorNode: prop.name, innerExpression: undefined, nameType: type }]; @@ -48592,8 +56534,8 @@ var ts; return 0 /* False */; } var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */; - var strictVariance = !(checkMode & 3 /* Callback */) && strictFunctionTypes && kind !== 161 /* MethodDeclaration */ && - kind !== 160 /* MethodSignature */ && kind !== 162 /* Constructor */; + var strictVariance = !(checkMode & 3 /* Callback */) && strictFunctionTypes && kind !== 164 /* MethodDeclaration */ && + kind !== 163 /* MethodSignature */ && kind !== 165 /* Constructor */; var result = -1 /* True */; var sourceThisType = getThisTypeOfSignature(source); if (sourceThisType && sourceThisType !== voidType) { @@ -48736,7 +56678,8 @@ var ts; false; } function isEmptyAnonymousObjectType(type) { - return !!(ts.getObjectFlags(type) & 16 /* Anonymous */) && isEmptyObjectType(type); + return !!(ts.getObjectFlags(type) & 16 /* Anonymous */ && (type.members && isEmptyResolvedType(type) || + type.symbol && type.symbol.flags & 2048 /* TypeLiteral */ && getMembersOfSymbol(type.symbol).size === 0)); } function isStringIndexSignatureOnlyType(type) { return type.flags & 524288 /* Object */ && !isGenericMappedType(type) && getPropertiesOfType(type).length === 0 && getIndexInfoOfType(type, 0 /* String */) && !getIndexInfoOfType(type, 1 /* Number */) || @@ -49088,14 +57031,21 @@ var ts; if (incompatibleStack.length) reportIncompatibleStack(); var _a = getTypeNamesForErrorDisplay(source, target), sourceType = _a[0], targetType = _a[1]; + var generalizedSource = source; + var generalizedSourceType = sourceType; + if (isLiteralType(source) && !typeCouldHaveTopLevelSingletonTypes(target)) { + generalizedSource = getBaseTypeOfLiteralType(source); + ts.Debug.assert(!isTypeAssignableTo(generalizedSource, target), "generalized source shouldn't be assignable"); + generalizedSourceType = getTypeNameForErrorDisplay(generalizedSource); + } if (target.flags & 262144 /* TypeParameter */) { var constraint = getBaseConstraintOfType(target); - var constraintElab = constraint && isTypeAssignableTo(source, constraint); - if (constraintElab) { - reportError(ts.Diagnostics._0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2, sourceType, targetType, typeToString(constraint)); + var needsOriginalSource = void 0; + if (constraint && (isTypeAssignableTo(generalizedSource, constraint) || (needsOriginalSource = isTypeAssignableTo(source, constraint)))) { + reportError(ts.Diagnostics._0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2, needsOriginalSource ? sourceType : generalizedSourceType, targetType, typeToString(constraint)); } else { - reportError(ts.Diagnostics._0_could_be_instantiated_with_an_arbitrary_type_which_could_be_unrelated_to_1, targetType, sourceType); + reportError(ts.Diagnostics._0_could_be_instantiated_with_an_arbitrary_type_which_could_be_unrelated_to_1, targetType, generalizedSourceType); } } if (!message) { @@ -49109,7 +57059,7 @@ var ts; message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1; } } - reportError(message, sourceType, targetType); + reportError(message, generalizedSourceType, targetType); } function tryElaborateErrorsForPrimitivesAndObjects(source, target) { var sourceType = symbolValueDeclarationIsContextSensitive(source.symbol) ? typeToString(source, source.symbol.valueDeclaration) : typeToString(source); @@ -49376,11 +57326,11 @@ var ts; return 0 /* False */; } if (flags & 3145728 /* UnionOrIntersection */) { - var result_5 = eachTypeRelatedToSomeType(source, target); - if (result_5) { - result_5 &= eachTypeRelatedToSomeType(target, source); + var result_6 = eachTypeRelatedToSomeType(source, target); + if (result_6) { + result_6 &= eachTypeRelatedToSomeType(target, source); } - return result_5; + return result_6; } return recursiveTypeRelatedTo(source, target, /*reportErrors*/ false, 0 /* None */); } @@ -49408,7 +57358,7 @@ var ts; reducedTarget = findMatchingDiscriminantType(source, target, isRelatedTo) || filterPrimitivesIfContainsNonPrimitive(target); checkTypes = reducedTarget.flags & 1048576 /* Union */ ? reducedTarget.types : [reducedTarget]; } - var _loop_13 = function (prop) { + var _loop_15 = function (prop) { if (shouldCheckAsExcessProperty(prop, source.symbol) && !isIgnoredJsxProperty(source, prop)) { if (!isKnownProperty(reducedTarget, prop.escapedName, isComparingJsxAttributes)) { if (reportErrors) { @@ -49423,13 +57373,20 @@ var ts; if (ts.isJsxAttributes(errorNode) || ts.isJsxOpeningLikeElement(errorNode) || ts.isJsxOpeningLikeElement(errorNode.parent)) { // JsxAttributes has an object-literal flag and undergo same type-assignablity check as normal object-literal. // However, using an object-literal error message will be very confusing to the users so we give different a message. - // TODO: Spelling suggestions for excess jsx attributes (needs new diagnostic messages) if (prop.valueDeclaration && ts.isJsxAttribute(prop.valueDeclaration) && ts.getSourceFileOfNode(errorNode) === ts.getSourceFileOfNode(prop.valueDeclaration.name)) { // Note that extraneous children (as in `extra`) don't pass this check, // since `children` is a SyntaxKind.PropertySignature instead of a SyntaxKind.JsxAttribute. errorNode = prop.valueDeclaration.name; } - reportError(ts.Diagnostics.Property_0_does_not_exist_on_type_1, symbolToString(prop), typeToString(errorTarget)); + var propName = symbolToString(prop); + var suggestionSymbol = getSuggestedSymbolForNonexistentJSXAttribute(propName, errorTarget); + var suggestion = suggestionSymbol ? symbolToString(suggestionSymbol) : undefined; + if (suggestion) { + reportError(ts.Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_mean_2, propName, typeToString(errorTarget), suggestion); + } + else { + reportError(ts.Diagnostics.Property_0_does_not_exist_on_type_1, propName, typeToString(errorTarget)); + } } else { // use the property's value declaration if the property is assigned inside the literal itself @@ -49464,7 +57421,7 @@ var ts; }; for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) { var prop = _a[_i]; - var state_5 = _loop_13(prop); + var state_5 = _loop_15(prop); if (typeof state_5 === "object") return state_5.value; } @@ -49710,21 +57667,21 @@ var ts; if (flags & 4194304 /* Index */) { return isRelatedTo(source.type, target.type, /*reportErrors*/ false); } - var result_6 = 0 /* False */; + var result_7 = 0 /* False */; if (flags & 8388608 /* IndexedAccess */) { - if (result_6 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) { - if (result_6 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) { - return result_6; + if (result_7 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) { + if (result_7 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) { + return result_7; } } } if (flags & 16777216 /* Conditional */) { if (source.root.isDistributive === target.root.isDistributive) { - if (result_6 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) { - if (result_6 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) { - if (result_6 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) { - if (result_6 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) { - return result_6; + if (result_7 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) { + if (result_7 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) { + if (result_7 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) { + if (result_7 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) { + return result_7; } } } @@ -49755,6 +57712,12 @@ var ts; return varianceResult; } } + // For a generic type T and a type U that is assignable to T, [...U] is assignable to T, U is assignable to readonly [...T], + // and U is assignable to [...T] when U is constrained to a mutable array or tuple type. + if (isSingleElementGenericTupleType(source) && !source.target.readonly && (result = isRelatedTo(getTypeArguments(source)[0], target)) || + isSingleElementGenericTupleType(target) && (target.target.readonly || isMutableArrayOrTuple(getBaseConstraintOfType(source) || source)) && (result = isRelatedTo(source, getTypeArguments(target)[0]))) { + return result; + } if (target.flags & 262144 /* TypeParameter */) { // A source type { [P in Q]: X } is related to a target type T if keyof T is related to Q and X is related to T[Q]. if (ts.getObjectFlags(source) & 32 /* Mapped */ && isRelatedTo(getIndexType(target), getConstraintTypeFromMappedType(source))) { @@ -49768,29 +57731,39 @@ var ts; } } else if (target.flags & 4194304 /* Index */) { + var targetType = target.type; // A keyof S is related to a keyof T if T is related to S. if (source.flags & 4194304 /* Index */) { - if (result = isRelatedTo(target.type, source.type, /*reportErrors*/ false)) { + if (result = isRelatedTo(targetType, source.type, /*reportErrors*/ false)) { return result; } } - // A type S is assignable to keyof T if S is assignable to keyof C, where C is the - // simplified form of T or, if T doesn't simplify, the constraint of T. - var constraint = getSimplifiedTypeOrConstraint(target.type); - if (constraint) { - // We require Ternary.True here such that circular constraints don't cause - // false positives. For example, given 'T extends { [K in keyof T]: string }', - // 'keyof T' has itself as its constraint and produces a Ternary.Maybe when - // related to other types. - if (isRelatedTo(source, getIndexType(constraint, target.stringsOnly), reportErrors) === -1 /* True */) { - return -1 /* True */; + if (isTupleType(targetType)) { + // An index type can have a tuple type target when the tuple type contains variadic elements. + // Check if the source is related to the known keys of the tuple type. + if (result = isRelatedTo(source, getKnownKeysOfTupleType(targetType), reportErrors)) { + return result; + } + } + else { + // A type S is assignable to keyof T if S is assignable to keyof C, where C is the + // simplified form of T or, if T doesn't simplify, the constraint of T. + var constraint = getSimplifiedTypeOrConstraint(targetType); + if (constraint) { + // We require Ternary.True here such that circular constraints don't cause + // false positives. For example, given 'T extends { [K in keyof T]: string }', + // 'keyof T' has itself as its constraint and produces a Ternary.Maybe when + // related to other types. + if (isRelatedTo(source, getIndexType(constraint, target.stringsOnly), reportErrors) === -1 /* True */) { + return -1 /* True */; + } } } } else if (target.flags & 8388608 /* IndexedAccess */) { // A type S is related to a type T[K] if S is related to C, where C is the base // constraint of T[K] for writing. - if (relation !== identityRelation) { + if (relation === assignableRelation || relation === comparableRelation) { var objectType = target.objectType; var indexType = target.indexType; var baseObjectType = getBaseConstraintOfType(objectType) || objectType; @@ -49823,12 +57796,22 @@ var ts; if (includeOptional ? !(filteredByApplicability.flags & 131072 /* Never */) : isRelatedTo(targetConstraint, sourceKeys)) { - var typeParameter = getTypeParameterFromMappedType(target); - var indexingType = filteredByApplicability ? getIntersectionType([filteredByApplicability, typeParameter]) : typeParameter; - var indexedAccessType = getIndexedAccessType(source, indexingType); var templateType = getTemplateTypeFromMappedType(target); - if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) { - return result; + var typeParameter = getTypeParameterFromMappedType(target); + // Fastpath: When the template has the form Obj[P] where P is the mapped type parameter, directly compare `source` with `Obj` + // to avoid creating the (potentially very large) number of new intermediate types made by manufacturing `source[P]` + var nonNullComponent = extractTypesOfKind(templateType, ~98304 /* Nullable */); + if (nonNullComponent.flags & 8388608 /* IndexedAccess */ && nonNullComponent.indexType === typeParameter) { + if (result = isRelatedTo(source, nonNullComponent.objectType, reportErrors)) { + return result; + } + } + else { + var indexingType = filteredByApplicability ? getIntersectionType([filteredByApplicability, typeParameter]) : typeParameter; + var indexedAccessType = getIndexedAccessType(source, indexingType); + if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) { + return result; + } } } originalErrorInfo = errorInfo; @@ -49885,7 +57868,7 @@ var ts; if (sourceParams) { // If the source has infer type parameters, we instantiate them in the context of the target var ctx = createInferenceContext(sourceParams, /*signature*/ undefined, 0 /* None */, isRelatedTo); - inferTypes(ctx.inferences, target.extendsType, sourceExtends, 128 /* NoConstraints */ | 256 /* AlwaysStrict */); + inferTypes(ctx.inferences, target.extendsType, sourceExtends, 256 /* NoConstraints */ | 512 /* AlwaysStrict */); sourceExtends = instantiateType(sourceExtends, ctx.mapper); mapper = ctx.mapper; } @@ -50009,9 +57992,9 @@ var ts; if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 1048576 /* Union */) { var objectOnlyTarget = extractTypesOfKind(target, 524288 /* Object */ | 2097152 /* Intersection */ | 33554432 /* Substitution */); if (objectOnlyTarget.flags & 1048576 /* Union */) { - var result_7 = typeRelatedToDiscriminatedType(source, objectOnlyTarget); - if (result_7) { - return result_7; + var result_8 = typeRelatedToDiscriminatedType(source, objectOnlyTarget); + if (result_8) { + return result_8; } } } @@ -50078,12 +58061,12 @@ var ts; var modifiersRelated = relation === comparableRelation || (relation === identityRelation ? getMappedTypeModifiers(source) === getMappedTypeModifiers(target) : getCombinedMappedTypeOptionality(source) <= getCombinedMappedTypeOptionality(target)); if (modifiersRelated) { - var result_8; + var result_9; var targetConstraint = getConstraintTypeFromMappedType(target); var sourceConstraint = instantiateType(getConstraintTypeFromMappedType(source), makeFunctionTypeMapper(getCombinedMappedTypeOptionality(source) < 0 ? reportUnmeasurableMarkers : reportUnreliableMarkers)); - if (result_8 = isRelatedTo(targetConstraint, sourceConstraint, reportErrors)) { + if (result_9 = isRelatedTo(targetConstraint, sourceConstraint, reportErrors)) { var mapper = createTypeMapper([getTypeParameterFromMappedType(source)], [getTypeParameterFromMappedType(target)]); - return result_8 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors); + return result_9 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors); } } return 0 /* False */; @@ -50118,24 +58101,24 @@ var ts; } // Compute the set of types for each discriminant property. var sourceDiscriminantTypes = new Array(sourcePropertiesFiltered.length); - var excludedProperties = ts.createUnderscoreEscapedMap(); + var excludedProperties = new ts.Set(); for (var i = 0; i < sourcePropertiesFiltered.length; i++) { var sourceProperty = sourcePropertiesFiltered[i]; var sourcePropertyType = getTypeOfSymbol(sourceProperty); sourceDiscriminantTypes[i] = sourcePropertyType.flags & 1048576 /* Union */ ? sourcePropertyType.types : [sourcePropertyType]; - excludedProperties.set(sourceProperty.escapedName, true); + excludedProperties.add(sourceProperty.escapedName); } // Match each combination of the cartesian product of discriminant properties to one or more // constituents of 'target'. If any combination does not have a match then 'source' is not relatable. var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes); var matchingTypes = []; - var _loop_14 = function (combination) { + var _loop_16 = function (combination) { var hasMatch = false; outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) { var type = _a[_i]; - var _loop_15 = function (i) { + var _loop_17 = function (i) { var sourceProperty = sourcePropertiesFiltered[i]; var targetProperty = getPropertyOfType(type, sourceProperty.escapedName); if (!targetProperty) @@ -50151,7 +58134,7 @@ var ts; } }; for (var i = 0; i < sourcePropertiesFiltered.length; i++) { - var state_7 = _loop_15(i); + var state_7 = _loop_17(i); switch (state_7) { case "continue-outer": continue outer; } @@ -50165,7 +58148,7 @@ var ts; }; for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) { var combination = discriminantCombinations_1[_a]; - var state_6 = _loop_14(combination); + var state_6 = _loop_16(combination); if (typeof state_6 === "object") return state_6.value; } @@ -50180,7 +58163,11 @@ var ts; result &= signaturesRelatedTo(source, type, 1 /* Construct */, /*reportStructuralErrors*/ false); if (result) { result &= indexTypesRelatedTo(source, type, 0 /* String */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false, 0 /* None */); - if (result) { + // Comparing numeric index types when both `source` and `type` are tuples is unnecessary as the + // element types should be sufficiently covered by `propertiesRelatedTo`. It also causes problems + // with index type assignability as the types for the excluded discriminants are still included + // in the index type. + if (result && !(isTupleType(source) && isTupleType(type))) { result &= indexTypesRelatedTo(source, type, 1 /* Number */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false, 0 /* None */); } } @@ -50217,7 +58204,7 @@ var ts; ts.Debug.assertIsDefined(links.deferralParent); ts.Debug.assertIsDefined(links.deferralConstituents); var unionParent = !!(links.deferralParent.flags & 1048576 /* Union */); - var result_9 = unionParent ? 0 /* False */ : -1 /* True */; + var result_10 = unionParent ? 0 /* False */ : -1 /* True */; var targetTypes = links.deferralConstituents; for (var _i = 0, targetTypes_3 = targetTypes; _i < targetTypes_3.length; _i++) { var targetType = targetTypes_3[_i]; @@ -50227,7 +58214,7 @@ var ts; // Can't assign to a target individually - have to fallback to assigning to the _whole_ intersection (which forces normalization) return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors); } - result_9 &= related; + result_10 &= related; } else { if (related) { @@ -50235,17 +58222,17 @@ var ts; } } } - if (unionParent && !result_9 && targetIsOptional) { - result_9 = isRelatedTo(source, undefinedType); + if (unionParent && !result_10 && targetIsOptional) { + result_10 = isRelatedTo(source, undefinedType); } - if (unionParent && !result_9 && reportErrors) { + if (unionParent && !result_10 && reportErrors) { // The easiest way to get the right errors here is to un-defer (which may be costly) // If it turns out this is too costly too often, we can replicate the error handling logic within // typeRelatedToSomeType without the discriminatable type branch (as that requires a manifest union // type on which to hand discriminable properties, which we are expressly trying to avoid here) return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors); } - return result_9; + return result_10; } else { return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors, /*headMessage*/ undefined, intersectionState); @@ -50316,8 +58303,8 @@ var ts; var privateIdentifierDescription = unmatchedProperty.valueDeclaration.name.escapedText; var symbolTableKey = ts.getSymbolNameForPrivateIdentifier(source.symbol, privateIdentifierDescription); if (symbolTableKey && getPropertyOfType(source, symbolTableKey)) { - var sourceName = ts.getDeclarationName(source.symbol.valueDeclaration); - var targetName = ts.getDeclarationName(target.symbol.valueDeclaration); + var sourceName = ts.factory.getDeclarationName(source.symbol.valueDeclaration); + var targetName = ts.factory.getDeclarationName(target.symbol.valueDeclaration); reportError(ts.Diagnostics.Property_0_in_type_1_refers_to_a_different_member_that_cannot_be_accessed_from_within_type_2, diagnosticName(privateIdentifierDescription), diagnosticName(sourceName.escapedText === "" ? anon : sourceName), diagnosticName(targetName.escapedText === "" ? anon : targetName)); return; } @@ -50354,6 +58341,90 @@ var ts; if (relation === identityRelation) { return propertiesIdenticalTo(source, target, excludedProperties); } + var result = -1 /* True */; + if (isTupleType(target)) { + if (isArrayType(source) || isTupleType(source)) { + if (!target.target.readonly && (isReadonlyArrayType(source) || isTupleType(source) && source.target.readonly)) { + return 0 /* False */; + } + var sourceArity = getTypeReferenceArity(source); + var targetArity = getTypeReferenceArity(target); + var sourceRestFlag = isTupleType(source) ? source.target.combinedFlags & 4 /* Rest */ : 4 /* Rest */; + var targetRestFlag = target.target.combinedFlags & 4 /* Rest */; + var sourceMinLength = isTupleType(source) ? source.target.minLength : 0; + var targetMinLength = target.target.minLength; + if (!sourceRestFlag && sourceArity < targetMinLength) { + if (reportErrors) { + reportError(ts.Diagnostics.Source_has_0_element_s_but_target_requires_1, sourceArity, targetMinLength); + } + return 0 /* False */; + } + if (!targetRestFlag && targetArity < sourceMinLength) { + if (reportErrors) { + reportError(ts.Diagnostics.Source_has_0_element_s_but_target_allows_only_1, sourceMinLength, targetArity); + } + return 0 /* False */; + } + if (!targetRestFlag && sourceRestFlag) { + if (reportErrors) { + if (sourceMinLength < targetMinLength) { + reportError(ts.Diagnostics.Target_requires_0_element_s_but_source_may_have_fewer, targetMinLength); + } + else { + reportError(ts.Diagnostics.Target_allows_only_0_element_s_but_source_may_have_more, targetArity); + } + } + return 0 /* False */; + } + var maxArity = Math.max(sourceArity, targetArity); + for (var i = 0; i < maxArity; i++) { + var targetFlags = i < targetArity ? target.target.elementFlags[i] : targetRestFlag; + var sourceFlags = isTupleType(source) && i < sourceArity ? source.target.elementFlags[i] : sourceRestFlag; + var canExcludeDiscriminants = !!excludedProperties; + if (sourceFlags && targetFlags) { + if (targetFlags & 8 /* Variadic */ && !(sourceFlags & 8 /* Variadic */) || + (sourceFlags & 8 /* Variadic */ && !(targetFlags & 12 /* Variable */))) { + if (reportErrors) { + reportError(ts.Diagnostics.Element_at_index_0_is_variadic_in_one_type_but_not_in_the_other, i); + } + return 0 /* False */; + } + if (targetFlags & 1 /* Required */) { + if (!(sourceFlags & 1 /* Required */)) { + if (reportErrors) { + reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, i, typeToString(source), typeToString(target)); + } + return 0 /* False */; + } + } + // We can only exclude discriminant properties if we have not yet encountered a variable-length element. + if (canExcludeDiscriminants) { + if (sourceFlags & 12 /* Variable */ || targetFlags & 12 /* Variable */) { + canExcludeDiscriminants = false; + } + if (canExcludeDiscriminants && (excludedProperties === null || excludedProperties === void 0 ? void 0 : excludedProperties.has(("" + i)))) { + continue; + } + } + var sourceType = getTypeArguments(source)[Math.min(i, sourceArity - 1)]; + var targetType = getTypeArguments(target)[Math.min(i, targetArity - 1)]; + var targetCheckType = sourceFlags & 8 /* Variadic */ && targetFlags & 4 /* Rest */ ? createArrayType(targetType) : targetType; + var related = isRelatedTo(sourceType, targetCheckType, reportErrors, /*headMessage*/ undefined, intersectionState); + if (!related) { + if (reportErrors) { + reportIncompatibleError(ts.Diagnostics.Types_of_property_0_are_incompatible, i); + } + return 0 /* False */; + } + result &= related; + } + } + return result; + } + if (target.target.combinedFlags & 12 /* Variable */) { + return 0 /* False */; + } + } var requireOptionalProperties = (relation === subtypeRelation || relation === strictSubtypeRelation) && !isObjectLiteralType(source) && !isEmptyArrayLiteralType(source) && !isTupleType(source); var unmatchedProperty = getUnmatchedProperty(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false); if (unmatchedProperty) { @@ -50376,35 +58447,6 @@ var ts; } } } - var result = -1 /* True */; - if (isTupleType(target)) { - var targetRestType = getRestTypeOfTupleType(target); - if (targetRestType) { - if (!isTupleType(source)) { - return 0 /* False */; - } - var sourceRestType = getRestTypeOfTupleType(source); - if (sourceRestType && !isRelatedTo(sourceRestType, targetRestType, reportErrors)) { - if (reportErrors) { - reportError(ts.Diagnostics.Rest_signatures_are_incompatible); - } - return 0 /* False */; - } - var targetCount = getTypeReferenceArity(target) - 1; - var sourceCount = getTypeReferenceArity(source) - (sourceRestType ? 1 : 0); - var sourceTypeArguments = getTypeArguments(source); - for (var i = targetCount; i < sourceCount; i++) { - var related = isRelatedTo(sourceTypeArguments[i], targetRestType, reportErrors); - if (!related) { - if (reportErrors) { - reportError(ts.Diagnostics.Property_0_is_incompatible_with_rest_element_type, "" + i); - } - return 0 /* False */; - } - result &= related; - } - } - } // We only call this for union target types when we're attempting to do excess property checking - in those cases, we want to get _all possible props_ // from the target union, across all members var properties = getPropertiesOfType(target); @@ -50602,9 +58644,10 @@ var ts; return -1 /* True */; } if (isGenericMappedType(source)) { - // A generic mapped type { [P in K]: T } is related to an index signature { [x: string]: U } - // if T is related to U. - return kind === 0 /* String */ ? isRelatedTo(getTemplateTypeFromMappedType(source), targetType, reportErrors) : 0 /* False */; + // A generic mapped type { [P in K]: T } is related to a type with an index signature + // { [x: string]: U }, and optionally with an index signature { [x: number]: V }, + // if T is related to U and V. + return getIndexTypeOfType(target, 0 /* String */) ? isRelatedTo(getTemplateTypeFromMappedType(source), targetType, reportErrors) : 0 /* False */; } var indexType = getIndexTypeOfType(source, kind) || kind === 1 /* Number */ && getIndexTypeOfType(source, 0 /* String */); if (indexType) { @@ -50641,8 +58684,8 @@ var ts; if (!sourceSignature.declaration || !targetSignature.declaration) { return true; } - var sourceAccessibility = ts.getSelectedModifierFlags(sourceSignature.declaration, 24 /* NonPublicAccessibilityModifier */); - var targetAccessibility = ts.getSelectedModifierFlags(targetSignature.declaration, 24 /* NonPublicAccessibilityModifier */); + var sourceAccessibility = ts.getSelectedEffectiveModifierFlags(sourceSignature.declaration, 24 /* NonPublicAccessibilityModifier */); + var targetAccessibility = ts.getSelectedEffectiveModifierFlags(targetSignature.declaration, 24 /* NonPublicAccessibilityModifier */); // A public, protected and private signature is assignable to a private signature. if (targetAccessibility === 8 /* Private */) { return true; @@ -50661,6 +58704,24 @@ var ts; return false; } } + function typeCouldHaveTopLevelSingletonTypes(type) { + // Okay, yes, 'boolean' is a union of 'true | false', but that's not useful + // in error reporting scenarios. If you need to use this function but that detail matters, + // feel free to add a flag. + if (type.flags & 16 /* Boolean */) { + return false; + } + if (type.flags & 3145728 /* UnionOrIntersection */) { + return !!ts.forEach(type.types, typeCouldHaveTopLevelSingletonTypes); + } + if (type.flags & 63176704 /* Instantiable */) { + var constraint = getConstraintOfType(type); + if (constraint) { + return typeCouldHaveTopLevelSingletonTypes(constraint); + } + } + return isUnitType(type); + } function getBestMatchingType(source, target, isRelatedTo) { if (isRelatedTo === void 0) { isRelatedTo = compareTypesAssignable; } return findMatchingDiscriminantType(source, target, isRelatedTo, /*skipPartial*/ true) || @@ -50749,7 +58810,7 @@ var ts; // The emptyArray singleton is used to signal a recursive invocation. cache.variances = ts.emptyArray; variances = []; - var _loop_16 = function (tp) { + var _loop_18 = function (tp) { var unmeasurable = false; var unreliable = false; var oldHandler = outofbandVarianceMarkerHandler; @@ -50781,7 +58842,7 @@ var ts; }; for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) { var tp = typeParameters_1[_i]; - _loop_16(tp); + _loop_18(tp); } cache.variances = variances; } @@ -50876,6 +58937,12 @@ var ts; function getDeclaringClass(prop) { return prop.parent && prop.parent.flags & 32 /* Class */ ? getDeclaredTypeOfSymbol(getParentOfSymbol(prop)) : undefined; } + // Return the inherited type of the given property or undefined if property doesn't exist in a base class. + function getTypeOfPropertyInBaseClass(property) { + var classType = getDeclaringClass(property); + var baseClassType = classType && getBaseTypes(classType)[0]; + return baseClassType && getTypeOfPropertyOfType(baseClassType, property.escapedName); + } // Return true if some underlying source property is declared in a class that derives // from the given base class. function isPropertyInClassDerivedFrom(prop, baseClass) { @@ -50903,15 +58970,33 @@ var ts; // In addition, this will also detect when an indexed access has been chained off of 5 or more times (which is essentially // the dual of the structural comparison), and likewise mark the type as deeply nested, potentially adding false positives // for finite but deeply expanding indexed accesses (eg, for `Q[P1][P2][P3][P4][P5]`). + // It also detects when a recursive type reference has expanded 5 or more times, eg, if the true branch of + // `type A = null extends T ? [A>] : [T]` + // has expanded into `[A>>>>>]` + // in such cases we need to terminate the expansion, and we do so here. function isDeeplyNestedType(type, stack, depth) { // We track all object types that have an associated symbol (representing the origin of the type) - if (depth >= 5 && type.flags & 524288 /* Object */ && !isObjectOrArrayLiteralType(type)) { - var symbol = type.symbol; - if (symbol) { + if (depth >= 5 && type.flags & 524288 /* Object */) { + if (!isObjectOrArrayLiteralType(type)) { + var symbol = type.symbol; + if (symbol) { + var count = 0; + for (var i = 0; i < depth; i++) { + var t = stack[i]; + if (t.flags & 524288 /* Object */ && t.symbol === symbol) { + count++; + if (count >= 5) + return true; + } + } + } + } + if (ts.getObjectFlags(type) && 4 /* Reference */ && !!type.node) { + var root = type.target; var count = 0; for (var i = 0; i < depth; i++) { var t = stack[i]; - if (t.flags & 524288 /* Object */ && t.symbol === symbol) { + if (ts.getObjectFlags(t) && 4 /* Reference */ && !!t.node && t.target === root) { count++; if (count >= 5) return true; @@ -51198,15 +59283,40 @@ var ts; function isTupleType(type) { return !!(ts.getObjectFlags(type) & 4 /* Reference */ && type.target.objectFlags & 8 /* Tuple */); } + function isGenericTupleType(type) { + return isTupleType(type) && !!(type.target.combinedFlags & 8 /* Variadic */); + } + function isSingleElementGenericTupleType(type) { + return isGenericTupleType(type) && type.target.elementFlags.length === 1; + } function getRestTypeOfTupleType(type) { - return type.target.hasRestElement ? getTypeArguments(type)[type.target.typeParameters.length - 1] : undefined; + return getElementTypeOfSliceOfTupleType(type, type.target.fixedLength); } function getRestArrayTypeOfTupleType(type) { var restType = getRestTypeOfTupleType(type); return restType && createArrayType(restType); } - function getLengthOfTupleType(type) { - return getTypeReferenceArity(type) - (type.target.hasRestElement ? 1 : 0); + function getEndLengthOfType(type) { + return isTupleType(type) ? getTypeReferenceArity(type) - ts.findLastIndex(type.target.elementFlags, function (f) { return !(f & (1 /* Required */ | 2 /* Optional */)); }) - 1 : 0; + } + function getElementTypeOfSliceOfTupleType(type, index, endSkipCount, writing) { + if (endSkipCount === void 0) { endSkipCount = 0; } + if (writing === void 0) { writing = false; } + var length = getTypeReferenceArity(type) - endSkipCount; + if (index < length) { + var typeArguments = getTypeArguments(type); + var elementTypes = []; + for (var i = index; i < length; i++) { + var t = typeArguments[i]; + elementTypes.push(type.target.elementFlags[i] & 8 /* Variadic */ ? getIndexedAccessType(t, numberType) : t); + } + return writing ? getIntersectionType(elementTypes) : getUnionType(elementTypes); + } + return undefined; + } + function isTupleTypeStructureMatching(t1, t2) { + return getTypeReferenceArity(t1) === getTypeReferenceArity(t2) && + ts.every(t1.target.elementFlags, function (f, i) { return (f & 12 /* Variable */) === (t2.target.elementFlags[i] & 12 /* Variable */); }); } function isZeroBigInt(_a) { var value = _a.value; @@ -51399,7 +59509,7 @@ var ts; } function getPropertiesOfContext(context) { if (!context.resolvedProperties) { - var names = ts.createMap(); + var names = new ts.Map(); for (var _i = 0, _a = getSiblingsOfContext(context); _i < _a.length; _i++) { var t = _a[_i]; if (isObjectLiteralType(t) && !(ts.getObjectFlags(t) & 1024 /* ContainsSpread */)) { @@ -51548,12 +59658,12 @@ var ts; } var diagnostic; switch (declaration.kind) { - case 209 /* BinaryExpression */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: + case 213 /* BinaryExpression */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: diagnostic = noImplicitAny ? ts.Diagnostics.Member_0_implicitly_has_an_1_type : ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage; break; - case 156 /* Parameter */: + case 159 /* Parameter */: var param = declaration; if (ts.isIdentifier(param.name) && (ts.isCallSignatureDeclaration(param.parent) || ts.isMethodSignature(param.parent) || ts.isFunctionTypeNode(param.parent)) && @@ -51568,23 +59678,23 @@ var ts; noImplicitAny ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage : noImplicitAny ? ts.Diagnostics.Parameter_0_implicitly_has_an_1_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage; break; - case 191 /* BindingElement */: + case 195 /* BindingElement */: diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type; if (!noImplicitAny) { // Don't issue a suggestion for binding elements since the codefix doesn't yet support them. return; } break; - case 300 /* JSDocFunctionType */: + case 304 /* JSDocFunctionType */: error(declaration, ts.Diagnostics.Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString); return; - case 244 /* FunctionDeclaration */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 248 /* FunctionDeclaration */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: if (noImplicitAny && !declaration.name) { if (wideningKind === 3 /* GeneratorYield */) { error(declaration, ts.Diagnostics.Generator_implicitly_has_yield_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type_annotation, typeAsString); @@ -51598,7 +59708,7 @@ var ts; wideningKind === 3 /* GeneratorYield */ ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_yield_type : ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type; break; - case 186 /* MappedType */: + case 189 /* MappedType */: if (noImplicitAny) { error(declaration, ts.Diagnostics.Mapped_object_type_implicitly_has_an_any_template_type); } @@ -51695,7 +59805,8 @@ var ts; inferredType: undefined, priority: undefined, topLevel: true, - isFixed: false + isFixed: false, + impliedArity: undefined }; } function cloneInferenceInfo(inference) { @@ -51706,7 +59817,8 @@ var ts; inferredType: inference.inferredType, priority: inference.priority, topLevel: inference.topLevel, - isFixed: inference.isFixed + isFixed: inference.isFixed, + impliedArity: inference.impliedArity }; } function cloneInferredPartOfContext(context) { @@ -51727,15 +59839,22 @@ var ts; return !!(objectFlags & 134217728 /* CouldContainTypeVariables */); } var result = !!(type.flags & 63176704 /* Instantiable */ || - objectFlags & 4 /* Reference */ && (type.node || ts.forEach(getTypeArguments(type), couldContainTypeVariables)) || - objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || - objectFlags & (32 /* Mapped */ | 131072 /* ObjectRestType */) || - type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && ts.some(type.types, couldContainTypeVariables)); + type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || ts.forEach(getTypeArguments(type), couldContainTypeVariables)) || + objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || + objectFlags & (32 /* Mapped */ | 131072 /* ObjectRestType */)) || + type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && ts.some(type.types, couldContainTypeVariables)); if (type.flags & 3899393 /* ObjectFlagsType */) { type.objectFlags |= 67108864 /* CouldContainTypeVariablesComputed */ | (result ? 134217728 /* CouldContainTypeVariables */ : 0); } return result; } + function isNonGenericTopLevelType(type) { + if (type.aliasSymbol && !type.aliasTypeArguments) { + var declaration = ts.getDeclarationOfKind(type.aliasSymbol, 251 /* TypeAliasDeclaration */); + return !!(declaration && ts.findAncestor(declaration.parent, function (n) { return n.kind === 294 /* SourceFile */ ? true : n.kind === 253 /* ModuleDeclaration */ ? false : "quit"; })); + } + return false; + } function isTypeParameterAtTopLevel(type, typeParameter) { return !!(type === typeParameter || type.flags & 3145728 /* UnionOrIntersection */ && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); }) || @@ -51768,12 +59887,16 @@ var ts; * variable T[P] (i.e. we treat the type T[P] as the type variable we're inferring for). */ function inferTypeForHomomorphicMappedType(source, target, constraint) { + if (inInferTypeForHomomorphicMappedType) { + return undefined; + } var key = source.id + "," + target.id + "," + constraint.id; if (reverseMappedCache.has(key)) { return reverseMappedCache.get(key); } - reverseMappedCache.set(key, undefined); + inInferTypeForHomomorphicMappedType = true; var type = createReverseMappedType(source, target, constraint); + inInferTypeForHomomorphicMappedType = false; reverseMappedCache.set(key, type); return type; } @@ -51798,9 +59921,10 @@ var ts; } if (isTupleType(source)) { var elementTypes = ts.map(getTypeArguments(source), function (t) { return inferReverseMappedType(t, target, constraint); }); - var minLength = getMappedTypeModifiers(target) & 4 /* IncludeOptional */ ? - getTypeReferenceArity(source) - (source.target.hasRestElement ? 1 : 0) : source.target.minLength; - return createTupleType(elementTypes, minLength, source.target.hasRestElement, source.target.readonly, source.target.associatedNames); + var elementFlags = getMappedTypeModifiers(target) & 4 /* IncludeOptional */ ? + ts.sameMap(source.target.elementFlags, function (f) { return f & 2 /* Optional */ ? 1 /* Required */ : f; }) : + source.target.elementFlags; + return createTupleType(elementTypes, elementFlags, source.target.readonly, source.target.labeledElementDeclarations); } // For all other object types we infer a new object type where the reverse mapping has been // applied to the type of each property. @@ -51865,13 +59989,13 @@ var ts; return result.value; } function tupleTypesDefinitelyUnrelated(source, target) { - return target.target.minLength > source.target.minLength || - !getRestTypeOfTupleType(target) && (!!getRestTypeOfTupleType(source) || getLengthOfTupleType(target) < getLengthOfTupleType(source)); + return !(target.target.combinedFlags & 8 /* Variadic */) && target.target.minLength > source.target.minLength || + !target.target.hasRestElement && (source.target.hasRestElement || target.target.fixedLength < source.target.fixedLength); } function typesDefinitelyUnrelated(source, target) { // Two tuple types with incompatible arities are definitely unrelated. // Two object types that each have a property that is unmatched in the other are definitely unrelated. - return isTupleType(source) && isTupleType(target) && tupleTypesDefinitelyUnrelated(source, target) || + return isTupleType(source) && isTupleType(target) ? tupleTypesDefinitelyUnrelated(source, target) : !!getUnmatchedProperty(source, target, /*requireOptionalProperties*/ false, /*matchDiscriminantProperties*/ true) && !!getUnmatchedProperty(target, source, /*requireOptionalProperties*/ false, /*matchDiscriminantProperties*/ true); } @@ -51893,8 +60017,10 @@ var ts; var visited; var bivariant = false; var propagationType; - var inferencePriority = 512 /* MaxValue */; + var inferencePriority = 1024 /* MaxValue */; var allowComplexConstraintInference = true; + var objectTypeComparisonDepth = 0; + var targetStack = []; inferFromTypes(originalSource, originalTarget); function inferFromTypes(source, target) { if (!couldContainTypeVariables(target)) { @@ -51977,7 +60103,7 @@ var ts; // of inference. Also, we exclude inferences for silentNeverType (which is used as a wildcard // when constructing types from type parameters that had no inference candidates). if (ts.getObjectFlags(source) & 2097152 /* NonInferrableType */ || source === nonInferrableAnyType || source === silentNeverType || - (priority & 32 /* ReturnType */ && (source === autoType || source === autoArrayType)) || isFromInferenceBlockedSource(source)) { + (priority & 64 /* ReturnType */ && (source === autoType || source === autoArrayType)) || isFromInferenceBlockedSource(source)) { return; } var inference = getInferenceInfoForType(target); @@ -52004,7 +60130,7 @@ var ts; clearCachedInferences(inferences); } } - if (!(priority & 32 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) { + if (!(priority & 64 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) { inference.topLevel = false; clearCachedInferences(inferences); } @@ -52044,7 +60170,7 @@ var ts; else if ((isLiteralType(source) || source.flags & 4 /* String */) && target.flags & 4194304 /* Index */) { var empty = createEmptyObjectTypeFromStringLiteral(source); contravariant = !contravariant; - inferWithPriority(empty, target.type, 64 /* LiteralKeyof */); + inferWithPriority(empty, target.type, 128 /* LiteralKeyof */); contravariant = !contravariant; } else if (source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */) { @@ -52059,7 +60185,7 @@ var ts; } else if (target.flags & 16777216 /* Conditional */) { var savePriority = priority; - priority |= contravariant ? 16 /* ContravariantConditional */ : 0; + priority |= contravariant ? 32 /* ContravariantConditional */ : 0; var targetTypes = [getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)]; inferToMultipleTypes(source, targetTypes, target.flags); priority = savePriority; @@ -52077,7 +60203,7 @@ var ts; } else { source = getReducedType(source); - if (!(priority & 128 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) { + if (!(priority & 256 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) { var apparentSource = getApparentType(source); // getApparentType can return _any_ type, since an indexed access or conditional may simplify to any other type. // If that occurs and it doesn't simplify to an object or intersection, we'll need to restart `inferFromTypes` @@ -52119,9 +60245,9 @@ var ts; inferencePriority = Math.min(inferencePriority, status); return; } - (visited || (visited = ts.createMap())).set(key, -1 /* Circularity */); + (visited || (visited = new ts.Map())).set(key, -1 /* Circularity */); var saveInferencePriority = inferencePriority; - inferencePriority = 512 /* MaxValue */; + inferencePriority = 1024 /* MaxValue */; action(source, target); visited.set(key, inferencePriority); inferencePriority = Math.min(inferencePriority, saveInferencePriority); @@ -52157,7 +60283,7 @@ var ts; } } function inferFromContravariantTypes(source, target) { - if (strictFunctionTypes || priority & 256 /* AlwaysStrict */) { + if (strictFunctionTypes || priority & 512 /* AlwaysStrict */) { contravariant = !contravariant; inferFromTypes(source, target); contravariant = !contravariant; @@ -52209,7 +60335,7 @@ var ts; else { for (var i = 0; i < sources.length; i++) { var saveInferencePriority = inferencePriority; - inferencePriority = 512 /* MaxValue */; + inferencePriority = 1024 /* MaxValue */; inferFromTypes(sources[i], t); if (inferencePriority === priority) matched_1[i] = true; @@ -52289,8 +60415,8 @@ var ts; // types because we may only have a partial result (i.e. we may have failed to make // reverse inferences for some properties). inferWithPriority(inferredType, inference.typeParameter, ts.getObjectFlags(source) & 2097152 /* NonInferrableType */ ? - 4 /* PartialHomomorphicMappedType */ : - 2 /* HomomorphicMappedType */); + 8 /* PartialHomomorphicMappedType */ : + 4 /* HomomorphicMappedType */); } } return true; @@ -52298,7 +60424,7 @@ var ts; if (constraintType.flags & 262144 /* TypeParameter */) { // We're inferring from some source type S to a mapped type { [P in K]: X }, where K is a type // parameter. First infer from 'keyof S' to K. - inferWithPriority(getIndexType(source), constraintType, 8 /* MappedTypeConstraint */); + inferWithPriority(getIndexType(source), constraintType, 16 /* MappedTypeConstraint */); // If K is constrained to a type C, also infer to C. Thus, for a mapped type { [P in K]: X }, // where K extends keyof T, we make the same inferences as for a homomorphic mapped type // { [P in keyof T]: X }. This enables us to make meaningful inferences when the target is a @@ -52325,15 +60451,27 @@ var ts; // its symbol with the instance side which would lead to false positives. var isNonConstructorObject = target.flags & 524288 /* Object */ && !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */); - var symbolOrType = isNonConstructorObject ? isTupleType(target) ? target.target : target.symbol : undefined; + var symbolOrType = ts.getObjectFlags(target) & 4 /* Reference */ && target.node ? getNormalizedType(target, /*writing*/ false) : isNonConstructorObject ? isTupleType(target) ? target.target : target.symbol : undefined; if (symbolOrType) { if (ts.contains(symbolOrTypeStack, symbolOrType)) { + if (ts.getObjectFlags(target) & 4 /* Reference */ && target.node) { + // Don't set the circularity flag for re-encountered recursive type references just because we're already exploring them + return; + } inferencePriority = -1 /* Circularity */; return; } + targetStack[objectTypeComparisonDepth] = target; + objectTypeComparisonDepth++; + if (isDeeplyNestedType(target, targetStack, objectTypeComparisonDepth)) { + inferencePriority = -1 /* Circularity */; + objectTypeComparisonDepth--; + return; + } (symbolOrTypeStack || (symbolOrTypeStack = [])).push(symbolOrType); inferFromObjectTypesWorker(source, target); symbolOrTypeStack.pop(); + objectTypeComparisonDepth--; } else { inferFromObjectTypesWorker(source, target); @@ -52361,22 +60499,64 @@ var ts; if (!typesDefinitelyUnrelated(source, target)) { if (isArrayType(source) || isTupleType(source)) { if (isTupleType(target)) { - var sourceLength = isTupleType(source) ? getLengthOfTupleType(source) : 0; - var targetLength = getLengthOfTupleType(target); - var sourceRestType = isTupleType(source) ? getRestTypeOfTupleType(source) : getElementTypeOfArrayType(source); - var targetRestType = getRestTypeOfTupleType(target); - var fixedLength = targetLength < sourceLength || sourceRestType ? targetLength : sourceLength; - for (var i = 0; i < fixedLength; i++) { - inferFromTypes(i < sourceLength ? getTypeArguments(source)[i] : sourceRestType, getTypeArguments(target)[i]); + var sourceArity = getTypeReferenceArity(source); + var targetArity = getTypeReferenceArity(target); + var elementTypes = getTypeArguments(target); + var elementFlags = target.target.elementFlags; + // When source and target are tuple types with the same structure (fixed, variadic, and rest are matched + // to the same kind in each position), simply infer between the element types. + if (isTupleType(source) && isTupleTypeStructureMatching(source, target)) { + for (var i = 0; i < targetArity; i++) { + inferFromTypes(getTypeArguments(source)[i], elementTypes[i]); + } + return; } - if (targetRestType) { - var types = fixedLength < sourceLength ? getTypeArguments(source).slice(fixedLength, sourceLength) : []; - if (sourceRestType) { - types.push(sourceRestType); + var startLength = isTupleType(source) ? Math.min(source.target.fixedLength, target.target.fixedLength) : 0; + var sourceRestType = !isTupleType(source) || sourceArity > 0 && source.target.elementFlags[sourceArity - 1] & 4 /* Rest */ ? + getTypeArguments(source)[sourceArity - 1] : undefined; + var endLength = !(target.target.combinedFlags & 12 /* Variable */) ? 0 : + sourceRestType ? getEndLengthOfType(target) : + Math.min(getEndLengthOfType(source), getEndLengthOfType(target)); + var sourceEndLength = sourceRestType ? 0 : endLength; + // Infer between starting fixed elements. + for (var i = 0; i < startLength; i++) { + inferFromTypes(getTypeArguments(source)[i], elementTypes[i]); + } + if (sourceRestType && sourceArity - startLength === 1) { + // Single rest element remains in source, infer from that to every element in target + for (var i = startLength; i < targetArity - endLength; i++) { + inferFromTypes(elementFlags[i] & 8 /* Variadic */ ? createArrayType(sourceRestType) : sourceRestType, elementTypes[i]); } - if (types.length) { - inferFromTypes(getUnionType(types), targetRestType); + } + else { + var middleLength = targetArity - startLength - endLength; + if (middleLength === 2 && elementFlags[startLength] & elementFlags[startLength + 1] & 8 /* Variadic */ && isTupleType(source)) { + // Middle of target is [...T, ...U] and source is tuple type + var targetInfo = getInferenceInfoForType(elementTypes[startLength]); + if (targetInfo && targetInfo.impliedArity !== undefined) { + // Infer slices from source based on implied arity of T. + inferFromTypes(sliceTupleType(source, startLength, sourceEndLength + sourceArity - targetInfo.impliedArity), elementTypes[startLength]); + inferFromTypes(sliceTupleType(source, startLength + targetInfo.impliedArity, sourceEndLength), elementTypes[startLength + 1]); + } } + else if (middleLength === 1 && elementFlags[startLength] & 8 /* Variadic */) { + // Middle of target is exactly one variadic element. Infer the slice between the fixed parts in the source. + // If target ends in optional element(s), make a lower priority a speculative inference. + var endsInOptional = target.target.elementFlags[targetArity - 1] & 2 /* Optional */; + var sourceSlice = isTupleType(source) ? sliceTupleType(source, startLength, sourceEndLength) : createArrayType(sourceRestType); + inferWithPriority(sourceSlice, elementTypes[startLength], endsInOptional ? 2 /* SpeculativeTuple */ : 0); + } + else if (middleLength === 1 && elementFlags[startLength] & 4 /* Rest */) { + // Middle of target is exactly one rest element. If middle of source is not empty, infer union of middle element types. + var restType = isTupleType(source) ? getElementTypeOfSliceOfTupleType(source, startLength, sourceEndLength) : sourceRestType; + if (restType) { + inferFromTypes(restType, elementTypes[startLength]); + } + } + } + // Infer between ending fixed elements + for (var i = 0; i < endLength; i++) { + inferFromTypes(sourceRestType || getTypeArguments(source)[sourceArity - i - 1], elementTypes[targetArity - i - 1]); } return; } @@ -52417,7 +60597,7 @@ var ts; var saveBivariant = bivariant; var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */; // Once we descend into a bivariant signature we remain bivariant for all nested inferences - bivariant = bivariant || kind === 161 /* MethodDeclaration */ || kind === 160 /* MethodSignature */ || kind === 162 /* Constructor */; + bivariant = bivariant || kind === 164 /* MethodDeclaration */ || kind === 163 /* MethodSignature */ || kind === 165 /* Constructor */; applyToParameterTypes(source, target, inferFromContravariantTypes); bivariant = saveBivariant; } @@ -52471,7 +60651,7 @@ var ts; return candidates; } function getContravariantInference(inference) { - return inference.priority & 104 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates); + return inference.priority & 208 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates); } function getCovariantInference(inference, signature) { // Extract all object and array literal types and replace them with a single widened and normalized type. @@ -52488,7 +60668,7 @@ var ts; candidates; // If all inferences were made from a position that implies a combined result, infer a union type. // Otherwise, infer a common supertype. - var unwidenedType = inference.priority & 104 /* PriorityImpliesCombination */ ? + var unwidenedType = inference.priority & 208 /* PriorityImpliesCombination */ ? getUnionType(baseCandidates, 2 /* Subtype */) : getCommonSupertype(baseCandidates); return getWidenedType(unwidenedType); @@ -52587,7 +60767,7 @@ var ts; case "AsyncIterator": return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later; default: - if (node.parent.kind === 282 /* ShorthandPropertyAssignment */) { + if (node.parent.kind === 286 /* ShorthandPropertyAssignment */) { return ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer; } else { @@ -52608,7 +60788,7 @@ var ts; // TypeScript 1.0 spec (April 2014): 3.6.3 // A type query consists of the keyword typeof followed by an expression. // The expression is restricted to a single identifier or a sequence of identifiers separated by periods - return !!ts.findAncestor(node, function (n) { return n.kind === 172 /* TypeQuery */ ? true : n.kind === 75 /* Identifier */ || n.kind === 153 /* QualifiedName */ ? false : "quit"; }); + return !!ts.findAncestor(node, function (n) { return n.kind === 175 /* TypeQuery */ ? true : n.kind === 78 /* Identifier */ || n.kind === 156 /* QualifiedName */ ? false : "quit"; }); } // Return the flow cache key for a "dotted name" (i.e. a sequence of identifiers // separated by dots). The key consists of the id of the symbol referenced by the @@ -52618,16 +60798,16 @@ var ts; // of such nodes may be based on the apparent type instead of the declared type. function getFlowCacheKey(node, declaredType, initialType, flowContainer) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: var symbol = getResolvedSymbol(node); return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined; - case 104 /* ThisKeyword */: - return "0"; - case 218 /* NonNullExpression */: - case 200 /* ParenthesizedExpression */: + case 107 /* ThisKeyword */: + return "0|" + (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType); + case 222 /* NonNullExpression */: + case 204 /* ParenthesizedExpression */: return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer); - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: var propName = getAccessedPropertyName(node); if (propName !== undefined) { var key = getFlowCacheKey(node.expression, declaredType, initialType, flowContainer); @@ -52638,24 +60818,26 @@ var ts; } function isMatchingReference(source, target) { switch (target.kind) { - case 200 /* ParenthesizedExpression */: - case 218 /* NonNullExpression */: + case 204 /* ParenthesizedExpression */: + case 222 /* NonNullExpression */: return isMatchingReference(source, target.expression); + case 213 /* BinaryExpression */: + return ts.isAssignmentExpression(target) && isMatchingReference(source, target.left); } switch (source.kind) { - case 75 /* Identifier */: - return target.kind === 75 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) || - (target.kind === 242 /* VariableDeclaration */ || target.kind === 191 /* BindingElement */) && + case 78 /* Identifier */: + return target.kind === 78 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) || + (target.kind === 246 /* VariableDeclaration */ || target.kind === 195 /* BindingElement */) && getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target); - case 104 /* ThisKeyword */: - return target.kind === 104 /* ThisKeyword */; - case 102 /* SuperKeyword */: - return target.kind === 102 /* SuperKeyword */; - case 218 /* NonNullExpression */: - case 200 /* ParenthesizedExpression */: + case 107 /* ThisKeyword */: + return target.kind === 107 /* ThisKeyword */; + case 105 /* SuperKeyword */: + return target.kind === 105 /* SuperKeyword */; + case 222 /* NonNullExpression */: + case 204 /* ParenthesizedExpression */: return isMatchingReference(source.expression, target); - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: return ts.isAccessExpression(target) && getAccessedPropertyName(source) === getAccessedPropertyName(target) && isMatchingReference(source.expression, target.expression); @@ -52665,11 +60847,11 @@ var ts; // Given a source x, check if target matches x or is an && operation with an operand that matches x. function containsTruthyCheck(source, target) { return isMatchingReference(source, target) || - (target.kind === 209 /* BinaryExpression */ && target.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && + (target.kind === 213 /* BinaryExpression */ && target.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && (containsTruthyCheck(source, target.left) || containsTruthyCheck(source, target.right))); } function getAccessedPropertyName(access) { - return access.kind === 194 /* PropertyAccessExpression */ ? access.name.escapedText : + return access.kind === 198 /* PropertyAccessExpression */ ? access.name.escapedText : ts.isStringOrNumericLiteralLike(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) : undefined; } @@ -52731,7 +60913,7 @@ var ts; } } } - if (callExpression.expression.kind === 194 /* PropertyAccessExpression */ && + if (callExpression.expression.kind === 198 /* PropertyAccessExpression */ && isOrContainsMatchingReference(reference, callExpression.expression.expression)) { return true; } @@ -52889,15 +61071,15 @@ var ts; return createArrayType(checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) || errorType); } function getAssignedTypeOfBinaryExpression(node) { - var isDestructuringDefaultAssignment = node.parent.kind === 192 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) || - node.parent.kind === 281 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent); + var isDestructuringDefaultAssignment = node.parent.kind === 196 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) || + node.parent.kind === 285 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent); return isDestructuringDefaultAssignment ? getTypeWithDefault(getAssignedType(node), node.right) : getTypeOfExpression(node.right); } function isDestructuringAssignmentTarget(parent) { - return parent.parent.kind === 209 /* BinaryExpression */ && parent.parent.left === parent || - parent.parent.kind === 232 /* ForOfStatement */ && parent.parent.initializer === parent; + return parent.parent.kind === 213 /* BinaryExpression */ && parent.parent.left === parent || + parent.parent.kind === 236 /* ForOfStatement */ && parent.parent.initializer === parent; } function getAssignedTypeOfArrayLiteralElement(node, element) { return getTypeOfDestructuredArrayElement(getAssignedType(node), node.elements.indexOf(element)); @@ -52914,21 +61096,21 @@ var ts; function getAssignedType(node) { var parent = node.parent; switch (parent.kind) { - case 231 /* ForInStatement */: + case 235 /* ForInStatement */: return stringType; - case 232 /* ForOfStatement */: + case 236 /* ForOfStatement */: return checkRightHandSideOfForOf(parent) || errorType; - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return getAssignedTypeOfBinaryExpression(parent); - case 203 /* DeleteExpression */: + case 207 /* DeleteExpression */: return undefinedType; - case 192 /* ArrayLiteralExpression */: + case 196 /* ArrayLiteralExpression */: return getAssignedTypeOfArrayLiteralElement(parent, node); - case 213 /* SpreadElement */: + case 217 /* SpreadElement */: return getAssignedTypeOfSpreadExpression(parent); - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: return getAssignedTypeOfPropertyAssignment(parent); - case 282 /* ShorthandPropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: return getAssignedTypeOfShorthandPropertyAssignment(parent); } return errorType; @@ -52936,7 +61118,7 @@ var ts; function getInitialTypeOfBindingElement(node) { var pattern = node.parent; var parentType = getInitialType(pattern.parent); - var type = pattern.kind === 189 /* ObjectBindingPattern */ ? + var type = pattern.kind === 193 /* ObjectBindingPattern */ ? getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) : !node.dotDotDotToken ? getTypeOfDestructuredArrayElement(parentType, pattern.elements.indexOf(node)) : @@ -52954,32 +61136,35 @@ var ts; if (node.initializer) { return getTypeOfInitializer(node.initializer); } - if (node.parent.parent.kind === 231 /* ForInStatement */) { + if (node.parent.parent.kind === 235 /* ForInStatement */) { return stringType; } - if (node.parent.parent.kind === 232 /* ForOfStatement */) { + if (node.parent.parent.kind === 236 /* ForOfStatement */) { return checkRightHandSideOfForOf(node.parent.parent) || errorType; } return errorType; } function getInitialType(node) { - return node.kind === 242 /* VariableDeclaration */ ? + return node.kind === 246 /* VariableDeclaration */ ? getInitialTypeOfVariableDeclaration(node) : getInitialTypeOfBindingElement(node); } function isEmptyArrayAssignment(node) { - return node.kind === 242 /* VariableDeclaration */ && node.initializer && + return node.kind === 246 /* VariableDeclaration */ && node.initializer && isEmptyArrayLiteral(node.initializer) || - node.kind !== 191 /* BindingElement */ && node.parent.kind === 209 /* BinaryExpression */ && + node.kind !== 195 /* BindingElement */ && node.parent.kind === 213 /* BinaryExpression */ && isEmptyArrayLiteral(node.parent.right); } function getReferenceCandidate(node) { switch (node.kind) { - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return getReferenceCandidate(node.expression); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: switch (node.operatorToken.kind) { case 62 /* EqualsToken */: + case 74 /* BarBarEqualsToken */: + case 75 /* AmpersandAmpersandEqualsToken */: + case 76 /* QuestionQuestionEqualsToken */: return getReferenceCandidate(node.left); case 27 /* CommaToken */: return getReferenceCandidate(node.right); @@ -52989,13 +61174,13 @@ var ts; } function getReferenceRoot(node) { var parent = node.parent; - return parent.kind === 200 /* ParenthesizedExpression */ || - parent.kind === 209 /* BinaryExpression */ && parent.operatorToken.kind === 62 /* EqualsToken */ && parent.left === node || - parent.kind === 209 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ? + return parent.kind === 204 /* ParenthesizedExpression */ || + parent.kind === 213 /* BinaryExpression */ && parent.operatorToken.kind === 62 /* EqualsToken */ && parent.left === node || + parent.kind === 213 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ? getReferenceRoot(parent) : node; } function getTypeOfSwitchClause(clause) { - if (clause.kind === 277 /* CaseClause */) { + if (clause.kind === 281 /* CaseClause */) { return getRegularTypeOfLiteralType(getTypeOfExpression(clause.expression)); } return neverType; @@ -53015,7 +61200,7 @@ var ts; var witnesses = []; for (var _i = 0, _a = switchStatement.caseBlock.clauses; _i < _a.length; _i++) { var clause = _a[_i]; - if (clause.kind === 277 /* CaseClause */) { + if (clause.kind === 281 /* CaseClause */) { if (ts.isStringLiteralLike(clause.expression)) { witnesses.push(clause.expression.text); continue; @@ -53112,7 +61297,7 @@ var ts; return flowType.flags === 0 ? flowType.type : flowType; } function createFlowType(type, incomplete) { - return incomplete ? { flags: 0, type: type } : type; + return incomplete ? { flags: 0, type: type.flags & 131072 /* Never */ ? silentNeverType : type } : type; } // An evolving array type tracks the element types that have so far been seen in an // 'x.push(value)' or 'x[n] = value' operation along the control flow graph. Evolving @@ -53130,7 +61315,7 @@ var ts; // we defer subtype reduction until the evolving array type is finalized into a manifest // array type. function addEvolvingArrayElementType(evolvingArrayType, node) { - var elementType = getBaseTypeOfLiteralType(getContextFreeTypeOfExpression(node)); + var elementType = getRegularTypeOfObjectLiteral(getBaseTypeOfLiteralType(getContextFreeTypeOfExpression(node))); return isTypeSubsetOf(elementType, evolvingArrayType.elementType) ? evolvingArrayType : getEvolvingArrayType(getUnionType([evolvingArrayType.elementType, elementType])); } function createFinalArrayType(elementType) { @@ -53177,12 +61362,12 @@ var ts; var root = getReferenceRoot(node); var parent = root.parent; var isLengthPushOrUnshift = ts.isPropertyAccessExpression(parent) && (parent.name.escapedText === "length" || - parent.parent.kind === 196 /* CallExpression */ + parent.parent.kind === 200 /* CallExpression */ && ts.isIdentifier(parent.name) && ts.isPushOrUnshiftIdentifier(parent.name)); - var isElementAssignment = parent.kind === 195 /* ElementAccessExpression */ && + var isElementAssignment = parent.kind === 199 /* ElementAccessExpression */ && parent.expression === root && - parent.parent.kind === 209 /* BinaryExpression */ && + parent.parent.kind === 213 /* BinaryExpression */ && parent.parent.operatorToken.kind === 62 /* EqualsToken */ && parent.parent.left === parent && !ts.isAssignmentTarget(parent.parent) && @@ -53190,8 +61375,8 @@ var ts; return isLengthPushOrUnshift || isElementAssignment; } function isDeclarationWithExplicitTypeAnnotation(declaration) { - return (declaration.kind === 242 /* VariableDeclaration */ || declaration.kind === 156 /* Parameter */ || - declaration.kind === 159 /* PropertyDeclaration */ || declaration.kind === 158 /* PropertySignature */) && + return (declaration.kind === 246 /* VariableDeclaration */ || declaration.kind === 159 /* Parameter */ || + declaration.kind === 162 /* PropertyDeclaration */ || declaration.kind === 161 /* PropertySignature */) && !!ts.getEffectiveTypeAnnotationNode(declaration); } function getExplicitTypeOfSymbol(symbol, diagnostic) { @@ -53204,7 +61389,7 @@ var ts; if (isDeclarationWithExplicitTypeAnnotation(declaration)) { return getTypeOfSymbol(symbol); } - if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 232 /* ForOfStatement */) { + if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 236 /* ForOfStatement */) { var statement = declaration.parent.parent; var expressionType = getTypeOfDottedName(statement.expression, /*diagnostic*/ undefined); if (expressionType) { @@ -53225,18 +61410,18 @@ var ts; function getTypeOfDottedName(node, diagnostic) { if (!(node.flags & 16777216 /* InWithStatement */)) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: var symbol = getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(node)); return getExplicitTypeOfSymbol(symbol.flags & 2097152 /* Alias */ ? resolveAlias(symbol) : symbol, diagnostic); - case 104 /* ThisKeyword */: + case 107 /* ThisKeyword */: return getExplicitThisType(node); - case 102 /* SuperKeyword */: + case 105 /* SuperKeyword */: return checkSuperExpression(node); - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: var type = getTypeOfDottedName(node.expression, diagnostic); var prop = type && getPropertyOfType(type, node.name.escapedText); return prop && getExplicitTypeOfSymbol(prop, diagnostic); - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return getTypeOfDottedName(node.expression, diagnostic); } } @@ -53250,10 +61435,10 @@ var ts; // circularities in control flow analysis, we use getTypeOfDottedName when resolving the call // target expression of an assertion. var funcType = void 0; - if (node.parent.kind === 226 /* ExpressionStatement */) { + if (node.parent.kind === 230 /* ExpressionStatement */) { funcType = getTypeOfDottedName(node.expression, /*diagnostic*/ undefined); } - else if (node.expression.kind !== 102 /* SuperKeyword */) { + else if (node.expression.kind !== 105 /* SuperKeyword */) { if (ts.isOptionalChain(node)) { funcType = checkNonNullType(getOptionalExpressionType(checkExpression(node.expression), node.expression), node.expression); } @@ -53294,7 +61479,7 @@ var ts; } function isFalseExpression(expr) { var node = ts.skipParentheses(expr); - return node.kind === 91 /* FalseKeyword */ || node.kind === 209 /* BinaryExpression */ && (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && (isFalseExpression(node.left) || isFalseExpression(node.right)) || + return node.kind === 94 /* FalseKeyword */ || node.kind === 213 /* BinaryExpression */ && (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && (isFalseExpression(node.left) || isFalseExpression(node.right)) || node.operatorToken.kind === 56 /* BarBarToken */ && isFalseExpression(node.left) && isFalseExpression(node.right)); } function isReachableFlowNodeWorker(flow, noCacheCheck) { @@ -53318,7 +61503,7 @@ var ts; var signature = getEffectsSignature(flow.node); if (signature) { var predicate = getTypePredicateOfSignature(signature); - if (predicate && predicate.kind === 3 /* AssertsIdentifier */) { + if (predicate && predicate.kind === 3 /* AssertsIdentifier */ && !predicate.type) { var predicateArgument = flow.node.arguments[predicate.parameterIndex]; if (predicateArgument && isFalseExpression(predicateArgument)) { return false; @@ -53361,10 +61546,54 @@ var ts; } } } + // Return true if the given flow node is preceded by a 'super(...)' call in every possible code path + // leading to the node. + function isPostSuperFlowNode(flow, noCacheCheck) { + while (true) { + var flags = flow.flags; + if (flags & 4096 /* Shared */) { + if (!noCacheCheck) { + var id = getFlowNodeId(flow); + var postSuper = flowNodePostSuper[id]; + return postSuper !== undefined ? postSuper : (flowNodePostSuper[id] = isPostSuperFlowNode(flow, /*noCacheCheck*/ true)); + } + noCacheCheck = false; + } + if (flags & (16 /* Assignment */ | 96 /* Condition */ | 256 /* ArrayMutation */ | 128 /* SwitchClause */)) { + flow = flow.antecedent; + } + else if (flags & 512 /* Call */) { + if (flow.node.expression.kind === 105 /* SuperKeyword */) { + return true; + } + flow = flow.antecedent; + } + else if (flags & 4 /* BranchLabel */) { + // A branching point is post-super if every branch is post-super. + return ts.every(flow.antecedents, function (f) { return isPostSuperFlowNode(f, /*noCacheCheck*/ false); }); + } + else if (flags & 8 /* LoopLabel */) { + // A loop is post-super if the control flow path that leads to the top is post-super. + flow = flow.antecedents[0]; + } + else if (flags & 1024 /* ReduceLabel */) { + var target = flow.target; + var saveAntecedents = target.antecedents; + target.antecedents = flow.antecedents; + var result = isPostSuperFlowNode(flow.antecedent, /*noCacheCheck*/ false); + target.antecedents = saveAntecedents; + return result; + } + else { + // Unreachable nodes are considered post-super to silence errors + return !!(flags & 1 /* Unreachable */); + } + } + } function getFlowTypeOfReference(reference, declaredType, initialType, flowContainer, couldBeUninitialized) { if (initialType === void 0) { initialType = declaredType; } var key; - var keySet = false; + var isKeySet = false; var flowDepth = 0; if (flowAnalysisDisabled) { return errorType; @@ -53381,15 +61610,15 @@ var ts; // on empty arrays are possible without implicit any errors and new element types can be inferred without // type mismatch errors. var resultType = ts.getObjectFlags(evolvedType) & 256 /* EvolvingArray */ && isEvolvingArrayOperationTarget(reference) ? autoArrayType : finalizeEvolvingArrayType(evolvedType); - if (resultType === unreachableNeverType || reference.parent && reference.parent.kind === 218 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) { + if (resultType === unreachableNeverType || reference.parent && reference.parent.kind === 222 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) { return declaredType; } return resultType; function getOrSetCacheKey() { - if (keySet) { + if (isKeySet) { return key; } - keySet = true; + isKeySet = true; return key = getFlowCacheKey(reference, declaredType, initialType, flowContainer); } function getTypeAtFlowNode(flow) { @@ -53462,9 +61691,9 @@ var ts; // Check if we should continue with the control flow of the containing function. var container = flow.node; if (container && container !== flowContainer && - reference.kind !== 194 /* PropertyAccessExpression */ && - reference.kind !== 195 /* ElementAccessExpression */ && - reference.kind !== 104 /* ThisKeyword */) { + reference.kind !== 198 /* PropertyAccessExpression */ && + reference.kind !== 199 /* ElementAccessExpression */ && + reference.kind !== 107 /* ThisKeyword */) { flow = container.flowNode; continue; } @@ -53488,7 +61717,7 @@ var ts; } function getInitialOrAssignedType(flow) { var node = flow.node; - return getConstraintForLocation(node.kind === 242 /* VariableDeclaration */ || node.kind === 191 /* BindingElement */ ? + return getConstraintForLocation(node.kind === 246 /* VariableDeclaration */ || node.kind === 195 /* BindingElement */ ? getInitialType(node) : getAssignedType(node), reference); } @@ -53508,7 +61737,7 @@ var ts; if (isEmptyArrayAssignment(node)) { return getEvolvingArrayType(neverType); } - var assignedType = getBaseTypeOfLiteralType(getInitialOrAssignedType(flow)); + var assignedType = getWidenedLiteralType(getInitialOrAssignedType(flow)); return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType; } if (declaredType.flags & 1048576 /* Union */) { @@ -53528,14 +61757,14 @@ var ts; // in which case we continue control flow analysis back to the function's declaration if (ts.isVariableDeclaration(node) && (ts.isInJSFile(node) || ts.isVarConst(node))) { var init = ts.getDeclaredExpandoInitializer(node); - if (init && (init.kind === 201 /* FunctionExpression */ || init.kind === 202 /* ArrowFunction */)) { + if (init && (init.kind === 205 /* FunctionExpression */ || init.kind === 206 /* ArrowFunction */)) { return getTypeAtFlowNode(flow.antecedent); } } return declaredType; } // for (const _ in ref) acts as a nonnull on ref - if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 231 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) { + if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 235 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) { return getNonNullableTypeIfNeeded(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent))); } // Assignment doesn't affect reference @@ -53543,10 +61772,10 @@ var ts; } function narrowTypeByAssertion(type, expr) { var node = ts.skipParentheses(expr); - if (node.kind === 91 /* FalseKeyword */) { + if (node.kind === 94 /* FalseKeyword */) { return unreachableNeverType; } - if (node.kind === 209 /* BinaryExpression */) { + if (node.kind === 213 /* BinaryExpression */) { if (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */) { return narrowTypeByAssertion(narrowTypeByAssertion(type, node.left), node.right); } @@ -53577,7 +61806,7 @@ var ts; function getTypeAtFlowArrayMutation(flow) { if (declaredType === autoType || declaredType === autoArrayType) { var node = flow.node; - var expr = node.kind === 196 /* CallExpression */ ? + var expr = node.kind === 200 /* CallExpression */ ? node.expression.expression : node.left.expression; if (isMatchingReference(reference, getReferenceCandidate(expr))) { @@ -53585,7 +61814,7 @@ var ts; var type = getTypeFromFlowType(flowType); if (ts.getObjectFlags(type) & 256 /* EvolvingArray */) { var evolvedType_1 = type; - if (node.kind === 196 /* CallExpression */) { + if (node.kind === 200 /* CallExpression */) { for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) { var arg = _a[_i]; evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg); @@ -53624,9 +61853,7 @@ var ts; if (narrowedType === nonEvolvingType) { return flowType; } - var incomplete = isIncomplete(flowType); - var resultType = incomplete && narrowedType.flags & 131072 /* Never */ ? silentNeverType : narrowedType; - return createFlowType(resultType, incomplete); + return createFlowType(narrowedType, isIncomplete(flowType)); } function getTypeAtSwitchClause(flow) { var expr = flow.switchStatement.expression; @@ -53635,7 +61862,7 @@ var ts; if (isMatchingReference(reference, expr)) { type = narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd); } - else if (expr.kind === 204 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) { + else if (expr.kind === 208 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) { type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd); } else { @@ -53643,7 +61870,7 @@ var ts; if (optionalChainContainsReference(expr, reference)) { type = narrowTypeBySwitchOptionalChainContainment(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd, function (t) { return !(t.flags & (32768 /* Undefined */ | 131072 /* Never */)); }); } - else if (expr.kind === 204 /* TypeOfExpression */ && optionalChainContainsReference(expr.expression, reference)) { + else if (expr.kind === 208 /* TypeOfExpression */ && optionalChainContainsReference(expr.expression, reference)) { type = narrowTypeBySwitchOptionalChainContainment(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd, function (t) { return !(t.flags & 131072 /* Never */ || t.flags & 128 /* StringLiteral */ && t.value === "undefined"); }); } } @@ -53710,7 +61937,7 @@ var ts; // If we have previously computed the control flow type for the reference at // this flow loop junction, return the cached type. var id = getFlowNodeId(flow); - var cache = flowLoopCaches[id] || (flowLoopCaches[id] = ts.createMap()); + var cache = flowLoopCaches[id] || (flowLoopCaches[id] = new ts.Map()); var key = getOrSetCacheKey(); if (!key) { // No cache key is generated when binding patterns are in unnarrowable situations @@ -53791,14 +62018,15 @@ var ts; return result; } function isMatchingReferenceDiscriminant(expr, computedType) { - if (!(computedType.flags & 1048576 /* Union */) || !ts.isAccessExpression(expr)) { + var type = declaredType.flags & 1048576 /* Union */ ? declaredType : computedType; + if (!(type.flags & 1048576 /* Union */) || !ts.isAccessExpression(expr)) { return false; } var name = getAccessedPropertyName(expr); if (name === undefined) { return false; } - return isMatchingReference(reference, expr.expression) && isDiscriminantProperty(computedType, name); + return isMatchingReference(reference, expr.expression) && isDiscriminantProperty(type, name); } function narrowTypeByDiscriminant(type, access, narrowType) { var propName = getAccessedPropertyName(access); @@ -53822,7 +62050,7 @@ var ts; if (strictNullChecks && assumeTrue && optionalChainContainsReference(expr, reference)) { type = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */); } - if (isMatchingReferenceDiscriminant(expr, declaredType)) { + if (isMatchingReferenceDiscriminant(expr, type)) { return narrowTypeByDiscriminant(type, expr, function (t) { return getTypeWithFacts(t, assumeTrue ? 4194304 /* Truthy */ : 8388608 /* Falsy */); }); } return type; @@ -53838,7 +62066,9 @@ var ts; return !assumeTrue; } function narrowByInKeyword(type, literal, assumeTrue) { - if (type.flags & (1048576 /* Union */ | 524288 /* Object */) || isThisTypeParameter(type)) { + if (type.flags & (1048576 /* Union */ | 524288 /* Object */) + || isThisTypeParameter(type) + || type.flags & 2097152 /* Intersection */ && ts.every(type.types, function (t) { return t.symbol !== globalThisSymbol; })) { var propName_1 = ts.escapeLeadingUnderscores(literal.text); return filterType(type, function (t) { return isTypePresencePossible(t, propName_1, assumeTrue); }); } @@ -53847,6 +62077,9 @@ var ts; function narrowTypeByBinaryExpression(type, expr, assumeTrue) { switch (expr.operatorToken.kind) { case 62 /* EqualsToken */: + case 74 /* BarBarEqualsToken */: + case 75 /* AmpersandAmpersandEqualsToken */: + case 76 /* QuestionQuestionEqualsToken */: return narrowTypeByTruthiness(narrowType(type, expr.right, assumeTrue), expr.left, assumeTrue); case 34 /* EqualsEqualsToken */: case 35 /* ExclamationEqualsToken */: @@ -53855,10 +62088,10 @@ var ts; var operator_1 = expr.operatorToken.kind; var left_1 = getReferenceCandidate(expr.left); var right_1 = getReferenceCandidate(expr.right); - if (left_1.kind === 204 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) { + if (left_1.kind === 208 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) { return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue); } - if (right_1.kind === 204 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) { + if (right_1.kind === 208 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) { return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue); } if (isMatchingReference(reference, left_1)) { @@ -53875,10 +62108,10 @@ var ts; type = narrowTypeByOptionalChainContainment(type, operator_1, left_1, assumeTrue); } } - if (isMatchingReferenceDiscriminant(left_1, declaredType)) { + if (isMatchingReferenceDiscriminant(left_1, type)) { return narrowTypeByDiscriminant(type, left_1, function (t) { return narrowTypeByEquality(t, operator_1, right_1, assumeTrue); }); } - if (isMatchingReferenceDiscriminant(right_1, declaredType)) { + if (isMatchingReferenceDiscriminant(right_1, type)) { return narrowTypeByDiscriminant(type, right_1, function (t) { return narrowTypeByEquality(t, operator_1, left_1, assumeTrue); }); } if (isMatchingConstructorReference(left_1)) { @@ -53888,9 +62121,9 @@ var ts; return narrowTypeByConstructor(type, operator_1, left_1, assumeTrue); } break; - case 98 /* InstanceOfKeyword */: + case 101 /* InstanceOfKeyword */: return narrowTypeByInstanceof(type, expr, assumeTrue); - case 97 /* InKeyword */: + case 100 /* InKeyword */: var target = getReferenceCandidate(expr.right); if (ts.isStringLiteralLike(expr.left) && isMatchingReference(reference, target)) { return narrowByInKeyword(type, expr.left, assumeTrue); @@ -53948,15 +62181,11 @@ var ts; assumeTrue ? 65536 /* EQUndefined */ : 524288 /* NEUndefined */; return getTypeWithFacts(type, facts); } - if (type.flags & 67637251 /* NotUnionOrUnit */) { - return type; - } if (assumeTrue) { var filterFn = operator === 34 /* EqualsEqualsToken */ ? (function (t) { return areTypesComparable(t, valueType) || isCoercibleUnderDoubleEquals(t, valueType); }) : function (t) { return areTypesComparable(t, valueType); }; - var narrowedType = filterType(type, filterFn); - return narrowedType.flags & 131072 /* Never */ ? type : replacePrimitivesWithLiterals(narrowedType, valueType); + return replacePrimitivesWithLiterals(filterType(type, filterFn), valueType); } if (isUnitType(valueType)) { var regularType_1 = getRegularTypeOfLiteralType(valueType); @@ -53982,7 +62211,7 @@ var ts; if (assumeTrue && type.flags & 2 /* Unknown */ && literal.text === "object") { // The pattern x && typeof x === 'object', where x is of type unknown, narrows x to type object. We don't // need to check for the reverse typeof x === 'object' && x since that already narrows correctly. - if (typeOfExpr.parent.parent.kind === 209 /* BinaryExpression */) { + if (typeOfExpr.parent.parent.kind === 213 /* BinaryExpression */) { var expr = typeOfExpr.parent.parent; if (expr.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && expr.right === typeOfExpr.parent && containsTruthyCheck(reference, expr.left)) { return nonPrimitiveType; @@ -53993,28 +62222,8 @@ var ts; var facts = assumeTrue ? typeofEQFacts.get(literal.text) || 128 /* TypeofEQHostObject */ : typeofNEFacts.get(literal.text) || 32768 /* TypeofNEHostObject */; - return getTypeWithFacts(assumeTrue ? mapType(type, narrowTypeForTypeof) : type, facts); - function narrowTypeForTypeof(type) { - // We narrow a non-union type to an exact primitive type if the non-union type - // is a supertype of that primitive type. For example, type 'any' can be narrowed - // to one of the primitive types. - var targetType = literal.text === "function" ? globalFunctionType : typeofTypesByName.get(literal.text); - if (targetType) { - if (isTypeSubtypeOf(type, targetType)) { - return type; - } - if (isTypeSubtypeOf(targetType, type)) { - return targetType; - } - if (type.flags & 63176704 /* Instantiable */) { - var constraint = getBaseConstraintOfType(type) || anyType; - if (isTypeSubtypeOf(targetType, constraint)) { - return getIntersectionType([type, targetType]); - } - } - } - return type; - } + var impliedType = getImpliedTypeFromTypeofGuard(type, literal.text); + return getTypeWithFacts(assumeTrue && impliedType ? mapType(type, narrowUnionMemberByTypeof(impliedType)) : type, facts); } function narrowTypeBySwitchOptionalChainContainment(type, switchStatement, clauseStart, clauseEnd, clauseCheck) { var everyClauseChecks = clauseStart !== clauseEnd && ts.every(getSwitchClauseTypes(switchStatement).slice(clauseStart, clauseEnd), clauseCheck); @@ -54061,18 +62270,27 @@ var ts; var defaultType = filterType(type, function (t) { return !(isUnitType(t) && ts.contains(switchTypes, getRegularTypeOfLiteralType(t))); }); return caseType.flags & 131072 /* Never */ ? defaultType : getUnionType([caseType, defaultType]); } - function getImpliedTypeFromTypeofCase(type, text) { + function getImpliedTypeFromTypeofGuard(type, text) { switch (text) { case "function": return type.flags & 1 /* Any */ ? type : globalFunctionType; case "object": return type.flags & 2 /* Unknown */ ? getUnionType([nonPrimitiveType, nullType]) : type; default: - return typeofTypesByName.get(text) || type; + return typeofTypesByName.get(text); } } - function narrowTypeForTypeofSwitch(candidate) { + // When narrowing a union type by a `typeof` guard using type-facts alone, constituent types that are + // super-types of the implied guard will be retained in the final type: this is because type-facts only + // filter. Instead, we would like to replace those union constituents with the more precise type implied by + // the guard. For example: narrowing `{} | undefined` by `"boolean"` should produce the type `boolean`, not + // the filtered type `{}`. For this reason we narrow constituents of the union individually, in addition to + // filtering by type-facts. + function narrowUnionMemberByTypeof(candidate) { return function (type) { + if (isTypeSubtypeOf(type, candidate)) { + return type; + } if (isTypeSubtypeOf(candidate, type)) { return candidate; } @@ -54096,11 +62314,9 @@ var ts; var clauseWitnesses; var switchFacts; if (defaultCaseLocation > -1) { - // We no longer need the undefined denoting an - // explicit default case. Remove the undefined and - // fix-up clauseStart and clauseEnd. This means - // that we don't have to worry about undefined - // in the witness array. + // We no longer need the undefined denoting an explicit default case. Remove the undefined and + // fix-up clauseStart and clauseEnd. This means that we don't have to worry about undefined in the + // witness array. var witnesses = switchWitnesses.filter(function (witness) { return witness !== undefined; }); // The adjusted clause start and end after removing the `default` statement. var fixedClauseStart = defaultCaseLocation < clauseStart ? clauseStart - 1 : clauseStart; @@ -54143,11 +62359,8 @@ var ts; boolean. We know that number cannot be selected because it is caught in the first clause. */ - var impliedType = getTypeWithFacts(getUnionType(clauseWitnesses.map(function (text) { return getImpliedTypeFromTypeofCase(type, text); })), switchFacts); - if (impliedType.flags & 1048576 /* Union */) { - impliedType = getAssignmentReducedType(impliedType, getBaseConstraintOrType(type)); - } - return getTypeWithFacts(mapType(type, narrowTypeForTypeofSwitch(impliedType)), switchFacts); + var impliedType = getTypeWithFacts(getUnionType(clauseWitnesses.map(function (text) { return getImpliedTypeFromTypeofGuard(type, text) || type; })), switchFacts); + return getTypeWithFacts(mapType(type, narrowUnionMemberByTypeof(impliedType)), switchFacts); } function isMatchingConstructorReference(expr) { return (ts.isPropertyAccessExpression(expr) && ts.idText(expr.name) === "constructor" || @@ -54226,6 +62439,12 @@ var ts; getUnionType(ts.map(constructSignatures, function (signature) { return getReturnTypeOfSignature(getErasedSignature(signature)); })) : emptyObjectType; } + // We can't narrow a union based off instanceof without negated types see #31576 for more info + if (!assumeTrue && rightType.flags & 1048576 /* Union */) { + var nonConstructorTypeInUnion = ts.find(rightType.types, function (t) { return !isConstructorType(t); }); + if (!nonConstructorTypeInUnion) + return type; + } return getNarrowedType(type, targetType, assumeTrue, isTypeDerivedFrom); } function getNarrowedType(type, candidate, assumeTrue, isRelated) { @@ -54272,7 +62491,7 @@ var ts; !(getTypeFacts(predicate.type) & 65536 /* EQUndefined */)) { type = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */); } - if (isMatchingReferenceDiscriminant(predicateArgument, declaredType)) { + if (isMatchingReferenceDiscriminant(predicateArgument, type)) { return narrowTypeByDiscriminant(type, predicateArgument, function (t) { return getNarrowedType(t, predicate.type, assumeTrue, isTypeSubtypeOf); }); } } @@ -54288,19 +62507,19 @@ var ts; return narrowTypeByOptionality(type, expr, assumeTrue); } switch (expr.kind) { - case 75 /* Identifier */: - case 104 /* ThisKeyword */: - case 102 /* SuperKeyword */: - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: + case 78 /* Identifier */: + case 107 /* ThisKeyword */: + case 105 /* SuperKeyword */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: return narrowTypeByTruthiness(type, expr, assumeTrue); - case 196 /* CallExpression */: + case 200 /* CallExpression */: return narrowTypeByCallExpression(type, expr, assumeTrue); - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return narrowType(type, expr.expression, assumeTrue); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return narrowTypeByBinaryExpression(type, expr, assumeTrue); - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: if (expr.operator === 53 /* ExclamationToken */) { return narrowType(type, expr.operand, !assumeTrue); } @@ -54312,7 +62531,7 @@ var ts; if (isMatchingReference(reference, expr)) { return getTypeWithFacts(type, assumePresent ? 2097152 /* NEUndefinedOrNull */ : 262144 /* EQUndefinedOrNull */); } - if (isMatchingReferenceDiscriminant(expr, declaredType)) { + if (isMatchingReferenceDiscriminant(expr, type)) { return narrowTypeByDiscriminant(type, expr, function (t) { return getTypeWithFacts(t, assumePresent ? 2097152 /* NEUndefinedOrNull */ : 262144 /* EQUndefinedOrNull */); }); } return type; @@ -54324,7 +62543,7 @@ var ts; // an dotted name expression, and if the location is not an assignment target, obtain the type // of the expression (which will reflect control flow analysis). If the expression indeed // resolved to the given symbol, return the narrowed type. - if (location.kind === 75 /* Identifier */) { + if (location.kind === 78 /* Identifier */) { if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) { location = location.parent; } @@ -54345,9 +62564,9 @@ var ts; function getControlFlowContainer(node) { return ts.findAncestor(node.parent, function (node) { return ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) || - node.kind === 250 /* ModuleBlock */ || - node.kind === 290 /* SourceFile */ || - node.kind === 159 /* PropertyDeclaration */; + node.kind === 254 /* ModuleBlock */ || + node.kind === 294 /* SourceFile */ || + node.kind === 162 /* PropertyDeclaration */; }); } // Check if a parameter is assigned anywhere within its declaring function. @@ -54366,10 +62585,10 @@ var ts; return !!ts.findAncestor(node.parent, function (node) { return ts.isFunctionLike(node) && !!(getNodeLinks(node).flags & 8388608 /* AssignmentsMarked */); }); } function markParameterAssignments(node) { - if (node.kind === 75 /* Identifier */) { + if (node.kind === 78 /* Identifier */) { if (ts.isAssignmentTarget(node)) { var symbol = getResolvedSymbol(node); - if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 156 /* Parameter */) { + if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 159 /* Parameter */) { symbol.isAssigned = true; } } @@ -54385,7 +62604,7 @@ var ts; function removeOptionalityFromDeclaredType(declaredType, declaration) { if (pushTypeResolution(declaration.symbol, 2 /* DeclaredType */)) { var annotationIncludesUndefined = strictNullChecks && - declaration.kind === 156 /* Parameter */ && + declaration.kind === 159 /* Parameter */ && declaration.initializer && getFalsyFlags(declaredType) & 32768 /* Undefined */ && !(getFalsyFlags(checkExpression(declaration.initializer)) & 32768 /* Undefined */); @@ -54399,10 +62618,10 @@ var ts; } function isConstraintPosition(node) { var parent = node.parent; - return parent.kind === 194 /* PropertyAccessExpression */ || - parent.kind === 196 /* CallExpression */ && parent.expression === node || - parent.kind === 195 /* ElementAccessExpression */ && parent.expression === node || - parent.kind === 191 /* BindingElement */ && parent.name === node && !!parent.initializer; + return parent.kind === 198 /* PropertyAccessExpression */ || + parent.kind === 200 /* CallExpression */ && parent.expression === node || + parent.kind === 199 /* ElementAccessExpression */ && parent.expression === node || + parent.kind === 195 /* BindingElement */ && parent.name === node && !!parent.initializer; } function typeHasNullableConstraint(type) { return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 98304 /* Nullable */); @@ -54444,10 +62663,10 @@ var ts; if (symbol === argumentsSymbol) { var container = ts.getContainingFunction(node); if (languageVersion < 2 /* ES2015 */) { - if (container.kind === 202 /* ArrowFunction */) { + if (container.kind === 206 /* ArrowFunction */) { error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression); } - else if (ts.hasModifier(container, 256 /* Async */)) { + else if (ts.hasSyntacticModifier(container, 256 /* Async */)) { error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_using_a_standard_function_or_method); } } @@ -54461,11 +62680,15 @@ var ts; } var localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol); var declaration = localOrExportSymbol.valueDeclaration; + if (declaration && ts.getCombinedNodeFlags(declaration) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node.parent, localOrExportSymbol)) { + errorOrSuggestion(/* isError */ false, node, ts.Diagnostics._0_is_deprecated, node.escapedText); + ; + } if (localOrExportSymbol.flags & 32 /* Class */) { // Due to the emit for class decorators, any reference to the class from inside of the class body // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind // behavior of class names in ES6. - if (declaration.kind === 245 /* ClassDeclaration */ + if (declaration.kind === 249 /* ClassDeclaration */ && ts.nodeIsDecorated(declaration)) { var container = ts.getContainingClass(node); while (container !== undefined) { @@ -54477,14 +62700,14 @@ var ts; container = ts.getContainingClass(container); } } - else if (declaration.kind === 214 /* ClassExpression */) { + else if (declaration.kind === 218 /* ClassExpression */) { // When we emit a class expression with static members that contain a reference // to the constructor in the initializer, we will need to substitute that // binding with an alias as the class name is not in scope. var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false); - while (container.kind !== 290 /* SourceFile */) { + while (container.kind !== 294 /* SourceFile */) { if (container.parent === declaration) { - if (container.kind === 159 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) { + if (container.kind === 162 /* PropertyDeclaration */ && ts.hasSyntacticModifier(container, 32 /* Static */)) { getNodeLinks(declaration).flags |= 16777216 /* ClassWithConstructorReference */; getNodeLinks(node).flags |= 33554432 /* ConstructorReferenceInClass */; } @@ -54533,7 +62756,7 @@ var ts; // The declaration container is the innermost function that encloses the declaration of the variable // or parameter. The flow container is the innermost function starting with which we analyze the control // flow graph to determine the control flow based type. - var isParameter = ts.getRootDeclaration(declaration).kind === 156 /* Parameter */; + var isParameter = ts.getRootDeclaration(declaration).kind === 159 /* Parameter */; var declarationContainer = getControlFlowContainer(declaration); var flowContainer = getControlFlowContainer(node); var isOuterVariable = flowContainer !== declarationContainer; @@ -54542,8 +62765,8 @@ var ts; // When the control flow originates in a function expression or arrow function and we are referencing // a const variable or parameter from an outer function, we extend the origin of the control flow // analysis to include the immediately enclosing function. - while (flowContainer !== declarationContainer && (flowContainer.kind === 201 /* FunctionExpression */ || - flowContainer.kind === 202 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) && + while (flowContainer !== declarationContainer && (flowContainer.kind === 205 /* FunctionExpression */ || + flowContainer.kind === 206 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) && (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) { flowContainer = getControlFlowContainer(flowContainer); } @@ -54552,9 +62775,9 @@ var ts; // declaration container are the same). var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports || ts.isBindingElement(declaration) || type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & (3 /* AnyOrUnknown */ | 16384 /* Void */)) !== 0 || - isInTypeQuery(node) || node.parent.kind === 263 /* ExportSpecifier */) || - node.parent.kind === 218 /* NonNullExpression */ || - declaration.kind === 242 /* VariableDeclaration */ && declaration.exclamationToken || + isInTypeQuery(node) || node.parent.kind === 267 /* ExportSpecifier */) || + node.parent.kind === 222 /* NonNullExpression */ || + declaration.kind === 246 /* VariableDeclaration */ && declaration.exclamationToken || declaration.flags & 8388608 /* Ambient */; var initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, declaration) : type) : type === autoType || type === autoArrayType ? undefinedType : @@ -54589,7 +62812,7 @@ var ts; if (languageVersion >= 2 /* ES2015 */ || (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 || ts.isSourceFile(symbol.valueDeclaration) || - symbol.valueDeclaration.parent.kind === 280 /* CatchClause */) { + symbol.valueDeclaration.parent.kind === 284 /* CatchClause */) { return; } // 1. walk from the use site up to the declaration and check @@ -54612,7 +62835,7 @@ var ts; // mark iteration statement as containing block-scoped binding captured in some function var capturesBlockScopeBindingInLoopBody = true; if (ts.isForStatement(container)) { - var varDeclList = ts.getAncestor(symbol.valueDeclaration, 243 /* VariableDeclarationList */); + var varDeclList = ts.getAncestor(symbol.valueDeclaration, 247 /* VariableDeclarationList */); if (varDeclList && varDeclList.parent === container) { var part = getPartOfForStatementContainingNode(node.parent, container); if (part) { @@ -54633,7 +62856,7 @@ var ts; // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement. // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back. if (ts.isForStatement(container)) { - var varDeclList = ts.getAncestor(symbol.valueDeclaration, 243 /* VariableDeclarationList */); + var varDeclList = ts.getAncestor(symbol.valueDeclaration, 247 /* VariableDeclarationList */); if (varDeclList && varDeclList.parent === container && isAssignedInBodyOfForStatement(node, container)) { getNodeLinks(symbol.valueDeclaration).flags |= 4194304 /* NeedsLoopOutParameter */; } @@ -54652,7 +62875,7 @@ var ts; function isAssignedInBodyOfForStatement(node, container) { // skip parenthesized nodes var current = node; - while (current.parent.kind === 200 /* ParenthesizedExpression */) { + while (current.parent.kind === 204 /* ParenthesizedExpression */) { current = current.parent; } // check if node is used as LHS in some assignment expression @@ -54660,7 +62883,7 @@ var ts; if (ts.isAssignmentTarget(current)) { isAssigned = true; } - else if ((current.parent.kind === 207 /* PrefixUnaryExpression */ || current.parent.kind === 208 /* PostfixUnaryExpression */)) { + else if ((current.parent.kind === 211 /* PrefixUnaryExpression */ || current.parent.kind === 212 /* PostfixUnaryExpression */)) { var expr = current.parent; isAssigned = expr.operator === 45 /* PlusPlusToken */ || expr.operator === 46 /* MinusMinusToken */; } @@ -54673,7 +62896,7 @@ var ts; } function captureLexicalThis(node, container) { getNodeLinks(node).flags |= 2 /* LexicalThis */; - if (container.kind === 159 /* PropertyDeclaration */ || container.kind === 162 /* Constructor */) { + if (container.kind === 162 /* PropertyDeclaration */ || container.kind === 165 /* Constructor */) { var classNode = container.parent; getNodeLinks(classNode).flags |= 4 /* CaptureThis */; } @@ -54681,29 +62904,10 @@ var ts; getNodeLinks(container).flags |= 4 /* CaptureThis */; } } - function findFirstSuperCall(n) { - if (ts.isSuperCall(n)) { - return n; - } - else if (ts.isFunctionLike(n)) { - return undefined; - } - return ts.forEachChild(n, findFirstSuperCall); - } - /** - * Return a cached result if super-statement is already found. - * Otherwise, find a super statement in a given constructor function and cache the result in the node-links of the constructor - * - * @param constructor constructor-function to look for super statement - */ - function getSuperCallInConstructor(constructor) { - var links = getNodeLinks(constructor); - // Only trying to find super-call if we haven't yet tried to find one. Once we try, we will record the result - if (links.hasSuperCall === undefined) { - links.superCall = findFirstSuperCall(constructor.body); - links.hasSuperCall = links.superCall ? true : false; - } - return links.superCall; + function findFirstSuperCall(node) { + return ts.isSuperCall(node) ? node : + ts.isFunctionLike(node) ? undefined : + ts.forEachChild(node, findFirstSuperCall); } /** * Check if the given class-declaration extends null then return true. @@ -54722,16 +62926,7 @@ var ts; // If a containing class does not have extends clause or the class extends null // skip checking whether super statement is called before "this" accessing. if (baseTypeNode && !classDeclarationExtendsNull(containingClassDecl)) { - var superCall = getSuperCallInConstructor(container); - // We should give an error in the following cases: - // - No super-call - // - "this" is accessing before super-call. - // i.e super(this) - // this.x; super(); - // We want to make sure that super-call is done before accessing "this" so that - // "this" is not accessed as a parameter of the super-call. - if (!superCall || superCall.end > node.pos) { - // In ES6, super inside constructor of class-declaration has to precede "this" accessing + if (node.flowNode && !isPostSuperFlowNode(node.flowNode, /*noCacheCheck*/ false)) { error(node, diagnosticMessage); } } @@ -54741,37 +62936,37 @@ var ts; // tell whether 'this' needs to be captured. var container = ts.getThisContainer(node, /* includeArrowFunctions */ true); var capturedByArrowFunction = false; - if (container.kind === 162 /* Constructor */) { + if (container.kind === 165 /* Constructor */) { checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class); } // Now skip arrow functions to get the "real" owner of 'this'. - if (container.kind === 202 /* ArrowFunction */) { + if (container.kind === 206 /* ArrowFunction */) { container = ts.getThisContainer(container, /* includeArrowFunctions */ false); capturedByArrowFunction = true; } switch (container.kind) { - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body); // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks break; - case 248 /* EnumDeclaration */: + case 252 /* EnumDeclaration */: error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location); // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks break; - case 162 /* Constructor */: + case 165 /* Constructor */: if (isInConstructorArgumentInitializer(node, container)) { error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments); // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks } break; - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - if (ts.hasModifier(container, 32 /* Static */) && !(compilerOptions.target === 99 /* ESNext */ && compilerOptions.useDefineForClassFields)) { + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + if (ts.hasSyntacticModifier(container, 32 /* Static */) && !(compilerOptions.target === 99 /* ESNext */ && compilerOptions.useDefineForClassFields)) { error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer); // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks } break; - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name); break; } @@ -54804,50 +62999,41 @@ var ts; var isInJS = ts.isInJSFile(node); if (ts.isFunctionLike(container) && (!isInParameterInitializerBeforeContainingFunction(node) || ts.getThisParameter(container))) { + var thisType = getThisTypeOfDeclaration(container) || isInJS && getTypeForThisExpressionFromJSDoc(container); // Note: a parameter initializer should refer to class-this unless function-this is explicitly annotated. // If this is a function in a JS file, it might be a class method. - var className = getClassNameFromPrototypeMethod(container); - if (isInJS && className) { - var classSymbol = checkExpression(className).symbol; - if (classSymbol && classSymbol.members && (classSymbol.flags & 16 /* Function */)) { - var classType = getDeclaredTypeOfSymbol(classSymbol).thisType; - if (classType) { - return getFlowTypeOfReference(node, classType); + if (!thisType) { + var className = getClassNameFromPrototypeMethod(container); + if (isInJS && className) { + var classSymbol = checkExpression(className).symbol; + if (classSymbol && classSymbol.members && (classSymbol.flags & 16 /* Function */)) { + thisType = getDeclaredTypeOfSymbol(classSymbol).thisType; } } + else if (isJSConstructor(container)) { + thisType = getDeclaredTypeOfSymbol(getMergedSymbol(container.symbol)).thisType; + } + thisType || (thisType = getContextualThisParameterType(container)); } - // Check if it's a constructor definition, can be either a variable decl or function decl - // i.e. - // * /** @constructor */ function [name]() { ... } - // * /** @constructor */ var x = function() { ... } - else if (isInJS && - (container.kind === 201 /* FunctionExpression */ || container.kind === 244 /* FunctionDeclaration */) && - ts.getJSDocClassTag(container)) { - var classType = getDeclaredTypeOfSymbol(getMergedSymbol(container.symbol)).thisType; - return getFlowTypeOfReference(node, classType); - } - var thisType = getThisTypeOfDeclaration(container) || getContextualThisParameterType(container); if (thisType) { return getFlowTypeOfReference(node, thisType); } } if (ts.isClassLike(container.parent)) { var symbol = getSymbolOfNode(container.parent); - var type = ts.hasModifier(container, 32 /* Static */) ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType; + var type = ts.hasSyntacticModifier(container, 32 /* Static */) ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType; return getFlowTypeOfReference(node, type); } - if (isInJS) { - var type = getTypeForThisExpressionFromJSDoc(container); - if (type && type !== errorType) { - return getFlowTypeOfReference(node, type); - } - } if (ts.isSourceFile(container)) { // look up in the source file's locals or exports if (container.commonJsModuleIndicator) { var fileSymbol = getSymbolOfNode(container); return fileSymbol && getTypeOfSymbol(fileSymbol); } + else if (container.externalModuleIndicator) { + // TODO: Maybe issue a better error than 'object is possibly undefined' + return undefinedType; + } else if (includeGlobalThis) { return getTypeOfSymbol(globalThisSymbol); } @@ -54863,12 +63049,12 @@ var ts; } if (ts.isClassLike(container.parent)) { var symbol = getSymbolOfNode(container.parent); - return ts.hasModifier(container, 32 /* Static */) ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType; + return ts.hasSyntacticModifier(container, 32 /* Static */) ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType; } } function getClassNameFromPrototypeMethod(container) { // Check if it's the RHS of a x.prototype.y = function [name]() { .... } - if (container.kind === 201 /* FunctionExpression */ && + if (container.kind === 205 /* FunctionExpression */ && ts.isBinaryExpression(container.parent) && ts.getAssignmentDeclarationKind(container.parent) === 3 /* PrototypeProperty */) { // Get the 'x' of 'x.prototype.y = container' @@ -54878,16 +63064,16 @@ var ts; .expression; // x } // x.prototype = { method() { } } - else if (container.kind === 161 /* MethodDeclaration */ && - container.parent.kind === 193 /* ObjectLiteralExpression */ && + else if (container.kind === 164 /* MethodDeclaration */ && + container.parent.kind === 197 /* ObjectLiteralExpression */ && ts.isBinaryExpression(container.parent.parent) && ts.getAssignmentDeclarationKind(container.parent.parent) === 6 /* Prototype */) { return container.parent.parent.left.expression; } // x.prototype = { method: function() { } } - else if (container.kind === 201 /* FunctionExpression */ && - container.parent.kind === 281 /* PropertyAssignment */ && - container.parent.parent.kind === 193 /* ObjectLiteralExpression */ && + else if (container.kind === 205 /* FunctionExpression */ && + container.parent.kind === 285 /* PropertyAssignment */ && + container.parent.parent.kind === 197 /* ObjectLiteralExpression */ && ts.isBinaryExpression(container.parent.parent.parent) && ts.getAssignmentDeclarationKind(container.parent.parent.parent) === 6 /* Prototype */) { return container.parent.parent.parent.left.expression; @@ -54895,7 +63081,7 @@ var ts; // Object.defineProperty(x, "method", { value: function() { } }); // Object.defineProperty(x, "method", { set: (x: () => void) => void }); // Object.defineProperty(x, "method", { get: () => function() { }) }); - else if (container.kind === 201 /* FunctionExpression */ && + else if (container.kind === 205 /* FunctionExpression */ && ts.isPropertyAssignment(container.parent) && ts.isIdentifier(container.parent.name) && (container.parent.name.escapedText === "value" || container.parent.name.escapedText === "get" || container.parent.name.escapedText === "set") && @@ -54920,7 +63106,7 @@ var ts; } function getTypeForThisExpressionFromJSDoc(node) { var jsdocType = ts.getJSDocType(node); - if (jsdocType && jsdocType.kind === 300 /* JSDocFunctionType */) { + if (jsdocType && jsdocType.kind === 304 /* JSDocFunctionType */) { var jsDocFunctionType = jsdocType; if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].name && @@ -54934,15 +63120,16 @@ var ts; } } function isInConstructorArgumentInitializer(node, constructorDecl) { - return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 156 /* Parameter */ && n.parent === constructorDecl; }); + return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 159 /* Parameter */ && n.parent === constructorDecl; }); } function checkSuperExpression(node) { - var isCallExpression = node.parent.kind === 196 /* CallExpression */ && node.parent.expression === node; - var container = ts.getSuperContainer(node, /*stopOnFunctions*/ true); + var isCallExpression = node.parent.kind === 200 /* CallExpression */ && node.parent.expression === node; + var immediateContainer = ts.getSuperContainer(node, /*stopOnFunctions*/ true); + var container = immediateContainer; var needToCaptureLexicalThis = false; // adjust the container reference in case if super is used inside arrow functions with arbitrarily deep nesting if (!isCallExpression) { - while (container && container.kind === 202 /* ArrowFunction */) { + while (container && container.kind === 206 /* ArrowFunction */) { container = ts.getSuperContainer(container, /*stopOnFunctions*/ true); needToCaptureLexicalThis = languageVersion < 2 /* ES2015 */; } @@ -54955,14 +63142,14 @@ var ts; // class B { // [super.foo()]() {} // } - var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 154 /* ComputedPropertyName */; }); - if (current && current.kind === 154 /* ComputedPropertyName */) { + var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 157 /* ComputedPropertyName */; }); + if (current && current.kind === 157 /* ComputedPropertyName */) { error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name); } else if (isCallExpression) { error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors); } - else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 193 /* ObjectLiteralExpression */)) { + else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 197 /* ObjectLiteralExpression */)) { error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions); } else { @@ -54970,10 +63157,10 @@ var ts; } return errorType; } - if (!isCallExpression && container.kind === 162 /* Constructor */) { + if (!isCallExpression && immediateContainer.kind === 165 /* Constructor */) { checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class); } - if (ts.hasModifier(container, 32 /* Static */) || isCallExpression) { + if (ts.hasSyntacticModifier(container, 32 /* Static */) || isCallExpression) { nodeCheckFlag = 512 /* SuperStatic */; } else { @@ -55039,7 +63226,7 @@ var ts; // as a call expression cannot be used as the target of a destructuring assignment while a property access can. // // For element access expressions (`super[x]`), we emit a generic helper that forwards the element access in both situations. - if (container.kind === 161 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) { + if (container.kind === 164 /* MethodDeclaration */ && ts.hasSyntacticModifier(container, 256 /* Async */)) { if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) { getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */; } @@ -55053,7 +63240,7 @@ var ts; // in this case they should also use correct lexical this captureLexicalThis(node.parent, container); } - if (container.parent.kind === 193 /* ObjectLiteralExpression */) { + if (container.parent.kind === 197 /* ObjectLiteralExpression */) { if (languageVersion < 2 /* ES2015 */) { error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher); return errorType; @@ -55074,7 +63261,7 @@ var ts; if (!baseClassType) { return errorType; } - if (container.kind === 162 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) { + if (container.kind === 165 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) { // issue custom error message for super property access in constructor arguments (to be aligned with old compiler) error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments); return errorType; @@ -55089,7 +63276,7 @@ var ts; if (isCallExpression) { // TS 1.0 SPEC (April 2014): 4.8.1 // Super calls are only permitted in constructors of derived classes - return container.kind === 162 /* Constructor */; + return container.kind === 165 /* Constructor */; } else { // TS 1.0 SPEC (April 2014) @@ -55097,21 +63284,21 @@ var ts; // - In a constructor, instance member function, instance member accessor, or instance member variable initializer where this references a derived class instance // - In a static member function or static member accessor // topmost container must be something that is directly nested in the class declaration\object literal expression - if (ts.isClassLike(container.parent) || container.parent.kind === 193 /* ObjectLiteralExpression */) { - if (ts.hasModifier(container, 32 /* Static */)) { - return container.kind === 161 /* MethodDeclaration */ || - container.kind === 160 /* MethodSignature */ || - container.kind === 163 /* GetAccessor */ || - container.kind === 164 /* SetAccessor */; + if (ts.isClassLike(container.parent) || container.parent.kind === 197 /* ObjectLiteralExpression */) { + if (ts.hasSyntacticModifier(container, 32 /* Static */)) { + return container.kind === 164 /* MethodDeclaration */ || + container.kind === 163 /* MethodSignature */ || + container.kind === 166 /* GetAccessor */ || + container.kind === 167 /* SetAccessor */; } else { - return container.kind === 161 /* MethodDeclaration */ || - container.kind === 160 /* MethodSignature */ || - container.kind === 163 /* GetAccessor */ || - container.kind === 164 /* SetAccessor */ || - container.kind === 159 /* PropertyDeclaration */ || - container.kind === 158 /* PropertySignature */ || - container.kind === 162 /* Constructor */; + return container.kind === 164 /* MethodDeclaration */ || + container.kind === 163 /* MethodSignature */ || + container.kind === 166 /* GetAccessor */ || + container.kind === 167 /* SetAccessor */ || + container.kind === 162 /* PropertyDeclaration */ || + container.kind === 161 /* PropertySignature */ || + container.kind === 165 /* Constructor */; } } } @@ -55119,10 +63306,10 @@ var ts; } } function getContainingObjectLiteral(func) { - return (func.kind === 161 /* MethodDeclaration */ || - func.kind === 163 /* GetAccessor */ || - func.kind === 164 /* SetAccessor */) && func.parent.kind === 193 /* ObjectLiteralExpression */ ? func.parent : - func.kind === 201 /* FunctionExpression */ && func.parent.kind === 281 /* PropertyAssignment */ ? func.parent.parent : + return (func.kind === 164 /* MethodDeclaration */ || + func.kind === 166 /* GetAccessor */ || + func.kind === 167 /* SetAccessor */) && func.parent.kind === 197 /* ObjectLiteralExpression */ ? func.parent : + func.kind === 205 /* FunctionExpression */ && func.parent.kind === 285 /* PropertyAssignment */ ? func.parent.parent : undefined; } function getThisTypeArgument(type) { @@ -55134,7 +63321,7 @@ var ts; }); } function getContextualThisParameterType(func) { - if (func.kind === 202 /* ArrowFunction */) { + if (func.kind === 206 /* ArrowFunction */) { return undefined; } if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) { @@ -55161,7 +63348,7 @@ var ts; if (thisType) { return instantiateType(thisType, getMapperFromContext(getInferenceContext(containingLiteral))); } - if (literal.parent.kind !== 281 /* PropertyAssignment */) { + if (literal.parent.kind !== 285 /* PropertyAssignment */) { break; } literal = literal.parent.parent; @@ -55175,7 +63362,7 @@ var ts; // In an assignment of the form 'obj.xxx = function(...)' or 'obj[xxx] = function(...)', the // contextual type for 'this' is 'obj'. var parent = ts.walkUpParenthesizedExpressions(func.parent); - if (parent.kind === 209 /* BinaryExpression */ && parent.operatorToken.kind === 62 /* EqualsToken */) { + if (parent.kind === 213 /* BinaryExpression */ && parent.operatorToken.kind === 62 /* EqualsToken */) { var target = parent.left; if (ts.isAccessExpression(target)) { var expression = target.expression; @@ -55203,7 +63390,7 @@ var ts; var args = getEffectiveCallArguments(iife); var indexOfParameter = func.parameters.indexOf(parameter); if (parameter.dotDotDotToken) { - return getSpreadArgumentType(args, indexOfParameter, args.length, anyType, /*context*/ undefined); + return getSpreadArgumentType(args, indexOfParameter, args.length, anyType, /*context*/ undefined, 0 /* Normal */); } var links = getNodeLinks(iife); var cached = links.resolvedSignature; @@ -55228,9 +63415,9 @@ var ts; return getTypeFromTypeNode(typeNode); } switch (declaration.kind) { - case 156 /* Parameter */: + case 159 /* Parameter */: return getContextuallyTypedParameterType(declaration); - case 191 /* BindingElement */: + case 195 /* BindingElement */: return getContextualTypeForBindingElement(declaration); // By default, do nothing and return undefined - only parameters and binding elements have context implied by a parent } @@ -55239,7 +63426,7 @@ var ts; var parent = declaration.parent.parent; var name = declaration.propertyName || declaration.name; var parentType = getContextualTypeForVariableLikeDeclaration(parent) || - parent.kind !== 191 /* BindingElement */ && parent.initializer && checkDeclarationInitializer(parent); + parent.kind !== 195 /* BindingElement */ && parent.initializer && checkDeclarationInitializer(parent); if (parentType && !ts.isBindingPattern(name) && !ts.isComputedNonLiteralName(name)) { var nameType = getLiteralTypeFromPropertyName(name); if (isTypeUsableAsPropertyName(nameType)) { @@ -55256,14 +63443,14 @@ var ts; // the contextual type of an initializer expression is the type implied by the binding pattern. // Otherwise, in a binding pattern inside a variable or parameter declaration, // the contextual type of an initializer expression is the type annotation of the containing declaration, if present. - function getContextualTypeForInitializerExpression(node) { + function getContextualTypeForInitializerExpression(node, contextFlags) { var declaration = node.parent; if (ts.hasInitializer(declaration) && node === declaration.initializer) { var result = getContextualTypeForVariableLikeDeclaration(declaration); if (result) { return result; } - if (ts.isBindingPattern(declaration.name)) { // This is less a contextual type and more an implied shape - in some cases, this may be undesirable + if (!(contextFlags & 8 /* SkipBindingPatterns */) && ts.isBindingPattern(declaration.name)) { // This is less a contextual type and more an implied shape - in some cases, this may be undesirable return getTypeFromBindingPattern(declaration.name, /*includePatternInType*/ true, /*reportErrors*/ false); } } @@ -55272,23 +63459,29 @@ var ts; function getContextualTypeForReturnExpression(node) { var func = ts.getContainingFunction(node); if (func) { - var functionFlags = ts.getFunctionFlags(func); - if (functionFlags & 1 /* Generator */) { // AsyncGenerator function or Generator function - return undefined; - } var contextualReturnType = getContextualReturnType(func); if (contextualReturnType) { - if (functionFlags & 2 /* Async */) { // Async function - var contextualAwaitedType = mapType(contextualReturnType, getAwaitedTypeOfPromise); + var functionFlags = ts.getFunctionFlags(func); + if (functionFlags & 1 /* Generator */) { // Generator or AsyncGenerator function + var use = functionFlags & 2 /* Async */ ? 2 /* AsyncGeneratorReturnType */ : 1 /* GeneratorReturnType */; + var iterationTypes = getIterationTypesOfIterable(contextualReturnType, use, /*errorNode*/ undefined); + if (!iterationTypes) { + return undefined; + } + contextualReturnType = iterationTypes.returnType; + // falls through to unwrap Promise for AsyncGenerators + } + if (functionFlags & 2 /* Async */) { // Async function or AsyncGenerator function + var contextualAwaitedType = mapType(contextualReturnType, getAwaitedType); return contextualAwaitedType && getUnionType([contextualAwaitedType, createPromiseLikeType(contextualAwaitedType)]); } - return contextualReturnType; // Regular function + return contextualReturnType; // Regular function or Generator function } } return undefined; } - function getContextualTypeForAwaitOperand(node) { - var contextualType = getContextualType(node); + function getContextualTypeForAwaitOperand(node, contextFlags) { + var contextualType = getContextualType(node, contextFlags); if (contextualType) { var contextualAwaitedType = getAwaitedType(contextualType); return contextualAwaitedType && getUnionType([contextualAwaitedType, createPromiseLikeType(contextualAwaitedType)]); @@ -55361,7 +63554,7 @@ var ts; return getTypeAtPosition(signature, argIndex); } function getContextualTypeForSubstitutionExpression(template, substitutionExpression) { - if (template.parent.kind === 198 /* TaggedTemplateExpression */) { + if (template.parent.kind === 202 /* TaggedTemplateExpression */) { return getContextualTypeForArgument(template.parent, substitutionExpression); } return undefined; @@ -55371,6 +63564,9 @@ var ts; var left = binaryExpression.left, operatorToken = binaryExpression.operatorToken, right = binaryExpression.right; switch (operatorToken.kind) { case 62 /* EqualsToken */: + case 75 /* AmpersandAmpersandEqualsToken */: + case 74 /* BarBarEqualsToken */: + case 76 /* QuestionQuestionEqualsToken */: if (node !== right) { return undefined; } @@ -55426,7 +63622,7 @@ var ts; var id = lhs.expression; var parentSymbol = resolveName(id, id.escapedText, 111551 /* Value */, undefined, id.escapedText, /*isUse*/ true); if (parentSymbol) { - var annotated = ts.getEffectiveTypeAnnotationNode(parentSymbol.valueDeclaration); + var annotated = parentSymbol.valueDeclaration && ts.getEffectiveTypeAnnotationNode(parentSymbol.valueDeclaration); if (annotated) { var nameStr_1 = ts.getElementOrPropertyAccessName(lhs); if (nameStr_1 !== undefined) { @@ -55596,25 +63792,25 @@ var ts; case 8 /* NumericLiteral */: case 9 /* BigIntLiteral */: case 14 /* NoSubstitutionTemplateLiteral */: - case 106 /* TrueKeyword */: - case 91 /* FalseKeyword */: - case 100 /* NullKeyword */: - case 75 /* Identifier */: - case 146 /* UndefinedKeyword */: + case 109 /* TrueKeyword */: + case 94 /* FalseKeyword */: + case 103 /* NullKeyword */: + case 78 /* Identifier */: + case 149 /* UndefinedKeyword */: return true; - case 194 /* PropertyAccessExpression */: - case 200 /* ParenthesizedExpression */: + case 198 /* PropertyAccessExpression */: + case 204 /* ParenthesizedExpression */: return isPossiblyDiscriminantValue(node.expression); - case 276 /* JsxExpression */: + case 280 /* JsxExpression */: return !node.expression || isPossiblyDiscriminantValue(node.expression); } return false; } function discriminateContextualTypeByObjectMembers(node, contextualType) { - return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 281 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType); + return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 285 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType); } function discriminateContextualTypeByJSXAttributes(node, contextualType) { - return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 273 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType); + return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 277 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType); } // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily // be "pushed" onto a node using the contextualType property. @@ -55700,61 +63896,67 @@ var ts; } var parent = node.parent; switch (parent.kind) { - case 242 /* VariableDeclaration */: - case 156 /* Parameter */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 191 /* BindingElement */: - return getContextualTypeForInitializerExpression(node); - case 202 /* ArrowFunction */: - case 235 /* ReturnStatement */: + case 246 /* VariableDeclaration */: + case 159 /* Parameter */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 195 /* BindingElement */: + return getContextualTypeForInitializerExpression(node, contextFlags); + case 206 /* ArrowFunction */: + case 239 /* ReturnStatement */: return getContextualTypeForReturnExpression(node); - case 212 /* YieldExpression */: + case 216 /* YieldExpression */: return getContextualTypeForYieldOperand(parent); - case 206 /* AwaitExpression */: - return getContextualTypeForAwaitOperand(parent); - case 196 /* CallExpression */: - if (parent.expression.kind === 96 /* ImportKeyword */) { + case 210 /* AwaitExpression */: + return getContextualTypeForAwaitOperand(parent, contextFlags); + case 200 /* CallExpression */: + if (parent.expression.kind === 99 /* ImportKeyword */) { return stringType; } /* falls through */ - case 197 /* NewExpression */: + case 201 /* NewExpression */: return getContextualTypeForArgument(parent, node); - case 199 /* TypeAssertionExpression */: - case 217 /* AsExpression */: - return ts.isConstTypeReference(parent.type) ? undefined : getTypeFromTypeNode(parent.type); - case 209 /* BinaryExpression */: + case 203 /* TypeAssertionExpression */: + case 221 /* AsExpression */: + return ts.isConstTypeReference(parent.type) ? tryFindWhenConstTypeReference(parent) : getTypeFromTypeNode(parent.type); + case 213 /* BinaryExpression */: return getContextualTypeForBinaryOperand(node, contextFlags); - case 281 /* PropertyAssignment */: - case 282 /* ShorthandPropertyAssignment */: + case 285 /* PropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: return getContextualTypeForObjectLiteralElement(parent, contextFlags); - case 283 /* SpreadAssignment */: + case 287 /* SpreadAssignment */: return getApparentTypeOfContextualType(parent.parent, contextFlags); - case 192 /* ArrayLiteralExpression */: { + case 196 /* ArrayLiteralExpression */: { var arrayLiteral = parent; var type = getApparentTypeOfContextualType(arrayLiteral, contextFlags); return getContextualTypeForElementExpression(type, ts.indexOfNode(arrayLiteral.elements, node)); } - case 210 /* ConditionalExpression */: + case 214 /* ConditionalExpression */: return getContextualTypeForConditionalOperand(node, contextFlags); - case 221 /* TemplateSpan */: - ts.Debug.assert(parent.parent.kind === 211 /* TemplateExpression */); + case 225 /* TemplateSpan */: + ts.Debug.assert(parent.parent.kind === 215 /* TemplateExpression */); return getContextualTypeForSubstitutionExpression(parent.parent, node); - case 200 /* ParenthesizedExpression */: { + case 204 /* ParenthesizedExpression */: { // Like in `checkParenthesizedExpression`, an `/** @type {xyz} */` comment before a parenthesized expression acts as a type cast. var tag = ts.isInJSFile(parent) ? ts.getJSDocTypeTag(parent) : undefined; return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent, contextFlags); } - case 276 /* JsxExpression */: + case 280 /* JsxExpression */: return getContextualTypeForJsxExpression(parent); - case 273 /* JsxAttribute */: - case 275 /* JsxSpreadAttribute */: + case 277 /* JsxAttribute */: + case 279 /* JsxSpreadAttribute */: return getContextualTypeForJsxAttribute(parent); - case 268 /* JsxOpeningElement */: - case 267 /* JsxSelfClosingElement */: + case 272 /* JsxOpeningElement */: + case 271 /* JsxSelfClosingElement */: return getContextualJsxElementAttributesType(parent, contextFlags); } return undefined; + function tryFindWhenConstTypeReference(node) { + if (ts.isCallLikeExpression(node.parent)) { + return getContextualTypeForArgument(node.parent, node); + } + return undefined; + } } function getInferenceContext(node) { var ancestor = ts.findAncestor(node, function (n) { return !!n.inferenceContext; }); @@ -55908,7 +64110,7 @@ var ts; return !hasEffectiveRestParameter(signature) && getParameterCount(signature) < targetParameterCount; } function isFunctionExpressionOrArrowFunction(node) { - return node.kind === 201 /* FunctionExpression */ || node.kind === 202 /* ArrowFunction */; + return node.kind === 205 /* FunctionExpression */ || node.kind === 206 /* ArrowFunction */; } function getContextualSignatureForFunctionLikeDeclaration(node) { // Only function expressions, arrow functions, and object literal methods are contextually typed. @@ -55922,7 +64124,7 @@ var ts; // all identical ignoring their return type, the result is same signature but with return type as // union type of return types from these signatures function getContextualSignature(node) { - ts.Debug.assert(node.kind !== 161 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node)); + ts.Debug.assert(node.kind !== 164 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node)); var typeTagSignature = getSignatureOfTypeTag(node); if (typeTagSignature) { return typeTagSignature; @@ -55966,34 +64168,33 @@ var ts; var arrayOrIterableType = checkExpression(node.expression, checkMode); return checkIteratedTypeOrElementType(33 /* Spread */, arrayOrIterableType, undefinedType, node.expression); } + function checkSyntheticExpression(node) { + return node.isSpread ? getIndexedAccessType(node.type, numberType) : node.type; + } function hasDefaultValue(node) { - return (node.kind === 191 /* BindingElement */ && !!node.initializer) || - (node.kind === 209 /* BinaryExpression */ && node.operatorToken.kind === 62 /* EqualsToken */); + return (node.kind === 195 /* BindingElement */ && !!node.initializer) || + (node.kind === 213 /* BinaryExpression */ && node.operatorToken.kind === 62 /* EqualsToken */); } function checkArrayLiteral(node, checkMode, forceTuple) { var elements = node.elements; var elementCount = elements.length; var elementTypes = []; - var hasEndingSpreadElement = false; - var hasNonEndingSpreadElement = false; + var elementFlags = []; var contextualType = getApparentTypeOfContextualType(node); var inDestructuringPattern = ts.isAssignmentTarget(node); var inConstContext = isConstContext(node); for (var i = 0; i < elementCount; i++) { var e = elements[i]; - var spread = e.kind === 213 /* SpreadElement */ && e.expression; - var spreadType = spread && checkExpression(spread, checkMode, forceTuple); - if (spreadType && isTupleType(spreadType)) { - elementTypes.push.apply(elementTypes, getTypeArguments(spreadType)); - if (spreadType.target.hasRestElement) { - if (i === elementCount - 1) - hasEndingSpreadElement = true; - else - hasNonEndingSpreadElement = true; + if (e.kind === 217 /* SpreadElement */) { + if (languageVersion < 2 /* ES2015 */) { + checkExternalEmitHelpers(e, compilerOptions.downlevelIteration ? 1536 /* SpreadIncludes */ : 2048 /* SpreadArrays */); } - } - else { - if (inDestructuringPattern && spreadType) { + var spreadType = checkExpression(e.expression, checkMode, forceTuple); + if (isArrayLikeType(spreadType)) { + elementTypes.push(spreadType); + elementFlags.push(8 /* Variadic */); + } + else if (inDestructuringPattern) { // Given the following situation: // var c: {}; // [...c] = ["", 0]; @@ -56007,43 +64208,31 @@ var ts; // getContextualTypeForElementExpression, which will crucially not error // if there is no index type / iterated type. var restElementType = getIndexTypeOfType(spreadType, 1 /* Number */) || - getIteratedTypeOrElementType(65 /* Destructuring */, spreadType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false); - if (restElementType) { - elementTypes.push(restElementType); - } + getIteratedTypeOrElementType(65 /* Destructuring */, spreadType, undefinedType, /*errorNode*/ undefined, /*checkAssignability*/ false) || + unknownType; + elementTypes.push(restElementType); + elementFlags.push(4 /* Rest */); } else { - var elementContextualType = getContextualTypeForElementExpression(contextualType, elementTypes.length); - var type = checkExpressionForMutableLocation(e, checkMode, elementContextualType, forceTuple); - elementTypes.push(type); - } - if (spread) { // tuples are done above, so these are only arrays - if (i === elementCount - 1) - hasEndingSpreadElement = true; - else - hasNonEndingSpreadElement = true; + elementTypes.push(checkIteratedTypeOrElementType(33 /* Spread */, spreadType, undefinedType, e.expression)); + elementFlags.push(4 /* Rest */); } } + else { + var elementContextualType = getContextualTypeForElementExpression(contextualType, elementTypes.length); + var type = checkExpressionForMutableLocation(e, checkMode, elementContextualType, forceTuple); + elementTypes.push(type); + elementFlags.push(1 /* Required */); + } } - if (!hasNonEndingSpreadElement) { - var minLength = elementTypes.length - (hasEndingSpreadElement ? 1 : 0); - // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such - // that we get the same behavior for "var [x, y] = []" and "[x, y] = []". - var tupleResult = void 0; - if (inDestructuringPattern && minLength > 0) { - var type = cloneTypeReference(createTupleType(elementTypes, minLength, hasEndingSpreadElement)); - type.pattern = node; - return type; - } - else if (tupleResult = getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasEndingSpreadElement, elementTypes.length, inConstContext)) { - return createArrayLiteralType(tupleResult); - } - else if (forceTuple) { - return createArrayLiteralType(createTupleType(elementTypes, minLength, hasEndingSpreadElement)); - } + if (inDestructuringPattern) { + return createTupleType(elementTypes, elementFlags); + } + if (forceTuple || inConstContext || contextualType && forEachType(contextualType, isTupleLikeType)) { + return createArrayLiteralType(createTupleType(elementTypes, elementFlags, /*readonly*/ inConstContext)); } return createArrayLiteralType(createArrayType(elementTypes.length ? - getUnionType(elementTypes, 2 /* Subtype */) : + getUnionType(ts.sameMap(elementTypes, function (t, i) { return elementFlags[i] & 8 /* Variadic */ ? getIndexedAccessTypeOrUndefined(t, numberType) || anyType : t; }), 2 /* Subtype */) : strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext)); } function createArrayLiteralType(type) { @@ -56057,19 +64246,11 @@ var ts; } return literalType; } - function getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, readonly) { - if (elementCount === void 0) { elementCount = elementTypes.length; } - if (readonly === void 0) { readonly = false; } - // Infer a tuple type when the contextual type is or contains a tuple-like type - if (readonly || (contextualType && forEachType(contextualType, isTupleLikeType))) { - return createTupleType(elementTypes, elementCount - (hasRestElement ? 1 : 0), hasRestElement, readonly); - } - } function isNumericName(name) { switch (name.kind) { - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: return isNumericComputedName(name); - case 75 /* Identifier */: + case 78 /* Identifier */: return isNumericLiteralName(name.escapedText); case 8 /* NumericLiteral */: case 10 /* StringLiteral */: @@ -56127,10 +64308,15 @@ var ts; } return links.resolvedType; } + function isSymbolWithNumericName(symbol) { + var _a; + var firstDecl = (_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a[0]; + return isNumericLiteralName(symbol.escapedName) || (firstDecl && ts.isNamedDeclaration(firstDecl) && isNumericName(firstDecl.name)); + } function getObjectLiteralIndexInfo(node, offset, properties, kind) { var propTypes = []; - for (var i = 0; i < properties.length; i++) { - if (kind === 0 /* String */ || isNumericName(node.properties[i + offset].name)) { + for (var i = offset; i < properties.length; i++) { + if (kind === 0 /* String */ || isSymbolWithNumericName(properties[i])) { propTypes.push(getTypeOfSymbol(properties[i])); } } @@ -56158,7 +64344,7 @@ var ts; var spread = emptyObjectType; var contextualType = getApparentTypeOfContextualType(node); var contextualTypeHasPattern = contextualType && contextualType.pattern && - (contextualType.pattern.kind === 189 /* ObjectBindingPattern */ || contextualType.pattern.kind === 193 /* ObjectLiteralExpression */); + (contextualType.pattern.kind === 193 /* ObjectBindingPattern */ || contextualType.pattern.kind === 197 /* ObjectLiteralExpression */); var inConstContext = isConstContext(node); var checkFlags = inConstContext ? 8 /* Readonly */ : 0; var isInJavascript = ts.isInJSFile(node) && !ts.isInJsonFile(node); @@ -56178,16 +64364,19 @@ var ts; } } var offset = 0; - for (var i = 0; i < node.properties.length; i++) { - var memberDecl = node.properties[i]; + for (var _b = 0, _c = node.properties; _b < _c.length; _b++) { + var memberDecl = _c[_b]; var member = getSymbolOfNode(memberDecl); - var computedNameType = memberDecl.name && memberDecl.name.kind === 154 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ? + var computedNameType = memberDecl.name && memberDecl.name.kind === 157 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ? checkComputedPropertyName(memberDecl.name) : undefined; - if (memberDecl.kind === 281 /* PropertyAssignment */ || - memberDecl.kind === 282 /* ShorthandPropertyAssignment */ || + if (memberDecl.kind === 285 /* PropertyAssignment */ || + memberDecl.kind === 286 /* ShorthandPropertyAssignment */ || ts.isObjectLiteralMethod(memberDecl)) { - var type = memberDecl.kind === 281 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) : - memberDecl.kind === 282 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) : + var type = memberDecl.kind === 285 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) : + // avoid resolving the left side of the ShorthandPropertyAssignment outside of the destructuring + // for error recovery purposes. For example, if a user wrote `{ a = 100 }` instead of `{ a: 100 }`. + // we don't want to say "could not find 'a'". + memberDecl.kind === 286 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, checkMode) : checkObjectLiteralMethod(memberDecl, checkMode); if (isInJavascript) { var jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl); @@ -56210,8 +64399,8 @@ var ts; if (inDestructuringPattern) { // If object literal is an assignment pattern and if the assignment pattern specifies a default value // for the property, make the property optional. - var isOptional = (memberDecl.kind === 281 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) || - (memberDecl.kind === 282 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer); + var isOptional = (memberDecl.kind === 285 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) || + (memberDecl.kind === 286 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer); if (isOptional) { prop.flags |= 16777216 /* Optional */; } @@ -56237,7 +64426,7 @@ var ts; member = prop; allPropertiesTable === null || allPropertiesTable === void 0 ? void 0 : allPropertiesTable.set(prop.escapedName, prop); } - else if (memberDecl.kind === 283 /* SpreadAssignment */) { + else if (memberDecl.kind === 287 /* SpreadAssignment */) { if (languageVersion < 2 /* ES2015 */) { checkExternalEmitHelpers(memberDecl, 2 /* Assign */); } @@ -56257,7 +64446,7 @@ var ts; checkSpreadPropOverrides(type, allPropertiesTable, memberDecl); } spread = getSpreadType(spread, type, node.symbol, objectFlags, inConstContext); - offset = i + 1; + offset = propertiesArray.length; continue; } else { @@ -56266,7 +64455,7 @@ var ts; // an ordinary function declaration(section 6.1) with no parameters. // A set accessor declaration is processed in the same manner // as an ordinary function declaration with a single parameter and a Void return type. - ts.Debug.assert(memberDecl.kind === 163 /* GetAccessor */ || memberDecl.kind === 164 /* SetAccessor */); + ts.Debug.assert(memberDecl.kind === 166 /* GetAccessor */ || memberDecl.kind === 167 /* SetAccessor */); checkNodeDeferred(memberDecl); } if (computedNameType && !(computedNameType.flags & 8576 /* StringOrNumberLiteralOrUnique */)) { @@ -56291,9 +64480,9 @@ var ts; // type with those properties for which the binding pattern specifies a default value. // If the object literal is spread into another object literal, skip this step and let the top-level object // literal handle it instead. - if (contextualTypeHasPattern && node.parent.kind !== 283 /* SpreadAssignment */) { - for (var _b = 0, _c = getPropertiesOfType(contextualType); _b < _c.length; _b++) { - var prop = _c[_b]; + if (contextualTypeHasPattern && node.parent.kind !== 287 /* SpreadAssignment */) { + for (var _d = 0, _e = getPropertiesOfType(contextualType); _d < _e.length; _d++) { + var prop = _e[_d]; if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) { if (!(prop.flags & 16777216 /* Optional */)) { error(prop.valueDeclaration || prop.bindingElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value); @@ -56369,10 +64558,14 @@ var ts; } function checkJsxFragment(node) { checkJsxOpeningLikeElementOrOpeningFragment(node.openingFragment); - if (compilerOptions.jsx === 2 /* React */ && (compilerOptions.jsxFactory || ts.getSourceFileOfNode(node).pragmas.has("jsx"))) { + // by default, jsx:'react' will use jsxFactory = React.createElement and jsxFragmentFactory = React.Fragment + // if jsxFactory compiler option is provided, ensure jsxFragmentFactory compiler option or @jsxFrag pragma is provided too + var nodeSourceFile = ts.getSourceFileOfNode(node); + if (compilerOptions.jsx === 2 /* React */ && (compilerOptions.jsxFactory || nodeSourceFile.pragmas.has("jsx")) + && !compilerOptions.jsxFragmentFactory && !nodeSourceFile.pragmas.has("jsxfrag")) { error(node, compilerOptions.jsxFactory - ? ts.Diagnostics.JSX_fragment_is_not_supported_when_using_jsxFactory - : ts.Diagnostics.JSX_fragment_is_not_supported_when_using_an_inline_JSX_factory_pragma); + ? ts.Diagnostics.The_jsxFragmentFactory_compiler_option_must_be_provided_to_use_JSX_fragments_with_the_jsxFactory_compiler_option + : ts.Diagnostics.An_jsxFrag_pragma_is_required_when_using_an_jsx_pragma_with_JSX_fragments); } checkJsxChildren(node); return getJsxElementTypeAt(node) || anyType; @@ -56388,7 +64581,7 @@ var ts; * Returns true iff React would emit this tag name as a string rather than an identifier or qualified name */ function isJsxIntrinsicIdentifier(tagName) { - return tagName.kind === 75 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText); + return tagName.kind === 78 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText); } function checkJsxAttribute(node, checkMode) { return node.initializer @@ -56435,7 +64628,7 @@ var ts; } } else { - ts.Debug.assert(attributeDecl.kind === 275 /* JsxSpreadAttribute */); + ts.Debug.assert(attributeDecl.kind === 279 /* JsxSpreadAttribute */); if (attributesTable.size > 0) { spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, /*readonly*/ false); attributesTable = ts.createSymbolTable(); @@ -56461,7 +64654,7 @@ var ts; } } // Handle children attribute - var parent = openingLikeElement.parent.kind === 266 /* JsxElement */ ? openingLikeElement.parent : undefined; + var parent = openingLikeElement.parent.kind === 270 /* JsxElement */ ? openingLikeElement.parent : undefined; // We have to check that openingElement of the parent is the one we are visiting as this may not be true for selfClosingElement if (parent && parent.openingElement === openingLikeElement && parent.children.length > 0) { var childrenTypes = checkJsxChildren(parent, checkMode); @@ -56476,12 +64669,12 @@ var ts; var childrenContextualType = contextualType && getTypeOfPropertyOfContextualType(contextualType, jsxChildrenPropertyName); // If there are children in the body of JSX element, create dummy attribute "children" with the union of children types so that it will pass the attribute checking process var childrenPropSymbol = createSymbol(4 /* Property */ | 33554432 /* Transient */, jsxChildrenPropertyName); - childrenPropSymbol.type = childrenTypes.length === 1 ? - childrenTypes[0] : - (getArrayLiteralTupleTypeIfApplicable(childrenTypes, childrenContextualType, /*hasRestElement*/ false) || createArrayType(getUnionType(childrenTypes))); + childrenPropSymbol.type = childrenTypes.length === 1 ? childrenTypes[0] : + childrenContextualType && forEachType(childrenContextualType, isTupleLikeType) ? createTupleType(childrenTypes) : + createArrayType(getUnionType(childrenTypes)); // Fake up a property declaration for the children - childrenPropSymbol.valueDeclaration = ts.createPropertySignature(/*modifiers*/ undefined, ts.unescapeLeadingUnderscores(jsxChildrenPropertyName), /*questionToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined); - childrenPropSymbol.valueDeclaration.parent = attributes; + childrenPropSymbol.valueDeclaration = ts.factory.createPropertySignature(/*modifiers*/ undefined, ts.unescapeLeadingUnderscores(jsxChildrenPropertyName), /*questionToken*/ undefined, /*type*/ undefined); + ts.setParent(childrenPropSymbol.valueDeclaration, attributes); childrenPropSymbol.valueDeclaration.symbol = childrenPropSymbol; var childPropMap = ts.createSymbolTable(); childPropMap.set(jsxChildrenPropertyName, childrenPropSymbol); @@ -56798,22 +64991,27 @@ var ts; checkJsxPreconditions(node); // The reactNamespace/jsxFactory's root symbol should be marked as 'used' so we don't incorrectly elide its import. // And if there is no reactNamespace/jsxFactory's symbol in scope when targeting React emit, we should issue an error. - var reactRefErr = diagnostics && compilerOptions.jsx === 2 /* React */ ? ts.Diagnostics.Cannot_find_name_0 : undefined; - var reactNamespace = getJsxNamespace(node); - var reactLocation = isNodeOpeningLikeElement ? node.tagName : node; - var reactSym = resolveName(reactLocation, reactNamespace, 111551 /* Value */, reactRefErr, reactNamespace, /*isUse*/ true); - if (reactSym) { + var jsxFactoryRefErr = diagnostics && compilerOptions.jsx === 2 /* React */ ? ts.Diagnostics.Cannot_find_name_0 : undefined; + var jsxFactoryNamespace = getJsxNamespace(node); + var jsxFactoryLocation = isNodeOpeningLikeElement ? node.tagName : node; + // allow null as jsxFragmentFactory + var jsxFactorySym; + if (!(ts.isJsxOpeningFragment(node) && jsxFactoryNamespace === "null")) { + jsxFactorySym = resolveName(jsxFactoryLocation, jsxFactoryNamespace, 111551 /* Value */, jsxFactoryRefErr, jsxFactoryNamespace, /*isUse*/ true); + } + if (jsxFactorySym) { // Mark local symbol as referenced here because it might not have been marked - // if jsx emit was not react as there wont be error being emitted - reactSym.isReferenced = 67108863 /* All */; - // If react symbol is alias, mark it as refereced - if (reactSym.flags & 2097152 /* Alias */ && !getTypeOnlyAliasDeclaration(reactSym)) { - markAliasSymbolAsReferenced(reactSym); + // if jsx emit was not jsxFactory as there wont be error being emitted + jsxFactorySym.isReferenced = 67108863 /* All */; + // If react/jsxFactory symbol is alias, mark it as refereced + if (jsxFactorySym.flags & 2097152 /* Alias */ && !getTypeOnlyAliasDeclaration(jsxFactorySym)) { + markAliasSymbolAsReferenced(jsxFactorySym); } } if (isNodeOpeningLikeElement) { var jsxOpeningLikeNode = node; var sig = getResolvedSignature(jsxOpeningLikeNode); + checkDeprecatedSignature(sig, node); checkJsxReturnAssignableToAppropriateBound(getJsxReferenceKind(jsxOpeningLikeNode), getReturnTypeOfSignature(sig), jsxOpeningLikeNode); } } @@ -56897,7 +65095,7 @@ var ts; */ function checkPropertyAccessibility(node, isSuper, type, prop) { var flags = ts.getDeclarationModifierFlagsFromSymbol(prop); - var errorNode = node.kind === 153 /* QualifiedName */ ? node.right : node.kind === 188 /* ImportType */ ? node : node.name; + var errorNode = node.kind === 156 /* QualifiedName */ ? node.right : node.kind === 192 /* ImportType */ ? node : node.name; if (isSuper) { // TS 1.0 spec (April 2014): 4.8.2 // - In a constructor, instance member function, instance member accessor, or @@ -57051,7 +65249,7 @@ var ts; return checkPropertyAccessExpressionOrQualifiedName(node, node.left, checkNonNullExpression(node.left), node.right); } function isMethodAccessForCall(node) { - while (node.parent.kind === 200 /* ParenthesizedExpression */) { + while (node.parent.kind === 204 /* ParenthesizedExpression */) { node = node.parent; } return ts.isCallOrNewExpression(node.parent) && node.parent.expression === node; @@ -57108,12 +65306,16 @@ var ts; } return false; } + function isThisPropertyAccessInConstructor(node, prop) { + return ts.isThisProperty(node) && (isAutoTypedProperty(prop) || isConstructorDeclaredProperty(prop)) && ts.getThisContainer(node, /*includeArrowFunctions*/ true) === getDeclaringConstructor(prop); + } function checkPropertyAccessExpressionOrQualifiedName(node, left, leftType, right) { + var _a; var parentSymbol = getNodeLinks(left).resolvedSymbol; var assignmentKind = ts.getAssignmentTargetKind(node); var apparentType = getApparentType(assignmentKind !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(leftType) : leftType); if (ts.isPrivateIdentifier(right)) { - checkExternalEmitHelpers(node, 262144 /* ClassPrivateFieldGet */); + checkExternalEmitHelpers(node, 1048576 /* ClassPrivateFieldGet */); } var isAnyLike = isTypeAny(apparentType) || apparentType === silentNeverType; var prop; @@ -57173,15 +65375,18 @@ var ts; propType = indexInfo.type; } else { + if (((_a = prop.valueDeclaration) === null || _a === void 0 ? void 0 : _a.flags) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node, prop)) { + errorOrSuggestion(/* isError */ false, right, ts.Diagnostics._0_is_deprecated, right.escapedText); + } checkPropertyNotUsedBeforeDeclaration(prop, node, right); - markPropertyAsReferenced(prop, node, left.kind === 104 /* ThisKeyword */); + markPropertyAsReferenced(prop, node, left.kind === 107 /* ThisKeyword */); getNodeLinks(node).resolvedSymbol = prop; - checkPropertyAccessibility(node, left.kind === 102 /* SuperKeyword */, apparentType, prop); + checkPropertyAccessibility(node, left.kind === 105 /* SuperKeyword */, apparentType, prop); if (isAssignmentToReadonlyEntity(node, prop, assignmentKind)) { error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, ts.idText(right)); return errorType; } - propType = getConstraintForLocation(getTypeOfSymbol(prop), node); + propType = isThisPropertyAccessInConstructor(node, prop) ? autoType : getConstraintForLocation(getTypeOfSymbol(prop), node); } return getFlowTypeOfAccessExpression(node, prop, propType, right); } @@ -57195,16 +65400,19 @@ var ts; prop && !(prop.flags & (3 /* Variable */ | 4 /* Property */ | 98304 /* Accessor */)) && !(prop.flags & 8192 /* Method */ && propType.flags & 1048576 /* Union */)) { return propType; } + if (propType === autoType) { + return getFlowTypeOfProperty(node, prop); + } // If strict null checks and strict property initialization checks are enabled, if we have // a this.xxx property access, if the property is an instance property without an initializer, // and if we are in a constructor of the same class as the property declaration, assume that // the property is uninitialized at the top of the control flow. var assumeUninitialized = false; - if (strictNullChecks && strictPropertyInitialization && node.expression.kind === 104 /* ThisKeyword */) { + if (strictNullChecks && strictPropertyInitialization && node.expression.kind === 107 /* ThisKeyword */) { var declaration = prop && prop.valueDeclaration; if (declaration && isInstancePropertyWithoutInitializer(declaration)) { var flowContainer = getControlFlowContainer(node); - if (flowContainer.kind === 162 /* Constructor */ && flowContainer.parent === declaration.parent && !(declaration.flags & 8388608 /* Ambient */)) { + if (flowContainer.kind === 165 /* Constructor */ && flowContainer.parent === declaration.parent && !(declaration.flags & 8388608 /* Ambient */)) { assumeUninitialized = true; } } @@ -57236,8 +65444,8 @@ var ts; && !isPropertyDeclaredInAncestorClass(prop)) { diagnosticMessage = error(right, ts.Diagnostics.Property_0_is_used_before_its_initialization, declarationName); } - else if (valueDeclaration.kind === 245 /* ClassDeclaration */ && - node.parent.kind !== 169 /* TypeReference */ && + else if (valueDeclaration.kind === 249 /* ClassDeclaration */ && + node.parent.kind !== 172 /* TypeReference */ && !(valueDeclaration.flags & 8388608 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)) { diagnosticMessage = error(right, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName); @@ -57249,22 +65457,22 @@ var ts; function isInPropertyInitializer(node) { return !!ts.findAncestor(node, function (node) { switch (node.kind) { - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: return true; - case 281 /* PropertyAssignment */: - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 283 /* SpreadAssignment */: - case 154 /* ComputedPropertyName */: - case 221 /* TemplateSpan */: - case 276 /* JsxExpression */: - case 273 /* JsxAttribute */: - case 274 /* JsxAttributes */: - case 275 /* JsxSpreadAttribute */: - case 268 /* JsxOpeningElement */: - case 216 /* ExpressionWithTypeArguments */: - case 279 /* HeritageClause */: + case 285 /* PropertyAssignment */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 287 /* SpreadAssignment */: + case 157 /* ComputedPropertyName */: + case 225 /* TemplateSpan */: + case 280 /* JsxExpression */: + case 277 /* JsxAttribute */: + case 278 /* JsxAttributes */: + case 279 /* JsxSpreadAttribute */: + case 272 /* JsxOpeningElement */: + case 220 /* ExpressionWithTypeArguments */: + case 283 /* HeritageClause */: return false; default: return ts.isExpressionNode(node) ? false : "quit"; @@ -57339,11 +65547,19 @@ var ts; } function typeHasStaticProperty(propName, containingType) { var prop = containingType.symbol && getPropertyOfType(getTypeOfSymbol(containingType.symbol), propName); - return prop !== undefined && prop.valueDeclaration && ts.hasModifier(prop.valueDeclaration, 32 /* Static */); + return prop !== undefined && prop.valueDeclaration && ts.hasSyntacticModifier(prop.valueDeclaration, 32 /* Static */); } function getSuggestedSymbolForNonexistentProperty(name, containingType) { return getSpellingSuggestionForName(ts.isString(name) ? name : ts.idText(name), getPropertiesOfType(containingType), 111551 /* Value */); } + function getSuggestedSymbolForNonexistentJSXAttribute(name, containingType) { + var strName = ts.isString(name) ? name : ts.idText(name); + var properties = getPropertiesOfType(containingType); + var jsxSpecific = strName === "for" ? ts.find(properties, function (x) { return ts.symbolName(x) === "htmlFor"; }) + : strName === "class" ? ts.find(properties, function (x) { return ts.symbolName(x) === "className"; }) + : undefined; + return jsxSpecific !== null && jsxSpecific !== void 0 ? jsxSpecific : getSpellingSuggestionForName(strName, properties, 111551 /* Value */); + } function getSuggestionForNonexistentProperty(name, containingType) { var suggestion = getSuggestedSymbolForNonexistentProperty(name, containingType); return suggestion && ts.symbolName(suggestion); @@ -57434,7 +65650,7 @@ var ts; if (!valueDeclaration) { return; } - var hasPrivateModifier = ts.hasModifier(valueDeclaration, 8 /* Private */); + var hasPrivateModifier = ts.hasEffectiveModifier(valueDeclaration, 8 /* Private */); var hasPrivateIdentifier = ts.isNamedDeclaration(prop.valueDeclaration) && ts.isPrivateIdentifier(prop.valueDeclaration.name); if (!hasPrivateModifier && !hasPrivateIdentifier) { return; @@ -57453,16 +65669,16 @@ var ts; } function isValidPropertyAccess(node, propertyName) { switch (node.kind) { - case 194 /* PropertyAccessExpression */: - return isValidPropertyAccessWithType(node, node.expression.kind === 102 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression))); - case 153 /* QualifiedName */: + case 198 /* PropertyAccessExpression */: + return isValidPropertyAccessWithType(node, node.expression.kind === 105 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression))); + case 156 /* QualifiedName */: return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getWidenedType(checkExpression(node.left))); - case 188 /* ImportType */: + case 192 /* ImportType */: return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getTypeFromTypeNode(node)); } } function isValidPropertyAccessForCompletions(node, type, property) { - return isValidPropertyAccessWithType(node, node.kind === 194 /* PropertyAccessExpression */ && node.expression.kind === 102 /* SuperKeyword */, property.escapedName, type); + return isValidPropertyAccessWithType(node, node.kind === 198 /* PropertyAccessExpression */ && node.expression.kind === 105 /* SuperKeyword */, property.escapedName, type); // Previously we validated the 'this' type of methods but this adversely affected performance. See #31377 for more context. } function isValidPropertyAccessWithType(node, isSuper, propertyName, type) { @@ -57485,13 +65701,13 @@ var ts; */ function getForInVariableSymbol(node) { var initializer = node.initializer; - if (initializer.kind === 243 /* VariableDeclarationList */) { + if (initializer.kind === 247 /* VariableDeclarationList */) { var variable = initializer.declarations[0]; if (variable && !ts.isBindingPattern(variable.name)) { return getSymbolOfNode(variable); } } - else if (initializer.kind === 75 /* Identifier */) { + else if (initializer.kind === 78 /* Identifier */) { return getResolvedSymbol(initializer); } return undefined; @@ -57508,13 +65724,13 @@ var ts; */ function isForInVariableForNumericPropertyNames(expr) { var e = ts.skipParentheses(expr); - if (e.kind === 75 /* Identifier */) { + if (e.kind === 78 /* Identifier */) { var symbol = getResolvedSymbol(e); if (symbol.flags & 3 /* Variable */) { var child = expr; var node = expr.parent; while (node) { - if (node.kind === 231 /* ForInStatement */ && + if (node.kind === 235 /* ForInStatement */ && child === node.statement && getForInVariableSymbol(node) === symbol && hasNumericPropertyNames(getTypeOfExpression(node.expression))) { @@ -57598,13 +65814,13 @@ var ts; // This gets us diagnostics for the type arguments and marks them as referenced. ts.forEach(node.typeArguments, checkSourceElement); } - if (node.kind === 198 /* TaggedTemplateExpression */) { + if (node.kind === 202 /* TaggedTemplateExpression */) { checkExpression(node.template); } else if (ts.isJsxOpeningLikeElement(node)) { checkExpression(node.attributes); } - else if (node.kind !== 157 /* Decorator */) { + else if (node.kind !== 160 /* Decorator */) { ts.forEach(node.arguments, function (argument) { checkExpression(argument); }); @@ -57668,7 +65884,7 @@ var ts; } } function isSpreadArgument(arg) { - return !!arg && (arg.kind === 213 /* SpreadElement */ || arg.kind === 220 /* SyntheticExpression */ && arg.isSpread); + return !!arg && (arg.kind === 217 /* SpreadElement */ || arg.kind === 224 /* SyntheticExpression */ && arg.isSpread); } function getSpreadArgumentIndex(args) { return ts.findIndex(args, isSpreadArgument); @@ -57682,9 +65898,9 @@ var ts; var callIsIncomplete = false; // In incomplete call we want to be lenient when we have too few arguments var effectiveParameterCount = getParameterCount(signature); var effectiveMinimumArguments = getMinArgumentCount(signature); - if (node.kind === 198 /* TaggedTemplateExpression */) { + if (node.kind === 202 /* TaggedTemplateExpression */) { argCount = args.length; - if (node.template.kind === 211 /* TemplateExpression */) { + if (node.template.kind === 215 /* TemplateExpression */) { // If a tagged template expression lacks a tail literal, the call is incomplete. // Specifically, a template only can end in a TemplateTail or a Missing literal. var lastSpan = ts.last(node.template.templateSpans); // we should always have at least one span. @@ -57699,7 +65915,7 @@ var ts; callIsIncomplete = !!templateLiteral.isUnterminated; } } - else if (node.kind === 157 /* Decorator */) { + else if (node.kind === 160 /* Decorator */) { argCount = getDecoratorArgumentCount(node, signature); } else if (ts.isJsxOpeningLikeElement(node)) { @@ -57711,12 +65927,12 @@ var ts; effectiveParameterCount = args.length === 0 ? effectiveParameterCount : 1; // class may have argumentless ctor functions - still resolve ctor and compare vs props member type effectiveMinimumArguments = Math.min(effectiveMinimumArguments, 1); // sfc may specify context argument - handled by framework and not typechecked } + else if (!node.arguments) { + // This only happens when we have something of the form: 'new C' + ts.Debug.assert(node.kind === 201 /* NewExpression */); + return getMinArgumentCount(signature) === 0; + } else { - if (!node.arguments) { - // This only happens when we have something of the form: 'new C' - ts.Debug.assert(node.kind === 197 /* NewExpression */); - return getMinArgumentCount(signature) === 0; - } argCount = signatureHelpTrailingComma ? args.length + 1 : args.length; // If we are missing the close parenthesis, the call is incomplete. callIsIncomplete = node.arguments.end === node.end; @@ -57788,7 +66004,7 @@ var ts; }); if (!inferenceContext) { applyToReturnTypes(contextualSignature, signature, function (source, target) { - inferTypes(context.inferences, source, target, 32 /* ReturnType */); + inferTypes(context.inferences, source, target, 64 /* ReturnType */); }); } return getSignatureInstantiation(signature, getInferredTypes(context), ts.isInJSFile(contextualSignature.declaration)); @@ -57807,8 +66023,8 @@ var ts; // example, given a 'function wrap(cb: (x: T) => U): (x: T) => U' and a call expression // 'let f: (x: string) => number = wrap(s => s.length)', we infer from the declared type of 'f' to the // return type of 'wrap'. - if (node.kind !== 157 /* Decorator */) { - var contextualType = getContextualType(node); + if (node.kind !== 160 /* Decorator */) { + var contextualType = getContextualType(node, ts.every(signature.typeParameters, function (p) { return !!getDefaultFromTypeParameter(p); }) ? 8 /* SkipBindingPatterns */ : 0 /* None */); if (contextualType) { // We clone the inference context to avoid disturbing a resolution in progress for an // outer call expression. Effectively we just want a snapshot of whatever has been @@ -57829,7 +66045,7 @@ var ts; instantiatedType; var inferenceTargetType = getReturnTypeOfSignature(signature); // Inferences made from return types have lower priority than all other inferences. - inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 32 /* ReturnType */); + inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 64 /* ReturnType */); // Create a type mapper for instantiating generic contextual types using the inferences made // from the return type. We need a separate inference pass here because (a) instantiation of // the source type uses the outer context's return mapper (which excludes inferences made from @@ -57840,59 +66056,78 @@ var ts; context.returnMapper = ts.some(returnContext.inferences, hasInferenceCandidates) ? getMapperFromContext(cloneInferredPartOfContext(returnContext)) : undefined; } } + var restType = getNonArrayRestType(signature); + var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length; + if (restType && restType.flags & 262144 /* TypeParameter */) { + var info = ts.find(context.inferences, function (info) { return info.typeParameter === restType; }); + if (info) { + info.impliedArity = ts.findIndex(args, isSpreadArgument, argCount) < 0 ? args.length - argCount : undefined; + } + } var thisType = getThisTypeOfSignature(signature); if (thisType) { var thisArgumentNode = getThisArgumentOfCall(node); var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType; inferTypes(context.inferences, thisArgumentType, thisType); } - var restType = getNonArrayRestType(signature); - var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length; for (var i = 0; i < argCount; i++) { var arg = args[i]; - if (arg.kind !== 215 /* OmittedExpression */) { + if (arg.kind !== 219 /* OmittedExpression */) { var paramType = getTypeAtPosition(signature, i); var argType = checkExpressionWithContextualType(arg, paramType, context, checkMode); inferTypes(context.inferences, argType, paramType); } } if (restType) { - var spreadType = getSpreadArgumentType(args, argCount, args.length, restType, context); + var spreadType = getSpreadArgumentType(args, argCount, args.length, restType, context, checkMode); inferTypes(context.inferences, spreadType, restType); } return getInferredTypes(context); } - function getArrayifiedType(type) { - return type.flags & 1048576 /* Union */ ? mapType(type, getArrayifiedType) : - type.flags & (1 /* Any */ | 63176704 /* Instantiable */) || isMutableArrayOrTuple(type) ? type : - isTupleType(type) ? createTupleType(getTypeArguments(type), type.target.minLength, type.target.hasRestElement, /*readonly*/ false, type.target.associatedNames) : - createArrayType(getIndexedAccessType(type, numberType)); + function getMutableArrayOrTupleType(type) { + return type.flags & 1048576 /* Union */ ? mapType(type, getMutableArrayOrTupleType) : + type.flags & 1 /* Any */ || isMutableArrayOrTuple(getBaseConstraintOfType(type) || type) ? type : + isTupleType(type) ? createTupleType(getTypeArguments(type), type.target.elementFlags, /*readonly*/ false, type.target.labeledElementDeclarations) : + createTupleType([type], [8 /* Variadic */]); } - function getSpreadArgumentType(args, index, argCount, restType, context) { + function getSpreadArgumentType(args, index, argCount, restType, context, checkMode) { if (index >= argCount - 1) { var arg = args[argCount - 1]; if (isSpreadArgument(arg)) { // We are inferring from a spread expression in the last argument position, i.e. both the parameter // and the argument are ...x forms. - return arg.kind === 220 /* SyntheticExpression */ ? - createArrayType(arg.type) : - getArrayifiedType(checkExpressionWithContextualType(arg.expression, restType, context, 0 /* Normal */)); + return getMutableArrayOrTupleType(arg.kind === 224 /* SyntheticExpression */ ? arg.type : + checkExpressionWithContextualType(arg.expression, restType, context, checkMode)); } } var types = []; - var spreadIndex = -1; + var flags = []; + var names = []; for (var i = index; i < argCount; i++) { - var contextualType = getIndexedAccessType(restType, getLiteralType(i - index)); - var argType = checkExpressionWithContextualType(args[i], contextualType, context, 0 /* Normal */); - if (spreadIndex < 0 && isSpreadArgument(args[i])) { - spreadIndex = i - index; + var arg = args[i]; + if (isSpreadArgument(arg)) { + var spreadType = arg.kind === 224 /* SyntheticExpression */ ? arg.type : checkExpression(arg.expression); + if (isArrayLikeType(spreadType)) { + types.push(spreadType); + flags.push(8 /* Variadic */); + } + else { + types.push(checkIteratedTypeOrElementType(33 /* Spread */, spreadType, undefinedType, arg.kind === 217 /* SpreadElement */ ? arg.expression : arg)); + flags.push(4 /* Rest */); + } + } + else { + var contextualType = getIndexedAccessType(restType, getLiteralType(i - index)); + var argType = checkExpressionWithContextualType(arg, contextualType, context, checkMode); + var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */); + types.push(hasPrimitiveContextualType ? getRegularTypeOfLiteralType(argType) : getWidenedLiteralType(argType)); + flags.push(1 /* Required */); + } + if (arg.kind === 224 /* SyntheticExpression */ && arg.tupleNameSource) { + names.push(arg.tupleNameSource); } - var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */); - types.push(hasPrimitiveContextualType ? getRegularTypeOfLiteralType(argType) : getWidenedLiteralType(argType)); } - return spreadIndex < 0 ? - createTupleType(types) : - createTupleType(ts.append(types.slice(0, spreadIndex), getUnionType(types.slice(spreadIndex))), spreadIndex, /*hasRestElement*/ true); + return createTupleType(types, flags, /*readonly*/ false, ts.length(names) === ts.length(types) ? names : undefined); } function checkTypeArguments(signature, typeArgumentNodes, reportErrors, headMessage) { var isJavascript = ts.isInJSFile(signature.declaration); @@ -58029,7 +66264,7 @@ var ts; return undefined; } var thisType = getThisTypeOfSignature(signature); - if (thisType && thisType !== voidType && node.kind !== 197 /* NewExpression */) { + if (thisType && thisType !== voidType && node.kind !== 201 /* NewExpression */) { // If the called expression is not of the form `x.f` or `x["f"]`, then sourceType = voidType // If the signature's 'this' type is voidType, then the check is skipped -- anything is compatible. // If the expression is a new expression, then the check is skipped. @@ -58059,7 +66294,7 @@ var ts; var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length; for (var i = 0; i < argCount; i++) { var arg = args[i]; - if (arg.kind !== 215 /* OmittedExpression */) { + if (arg.kind !== 219 /* OmittedExpression */) { var paramType = getTypeAtPosition(signature, i); var argType = checkExpressionWithContextualType(arg, paramType, /*inferenceContext*/ undefined, checkMode); // If one or more arguments are still excluded (as indicated by CheckMode.SkipContextSensitive), @@ -58074,7 +66309,7 @@ var ts; } } if (restType) { - var spreadType = getSpreadArgumentType(args, argCount, args.length, restType, /*context*/ undefined); + var spreadType = getSpreadArgumentType(args, argCount, args.length, restType, /*context*/ undefined, checkMode); var errorNode = reportErrors ? argCount < args.length ? args[argCount] : node : undefined; if (!checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage, /*containingMessageChain*/ undefined, errorOutputContainer)) { ts.Debug.assert(!reportErrors || !!errorOutputContainer.errors, "rest parameter should have errors when reporting errors"); @@ -58100,54 +66335,64 @@ var ts; * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise. */ function getThisArgumentOfCall(node) { - if (node.kind === 196 /* CallExpression */) { + if (node.kind === 200 /* CallExpression */) { var callee = ts.skipOuterExpressions(node.expression); if (ts.isAccessExpression(callee)) { return callee.expression; } } } - function createSyntheticExpression(parent, type, isSpread) { - var result = ts.createNode(220 /* SyntheticExpression */, parent.pos, parent.end); - result.parent = parent; - result.type = type; - result.isSpread = isSpread || false; + function createSyntheticExpression(parent, type, isSpread, tupleNameSource) { + var result = ts.parseNodeFactory.createSyntheticExpression(type, isSpread, tupleNameSource); + ts.setTextRange(result, parent); + ts.setParent(result, parent); return result; } /** * Returns the effective arguments for an expression that works like a function invocation. */ function getEffectiveCallArguments(node) { - if (node.kind === 198 /* TaggedTemplateExpression */) { + if (node.kind === 202 /* TaggedTemplateExpression */) { var template = node.template; var args_3 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())]; - if (template.kind === 211 /* TemplateExpression */) { + if (template.kind === 215 /* TemplateExpression */) { ts.forEach(template.templateSpans, function (span) { args_3.push(span.expression); }); } return args_3; } - if (node.kind === 157 /* Decorator */) { + if (node.kind === 160 /* Decorator */) { return getEffectiveDecoratorArguments(node); } if (ts.isJsxOpeningLikeElement(node)) { return node.attributes.properties.length > 0 || (ts.isJsxOpeningElement(node) && node.parent.children.length > 0) ? [node.attributes] : ts.emptyArray; } var args = node.arguments || ts.emptyArray; - var length = args.length; - if (length && isSpreadArgument(args[length - 1]) && getSpreadArgumentIndex(args) === length - 1) { - // We have a spread argument in the last position and no other spread arguments. If the type - // of the argument is a tuple type, spread the tuple elements into the argument list. We can - // call checkExpressionCached because spread expressions never have a contextual type. - var spreadArgument_1 = args[length - 1]; - var type = flowLoopCount ? checkExpression(spreadArgument_1.expression) : checkExpressionCached(spreadArgument_1.expression); - if (isTupleType(type)) { - var typeArguments = getTypeArguments(type); - var restIndex_2 = type.target.hasRestElement ? typeArguments.length - 1 : -1; - var syntheticArgs = ts.map(typeArguments, function (t, i) { return createSyntheticExpression(spreadArgument_1, t, /*isSpread*/ i === restIndex_2); }); - return ts.concatenate(args.slice(0, length - 1), syntheticArgs); + var spreadIndex = getSpreadArgumentIndex(args); + if (spreadIndex >= 0) { + // Create synthetic arguments from spreads of tuple types. + var effectiveArgs_1 = args.slice(0, spreadIndex); + var _loop_19 = function (i) { + var arg = args[i]; + // We can call checkExpressionCached because spread expressions never have a contextual type. + var spreadType = arg.kind === 217 /* SpreadElement */ && (flowLoopCount ? checkExpression(arg.expression) : checkExpressionCached(arg.expression)); + if (spreadType && isTupleType(spreadType)) { + ts.forEach(getTypeArguments(spreadType), function (t, i) { + var _a; + var flags = spreadType.target.elementFlags[i]; + var syntheticArg = createSyntheticExpression(arg, flags & 4 /* Rest */ ? createArrayType(t) : t, !!(flags & 12 /* Variable */), (_a = spreadType.target.labeledElementDeclarations) === null || _a === void 0 ? void 0 : _a[i]); + effectiveArgs_1.push(syntheticArg); + }); + } + else { + effectiveArgs_1.push(arg); + } + }; + for (var i = spreadIndex; i < args.length; i++) { + _loop_19(i); } + return effectiveArgs_1; } return args; } @@ -58158,30 +66403,30 @@ var ts; var parent = node.parent; var expr = node.expression; switch (parent.kind) { - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: // For a class decorator, the `target` is the type of the class (e.g. the // "static" or "constructor" side of the class). return [ createSyntheticExpression(expr, getTypeOfSymbol(getSymbolOfNode(parent))) ]; - case 156 /* Parameter */: + case 159 /* Parameter */: // A parameter declaration decorator will have three arguments (see // `ParameterDecorator` in core.d.ts). var func = parent.parent; return [ - createSyntheticExpression(expr, parent.parent.kind === 162 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType), + createSyntheticExpression(expr, parent.parent.kind === 165 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType), createSyntheticExpression(expr, anyType), createSyntheticExpression(expr, numberType) ]; - case 159 /* PropertyDeclaration */: - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 162 /* PropertyDeclaration */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: // A method or accessor declaration decorator will have two or three arguments (see // `PropertyDecorator` and `MethodDecorator` in core.d.ts). If we are emitting decorators // for ES3, we will only pass two arguments. - var hasPropDesc = parent.kind !== 159 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */; + var hasPropDesc = parent.kind !== 162 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */; return [ createSyntheticExpression(expr, getParentTypeOfClassElement(parent)), createSyntheticExpression(expr, getClassElementPropertyKeyType(parent)), @@ -58195,17 +66440,17 @@ var ts; */ function getDecoratorArgumentCount(node, signature) { switch (node.parent.kind) { - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: return 1; - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: return 2; - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: // For ES3 or decorators with only two parameters we supply only two arguments return languageVersion === 0 /* ES3 */ || signature.parameters.length <= 2 ? 2 : 3; - case 156 /* Parameter */: + case 159 /* Parameter */: return 3; default: return ts.Debug.fail(); @@ -58273,7 +66518,8 @@ var ts; if (closestSignature && getMinArgumentCount(closestSignature) > argCount && closestSignature.declaration) { var paramDecl = closestSignature.declaration.parameters[closestSignature.thisParameter ? argCount + 1 : argCount]; if (paramDecl) { - related = ts.createDiagnosticForNode(paramDecl, ts.isBindingPattern(paramDecl.name) ? ts.Diagnostics.An_argument_matching_this_binding_pattern_was_not_provided : ts.Diagnostics.An_argument_for_0_was_not_provided, !paramDecl.name ? argCount : !ts.isBindingPattern(paramDecl.name) ? ts.idText(ts.getFirstIdentifier(paramDecl.name)) : undefined); + related = ts.createDiagnosticForNode(paramDecl, ts.isBindingPattern(paramDecl.name) ? ts.Diagnostics.An_argument_matching_this_binding_pattern_was_not_provided : + ts.isRestParameter(paramDecl) ? ts.Diagnostics.Arguments_for_the_rest_parameter_0_were_not_provided : ts.Diagnostics.An_argument_for_0_was_not_provided, !paramDecl.name ? argCount : !ts.isBindingPattern(paramDecl.name) ? ts.idText(ts.getFirstIdentifier(paramDecl.name)) : undefined); } } if (min < argCount && argCount < max) { @@ -58284,20 +66530,21 @@ var ts; return related ? ts.addRelatedInfo(diagnostic_1, related) : diagnostic_1; } if (hasRestParameter || hasSpreadArgument) { - spanArray = ts.createNodeArray(args); + spanArray = ts.factory.createNodeArray(args); if (hasSpreadArgument && argCount) { var nextArg = ts.elementAt(args, getSpreadArgumentIndex(args) + 1) || undefined; - spanArray = ts.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : Math.min(max, args.length - 1))); + spanArray = ts.factory.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : Math.min(max, args.length - 1))); } } else { - spanArray = ts.createNodeArray(args.slice(max)); + spanArray = ts.factory.createNodeArray(args.slice(max)); } - spanArray.pos = ts.first(spanArray).pos; - spanArray.end = ts.last(spanArray).end; - if (spanArray.end === spanArray.pos) { - spanArray.end++; + var pos = ts.first(spanArray).pos; + var end = ts.last(spanArray).end; + if (end === pos) { + end++; } + ts.setTextRangePosEnd(spanArray, pos, end); var diagnostic = ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), spanArray, error, paramRange, argCount); return related ? ts.addRelatedInfo(diagnostic, related) : diagnostic; } @@ -58330,15 +66577,15 @@ var ts; return ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), typeArguments, ts.Diagnostics.Expected_0_type_arguments_but_got_1, belowArgCount === -Infinity ? aboveArgCount : belowArgCount, argCount); } function resolveCall(node, signatures, candidatesOutArray, checkMode, callChainFlags, fallbackError) { - var isTaggedTemplate = node.kind === 198 /* TaggedTemplateExpression */; - var isDecorator = node.kind === 157 /* Decorator */; + var isTaggedTemplate = node.kind === 202 /* TaggedTemplateExpression */; + var isDecorator = node.kind === 160 /* Decorator */; var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node); - var reportErrors = !candidatesOutArray; + var reportErrors = !candidatesOutArray && produceDiagnostics; var typeArguments; if (!isDecorator) { typeArguments = node.typeArguments; // We already perform checking on the type arguments on the class declaration itself. - if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 102 /* SuperKeyword */) { + if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 105 /* SuperKeyword */) { ts.forEach(typeArguments, checkSourceElement); } } @@ -58393,7 +66640,7 @@ var ts; var result; // If we are in signature help, a trailing comma indicates that we intend to provide another argument, // so we will only accept overloads with arity at least 1 higher than the current number of provided arguments. - var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 196 /* CallExpression */ && node.arguments.hasTrailingComma; + var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 200 /* CallExpression */ && node.arguments.hasTrailingComma; // Section 4.12.1: // if the candidate list contains one or more signatures for which the type of each argument // expression is a subtype of each corresponding parameter type, the return type of the first @@ -58446,7 +66693,7 @@ var ts; var min_3 = Number.MAX_VALUE; var minIndex = 0; var i_1 = 0; - var _loop_17 = function (c) { + var _loop_20 = function (c) { var chain_2 = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); }; var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, chain_2); if (diags_2) { @@ -58464,7 +66711,7 @@ var ts; }; for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) { var c = candidatesForArgumentError_1[_a]; - _loop_17(c); + _loop_20(c); } var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics); ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures"); @@ -58598,7 +66845,7 @@ var ts; } var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max; var parameters = []; - var _loop_18 = function (i) { + var _loop_21 = function (i) { var symbols = ts.mapDefined(candidates, function (s) { return signatureHasRestParameter(s) ? i < s.parameters.length - 1 ? s.parameters[i] : ts.last(s.parameters) : i < s.parameters.length ? s.parameters[i] : undefined; }); @@ -58606,7 +66853,7 @@ var ts; parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); }))); }; for (var i = 0; i < maxNonRestParam; i++) { - _loop_18(i); + _loop_21(i); } var restParameterSymbols = ts.mapDefined(candidates, function (c) { return signatureHasRestParameter(c) ? ts.last(c.parameters) : undefined; }); var flags = 0 /* None */; @@ -58687,7 +66934,7 @@ var ts; return maxParamsIndex; } function resolveCallExpression(node, candidatesOutArray, checkMode) { - if (node.expression.kind === 102 /* SuperKeyword */) { + if (node.expression.kind === 105 /* SuperKeyword */) { var superType = checkSuperExpression(node.expression); if (isTypeAny(superType)) { for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) { @@ -58844,7 +67091,7 @@ var ts; // In the case of a merged class-module or class-interface declaration, // only the class declaration node will have the Abstract flag set. var valueDecl = expressionType.symbol && ts.getClassLikeDeclarationOfSymbol(expressionType.symbol); - if (valueDecl && ts.hasModifier(valueDecl, 128 /* Abstract */)) { + if (valueDecl && ts.hasSyntacticModifier(valueDecl, 128 /* Abstract */)) { error(node, ts.Diagnostics.Cannot_create_an_instance_of_an_abstract_class); return resolveErrorCall(node); } @@ -58907,9 +67154,9 @@ var ts; return true; } var declaration = signature.declaration; - var modifiers = ts.getSelectedModifierFlags(declaration, 24 /* NonPublicAccessibilityModifier */); + var modifiers = ts.getSelectedEffectiveModifierFlags(declaration, 24 /* NonPublicAccessibilityModifier */); // (1) Public constructors and (2) constructor functions are always accessible. - if (!modifiers || declaration.kind !== 162 /* Constructor */) { + if (!modifiers || declaration.kind !== 165 /* Constructor */) { return true; } var declaringClassDeclaration = ts.getClassLikeDeclarationOfSymbol(declaration.parent.symbol); @@ -58933,7 +67180,7 @@ var ts; } return true; } - function invocationErrorDetails(apparentType, kind) { + function invocationErrorDetails(errorTarget, apparentType, kind) { var errorInfo; var isCall = kind === 0 /* Call */; var awaitedType = getAwaitedType(apparentType); @@ -58984,13 +67231,21 @@ var ts; ts.Diagnostics.Type_0_has_no_call_signatures : ts.Diagnostics.Type_0_has_no_construct_signatures, typeToString(apparentType)); } + var headMessage = isCall ? ts.Diagnostics.This_expression_is_not_callable : ts.Diagnostics.This_expression_is_not_constructable; + // Diagnose get accessors incorrectly called as functions + if (ts.isCallExpression(errorTarget.parent) && errorTarget.parent.arguments.length === 0) { + var resolvedSymbol = getNodeLinks(errorTarget).resolvedSymbol; + if (resolvedSymbol && resolvedSymbol.flags & 32768 /* GetAccessor */) { + headMessage = ts.Diagnostics.This_expression_is_not_callable_because_it_is_a_get_accessor_Did_you_mean_to_use_it_without; + } + } return { - messageChain: ts.chainDiagnosticMessages(errorInfo, isCall ? ts.Diagnostics.This_expression_is_not_callable : ts.Diagnostics.This_expression_is_not_constructable), + messageChain: ts.chainDiagnosticMessages(errorInfo, headMessage), relatedMessage: maybeMissingAwait ? ts.Diagnostics.Did_you_forget_to_use_await : undefined, }; } function invocationError(errorTarget, apparentType, kind, relatedInformation) { - var _a = invocationErrorDetails(apparentType, kind), messageChain = _a.messageChain, relatedInfo = _a.relatedMessage; + var _a = invocationErrorDetails(errorTarget, apparentType, kind), messageChain = _a.messageChain, relatedInfo = _a.relatedMessage; var diagnostic = ts.createDiagnosticForNodeFromMessageChain(errorTarget, messageChain); if (relatedInfo) { ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(errorTarget, relatedInfo)); @@ -59040,16 +67295,16 @@ var ts; */ function getDiagnosticHeadMessageForDecoratorResolution(node) { switch (node.parent.kind) { - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression; - case 156 /* Parameter */: + case 159 /* Parameter */: return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression; - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression; - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression; default: return ts.Debug.fail(); @@ -59076,7 +67331,7 @@ var ts; } var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node); if (!callSignatures.length) { - var errorDetails = invocationErrorDetails(apparentType, 0 /* Call */); + var errorDetails = invocationErrorDetails(node.expression, apparentType, 0 /* Call */); var messageChain = ts.chainDiagnosticMessages(errorDetails.messageChain, headMessage); var diag = ts.createDiagnosticForNodeFromMessageChain(node.expression, messageChain); if (errorDetails.relatedMessage) { @@ -59095,7 +67350,7 @@ var ts; // file would probably be preferable. var typeSymbol = exports && getSymbol(exports, JsxNames.Element, 788968 /* Type */); var returnNode = typeSymbol && nodeBuilder.symbolToEntityName(typeSymbol, 788968 /* Type */, node); - var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(125 /* AnyKeyword */)); + var declaration = ts.factory.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.factory.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.factory.createKeywordTypeNode(128 /* AnyKeyword */)); var parameterSymbol = createSymbol(1 /* FunctionScopedVariable */, "props"); parameterSymbol.type = result; return createSignature(declaration, @@ -59140,16 +67395,16 @@ var ts; } function resolveSignature(node, candidatesOutArray, checkMode) { switch (node.kind) { - case 196 /* CallExpression */: + case 200 /* CallExpression */: return resolveCallExpression(node, candidatesOutArray, checkMode); - case 197 /* NewExpression */: + case 201 /* NewExpression */: return resolveNewExpression(node, candidatesOutArray, checkMode); - case 198 /* TaggedTemplateExpression */: + case 202 /* TaggedTemplateExpression */: return resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode); - case 157 /* Decorator */: + case 160 /* Decorator */: return resolveDecorator(node, candidatesOutArray, checkMode); - case 268 /* JsxOpeningElement */: - case 267 /* JsxSelfClosingElement */: + case 272 /* JsxOpeningElement */: + case 271 /* JsxSelfClosingElement */: return resolveJsxOpeningLikeElement(node, candidatesOutArray, checkMode); } throw ts.Debug.assertNever(node, "Branch in 'resolveSignature' should be unreachable."); @@ -59188,6 +67443,7 @@ var ts; * file. */ function isJSConstructor(node) { + var _a; if (!node || !ts.isInJSFile(node)) { return false; } @@ -59200,28 +67456,29 @@ var ts; return true; // If the symbol of the node has members, treat it like a constructor. var symbol = getSymbolOfNode(func); - return !!symbol && ts.hasEntries(symbol.members); + return !!((_a = symbol === null || symbol === void 0 ? void 0 : symbol.members) === null || _a === void 0 ? void 0 : _a.size); } return false; } function mergeJSSymbols(target, source) { + var _a, _b; if (source) { var links = getSymbolLinks(source); - if (!links.inferredClassSymbol || !links.inferredClassSymbol.has("" + getSymbolId(target))) { + if (!links.inferredClassSymbol || !links.inferredClassSymbol.has(getSymbolId(target))) { var inferred = ts.isTransientSymbol(target) ? target : cloneSymbol(target); inferred.exports = inferred.exports || ts.createSymbolTable(); inferred.members = inferred.members || ts.createSymbolTable(); inferred.flags |= source.flags & 32 /* Class */; - if (ts.hasEntries(source.exports)) { + if ((_a = source.exports) === null || _a === void 0 ? void 0 : _a.size) { mergeSymbolTable(inferred.exports, source.exports); } - if (ts.hasEntries(source.members)) { + if ((_b = source.members) === null || _b === void 0 ? void 0 : _b.size) { mergeSymbolTable(inferred.members, source.members); } - (links.inferredClassSymbol || (links.inferredClassSymbol = ts.createMap())).set("" + getSymbolId(inferred), inferred); + (links.inferredClassSymbol || (links.inferredClassSymbol = new ts.Map())).set(getSymbolId(inferred), inferred); return inferred; } - return links.inferredClassSymbol.get("" + getSymbolId(target)); + return links.inferredClassSymbol.get(getSymbolId(target)); } } function getAssignedClassSymbol(decl) { @@ -59238,7 +67495,7 @@ var ts; return false; } var parent = node.parent; - while (parent && parent.kind === 194 /* PropertyAccessExpression */) { + while (parent && parent.kind === 198 /* PropertyAccessExpression */) { parent = parent.parent; } if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 62 /* EqualsToken */) { @@ -59252,6 +67509,7 @@ var ts; * @returns On success, the expression's signature's return type. On failure, anyType. */ function checkCallExpression(node, checkMode) { + var _a; if (!checkGrammarTypeArguments(node, node.typeArguments)) checkGrammarArguments(node.arguments); var signature = getResolvedSignature(node, /*candidatesOutArray*/ undefined, checkMode); @@ -59260,15 +67518,16 @@ var ts; // returns a function type. We defer checking and return nonInferrableType. return nonInferrableType; } - if (node.expression.kind === 102 /* SuperKeyword */) { + checkDeprecatedSignature(signature, node); + if (node.expression.kind === 105 /* SuperKeyword */) { return voidType; } - if (node.kind === 197 /* NewExpression */) { + if (node.kind === 201 /* NewExpression */) { var declaration = signature.declaration; if (declaration && - declaration.kind !== 162 /* Constructor */ && - declaration.kind !== 166 /* ConstructSignature */ && - declaration.kind !== 171 /* ConstructorType */ && + declaration.kind !== 165 /* Constructor */ && + declaration.kind !== 169 /* ConstructSignature */ && + declaration.kind !== 174 /* ConstructorType */ && !ts.isJSDocConstructSignature(declaration) && !isJSConstructor(declaration)) { // When resolved signature is a call signature (and not a construct signature) the result type is any @@ -59288,7 +67547,7 @@ var ts; if (returnType.flags & 12288 /* ESSymbolLike */ && isSymbolOrSymbolForCall(node)) { return getESSymbolLikeTypeForNode(ts.walkUpParenthesizedExpressions(node.parent)); } - if (node.kind === 196 /* CallExpression */ && node.parent.kind === 226 /* ExpressionStatement */ && + if (node.kind === 200 /* CallExpression */ && node.parent.kind === 230 /* ExpressionStatement */ && returnType.flags & 16384 /* Void */ && getTypePredicateOfSignature(signature)) { if (!ts.isDottedName(node.expression)) { error(node.expression, ts.Diagnostics.Assertions_require_the_call_target_to_be_an_identifier_or_qualified_name); @@ -59302,7 +67561,7 @@ var ts; var decl = ts.getDeclarationOfExpando(node); if (decl) { var jsSymbol = getSymbolOfNode(decl); - if (jsSymbol && ts.hasEntries(jsSymbol.exports)) { + if ((_a = jsSymbol === null || jsSymbol === void 0 ? void 0 : jsSymbol.exports) === null || _a === void 0 ? void 0 : _a.size) { var jsAssignmentType = createAnonymousType(jsSymbol, jsSymbol.exports, ts.emptyArray, ts.emptyArray, undefined, undefined); jsAssignmentType.objectFlags |= 16384 /* JSLiteral */; return getIntersectionType([returnType, jsAssignmentType]); @@ -59311,6 +67570,35 @@ var ts; } return returnType; } + function checkDeprecatedSignature(signature, node) { + if (signature.declaration && signature.declaration.flags & 134217728 /* Deprecated */) { + var suggestionNode = getDeprecatedSuggestionNode(node); + errorOrSuggestion(/*isError*/ false, suggestionNode, ts.Diagnostics._0_is_deprecated, signatureToString(signature)); + } + } + function getDeprecatedSuggestionNode(node) { + node = ts.skipParentheses(node); + switch (node.kind) { + case 200 /* CallExpression */: + case 160 /* Decorator */: + case 201 /* NewExpression */: + return getDeprecatedSuggestionNode(node.expression); + case 202 /* TaggedTemplateExpression */: + return getDeprecatedSuggestionNode(node.tag); + case 272 /* JsxOpeningElement */: + case 271 /* JsxSelfClosingElement */: + return getDeprecatedSuggestionNode(node.tagName); + case 199 /* ElementAccessExpression */: + return node.argumentExpression; + case 198 /* PropertyAccessExpression */: + return node.name; + case 172 /* TypeReference */: + var typeReference = node; + return ts.isQualifiedName(typeReference.typeName) ? typeReference.typeName.right : typeReference; + default: + return node; + } + } function isSymbolOrSymbolForCall(node) { if (!ts.isCallExpression(node)) return false; @@ -59395,9 +67683,9 @@ var ts; return false; } var targetDeclarationKind = resolvedRequire.flags & 16 /* Function */ - ? 244 /* FunctionDeclaration */ + ? 248 /* FunctionDeclaration */ : resolvedRequire.flags & 3 /* Variable */ - ? 242 /* VariableDeclaration */ + ? 246 /* VariableDeclaration */ : 0 /* Unknown */; if (targetDeclarationKind !== 0 /* Unknown */) { var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind); @@ -59410,9 +67698,11 @@ var ts; if (!checkGrammarTaggedTemplateChain(node)) checkGrammarTypeArguments(node, node.typeArguments); if (languageVersion < 2 /* ES2015 */) { - checkExternalEmitHelpers(node, 131072 /* MakeTemplateObject */); + checkExternalEmitHelpers(node, 524288 /* MakeTemplateObject */); } - return getReturnTypeOfSignature(getResolvedSignature(node)); + var signature = getResolvedSignature(node); + checkDeprecatedSignature(signature, node); + return getReturnTypeOfSignature(signature); } function checkAssertion(node) { return checkAssertionWorker(node, node.type, node.expression); @@ -59423,20 +67713,20 @@ var ts; case 14 /* NoSubstitutionTemplateLiteral */: case 8 /* NumericLiteral */: case 9 /* BigIntLiteral */: - case 106 /* TrueKeyword */: - case 91 /* FalseKeyword */: - case 192 /* ArrayLiteralExpression */: - case 193 /* ObjectLiteralExpression */: + case 109 /* TrueKeyword */: + case 94 /* FalseKeyword */: + case 196 /* ArrayLiteralExpression */: + case 197 /* ObjectLiteralExpression */: return true; - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return isValidConstAssertionArgument(node.expression); - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: var op = node.operator; var arg = node.operand; return op === 40 /* MinusToken */ && (arg.kind === 8 /* NumericLiteral */ || arg.kind === 9 /* BigIntLiteral */) || op === 39 /* PlusToken */ && arg.kind === 8 /* NumericLiteral */; - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: var expr = node.expression; if (ts.isIdentifier(expr)) { var symbol = getSymbolAtLocation(expr); @@ -59478,10 +67768,10 @@ var ts; } function checkMetaProperty(node) { checkGrammarMetaProperty(node); - if (node.keywordToken === 99 /* NewKeyword */) { + if (node.keywordToken === 102 /* NewKeyword */) { return checkNewTargetMetaProperty(node); } - if (node.keywordToken === 96 /* ImportKeyword */) { + if (node.keywordToken === 99 /* ImportKeyword */) { return checkImportMetaProperty(node); } return ts.Debug.assertNever(node.keywordToken); @@ -59492,7 +67782,7 @@ var ts; error(node, ts.Diagnostics.Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constructor, "new.target"); return errorType; } - else if (container.kind === 162 /* Constructor */) { + else if (container.kind === 165 /* Constructor */) { var symbol = getSymbolOfNode(container.parent); return getTypeOfSymbol(symbol); } @@ -59520,20 +67810,42 @@ var ts; } return type; } - function getParameterNameAtPosition(signature, pos) { + function getTupleElementLabel(d) { + ts.Debug.assert(ts.isIdentifier(d.name)); // Parameter declarations could be binding patterns, but we only allow identifier names + return d.name.escapedText; + } + function getParameterNameAtPosition(signature, pos, overrideRestType) { var paramCount = signature.parameters.length - (signatureHasRestParameter(signature) ? 1 : 0); if (pos < paramCount) { return signature.parameters[pos].escapedName; } var restParameter = signature.parameters[paramCount] || unknownSymbol; - var restType = getTypeOfSymbol(restParameter); + var restType = overrideRestType || getTypeOfSymbol(restParameter); if (isTupleType(restType)) { - var associatedNames = restType.target.associatedNames; + var associatedNames = restType.target.labeledElementDeclarations; var index = pos - paramCount; - return associatedNames && associatedNames[index] || restParameter.escapedName + "_" + index; + return associatedNames && getTupleElementLabel(associatedNames[index]) || restParameter.escapedName + "_" + index; } return restParameter.escapedName; } + function isValidDeclarationForTupleLabel(d) { + return d.kind === 191 /* NamedTupleMember */ || (ts.isParameter(d) && d.name && ts.isIdentifier(d.name)); + } + function getNameableDeclarationAtPosition(signature, pos) { + var paramCount = signature.parameters.length - (signatureHasRestParameter(signature) ? 1 : 0); + if (pos < paramCount) { + var decl = signature.parameters[pos].valueDeclaration; + return decl && isValidDeclarationForTupleLabel(decl) ? decl : undefined; + } + var restParameter = signature.parameters[paramCount] || unknownSymbol; + var restType = getTypeOfSymbol(restParameter); + if (isTupleType(restType)) { + var associatedNames = restType.target.labeledElementDeclarations; + var index = pos - paramCount; + return associatedNames && associatedNames[index]; + } + return restParameter.valueDeclaration && isValidDeclarationForTupleLabel(restParameter.valueDeclaration) ? restParameter.valueDeclaration : undefined; + } function getTypeAtPosition(signature, pos) { return tryGetTypeAtPosition(signature, pos) || anyType; } @@ -59548,39 +67860,44 @@ var ts; // otherwise would return the type 'undefined'). var restType = getTypeOfSymbol(signature.parameters[paramCount]); var index = pos - paramCount; - if (!isTupleType(restType) || restType.target.hasRestElement || index < getTypeArguments(restType).length) { + if (!isTupleType(restType) || restType.target.hasRestElement || index < restType.target.fixedLength) { return getIndexedAccessType(restType, getLiteralType(index)); } } return undefined; } function getRestTypeAtPosition(source, pos) { - var paramCount = getParameterCount(source); + var parameterCount = getParameterCount(source); + var minArgumentCount = getMinArgumentCount(source); var restType = getEffectiveRestType(source); - var nonRestCount = paramCount - (restType ? 1 : 0); - if (restType && pos === nonRestCount) { - return restType; + if (restType && pos >= parameterCount - 1) { + return pos === parameterCount - 1 ? restType : createArrayType(getIndexedAccessType(restType, numberType)); } var types = []; + var flags = []; var names = []; - for (var i = pos; i < nonRestCount; i++) { - types.push(getTypeAtPosition(source, i)); - names.push(getParameterNameAtPosition(source, i)); + for (var i = pos; i < parameterCount; i++) { + if (!restType || i < parameterCount - 1) { + types.push(getTypeAtPosition(source, i)); + flags.push(i < minArgumentCount ? 1 /* Required */ : 2 /* Optional */); + } + else { + types.push(restType); + flags.push(8 /* Variadic */); + } + var name = getNameableDeclarationAtPosition(source, i); + if (name) { + names.push(name); + } } - if (restType) { - types.push(getIndexedAccessType(restType, numberType)); - names.push(getParameterNameAtPosition(source, nonRestCount)); - } - var minArgumentCount = getMinArgumentCount(source); - var minLength = minArgumentCount < pos ? 0 : minArgumentCount - pos; - return createTupleType(types, minLength, !!restType, /*readonly*/ false, names); + return createTupleType(types, flags, /*readonly*/ false, ts.length(names) === ts.length(types) ? names : undefined); } function getParameterCount(signature) { var length = signature.parameters.length; if (signatureHasRestParameter(signature)) { var restType = getTypeOfSymbol(signature.parameters[length - 1]); if (isTupleType(restType)) { - return length + getTypeArguments(restType).length - 1; + return length + restType.target.fixedLength - (restType.target.hasRestElement ? 0 : 1); } } return length; @@ -59589,9 +67906,10 @@ var ts; if (signatureHasRestParameter(signature)) { var restType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]); if (isTupleType(restType)) { - var minLength = restType.target.minLength; - if (minLength > 0) { - return signature.parameters.length - 1 + minLength; + var firstOptionalIndex = ts.findIndex(restType.target.elementFlags, function (f) { return !(f & 1 /* Required */); }); + var requiredCount = firstOptionalIndex < 0 ? restType.target.fixedLength : firstOptionalIndex; + if (requiredCount > 0) { + return signature.parameters.length - 1 + requiredCount; } } } @@ -59610,7 +67928,12 @@ var ts; function getEffectiveRestType(signature) { if (signatureHasRestParameter(signature)) { var restType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]); - return isTupleType(restType) ? getRestArrayTypeOfTupleType(restType) : restType; + if (!isTupleType(restType)) { + return restType; + } + if (restType.target.hasRestElement) { + return sliceTupleType(restType, restType.target.fixedLength); + } } return undefined; } @@ -59689,7 +68012,7 @@ var ts; if (!links.type) { var declaration = parameter.valueDeclaration; links.type = type || getWidenedTypeForVariableLikeDeclaration(declaration, /*includeOptionality*/ true); - if (declaration.name.kind !== 75 /* Identifier */) { + if (declaration.name.kind !== 78 /* Identifier */) { // if inference didn't come up with anything but unknown, fall back to the binding pattern if present. if (links.type === unknownType) { links.type = getTypeFromBindingPattern(declaration.name); @@ -59704,7 +68027,7 @@ var ts; for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) { var element = _a[_i]; if (!ts.isOmittedExpression(element)) { - if (element.name.kind === 75 /* Identifier */) { + if (element.name.kind === 78 /* Identifier */) { getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element); } else { @@ -59759,7 +68082,7 @@ var ts; var yieldType; var nextType; var fallbackReturnType = voidType; - if (func.body.kind !== 223 /* Block */) { // Async or normal arrow function + if (func.body.kind !== 227 /* Block */) { // Async or normal arrow function returnType = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */); if (isAsync) { // From within an async function you can return either a non-promise value or a promise. Any @@ -59944,13 +68267,17 @@ var ts; return links.isExhaustive !== undefined ? links.isExhaustive : (links.isExhaustive = computeExhaustiveSwitchStatement(node)); } function computeExhaustiveSwitchStatement(node) { - if (node.expression.kind === 204 /* TypeOfExpression */) { + if (node.expression.kind === 208 /* TypeOfExpression */) { var operandType = getTypeOfExpression(node.expression.expression); var witnesses = getSwitchClauseTypeOfWitnesses(node, /*retainDefault*/ false); // notEqualFacts states that the type of the switched value is not equal to every type in the switch. var notEqualFacts_1 = getFactsFromTypeofSwitch(0, 0, witnesses, /*hasDefault*/ true); - var type_3 = getBaseConstraintOfType(operandType) || operandType; - return !!(filterType(type_3, function (t) { return (getTypeFacts(t) & notEqualFacts_1) === notEqualFacts_1; }).flags & 131072 /* Never */); + var type_4 = getBaseConstraintOfType(operandType) || operandType; + // Take any/unknown as a special condition. Or maybe we could change `type` to a union containing all primitive types. + if (type_4.flags & 3 /* AnyOrUnknown */) { + return (556800 /* AllTypeofNE */ & notEqualFacts_1) === 556800 /* AllTypeofNE */; + } + return !!(filterType(type_4, function (t) { return (getTypeFacts(t) & notEqualFacts_1) === notEqualFacts_1; }).flags & 131072 /* Never */); } var type = getTypeOfExpression(node.expression); if (!isLiteralType(type)) { @@ -60003,11 +68330,11 @@ var ts; } function mayReturnNever(func) { switch (func.kind) { - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: return true; - case 161 /* MethodDeclaration */: - return func.parent.kind === 193 /* ObjectLiteralExpression */; + case 164 /* MethodDeclaration */: + return func.parent.kind === 197 /* ObjectLiteralExpression */; default: return false; } @@ -60033,7 +68360,7 @@ var ts; } // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check. // also if HasImplicitReturn flag is not set this means that all codepaths in function body end with return or throw - if (func.kind === 160 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 223 /* Block */ || !functionHasImplicitReturn(func)) { + if (func.kind === 163 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 227 /* Block */ || !functionHasImplicitReturn(func)) { return; } var hasExplicitReturn = func.flags & 512 /* HasExplicitReturn */; @@ -60066,7 +68393,7 @@ var ts; } } function checkFunctionExpressionOrObjectLiteralMethod(node, checkMode) { - ts.Debug.assert(node.kind !== 161 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node)); + ts.Debug.assert(node.kind !== 164 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node)); checkNodeDeferred(node); // The identityMapper object is used to indicate that function expressions are wildcards if (checkMode && checkMode & 4 /* SkipContextSensitive */ && isContextSensitive(node)) { @@ -60090,7 +68417,7 @@ var ts; } // Grammar checking var hasGrammarError = checkGrammarFunctionLikeDeclaration(node); - if (!hasGrammarError && node.kind === 201 /* FunctionExpression */) { + if (!hasGrammarError && node.kind === 205 /* FunctionExpression */) { checkGrammarForGenerator(node); } contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode); @@ -60136,7 +68463,7 @@ var ts; } } function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) { - ts.Debug.assert(node.kind !== 161 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node)); + ts.Debug.assert(node.kind !== 164 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node)); var functionFlags = ts.getFunctionFlags(node); var returnType = getReturnTypeFromAnnotation(node); checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType); @@ -60149,7 +68476,7 @@ var ts; // checkFunctionExpressionBodies). So it must be done now. getReturnTypeOfSignature(getSignatureFromDeclaration(node)); } - if (node.body.kind === 223 /* Block */) { + if (node.body.kind === 227 /* Block */) { checkSourceElement(node.body); } else { @@ -60236,10 +68563,10 @@ var ts; // Allow assignments to readonly properties within constructors of the same class declaration. if (symbol.flags & 4 /* Property */ && ts.isAccessExpression(expr) && - expr.expression.kind === 104 /* ThisKeyword */) { + expr.expression.kind === 107 /* ThisKeyword */) { // Look for if this is the constructor for the class that `symbol` is a property of. var ctor = ts.getContainingFunction(expr); - if (!(ctor && ctor.kind === 162 /* Constructor */)) { + if (!(ctor && (ctor.kind === 165 /* Constructor */ || isJSConstructor(ctor)))) { return true; } if (symbol.valueDeclaration) { @@ -60260,11 +68587,11 @@ var ts; if (ts.isAccessExpression(expr)) { // references through namespace import should be readonly var node = ts.skipParentheses(expr.expression); - if (node.kind === 75 /* Identifier */) { + if (node.kind === 78 /* Identifier */) { var symbol_2 = getNodeLinks(node).resolvedSymbol; if (symbol_2.flags & 2097152 /* Alias */) { var declaration = getDeclarationOfAliasSymbol(symbol_2); - return !!declaration && declaration.kind === 256 /* NamespaceImport */; + return !!declaration && declaration.kind === 260 /* NamespaceImport */; } } } @@ -60273,7 +68600,7 @@ var ts; function checkReferenceExpression(expr, invalidReferenceMessage, invalidOptionalChainMessage) { // References are combinations of identifiers, parentheses, and property accesses. var node = ts.skipOuterExpressions(expr, 6 /* Assertions */ | 1 /* Parentheses */); - if (node.kind !== 75 /* Identifier */ && !ts.isAccessExpression(node)) { + if (node.kind !== 78 /* Identifier */ && !ts.isAccessExpression(node)) { error(expr, invalidReferenceMessage); return false; } @@ -60290,17 +68617,25 @@ var ts; error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_must_be_a_property_reference); return booleanType; } - // eslint-disable-next-line - if (expr.kind === 194 /* PropertyAccessExpression */ && ts.isPrivateIdentifier(expr.name)) { + if (ts.isPropertyAccessExpression(expr) && ts.isPrivateIdentifier(expr.name)) { error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_cannot_be_a_private_identifier); } var links = getNodeLinks(expr); var symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol); - if (symbol && isReadonlySymbol(symbol)) { - error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_cannot_be_a_read_only_property); + if (symbol) { + if (isReadonlySymbol(symbol)) { + error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_cannot_be_a_read_only_property); + } + checkDeleteExpressionMustBeOptional(expr, getTypeOfSymbol(symbol)); } return booleanType; } + function checkDeleteExpressionMustBeOptional(expr, type) { + var AnyOrUnknownOrNeverFlags = 3 /* AnyOrUnknown */ | 131072 /* Never */; + if (strictNullChecks && !(type.flags & AnyOrUnknownOrNeverFlags) && !(getFalsyFlags(type) & 32768 /* Undefined */)) { + error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_must_be_optional); + } + } function checkTypeOfExpression(node) { checkExpression(node.expression); return typeofType; @@ -60309,15 +68644,11 @@ var ts; checkExpression(node.expression); return undefinedWideningType; } - function isTopLevelAwait(node) { - var container = ts.getThisContainer(node, /*includeArrowFunctions*/ true); - return ts.isSourceFile(container); - } function checkAwaitExpression(node) { // Grammar checking if (produceDiagnostics) { if (!(node.flags & 32768 /* AwaitContext */)) { - if (isTopLevelAwait(node)) { + if (ts.isInTopLevelContext(node)) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { var span = void 0; @@ -60341,7 +68672,7 @@ var ts; var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos); var diagnostic = ts.createFileDiagnostic(sourceFile, span.start, span.length, ts.Diagnostics.await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules); var func = ts.getContainingFunction(node); - if (func && func.kind !== 162 /* Constructor */ && (ts.getFunctionFlags(func) & 2 /* Async */) === 0) { + if (func && func.kind !== 165 /* Constructor */ && (ts.getFunctionFlags(func) & 2 /* Async */) === 0) { var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async); ts.addRelatedInfo(diagnostic, relatedInfo); } @@ -60510,7 +68841,8 @@ var ts; // The in operator requires the left operand to be of type Any, the String primitive type, or the Number primitive type, // and the right operand to be of type Any, an object type, or a type parameter type. // The result is always of the Boolean primitive type. - if (!(isTypeComparableTo(leftType, stringType) || isTypeAssignableToKind(leftType, 296 /* NumberLike */ | 12288 /* ESSymbolLike */))) { + if (!(allTypesAssignableToKind(leftType, 132 /* StringLike */ | 296 /* NumberLike */ | 12288 /* ESSymbolLike */) || + isTypeAssignableToKind(leftType, 4194304 /* Index */ | 262144 /* TypeParameter */))) { error(left, ts.Diagnostics.The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol); } if (!allTypesAssignableToKind(rightType, 67108864 /* NonPrimitive */ | 58982400 /* InstantiableNonPrimitive */)) { @@ -60533,7 +68865,7 @@ var ts; if (rightIsThis === void 0) { rightIsThis = false; } var properties = node.properties; var property = properties[propertyIndex]; - if (property.kind === 281 /* PropertyAssignment */ || property.kind === 282 /* ShorthandPropertyAssignment */) { + if (property.kind === 285 /* PropertyAssignment */ || property.kind === 286 /* ShorthandPropertyAssignment */) { var name = property.name; var exprType = getLiteralTypeFromPropertyName(name); if (isTypeUsableAsPropertyName(exprType)) { @@ -60546,9 +68878,9 @@ var ts; } var elementType = getIndexedAccessType(objectLiteralType, exprType, name); var type = getFlowTypeOfDestructuring(property, elementType); - return checkDestructuringAssignment(property.kind === 282 /* ShorthandPropertyAssignment */ ? property : property.initializer, type); + return checkDestructuringAssignment(property.kind === 286 /* ShorthandPropertyAssignment */ ? property : property.initializer, type); } - else if (property.kind === 283 /* SpreadAssignment */) { + else if (property.kind === 287 /* SpreadAssignment */) { if (propertyIndex < properties.length - 1) { error(property, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern); } @@ -60591,8 +68923,8 @@ var ts; function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, checkMode) { var elements = node.elements; var element = elements[elementIndex]; - if (element.kind !== 215 /* OmittedExpression */) { - if (element.kind !== 213 /* SpreadElement */) { + if (element.kind !== 219 /* OmittedExpression */) { + if (element.kind !== 217 /* SpreadElement */) { var indexType = getLiteralType(elementIndex); if (isArrayLikeType(sourceType)) { // We create a synthetic expression so that getIndexedAccessType doesn't get confused @@ -60610,7 +68942,7 @@ var ts; } else { var restExpression = element.expression; - if (restExpression.kind === 209 /* BinaryExpression */ && restExpression.operatorToken.kind === 62 /* EqualsToken */) { + if (restExpression.kind === 213 /* BinaryExpression */ && restExpression.operatorToken.kind === 62 /* EqualsToken */) { error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer); } else { @@ -60626,7 +68958,7 @@ var ts; } function checkDestructuringAssignment(exprOrAssignment, sourceType, checkMode, rightIsThis) { var target; - if (exprOrAssignment.kind === 282 /* ShorthandPropertyAssignment */) { + if (exprOrAssignment.kind === 286 /* ShorthandPropertyAssignment */) { var prop = exprOrAssignment; if (prop.objectAssignmentInitializer) { // In strict null checking mode, if a default value of a non-undefined type is specified, remove @@ -60642,31 +68974,31 @@ var ts; else { target = exprOrAssignment; } - if (target.kind === 209 /* BinaryExpression */ && target.operatorToken.kind === 62 /* EqualsToken */) { + if (target.kind === 213 /* BinaryExpression */ && target.operatorToken.kind === 62 /* EqualsToken */) { checkBinaryExpression(target, checkMode); target = target.left; } - if (target.kind === 193 /* ObjectLiteralExpression */) { + if (target.kind === 197 /* ObjectLiteralExpression */) { return checkObjectLiteralAssignment(target, sourceType, rightIsThis); } - if (target.kind === 192 /* ArrayLiteralExpression */) { + if (target.kind === 196 /* ArrayLiteralExpression */) { return checkArrayLiteralAssignment(target, sourceType, checkMode); } return checkReferenceAssignment(target, sourceType, checkMode); } function checkReferenceAssignment(target, sourceType, checkMode) { var targetType = checkExpression(target, checkMode); - var error = target.parent.kind === 283 /* SpreadAssignment */ ? + var error = target.parent.kind === 287 /* SpreadAssignment */ ? ts.Diagnostics.The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access : ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access; - var optionalError = target.parent.kind === 283 /* SpreadAssignment */ ? + var optionalError = target.parent.kind === 287 /* SpreadAssignment */ ? ts.Diagnostics.The_target_of_an_object_rest_assignment_may_not_be_an_optional_property_access : ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_may_not_be_an_optional_property_access; if (checkReferenceExpression(target, error, optionalError)) { checkTypeAssignableToAndOptionallyElaborate(sourceType, targetType, target, target); } if (ts.isPrivateIdentifierPropertyAccessExpression(target)) { - checkExternalEmitHelpers(target.parent, 524288 /* ClassPrivateFieldSet */); + checkExternalEmitHelpers(target.parent, 2097152 /* ClassPrivateFieldSet */); } return sourceType; } @@ -60681,39 +69013,39 @@ var ts; function isSideEffectFree(node) { node = ts.skipParentheses(node); switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: case 10 /* StringLiteral */: case 13 /* RegularExpressionLiteral */: - case 198 /* TaggedTemplateExpression */: - case 211 /* TemplateExpression */: + case 202 /* TaggedTemplateExpression */: + case 215 /* TemplateExpression */: case 14 /* NoSubstitutionTemplateLiteral */: case 8 /* NumericLiteral */: case 9 /* BigIntLiteral */: - case 106 /* TrueKeyword */: - case 91 /* FalseKeyword */: - case 100 /* NullKeyword */: - case 146 /* UndefinedKeyword */: - case 201 /* FunctionExpression */: - case 214 /* ClassExpression */: - case 202 /* ArrowFunction */: - case 192 /* ArrayLiteralExpression */: - case 193 /* ObjectLiteralExpression */: - case 204 /* TypeOfExpression */: - case 218 /* NonNullExpression */: - case 267 /* JsxSelfClosingElement */: - case 266 /* JsxElement */: + case 109 /* TrueKeyword */: + case 94 /* FalseKeyword */: + case 103 /* NullKeyword */: + case 149 /* UndefinedKeyword */: + case 205 /* FunctionExpression */: + case 218 /* ClassExpression */: + case 206 /* ArrowFunction */: + case 196 /* ArrayLiteralExpression */: + case 197 /* ObjectLiteralExpression */: + case 208 /* TypeOfExpression */: + case 222 /* NonNullExpression */: + case 271 /* JsxSelfClosingElement */: + case 270 /* JsxElement */: return true; - case 210 /* ConditionalExpression */: + case 214 /* ConditionalExpression */: return isSideEffectFree(node.whenTrue) && isSideEffectFree(node.whenFalse); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: if (ts.isAssignmentOperator(node.operatorToken.kind)) { return false; } return isSideEffectFree(node.left) && isSideEffectFree(node.right); - case 207 /* PrefixUnaryExpression */: - case 208 /* PostfixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: // Unary operators ~, !, +, and - have no side effects. // The rest do. switch (node.operator) { @@ -60725,9 +69057,9 @@ var ts; } return false; // Some forms listed here for clarity - case 205 /* VoidExpression */: // Explicit opt-out - case 199 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings - case 217 /* AsExpression */: // Not SEF, but can produce useful type warnings + case 209 /* VoidExpression */: // Explicit opt-out + case 203 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings + case 221 /* AsExpression */: // Not SEF, but can produce useful type warnings default: return false; } @@ -60759,8 +69091,8 @@ var ts; } checkGrammarNullishCoalesceWithLogicalExpression(node); var operator = node.operatorToken.kind; - if (operator === 62 /* EqualsToken */ && (node.left.kind === 193 /* ObjectLiteralExpression */ || node.left.kind === 192 /* ArrayLiteralExpression */)) { - finishInvocation(checkDestructuringAssignment(node.left, checkExpression(node.right, checkMode), checkMode, node.right.kind === 104 /* ThisKeyword */)); + if (operator === 62 /* EqualsToken */ && (node.left.kind === 197 /* ObjectLiteralExpression */ || node.left.kind === 196 /* ArrayLiteralExpression */)) { + finishInvocation(checkDestructuringAssignment(node.left, checkExpression(node.right, checkMode), checkMode, node.right.kind === 107 /* ThisKeyword */)); break; } advanceState(1 /* CheckRight */); @@ -60826,8 +69158,8 @@ var ts; // expression-wide checks and does not use a work stack to fold nested binary expressions into the same callstack frame function checkBinaryLikeExpression(left, operatorToken, right, checkMode, errorNode) { var operator = operatorToken.kind; - if (operator === 62 /* EqualsToken */ && (left.kind === 193 /* ObjectLiteralExpression */ || left.kind === 192 /* ArrayLiteralExpression */)) { - return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 104 /* ThisKeyword */); + if (operator === 62 /* EqualsToken */ && (left.kind === 197 /* ObjectLiteralExpression */ || left.kind === 196 /* ArrayLiteralExpression */)) { + return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 107 /* ThisKeyword */); } var leftType; if (operator === 55 /* AmpersandAmpersandToken */ || operator === 56 /* BarBarToken */ || operator === 60 /* QuestionQuestionToken */) { @@ -60861,7 +69193,7 @@ var ts; case 51 /* BarToken */: case 73 /* BarEqualsToken */: case 52 /* CaretToken */: - case 74 /* CaretEqualsToken */: + case 77 /* CaretEqualsToken */: case 50 /* AmpersandToken */: case 72 /* AmpersandEqualsToken */: if (leftType === silentNeverType || rightType === silentNeverType) { @@ -60895,6 +69227,12 @@ var ts; case 49 /* GreaterThanGreaterThanGreaterThanToken */: case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */: reportOperatorError(); + break; + case 42 /* AsteriskAsteriskToken */: + case 66 /* AsteriskAsteriskEqualsToken */: + if (languageVersion < 3 /* ES2016 */) { + error(errorNode, ts.Diagnostics.Exponentiation_cannot_be_performed_on_bigint_values_unless_the_target_option_is_set_to_es2016_or_later); + } } resultType_1 = bigintType; } @@ -60974,22 +69312,40 @@ var ts; case 37 /* ExclamationEqualsEqualsToken */: reportOperatorErrorUnless(function (left, right) { return isTypeEqualityComparableTo(left, right) || isTypeEqualityComparableTo(right, left); }); return booleanType; - case 98 /* InstanceOfKeyword */: + case 101 /* InstanceOfKeyword */: return checkInstanceOfExpression(left, right, leftType, rightType); - case 97 /* InKeyword */: + case 100 /* InKeyword */: return checkInExpression(left, right, leftType, rightType); case 55 /* AmpersandAmpersandToken */: - return getTypeFacts(leftType) & 4194304 /* Truthy */ ? + case 75 /* AmpersandAmpersandEqualsToken */: { + var resultType_2 = getTypeFacts(leftType) & 4194304 /* Truthy */ ? getUnionType([extractDefinitelyFalsyTypes(strictNullChecks ? leftType : getBaseTypeOfLiteralType(rightType)), rightType]) : leftType; + if (operator === 75 /* AmpersandAmpersandEqualsToken */) { + checkAssignmentOperator(rightType); + } + return resultType_2; + } case 56 /* BarBarToken */: - return getTypeFacts(leftType) & 8388608 /* Falsy */ ? + case 74 /* BarBarEqualsToken */: { + var resultType_3 = getTypeFacts(leftType) & 8388608 /* Falsy */ ? getUnionType([removeDefinitelyFalsyTypes(leftType), rightType], 2 /* Subtype */) : leftType; + if (operator === 74 /* BarBarEqualsToken */) { + checkAssignmentOperator(rightType); + } + return resultType_3; + } case 60 /* QuestionQuestionToken */: - return getTypeFacts(leftType) & 262144 /* EQUndefinedOrNull */ ? + case 76 /* QuestionQuestionEqualsToken */: { + var resultType_4 = getTypeFacts(leftType) & 262144 /* EQUndefinedOrNull */ ? getUnionType([getNonNullableType(leftType), rightType], 2 /* Subtype */) : leftType; + if (operator === 76 /* QuestionQuestionEqualsToken */) { + checkAssignmentOperator(rightType); + } + return resultType_4; + } case 62 /* EqualsToken */: var declKind = ts.isBinaryExpression(left.parent) ? ts.getAssignmentDeclarationKind(left.parent) : 0 /* None */; checkAssignmentDeclaration(declKind, rightType); @@ -61011,7 +69367,16 @@ var ts; } case 27 /* CommaToken */: if (!compilerOptions.allowUnreachableCode && isSideEffectFree(left) && !isEvalNode(right)) { - error(left, ts.Diagnostics.Left_side_of_comma_operator_is_unused_and_has_no_side_effects); + var sf = ts.getSourceFileOfNode(left); + var sourceText = sf.text; + var start_3 = ts.skipTrivia(sourceText, left.pos); + var isInDiag2657 = sf.parseDiagnostics.some(function (diag) { + if (diag.code !== ts.Diagnostics.JSX_expressions_must_have_one_parent_element.code) + return false; + return ts.textSpanContainsPosition(diag, start_3); + }); + if (!isInDiag2657) + error(left, ts.Diagnostics.Left_side_of_comma_operator_is_unused_and_has_no_side_effects); } return rightType; default: @@ -61037,7 +69402,7 @@ var ts; } } function isEvalNode(node) { - return node.kind === 75 /* Identifier */ && node.escapedText === "eval"; + return node.kind === 78 /* Identifier */ && node.escapedText === "eval"; } // Return true if there was no error, false if there was an error. function checkForDisallowedESSymbolOperand(operator) { @@ -61056,7 +69421,7 @@ var ts; case 73 /* BarEqualsToken */: return 56 /* BarBarToken */; case 52 /* CaretToken */: - case 74 /* CaretEqualsToken */: + case 77 /* CaretEqualsToken */: return 37 /* ExclamationEqualsEqualsToken */; case 50 /* AmpersandToken */: case 72 /* AmpersandEqualsToken */: @@ -61081,6 +69446,7 @@ var ts; } } function isAssignmentDeclaration(kind) { + var _a; switch (kind) { case 2 /* ModuleExports */: return true; @@ -61091,8 +69457,8 @@ var ts; case 4 /* ThisProperty */: var symbol = getSymbolOfNode(left); var init = ts.getAssignedExpandoInitializer(right); - return init && ts.isObjectLiteralExpression(init) && - symbol && ts.hasEntries(symbol.exports); + return !!init && ts.isObjectLiteralExpression(init) && + !!((_a = symbol === null || symbol === void 0 ? void 0 : symbol.exports) === null || _a === void 0 ? void 0 : _a.size); default: return false; } @@ -61231,7 +69597,7 @@ var ts; return stringType; } function getContextNode(node) { - if (node.kind === 274 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) { + if (node.kind === 278 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) { return node.parent.parent; // Needs to be the root JsxElement, so it encompasses the attributes _and_ the children (which are essentially part of the attributes) } return node; @@ -61280,30 +69646,31 @@ var ts; } function isTypeAssertion(node) { node = ts.skipParentheses(node); - return node.kind === 199 /* TypeAssertionExpression */ || node.kind === 217 /* AsExpression */; + return node.kind === 203 /* TypeAssertionExpression */ || node.kind === 221 /* AsExpression */; } function checkDeclarationInitializer(declaration, contextualType) { var initializer = ts.getEffectiveInitializer(declaration); var type = getQuickTypeOfExpression(initializer) || (contextualType ? checkExpressionWithContextualType(initializer, contextualType, /*inferenceContext*/ undefined, 0 /* Normal */) : checkExpressionCached(initializer)); - return ts.isParameter(declaration) && declaration.name.kind === 190 /* ArrayBindingPattern */ && + return ts.isParameter(declaration) && declaration.name.kind === 194 /* ArrayBindingPattern */ && isTupleType(type) && !type.target.hasRestElement && getTypeReferenceArity(type) < declaration.name.elements.length ? padTupleType(type, declaration.name) : type; } function padTupleType(type, pattern) { var patternElements = pattern.elements; - var arity = getTypeReferenceArity(type); - var elementTypes = arity ? getTypeArguments(type).slice() : []; - for (var i = arity; i < patternElements.length; i++) { + var elementTypes = getTypeArguments(type).slice(); + var elementFlags = type.target.elementFlags.slice(); + for (var i = getTypeReferenceArity(type); i < patternElements.length; i++) { var e = patternElements[i]; - if (i < patternElements.length - 1 || !(e.kind === 191 /* BindingElement */ && e.dotDotDotToken)) { + if (i < patternElements.length - 1 || !(e.kind === 195 /* BindingElement */ && e.dotDotDotToken)) { elementTypes.push(!ts.isOmittedExpression(e) && hasDefaultValue(e) ? getTypeFromBindingElement(e, /*includePatternInType*/ false, /*reportErrors*/ false) : anyType); + elementFlags.push(2 /* Optional */); if (!ts.isOmittedExpression(e) && !hasDefaultValue(e)) { reportImplicitAny(e, anyType); } } } - return createTupleType(elementTypes, type.target.minLength, /*hasRestElement*/ false, type.target.readonly); + return createTupleType(elementTypes, elementFlags, type.target.readonly); } function widenTypeInferredFromInitializer(declaration, type) { var widened = ts.getCombinedNodeFlags(declaration) & 2 /* Const */ || ts.isDeclarationReadonly(declaration) ? type : getWidenedLiteralType(type); @@ -61362,7 +69729,7 @@ var ts; // Do not use hasDynamicName here, because that returns false for well known symbols. // We want to perform checkComputedPropertyName for all computed properties, including // well known symbols. - if (node.name.kind === 154 /* ComputedPropertyName */) { + if (node.name.kind === 157 /* ComputedPropertyName */) { checkComputedPropertyName(node.name); } return checkExpressionForMutableLocation(node.initializer, checkMode); @@ -61373,7 +69740,7 @@ var ts; // Do not use hasDynamicName here, because that returns false for well known symbols. // We want to perform checkComputedPropertyName for all computed properties, including // well known symbols. - if (node.name.kind === 154 /* ComputedPropertyName */) { + if (node.name.kind === 157 /* ComputedPropertyName */) { checkComputedPropertyName(node.name); } var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, checkMode); @@ -61541,7 +69908,7 @@ var ts; if (flowInvocationCount !== startInvocationCount) { var cache = flowTypeCache || (flowTypeCache = []); cache[getNodeId(node)] = type; - node.flags |= 67108864 /* TypeCached */; + ts.setNodeFlags(node, node.flags | 67108864 /* TypeCached */); } return type; } @@ -61549,7 +69916,7 @@ var ts; var expr = ts.skipParentheses(node); // Optimize for the common case of a call to a function with a single non-generic call // signature where we can just fetch the return type without checking the arguments. - if (ts.isCallExpression(expr) && expr.expression.kind !== 102 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) { + if (ts.isCallExpression(expr) && expr.expression.kind !== 105 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) { var type = ts.isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression)); if (type) { @@ -61560,7 +69927,7 @@ var ts; return getTypeFromTypeNode(expr.type); } else if (node.kind === 8 /* NumericLiteral */ || node.kind === 10 /* StringLiteral */ || - node.kind === 106 /* TrueKeyword */ || node.kind === 91 /* FalseKeyword */) { + node.kind === 109 /* TrueKeyword */ || node.kind === 94 /* FalseKeyword */) { return checkExpression(node); } return undefined; @@ -61607,11 +69974,11 @@ var ts; // - 'left' in property access // - 'object' in indexed access // - target in rhs of import statement - var ok = (node.parent.kind === 194 /* PropertyAccessExpression */ && node.parent.expression === node) || - (node.parent.kind === 195 /* ElementAccessExpression */ && node.parent.expression === node) || - ((node.kind === 75 /* Identifier */ || node.kind === 153 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) || - (node.parent.kind === 172 /* TypeQuery */ && node.parent.exprName === node)) || - (node.parent.kind === 263 /* ExportSpecifier */); // We allow reexporting const enums + var ok = (node.parent.kind === 198 /* PropertyAccessExpression */ && node.parent.expression === node) || + (node.parent.kind === 199 /* ElementAccessExpression */ && node.parent.expression === node) || + ((node.kind === 78 /* Identifier */ || node.kind === 156 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) || + (node.parent.kind === 175 /* TypeQuery */ && node.parent.exprName === node)) || + (node.parent.kind === 267 /* ExportSpecifier */); // We allow reexporting const enums if (!ok) { error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query); } @@ -61636,20 +70003,20 @@ var ts; // Only bother checking on a few construct kinds. We don't want to be excessively // hitting the cancellation token on every node we check. switch (kind) { - case 214 /* ClassExpression */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 218 /* ClassExpression */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: cancellationToken.throwIfCancellationRequested(); } } switch (kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return checkIdentifier(node); - case 104 /* ThisKeyword */: + case 107 /* ThisKeyword */: return checkThisExpression(node); - case 102 /* SuperKeyword */: + case 105 /* SuperKeyword */: return checkSuperExpression(node); - case 100 /* NullKeyword */: + case 103 /* NullKeyword */: return nullWideningType; case 14 /* NoSubstitutionTemplateLiteral */: case 10 /* StringLiteral */: @@ -61660,82 +70027,82 @@ var ts; case 9 /* BigIntLiteral */: checkGrammarBigIntLiteral(node); return getFreshTypeOfLiteralType(getBigIntLiteralType(node)); - case 106 /* TrueKeyword */: + case 109 /* TrueKeyword */: return trueType; - case 91 /* FalseKeyword */: + case 94 /* FalseKeyword */: return falseType; - case 211 /* TemplateExpression */: + case 215 /* TemplateExpression */: return checkTemplateExpression(node); case 13 /* RegularExpressionLiteral */: return globalRegExpType; - case 192 /* ArrayLiteralExpression */: + case 196 /* ArrayLiteralExpression */: return checkArrayLiteral(node, checkMode, forceTuple); - case 193 /* ObjectLiteralExpression */: + case 197 /* ObjectLiteralExpression */: return checkObjectLiteral(node, checkMode); - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: return checkPropertyAccessExpression(node); - case 153 /* QualifiedName */: + case 156 /* QualifiedName */: return checkQualifiedName(node); - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: return checkIndexedAccess(node); - case 196 /* CallExpression */: - if (node.expression.kind === 96 /* ImportKeyword */) { + case 200 /* CallExpression */: + if (node.expression.kind === 99 /* ImportKeyword */) { return checkImportCallExpression(node); } // falls through - case 197 /* NewExpression */: + case 201 /* NewExpression */: return checkCallExpression(node, checkMode); - case 198 /* TaggedTemplateExpression */: + case 202 /* TaggedTemplateExpression */: return checkTaggedTemplateExpression(node); - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return checkParenthesizedExpression(node, checkMode); - case 214 /* ClassExpression */: + case 218 /* ClassExpression */: return checkClassExpression(node); - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: return checkFunctionExpressionOrObjectLiteralMethod(node, checkMode); - case 204 /* TypeOfExpression */: + case 208 /* TypeOfExpression */: return checkTypeOfExpression(node); - case 199 /* TypeAssertionExpression */: - case 217 /* AsExpression */: + case 203 /* TypeAssertionExpression */: + case 221 /* AsExpression */: return checkAssertion(node); - case 218 /* NonNullExpression */: + case 222 /* NonNullExpression */: return checkNonNullAssertion(node); - case 219 /* MetaProperty */: + case 223 /* MetaProperty */: return checkMetaProperty(node); - case 203 /* DeleteExpression */: + case 207 /* DeleteExpression */: return checkDeleteExpression(node); - case 205 /* VoidExpression */: + case 209 /* VoidExpression */: return checkVoidExpression(node); - case 206 /* AwaitExpression */: + case 210 /* AwaitExpression */: return checkAwaitExpression(node); - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: return checkPrefixUnaryExpression(node); - case 208 /* PostfixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: return checkPostfixUnaryExpression(node); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return checkBinaryExpression(node, checkMode); - case 210 /* ConditionalExpression */: + case 214 /* ConditionalExpression */: return checkConditionalExpression(node, checkMode); - case 213 /* SpreadElement */: + case 217 /* SpreadElement */: return checkSpreadExpression(node, checkMode); - case 215 /* OmittedExpression */: + case 219 /* OmittedExpression */: return undefinedWideningType; - case 212 /* YieldExpression */: + case 216 /* YieldExpression */: return checkYieldExpression(node); - case 220 /* SyntheticExpression */: - return node.type; - case 276 /* JsxExpression */: + case 224 /* SyntheticExpression */: + return checkSyntheticExpression(node); + case 280 /* JsxExpression */: return checkJsxExpression(node, checkMode); - case 266 /* JsxElement */: + case 270 /* JsxElement */: return checkJsxElement(node, checkMode); - case 267 /* JsxSelfClosingElement */: + case 271 /* JsxSelfClosingElement */: return checkJsxSelfClosingElement(node, checkMode); - case 270 /* JsxFragment */: + case 274 /* JsxFragment */: return checkJsxFragment(node); - case 274 /* JsxAttributes */: + case 278 /* JsxAttributes */: return checkJsxAttributes(node, checkMode); - case 268 /* JsxOpeningElement */: + case 272 /* JsxOpeningElement */: ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement"); } return errorType; @@ -61771,11 +70138,11 @@ var ts; checkGrammarDecoratorsAndModifiers(node); checkVariableLikeDeclaration(node); var func = ts.getContainingFunction(node); - if (ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) { - if (!(func.kind === 162 /* Constructor */ && ts.nodeIsPresent(func.body))) { + if (ts.hasSyntacticModifier(node, 92 /* ParameterPropertyModifier */)) { + if (!(func.kind === 165 /* Constructor */ && ts.nodeIsPresent(func.body))) { error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation); } - if (func.kind === 162 /* Constructor */ && ts.isIdentifier(node.name) && node.name.escapedText === "constructor") { + if (func.kind === 165 /* Constructor */ && ts.isIdentifier(node.name) && node.name.escapedText === "constructor") { error(node.name, ts.Diagnostics.constructor_cannot_be_used_as_a_parameter_property_name); } } @@ -61786,13 +70153,13 @@ var ts; if (func.parameters.indexOf(node) !== 0) { error(node, ts.Diagnostics.A_0_parameter_must_be_the_first_parameter, node.name.escapedText); } - if (func.kind === 162 /* Constructor */ || func.kind === 166 /* ConstructSignature */ || func.kind === 171 /* ConstructorType */) { + if (func.kind === 165 /* Constructor */ || func.kind === 169 /* ConstructSignature */ || func.kind === 174 /* ConstructorType */) { error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter); } - if (func.kind === 202 /* ArrowFunction */) { + if (func.kind === 206 /* ArrowFunction */) { error(node, ts.Diagnostics.An_arrow_function_cannot_have_a_this_parameter); } - if (func.kind === 163 /* GetAccessor */ || func.kind === 164 /* SetAccessor */) { + if (func.kind === 166 /* GetAccessor */ || func.kind === 167 /* SetAccessor */) { error(node, ts.Diagnostics.get_and_set_accessors_cannot_declare_this_parameters); } } @@ -61850,13 +70217,13 @@ var ts; } function getTypePredicateParent(node) { switch (node.parent.kind) { - case 202 /* ArrowFunction */: - case 165 /* CallSignature */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 170 /* FunctionType */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: + case 206 /* ArrowFunction */: + case 168 /* CallSignature */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 173 /* FunctionType */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: var parent = node.parent; if (node === parent.type) { return parent; @@ -61870,11 +70237,11 @@ var ts; continue; } var name = element.name; - if (name.kind === 75 /* Identifier */ && name.escapedText === predicateVariableName) { + if (name.kind === 78 /* Identifier */ && name.escapedText === predicateVariableName) { error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName); return true; } - else if (name.kind === 190 /* ArrayBindingPattern */ || name.kind === 189 /* ObjectBindingPattern */) { + else if (name.kind === 194 /* ArrayBindingPattern */ || name.kind === 193 /* ObjectBindingPattern */) { if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name, predicateVariableNode, predicateVariableName)) { return true; } @@ -61883,13 +70250,13 @@ var ts; } function checkSignatureDeclaration(node) { // Grammar checking - if (node.kind === 167 /* IndexSignature */) { + if (node.kind === 170 /* IndexSignature */) { checkGrammarIndexSignature(node); } // TODO (yuisu): Remove this check in else-if when SyntaxKind.Construct is moved and ambient context is handled - else if (node.kind === 170 /* FunctionType */ || node.kind === 244 /* FunctionDeclaration */ || node.kind === 171 /* ConstructorType */ || - node.kind === 165 /* CallSignature */ || node.kind === 162 /* Constructor */ || - node.kind === 166 /* ConstructSignature */) { + else if (node.kind === 173 /* FunctionType */ || node.kind === 248 /* FunctionDeclaration */ || node.kind === 174 /* ConstructorType */ || + node.kind === 168 /* CallSignature */ || node.kind === 165 /* Constructor */ || + node.kind === 169 /* ConstructSignature */) { checkGrammarFunctionLikeDeclaration(node); } var functionFlags = ts.getFunctionFlags(node); @@ -61919,10 +70286,10 @@ var ts; var returnTypeNode = ts.getEffectiveReturnTypeNode(node); if (noImplicitAny && !returnTypeNode) { switch (node.kind) { - case 166 /* ConstructSignature */: + case 169 /* ConstructSignature */: error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type); break; - case 165 /* CallSignature */: + case 168 /* CallSignature */: error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type); break; } @@ -61952,19 +70319,19 @@ var ts; checkAsyncFunctionReturnType(node, returnTypeNode); } } - if (node.kind !== 167 /* IndexSignature */ && node.kind !== 300 /* JSDocFunctionType */) { + if (node.kind !== 170 /* IndexSignature */ && node.kind !== 304 /* JSDocFunctionType */) { registerForUnusedIdentifiersCheck(node); } } } function checkClassForDuplicateDeclarations(node) { - var instanceNames = ts.createUnderscoreEscapedMap(); - var staticNames = ts.createUnderscoreEscapedMap(); + var instanceNames = new ts.Map(); + var staticNames = new ts.Map(); // instance and static private identifiers share the same scope - var privateIdentifiers = ts.createUnderscoreEscapedMap(); + var privateIdentifiers = new ts.Map(); for (var _i = 0, _a = node.members; _i < _a.length; _i++) { var member = _a[_i]; - if (member.kind === 162 /* Constructor */) { + if (member.kind === 165 /* Constructor */) { for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) { var param = _c[_b]; if (ts.isParameterPropertyDeclaration(param, member) && !ts.isBindingPattern(param.name)) { @@ -61973,7 +70340,7 @@ var ts; } } else { - var isStatic = ts.hasModifier(member, 32 /* Static */); + var isStatic = ts.hasSyntacticModifier(member, 32 /* Static */); var name = member.name; if (!name) { return; @@ -61984,16 +70351,16 @@ var ts; var memberName = name && ts.getPropertyNameForPropertyNameNode(name); if (memberName) { switch (member.kind) { - case 163 /* GetAccessor */: + case 166 /* GetAccessor */: addName(names, name, memberName, 1 /* GetAccessor */); break; - case 164 /* SetAccessor */: + case 167 /* SetAccessor */: addName(names, name, memberName, 2 /* SetAccessor */); break; - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: addName(names, name, memberName, 3 /* GetOrSetAccessor */); break; - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: addName(names, name, memberName, 8 /* Method */); break; } @@ -62035,7 +70402,7 @@ var ts; for (var _i = 0, _a = node.members; _i < _a.length; _i++) { var member = _a[_i]; var memberNameNode = member.name; - var isStatic = ts.hasModifier(member, 32 /* Static */); + var isStatic = ts.hasSyntacticModifier(member, 32 /* Static */); if (isStatic && memberNameNode) { var memberName = ts.getPropertyNameForPropertyNameNode(memberNameNode); switch (memberName) { @@ -62053,10 +70420,10 @@ var ts; } } function checkObjectTypeForDuplicateDeclarations(node) { - var names = ts.createMap(); + var names = new ts.Map(); for (var _i = 0, _a = node.members; _i < _a.length; _i++) { var member = _a[_i]; - if (member.kind === 158 /* PropertySignature */) { + if (member.kind === 161 /* PropertySignature */) { var memberName = void 0; var name = member.name; switch (name.kind) { @@ -62064,7 +70431,7 @@ var ts; case 8 /* NumericLiteral */: memberName = name.text; break; - case 75 /* Identifier */: + case 78 /* Identifier */: memberName = ts.idText(name); break; default: @@ -62081,7 +70448,7 @@ var ts; } } function checkTypeForDuplicateIndexSignatures(node) { - if (node.kind === 246 /* InterfaceDeclaration */) { + if (node.kind === 250 /* InterfaceDeclaration */) { var nodeSymbol = getSymbolOfNode(node); // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration // to prevent this run check only for the first declaration of a given kind @@ -62101,7 +70468,7 @@ var ts; var declaration = decl; if (declaration.parameters.length === 1 && declaration.parameters[0].type) { switch (declaration.parameters[0].type.kind) { - case 143 /* StringKeyword */: + case 146 /* StringKeyword */: if (!seenStringIndexer) { seenStringIndexer = true; } @@ -62109,7 +70476,7 @@ var ts; error(declaration, ts.Diagnostics.Duplicate_string_index_signature); } break; - case 140 /* NumberKeyword */: + case 143 /* NumberKeyword */: if (!seenNumericIndexer) { seenNumericIndexer = true; } @@ -62151,7 +70518,7 @@ var ts; checkFunctionOrMethodDeclaration(node); // Abstract methods cannot have an implementation. // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node. - if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 161 /* MethodDeclaration */ && node.body) { + if (ts.hasSyntacticModifier(node, 128 /* Abstract */) && node.kind === 164 /* MethodDeclaration */ && node.body) { error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name)); } } @@ -62179,8 +70546,8 @@ var ts; if (ts.isPrivateIdentifierPropertyDeclaration(n)) { return true; } - return n.kind === 159 /* PropertyDeclaration */ && - !ts.hasModifier(n, 32 /* Static */) && + return n.kind === 162 /* PropertyDeclaration */ && + !ts.hasSyntacticModifier(n, 32 /* Static */) && !!n.initializer; } // TS 1.0 spec (April 2014): 8.3.2 @@ -62190,7 +70557,7 @@ var ts; if (ts.getClassExtendsHeritageElement(containingClassDecl)) { captureLexicalThis(node.parent, containingClassDecl); var classExtendsNull = classDeclarationExtendsNull(containingClassDecl); - var superCall = getSuperCallInConstructor(node); + var superCall = findFirstSuperCall(node.body); if (superCall) { if (classExtendsNull) { error(superCall, ts.Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null); @@ -62202,15 +70569,15 @@ var ts; // or the containing class declares instance member variables with initializers. var superCallShouldBeFirst = (compilerOptions.target !== 99 /* ESNext */ || !compilerOptions.useDefineForClassFields) && (ts.some(node.parent.members, isInstancePropertyWithInitializerOrPrivateIdentifierProperty) || - ts.some(node.parameters, function (p) { return ts.hasModifier(p, 92 /* ParameterPropertyModifier */); })); + ts.some(node.parameters, function (p) { return ts.hasSyntacticModifier(p, 92 /* ParameterPropertyModifier */); })); // Skip past any prologue directives to find the first statement // to ensure that it was a super call. if (superCallShouldBeFirst) { var statements = node.body.statements; var superCallStatement = void 0; - for (var _i = 0, statements_3 = statements; _i < statements_3.length; _i++) { - var statement = statements_3[_i]; - if (statement.kind === 226 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) { + for (var _i = 0, statements_4 = statements; _i < statements_4.length; _i++) { + var statement = statements_4[_i]; + if (statement.kind === 230 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) { superCallStatement = statement; break; } @@ -62235,7 +70602,7 @@ var ts; checkGrammarComputedPropertyName(node.name); checkDecorators(node); checkSignatureDeclaration(node); - if (node.kind === 163 /* GetAccessor */) { + if (node.kind === 166 /* GetAccessor */) { if (!(node.flags & 8388608 /* Ambient */) && ts.nodeIsPresent(node.body) && (node.flags & 256 /* HasImplicitReturn */)) { if (!(node.flags & 512 /* HasExplicitReturn */)) { error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value); @@ -62245,7 +70612,7 @@ var ts; // Do not use hasDynamicName here, because that returns false for well known symbols. // We want to perform checkComputedPropertyName for all computed properties, including // well known symbols. - if (node.name.kind === 154 /* ComputedPropertyName */) { + if (node.name.kind === 157 /* ComputedPropertyName */) { checkComputedPropertyName(node.name); } if (ts.isPrivateIdentifier(node.name)) { @@ -62254,11 +70621,11 @@ var ts; if (!hasNonBindableDynamicName(node)) { // TypeScript 1.0 spec (April 2014): 8.4.3 // Accessors for the same member name must specify the same accessibility. - var otherKind = node.kind === 163 /* GetAccessor */ ? 164 /* SetAccessor */ : 163 /* GetAccessor */; + var otherKind = node.kind === 166 /* GetAccessor */ ? 167 /* SetAccessor */ : 166 /* GetAccessor */; var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind); if (otherAccessor) { - var nodeFlags = ts.getModifierFlags(node); - var otherFlags = ts.getModifierFlags(otherAccessor); + var nodeFlags = ts.getEffectiveModifierFlags(node); + var otherFlags = ts.getEffectiveModifierFlags(otherAccessor); if ((nodeFlags & 28 /* AccessibilityModifier */) !== (otherFlags & 28 /* AccessibilityModifier */)) { error(node.name, ts.Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility); } @@ -62272,7 +70639,7 @@ var ts; } } var returnType = getTypeOfAccessors(getSymbolOfNode(node)); - if (node.kind === 163 /* GetAccessor */) { + if (node.kind === 166 /* GetAccessor */) { checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType); } } @@ -62320,7 +70687,7 @@ var ts; } function checkTypeReferenceNode(node) { checkGrammarTypeArguments(node, node.typeArguments); - if (node.kind === 169 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) { + if (node.kind === 172 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) { grammarErrorAtPos(node, node.typeName.jsdocDotPos, 1, ts.Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments); } ts.forEach(node.typeArguments, checkSourceElement); @@ -62332,8 +70699,14 @@ var ts; checkTypeArgumentConstraints(node, typeParameters); } } - if (type.flags & 32 /* Enum */ && getNodeLinks(node).resolvedSymbol.flags & 8 /* EnumMember */) { - error(node, ts.Diagnostics.Enum_type_0_has_members_with_initializers_that_are_not_literals, typeToString(type)); + var symbol = getNodeLinks(node).resolvedSymbol; + if (symbol) { + if (ts.some(symbol.declarations, function (d) { return isTypeDeclaration(d) && !!(d.flags & 134217728 /* Deprecated */); })) { + errorOrSuggestion(/* isError */ false, getDeprecatedSuggestionNode(node), ts.Diagnostics._0_is_deprecated, symbol.escapedName); + } + if (type.flags & 32 /* Enum */ && symbol.flags & 8 /* EnumMember */) { + error(node, ts.Diagnostics.Enum_type_0_has_members_with_initializers_that_are_not_literals, typeToString(type)); + } } } } @@ -62361,20 +70734,32 @@ var ts; checkSourceElement(node.elementType); } function checkTupleType(node) { - var elementTypes = node.elementTypes; + var elementTypes = node.elements; var seenOptionalElement = false; + var seenNamedElement = false; for (var i = 0; i < elementTypes.length; i++) { var e = elementTypes[i]; - if (e.kind === 177 /* RestType */) { + if (e.kind === 191 /* NamedTupleMember */) { + seenNamedElement = true; + } + else if (seenNamedElement) { + grammarErrorOnNode(e, ts.Diagnostics.Tuple_members_must_all_have_names_or_all_not_have_names); + break; + } + var flags = getTupleElementFlags(e); + if (flags & 8 /* Variadic */) { + if (!isArrayLikeType(getTypeFromTypeNode(e.type))) { + error(e, ts.Diagnostics.A_rest_element_type_must_be_an_array_type); + break; + } + } + else if (flags & 4 /* Rest */) { if (i !== elementTypes.length - 1) { grammarErrorOnNode(e, ts.Diagnostics.A_rest_element_must_be_last_in_a_tuple_type); break; } - if (!isArrayType(getTypeFromTypeNode(e.type))) { - error(e, ts.Diagnostics.A_rest_element_type_must_be_an_array_type); - } } - else if (e.kind === 176 /* OptionalType */) { + else if (flags & 2 /* Optional */) { seenOptionalElement = true; } else if (seenOptionalElement) { @@ -62382,7 +70767,7 @@ var ts; break; } } - ts.forEach(node.elementTypes, checkSourceElement); + ts.forEach(node.elements, checkSourceElement); } function checkUnionOrIntersectionType(node) { ts.forEach(node.types, checkSourceElement); @@ -62395,7 +70780,7 @@ var ts; var objectType = type.objectType; var indexType = type.indexType; if (isTypeAssignableTo(indexType, getIndexType(objectType, /*stringsOnly*/ false))) { - if (accessNode.kind === 195 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) && + if (accessNode.kind === 199 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) && ts.getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) { error(accessNode, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType)); } @@ -62446,7 +70831,7 @@ var ts; ts.forEachChild(node, checkSourceElement); } function checkInferType(node) { - if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 180 /* ConditionalType */ && n.parent.extendsType === n; })) { + if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 183 /* ConditionalType */ && n.parent.extendsType === n; })) { grammarErrorOnNode(node, ts.Diagnostics.infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type); } checkSourceElement(node.typeParameter); @@ -62456,16 +70841,29 @@ var ts; checkSourceElement(node.argument); getTypeFromTypeNode(node); } + function checkNamedTupleMember(node) { + if (node.dotDotDotToken && node.questionToken) { + grammarErrorOnNode(node, ts.Diagnostics.A_tuple_member_cannot_be_both_optional_and_rest); + } + if (node.type.kind === 179 /* OptionalType */) { + grammarErrorOnNode(node.type, ts.Diagnostics.A_labeled_tuple_element_is_declared_as_optional_with_a_question_mark_after_the_name_and_before_the_colon_rather_than_after_the_type); + } + if (node.type.kind === 180 /* RestType */) { + grammarErrorOnNode(node.type, ts.Diagnostics.A_labeled_tuple_element_is_declared_as_rest_with_a_before_the_name_rather_than_before_the_type); + } + checkSourceElement(node.type); + getTypeFromTypeNode(node); + } function isPrivateWithinAmbient(node) { - return (ts.hasModifier(node, 8 /* Private */) || ts.isPrivateIdentifierPropertyDeclaration(node)) && !!(node.flags & 8388608 /* Ambient */); + return (ts.hasEffectiveModifier(node, 8 /* Private */) || ts.isPrivateIdentifierPropertyDeclaration(node)) && !!(node.flags & 8388608 /* Ambient */); } function getEffectiveDeclarationFlags(n, flagsToCheck) { var flags = ts.getCombinedModifierFlags(n); // children of classes (even ambient classes) should not be marked as ambient or export // because those flags have no useful semantics there. - if (n.parent.kind !== 246 /* InterfaceDeclaration */ && - n.parent.kind !== 245 /* ClassDeclaration */ && - n.parent.kind !== 214 /* ClassExpression */ && + if (n.parent.kind !== 250 /* InterfaceDeclaration */ && + n.parent.kind !== 249 /* ClassDeclaration */ && + n.parent.kind !== 218 /* ClassExpression */ && n.flags & 8388608 /* Ambient */) { if (!(flags & 2 /* Ambient */) && !(ts.isModuleBlock(n.parent) && ts.isModuleDeclaration(n.parent.parent) && ts.isGlobalScopeAugmentation(n.parent.parent))) { // It is nested in an ambient context, which means it is automatically exported @@ -62561,14 +70959,14 @@ var ts; // Both are literal property names that are the same. ts.isPropertyNameLiteral(node.name) && ts.isPropertyNameLiteral(subsequentName) && ts.getEscapedTextOfIdentifierOrLiteral(node.name) === ts.getEscapedTextOfIdentifierOrLiteral(subsequentName))) { - var reportError = (node.kind === 161 /* MethodDeclaration */ || node.kind === 160 /* MethodSignature */) && - ts.hasModifier(node, 32 /* Static */) !== ts.hasModifier(subsequentNode, 32 /* Static */); + var reportError = (node.kind === 164 /* MethodDeclaration */ || node.kind === 163 /* MethodSignature */) && + ts.hasSyntacticModifier(node, 32 /* Static */) !== ts.hasSyntacticModifier(subsequentNode, 32 /* Static */); // we can get here in two cases // 1. mixed static and instance class members // 2. something with the same name was defined before the set of overloads that prevents them from merging // here we'll report error only for the first case since for second we should already report error in binder if (reportError) { - var diagnostic = ts.hasModifier(node, 32 /* Static */) ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static; + var diagnostic = ts.hasSyntacticModifier(node, 32 /* Static */) ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static; error(errorNode_1, diagnostic); } return; @@ -62586,7 +70984,7 @@ var ts; else { // Report different errors regarding non-consecutive blocks of declarations depending on whether // the node in question is abstract. - if (ts.hasModifier(node, 128 /* Abstract */)) { + if (ts.hasSyntacticModifier(node, 128 /* Abstract */)) { error(errorNode, ts.Diagnostics.All_declarations_of_an_abstract_method_must_be_consecutive); } else { @@ -62597,11 +70995,12 @@ var ts; var duplicateFunctionDeclaration = false; var multipleConstructorImplementation = false; var hasNonAmbientClass = false; + var functionDeclarations = []; for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) { var current = declarations_4[_i]; var node = current; var inAmbientContext = node.flags & 8388608 /* Ambient */; - var inAmbientContextOrInterface = node.parent.kind === 246 /* InterfaceDeclaration */ || node.parent.kind === 173 /* TypeLiteral */ || inAmbientContext; + var inAmbientContextOrInterface = node.parent.kind === 250 /* InterfaceDeclaration */ || node.parent.kind === 176 /* TypeLiteral */ || inAmbientContext; if (inAmbientContextOrInterface) { // check if declarations are consecutive only if they are non-ambient // 1. ambient declarations can be interleaved @@ -62612,16 +71011,18 @@ var ts; // 2. mixing ambient and non-ambient declarations is a separate error that will be reported - do not want to report an extra one previousDeclaration = undefined; } - if ((node.kind === 245 /* ClassDeclaration */ || node.kind === 214 /* ClassExpression */) && !inAmbientContext) { + if ((node.kind === 249 /* ClassDeclaration */ || node.kind === 218 /* ClassExpression */) && !inAmbientContext) { hasNonAmbientClass = true; } - if (node.kind === 244 /* FunctionDeclaration */ || node.kind === 161 /* MethodDeclaration */ || node.kind === 160 /* MethodSignature */ || node.kind === 162 /* Constructor */) { + if (node.kind === 248 /* FunctionDeclaration */ || node.kind === 164 /* MethodDeclaration */ || node.kind === 163 /* MethodSignature */ || node.kind === 165 /* Constructor */) { + functionDeclarations.push(node); var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck); someNodeFlags |= currentNodeFlags; allNodeFlags &= currentNodeFlags; someHaveQuestionToken = someHaveQuestionToken || ts.hasQuestionToken(node); allHaveQuestionToken = allHaveQuestionToken && ts.hasQuestionToken(node); - if (ts.nodeIsPresent(node.body) && bodyDeclaration) { + var bodyIsPresent = ts.nodeIsPresent(node.body); + if (bodyIsPresent && bodyDeclaration) { if (isConstructor) { multipleConstructorImplementation = true; } @@ -62629,10 +71030,10 @@ var ts; duplicateFunctionDeclaration = true; } } - else if (previousDeclaration && previousDeclaration.parent === node.parent && previousDeclaration.end !== node.pos) { + else if ((previousDeclaration === null || previousDeclaration === void 0 ? void 0 : previousDeclaration.parent) === node.parent && previousDeclaration.end !== node.pos) { reportImplementationExpectedError(previousDeclaration); } - if (ts.nodeIsPresent(node.body)) { + if (bodyIsPresent) { if (!bodyDeclaration) { bodyDeclaration = node; } @@ -62647,13 +71048,13 @@ var ts; } } if (multipleConstructorImplementation) { - ts.forEach(declarations, function (declaration) { + ts.forEach(functionDeclarations, function (declaration) { error(declaration, ts.Diagnostics.Multiple_constructor_implementations_are_not_allowed); }); } if (duplicateFunctionDeclaration) { - ts.forEach(declarations, function (declaration) { - error(ts.getNameOfDeclaration(declaration), ts.Diagnostics.Duplicate_function_implementation); + ts.forEach(functionDeclarations, function (declaration) { + error(ts.getNameOfDeclaration(declaration) || declaration, ts.Diagnostics.Duplicate_function_implementation); }); } if (hasNonAmbientClass && !isConstructor && symbol.flags & 16 /* Function */) { @@ -62667,7 +71068,7 @@ var ts; } // Abstract methods can't have an implementation -- in particular, they don't need one. if (lastSeenNonAmbientDeclaration && !lastSeenNonAmbientDeclaration.body && - !ts.hasModifier(lastSeenNonAmbientDeclaration, 128 /* Abstract */) && !lastSeenNonAmbientDeclaration.questionToken) { + !ts.hasSyntacticModifier(lastSeenNonAmbientDeclaration, 128 /* Abstract */) && !lastSeenNonAmbientDeclaration.questionToken) { reportImplementationExpectedError(lastSeenNonAmbientDeclaration); } if (hasOverloads) { @@ -62746,25 +71147,25 @@ var ts; function getDeclarationSpaces(decl) { var d = decl; switch (d.kind) { - case 246 /* InterfaceDeclaration */: - case 247 /* TypeAliasDeclaration */: + case 250 /* InterfaceDeclaration */: + case 251 /* TypeAliasDeclaration */: // A jsdoc typedef and callback are, by definition, type aliases. // falls through - case 322 /* JSDocTypedefTag */: - case 315 /* JSDocCallbackTag */: - case 316 /* JSDocEnumTag */: + case 327 /* JSDocTypedefTag */: + case 320 /* JSDocCallbackTag */: + case 321 /* JSDocEnumTag */: return 2 /* ExportType */; - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */ ? 4 /* ExportNamespace */ | 1 /* ExportValue */ : 4 /* ExportNamespace */; - case 245 /* ClassDeclaration */: - case 248 /* EnumDeclaration */: - case 284 /* EnumMember */: + case 249 /* ClassDeclaration */: + case 252 /* EnumDeclaration */: + case 288 /* EnumMember */: return 2 /* ExportType */ | 1 /* ExportValue */; - case 290 /* SourceFile */: + case 294 /* SourceFile */: return 2 /* ExportType */ | 1 /* ExportValue */ | 4 /* ExportNamespace */; - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: // Export assigned entity name expressions act as aliases and should fall through, otherwise they export values if (!ts.isEntityNameExpression(d.expression)) { return 1 /* ExportValue */; @@ -62772,18 +71173,18 @@ var ts; d = d.expression; // The below options all declare an Alias, which is allowed to merge with other values within the importing module. // falls through - case 253 /* ImportEqualsDeclaration */: - case 256 /* NamespaceImport */: - case 255 /* ImportClause */: - var result_10 = 0 /* None */; + case 257 /* ImportEqualsDeclaration */: + case 260 /* NamespaceImport */: + case 259 /* ImportClause */: + var result_11 = 0 /* None */; var target = resolveAlias(getSymbolOfNode(d)); - ts.forEach(target.declarations, function (d) { result_10 |= getDeclarationSpaces(d); }); - return result_10; - case 242 /* VariableDeclaration */: - case 191 /* BindingElement */: - case 244 /* FunctionDeclaration */: - case 258 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591 - case 75 /* Identifier */: // https://github.com/microsoft/TypeScript/issues/36098 + ts.forEach(target.declarations, function (d) { result_11 |= getDeclarationSpaces(d); }); + return result_11; + case 246 /* VariableDeclaration */: + case 195 /* BindingElement */: + case 248 /* FunctionDeclaration */: + case 262 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591 + case 78 /* Identifier */: // https://github.com/microsoft/TypeScript/issues/36098 // Identifiers are used as declarations of assignment declarations whose parents may be // SyntaxKind.CallExpression - `Object.defineProperty(thing, "aField", {value: 42});` // SyntaxKind.ElementAccessExpression - `thing["aField"] = 42;` or `thing["aField"];` (with a doc comment on it) @@ -63017,7 +71418,7 @@ var ts; if (globalPromiseType !== emptyGenericType && !isReferenceToType(returnType, globalPromiseType)) { // The promise type was not a valid type reference to the global promise type, so we // report an error and return the unknown type. - error(returnTypeNode, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type); + error(returnTypeNode, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0, typeToString(getAwaitedType(returnType) || voidType)); return; } } @@ -63035,7 +71436,7 @@ var ts; var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 111551 /* Value */, /*ignoreErrors*/ true); var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : errorType; if (promiseConstructorType === errorType) { - if (promiseConstructorName.kind === 75 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) { + if (promiseConstructorName.kind === 78 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) { error(returnTypeNode, ts.Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option); } else { @@ -63066,6 +71467,7 @@ var ts; /** Check a decorator */ function checkDecorator(node) { var signature = getResolvedSignature(node); + checkDeprecatedSignature(signature, node); var returnType = getReturnTypeOfSignature(signature); if (returnType.flags & 1 /* Any */) { return; @@ -63074,24 +71476,24 @@ var ts; var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node); var errorInfo; switch (node.parent.kind) { - case 245 /* ClassDeclaration */: + case 249 /* ClassDeclaration */: var classSymbol = getSymbolOfNode(node.parent); var classConstructorType = getTypeOfSymbol(classSymbol); expectedReturnType = getUnionType([classConstructorType, voidType]); break; - case 156 /* Parameter */: + case 159 /* Parameter */: expectedReturnType = voidType; errorInfo = ts.chainDiagnosticMessages( /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any); break; - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: expectedReturnType = voidType; errorInfo = ts.chainDiagnosticMessages( /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any); break; - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: var methodType = getTypeOfNode(node.parent); var descriptorType = createTypedPropertyDescriptorType(methodType); expectedReturnType = getUnionType([descriptorType, voidType]); @@ -63112,7 +71514,7 @@ var ts; if (!typeName) return; var rootName = ts.getFirstIdentifier(typeName); - var meaning = (typeName.kind === 75 /* Identifier */ ? 788968 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */; + var meaning = (typeName.kind === 78 /* Identifier */ ? 788968 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */; var rootSymbol = resolveName(rootName, rootName.escapedText, meaning, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isRefernce*/ true); if (rootSymbol && rootSymbol.flags & 2097152 /* Alias */ @@ -63138,14 +71540,15 @@ var ts; function getEntityNameForDecoratorMetadata(node) { if (node) { switch (node.kind) { - case 179 /* IntersectionType */: - case 178 /* UnionType */: + case 182 /* IntersectionType */: + case 181 /* UnionType */: return getEntityNameForDecoratorMetadataFromTypeList(node.types); - case 180 /* ConditionalType */: + case 183 /* ConditionalType */: return getEntityNameForDecoratorMetadataFromTypeList([node.trueType, node.falseType]); - case 182 /* ParenthesizedType */: + case 185 /* ParenthesizedType */: + case 191 /* NamedTupleMember */: return getEntityNameForDecoratorMetadata(node.type); - case 169 /* TypeReference */: + case 172 /* TypeReference */: return node.typeName; } } @@ -63154,13 +71557,13 @@ var ts; var commonEntityName; for (var _i = 0, types_20 = types; _i < types_20.length; _i++) { var typeNode = types_20[_i]; - while (typeNode.kind === 182 /* ParenthesizedType */) { + while (typeNode.kind === 185 /* ParenthesizedType */ || typeNode.kind === 191 /* NamedTupleMember */) { typeNode = typeNode.type; // Skip parens if need be } - if (typeNode.kind === 137 /* NeverKeyword */) { + if (typeNode.kind === 140 /* NeverKeyword */) { continue; // Always elide `never` from the union/intersection if possible } - if (!strictNullChecks && (typeNode.kind === 100 /* NullKeyword */ || typeNode.kind === 146 /* UndefinedKeyword */)) { + if (!strictNullChecks && (typeNode.kind === 190 /* LiteralType */ && typeNode.literal.kind === 103 /* NullKeyword */ || typeNode.kind === 149 /* UndefinedKeyword */)) { continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks } var individualEntityName = getEntityNameForDecoratorMetadata(typeNode); @@ -63206,14 +71609,14 @@ var ts; } var firstDecorator = node.decorators[0]; checkExternalEmitHelpers(firstDecorator, 8 /* Decorate */); - if (node.kind === 156 /* Parameter */) { + if (node.kind === 159 /* Parameter */) { checkExternalEmitHelpers(firstDecorator, 32 /* Param */); } if (compilerOptions.emitDecoratorMetadata) { checkExternalEmitHelpers(firstDecorator, 16 /* Metadata */); // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator. switch (node.kind) { - case 245 /* ClassDeclaration */: + case 249 /* ClassDeclaration */: var constructor = ts.getFirstConstructorWithBody(node); if (constructor) { for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) { @@ -63222,23 +71625,23 @@ var ts; } } break; - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - var otherKind = node.kind === 163 /* GetAccessor */ ? 164 /* SetAccessor */ : 163 /* GetAccessor */; + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + var otherKind = node.kind === 166 /* GetAccessor */ ? 167 /* SetAccessor */ : 166 /* GetAccessor */; var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind); markDecoratorMedataDataTypeNodeAsReferenced(getAnnotatedAccessorTypeNode(node) || otherAccessor && getAnnotatedAccessorTypeNode(otherAccessor)); break; - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) { var parameter = _c[_b]; markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter)); } markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveReturnTypeNode(node)); break; - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveTypeAnnotationNode(node)); break; - case 156 /* Parameter */: + case 159 /* Parameter */: markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(node)); var containingSignature = node.parent; for (var _d = 0, _e = containingSignature.parameters; _d < _e.length; _d++) { @@ -63301,7 +71704,7 @@ var ts; else if (ts.findLast(ts.getJSDocTags(decl), ts.isJSDocParameterTag) === node && node.typeExpression && node.typeExpression.type && !isArrayType(getTypeFromTypeNode(node.typeExpression.type))) { - error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 153 /* QualifiedName */ ? node.name.right : node.name)); + error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 156 /* QualifiedName */ ? node.name.right : node.name)); } } } @@ -63343,9 +71746,9 @@ var ts; } function getIdentifierFromEntityNameExpression(node) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return node; - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: return node.name; default: return undefined; @@ -63358,7 +71761,7 @@ var ts; // Do not use hasDynamicName here, because that returns false for well known symbols. // We want to perform checkComputedPropertyName for all computed properties, including // well known symbols. - if (node.name && node.name.kind === 154 /* ComputedPropertyName */) { + if (node.name && node.name.kind === 157 /* ComputedPropertyName */) { // This check will account for methods in class/interface declarations, // as well as accessors in classes/object literals checkComputedPropertyName(node.name); @@ -63387,7 +71790,7 @@ var ts; } } } - var body = node.kind === 160 /* MethodSignature */ ? undefined : node.body; + var body = node.kind === 163 /* MethodSignature */ ? undefined : node.body; checkSourceElement(body); checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, getReturnTypeFromAnnotation(node)); if (produceDiagnostics && !ts.getEffectiveReturnTypeNode(node)) { @@ -63429,42 +71832,42 @@ var ts; for (var _i = 0, potentiallyUnusedIdentifiers_1 = potentiallyUnusedIdentifiers; _i < potentiallyUnusedIdentifiers_1.length; _i++) { var node = potentiallyUnusedIdentifiers_1[_i]; switch (node.kind) { - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: checkUnusedClassMembers(node, addDiagnostic); checkUnusedTypeParameters(node, addDiagnostic); break; - case 290 /* SourceFile */: - case 249 /* ModuleDeclaration */: - case 223 /* Block */: - case 251 /* CaseBlock */: - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: + case 294 /* SourceFile */: + case 253 /* ModuleDeclaration */: + case 227 /* Block */: + case 255 /* CaseBlock */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: checkUnusedLocalsAndParameters(node, addDiagnostic); break; - case 162 /* Constructor */: - case 201 /* FunctionExpression */: - case 244 /* FunctionDeclaration */: - case 202 /* ArrowFunction */: - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 165 /* Constructor */: + case 205 /* FunctionExpression */: + case 248 /* FunctionDeclaration */: + case 206 /* ArrowFunction */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: if (node.body) { // Don't report unused parameters in overloads checkUnusedLocalsAndParameters(node, addDiagnostic); } checkUnusedTypeParameters(node, addDiagnostic); break; - case 160 /* MethodSignature */: - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 170 /* FunctionType */: - case 171 /* ConstructorType */: - case 247 /* TypeAliasDeclaration */: - case 246 /* InterfaceDeclaration */: + case 163 /* MethodSignature */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: + case 251 /* TypeAliasDeclaration */: + case 250 /* InterfaceDeclaration */: checkUnusedTypeParameters(node, addDiagnostic); break; - case 181 /* InferType */: + case 184 /* InferType */: checkUnusedInferTypeParameter(node, addDiagnostic); break; default: @@ -63484,31 +71887,31 @@ var ts; for (var _i = 0, _a = node.members; _i < _a.length; _i++) { var member = _a[_i]; switch (member.kind) { - case 161 /* MethodDeclaration */: - case 159 /* PropertyDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - if (member.kind === 164 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) { + case 164 /* MethodDeclaration */: + case 162 /* PropertyDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + if (member.kind === 167 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) { // Already would have reported an error on the getter. break; } var symbol = getSymbolOfNode(member); if (!symbol.isReferenced - && (ts.hasModifier(member, 8 /* Private */) || ts.isNamedDeclaration(member) && ts.isPrivateIdentifier(member.name)) + && (ts.hasEffectiveModifier(member, 8 /* Private */) || ts.isNamedDeclaration(member) && ts.isPrivateIdentifier(member.name)) && !(member.flags & 8388608 /* Ambient */)) { addDiagnostic(member, 0 /* Local */, ts.createDiagnosticForNode(member.name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, symbolToString(symbol))); } break; - case 162 /* Constructor */: + case 165 /* Constructor */: for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) { var parameter = _c[_b]; - if (!parameter.symbol.isReferenced && ts.hasModifier(parameter, 8 /* Private */)) { + if (!parameter.symbol.isReferenced && ts.hasSyntacticModifier(parameter, 8 /* Private */)) { addDiagnostic(parameter, 0 /* Local */, ts.createDiagnosticForNode(parameter.name, ts.Diagnostics.Property_0_is_declared_but_its_value_is_never_read, ts.symbolName(parameter.symbol))); } } break; - case 167 /* IndexSignature */: - case 222 /* SemicolonClassElement */: + case 170 /* IndexSignature */: + case 226 /* SemicolonClassElement */: // Can't be private break; default: @@ -63528,15 +71931,15 @@ var ts; if (ts.last(getSymbolOfNode(node).declarations) !== node) return; var typeParameters = ts.getEffectiveTypeParameterDeclarations(node); - var seenParentsWithEveryUnused = new ts.NodeSet(); + var seenParentsWithEveryUnused = new ts.Set(); for (var _i = 0, typeParameters_3 = typeParameters; _i < typeParameters_3.length; _i++) { var typeParameter = typeParameters_3[_i]; if (!isTypeParameterUnused(typeParameter)) continue; var name = ts.idText(typeParameter.name); var parent = typeParameter.parent; - if (parent.kind !== 181 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) { - if (seenParentsWithEveryUnused.tryAdd(parent)) { + if (parent.kind !== 184 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) { + if (ts.tryAddToSet(seenParentsWithEveryUnused, parent)) { var range = ts.isJSDocTemplateTag(parent) // Whole @template tag ? ts.rangeOfNode(parent) @@ -63581,9 +71984,9 @@ var ts; } function checkUnusedLocalsAndParameters(nodeWithLocals, addDiagnostic) { // Ideally we could use the ImportClause directly as a key, but must wait until we have full ES6 maps. So must store key along with value. - var unusedImports = ts.createMap(); - var unusedDestructures = ts.createMap(); - var unusedVariables = ts.createMap(); + var unusedImports = new ts.Map(); + var unusedDestructures = new ts.Map(); + var unusedVariables = new ts.Map(); nodeWithLocals.locals.forEach(function (local) { // If it's purely a type parameter, ignore, will be checked in `checkUnusedTypeParameters`. // If it's a type parameter merged with a parameter, check if the parameter-side is used. @@ -63627,7 +72030,7 @@ var ts; var importDecl = importClause.parent; var nDeclarations = (importClause.name ? 1 : 0) + (importClause.namedBindings ? - (importClause.namedBindings.kind === 256 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length) + (importClause.namedBindings.kind === 260 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length) : 0); if (nDeclarations === unuseds.length) { addDiagnostic(importDecl, 0 /* Local */, unuseds.length === 1 @@ -63645,7 +72048,7 @@ var ts; var bindingPattern = _a[0], bindingElements = _a[1]; var kind = tryGetRootParameterDeclaration(bindingPattern.parent) ? 1 /* Parameter */ : 0 /* Local */; if (bindingPattern.elements.length === bindingElements.length) { - if (bindingElements.length === 1 && bindingPattern.parent.kind === 242 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 243 /* VariableDeclarationList */) { + if (bindingElements.length === 1 && bindingPattern.parent.kind === 246 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 247 /* VariableDeclarationList */) { addToGroup(unusedVariables, bindingPattern.parent.parent, bindingPattern.parent, getNodeId); } else { @@ -63666,7 +72069,7 @@ var ts; if (declarationList.declarations.length === declarations.length) { addDiagnostic(declarationList, 0 /* Local */, declarations.length === 1 ? ts.createDiagnosticForNode(ts.first(declarations).name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, bindingNameText(ts.first(declarations).name)) - : ts.createDiagnosticForNode(declarationList.parent.kind === 225 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused)); + : ts.createDiagnosticForNode(declarationList.parent.kind === 229 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused)); } else { for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) { @@ -63678,24 +72081,24 @@ var ts; } function bindingNameText(name) { switch (name.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return ts.idText(name); - case 190 /* ArrayBindingPattern */: - case 189 /* ObjectBindingPattern */: + case 194 /* ArrayBindingPattern */: + case 193 /* ObjectBindingPattern */: return bindingNameText(ts.cast(ts.first(name.elements), ts.isBindingElement).name); default: return ts.Debug.assertNever(name); } } function isImportedDeclaration(node) { - return node.kind === 255 /* ImportClause */ || node.kind === 258 /* ImportSpecifier */ || node.kind === 256 /* NamespaceImport */; + return node.kind === 259 /* ImportClause */ || node.kind === 262 /* ImportSpecifier */ || node.kind === 260 /* NamespaceImport */; } function importClauseFromImported(decl) { - return decl.kind === 255 /* ImportClause */ ? decl : decl.kind === 256 /* NamespaceImport */ ? decl.parent : decl.parent.parent; + return decl.kind === 259 /* ImportClause */ ? decl : decl.kind === 260 /* NamespaceImport */ ? decl.parent : decl.parent.parent; } function checkBlock(node) { // Grammar checking for SyntaxKind.Block - if (node.kind === 223 /* Block */) { + if (node.kind === 227 /* Block */) { checkGrammarStatementInAmbientContext(node); } if (ts.isFunctionOrModuleBlock(node)) { @@ -63712,12 +72115,12 @@ var ts; } function checkCollisionWithArgumentsInGeneratedCode(node) { // no rest parameters \ declaration context \ overload - no codegen impact - if (languageVersion >= 2 /* ES2015 */ || compilerOptions.noEmit || !ts.hasRestParameter(node) || node.flags & 8388608 /* Ambient */ || ts.nodeIsMissing(node.body)) { + if (languageVersion >= 2 /* ES2015 */ || !ts.hasRestParameter(node) || node.flags & 8388608 /* Ambient */ || ts.nodeIsMissing(node.body)) { return; } ts.forEach(node.parameters, function (p) { if (p.name && !ts.isBindingPattern(p.name) && p.name.escapedText === argumentsSymbol.escapedName) { - error(p, ts.Diagnostics.Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters); + errorSkippedOn("noEmit", p, ts.Diagnostics.Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters); } }); } @@ -63725,12 +72128,12 @@ var ts; if (!(identifier && identifier.escapedText === name)) { return false; } - if (node.kind === 159 /* PropertyDeclaration */ || - node.kind === 158 /* PropertySignature */ || - node.kind === 161 /* MethodDeclaration */ || - node.kind === 160 /* MethodSignature */ || - node.kind === 163 /* GetAccessor */ || - node.kind === 164 /* SetAccessor */) { + if (node.kind === 162 /* PropertyDeclaration */ || + node.kind === 161 /* PropertySignature */ || + node.kind === 164 /* MethodDeclaration */ || + node.kind === 163 /* MethodSignature */ || + node.kind === 166 /* GetAccessor */ || + node.kind === 167 /* SetAccessor */) { // it is ok to have member named '_super' or '_this' - member access is always qualified return false; } @@ -63739,7 +72142,7 @@ var ts; return false; } var root = ts.getRootDeclaration(node); - if (root.kind === 156 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) { + if (root.kind === 159 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) { // just an overload - no codegen impact return false; } @@ -63749,7 +72152,7 @@ var ts; function checkIfThisIsCapturedInEnclosingScope(node) { ts.findAncestor(node, function (current) { if (getNodeCheckFlags(current) & 4 /* CaptureThis */) { - var isDeclaration_1 = node.kind !== 75 /* Identifier */; + var isDeclaration_1 = node.kind !== 78 /* Identifier */; if (isDeclaration_1) { error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference); } @@ -63764,7 +72167,7 @@ var ts; function checkIfNewTargetIsCapturedInEnclosingScope(node) { ts.findAncestor(node, function (current) { if (getNodeCheckFlags(current) & 8 /* CaptureNewTarget */) { - var isDeclaration_2 = node.kind !== 75 /* Identifier */; + var isDeclaration_2 = node.kind !== 78 /* Identifier */; if (isDeclaration_2) { error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_newTarget_Compiler_uses_variable_declaration_newTarget_to_capture_new_target_meta_property_reference); } @@ -63779,12 +72182,12 @@ var ts; function checkWeakMapCollision(node) { var enclosingBlockScope = ts.getEnclosingBlockScopeContainer(node); if (getNodeCheckFlags(enclosingBlockScope) & 67108864 /* ContainsClassWithPrivateIdentifiers */) { - error(node, ts.Diagnostics.Compiler_reserves_name_0_when_emitting_private_identifier_downlevel, "WeakMap"); + errorSkippedOn("noEmit", node, ts.Diagnostics.Compiler_reserves_name_0_when_emitting_private_identifier_downlevel, "WeakMap"); } } function checkCollisionWithRequireExportsInGeneratedCode(node, name) { // No need to check for require or exports for ES6 modules and later - if (moduleKind >= ts.ModuleKind.ES2015 || compilerOptions.noEmit) { + if (moduleKind >= ts.ModuleKind.ES2015) { return; } if (!needCollisionCheckForIdentifier(node, name, "require") && !needCollisionCheckForIdentifier(node, name, "exports")) { @@ -63796,13 +72199,13 @@ var ts; } // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent var parent = getDeclarationContainer(node); - if (parent.kind === 290 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) { + if (parent.kind === 294 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) { // If the declaration happens to be in external module, report error that require and exports are reserved keywords - error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name)); + errorSkippedOn("noEmit", name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name)); } } function checkCollisionWithGlobalPromiseInGeneratedCode(node, name) { - if (languageVersion >= 4 /* ES2017 */ || compilerOptions.noEmit || !needCollisionCheckForIdentifier(node, name, "Promise")) { + if (languageVersion >= 4 /* ES2017 */ || !needCollisionCheckForIdentifier(node, name, "Promise")) { return; } // Uninstantiated modules shouldnt do this check @@ -63811,9 +72214,9 @@ var ts; } // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent var parent = getDeclarationContainer(node); - if (parent.kind === 290 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 2048 /* HasAsyncFunctions */) { + if (parent.kind === 294 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 2048 /* HasAsyncFunctions */) { // If the declaration happens to be in external module, report error that Promise is a reserved identifier. - error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name)); + errorSkippedOn("noEmit", name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name)); } } function checkVarDeclaredNamesNotShadowed(node) { @@ -63846,7 +72249,7 @@ var ts; // skip variable declarations that don't have initializers // NOTE: in ES6 spec initializer is required in variable declarations where name is binding pattern // so we'll always treat binding elements as initialized - if (node.kind === 242 /* VariableDeclaration */ && !node.initializer) { + if (node.kind === 246 /* VariableDeclaration */ && !node.initializer) { return; } var symbol = getSymbolOfNode(node); @@ -63858,17 +72261,17 @@ var ts; localDeclarationSymbol !== symbol && localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) { if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3 /* BlockScoped */) { - var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 243 /* VariableDeclarationList */); - var container = varDeclList.parent.kind === 225 /* VariableStatement */ && varDeclList.parent.parent + var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 247 /* VariableDeclarationList */); + var container = varDeclList.parent.kind === 229 /* VariableStatement */ && varDeclList.parent.parent ? varDeclList.parent.parent : undefined; // names of block-scoped and function scoped variables can collide only // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting) var namesShareScope = container && - (container.kind === 223 /* Block */ && ts.isFunctionLike(container.parent) || - container.kind === 250 /* ModuleBlock */ || - container.kind === 249 /* ModuleDeclaration */ || - container.kind === 290 /* SourceFile */); + (container.kind === 227 /* Block */ && ts.isFunctionLike(container.parent) || + container.kind === 254 /* ModuleBlock */ || + container.kind === 253 /* ModuleDeclaration */ || + container.kind === 294 /* SourceFile */); // here we know that function scoped variable is shadowed by block scoped one // if they are defined in the same scope - binder has already reported redeclaration error // otherwise if variable has an initializer - show error that initialization will fail @@ -63886,6 +72289,7 @@ var ts; } // Check variable, parameter, or property declaration function checkVariableLikeDeclaration(node) { + var _a; checkDecorators(node); if (!ts.isBindingElement(node)) { checkSourceElement(node.type); @@ -63898,18 +72302,18 @@ var ts; // Do not use hasDynamicName here, because that returns false for well known symbols. // We want to perform checkComputedPropertyName for all computed properties, including // well known symbols. - if (node.name.kind === 154 /* ComputedPropertyName */) { + if (node.name.kind === 157 /* ComputedPropertyName */) { checkComputedPropertyName(node.name); if (node.initializer) { checkExpressionCached(node.initializer); } } - if (node.kind === 191 /* BindingElement */) { - if (node.parent.kind === 189 /* ObjectBindingPattern */ && languageVersion < 99 /* ESNext */) { + if (node.kind === 195 /* BindingElement */) { + if (node.parent.kind === 193 /* ObjectBindingPattern */ && languageVersion < 99 /* ESNext */) { checkExternalEmitHelpers(node, 4 /* Rest */); } // check computed properties inside property names of binding elements - if (node.propertyName && node.propertyName.kind === 154 /* ComputedPropertyName */) { + if (node.propertyName && node.propertyName.kind === 157 /* ComputedPropertyName */) { checkComputedPropertyName(node.propertyName); } // check private/protected variable access @@ -63923,26 +72327,26 @@ var ts; var property = getPropertyOfType(parentType, nameText); if (property) { markPropertyAsReferenced(property, /*nodeForCheckWriteOnly*/ undefined, /*isThisAccess*/ false); // A destructuring is never a write-only reference. - checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 102 /* SuperKeyword */, parentType, property); + checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 105 /* SuperKeyword */, parentType, property); } } } } // For a binding pattern, check contained binding elements if (ts.isBindingPattern(node.name)) { - if (node.name.kind === 190 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) { + if (node.name.kind === 194 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) { checkExternalEmitHelpers(node, 512 /* Read */); } ts.forEach(node.name.elements, checkSourceElement); } // For a parameter declaration with an initializer, error and exit if the containing function doesn't have a body - if (node.initializer && ts.getRootDeclaration(node).kind === 156 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) { + if (node.initializer && ts.getRootDeclaration(node).kind === 159 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) { error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation); return; } // For a binding pattern, validate the initializer and exit if (ts.isBindingPattern(node.name)) { - var needCheckInitializer = node.initializer && node.parent.parent.kind !== 231 /* ForInStatement */; + var needCheckInitializer = node.initializer && node.parent.parent.kind !== 235 /* ForInStatement */; var needCheckWidenedType = node.name.elements.length === 0; if (needCheckInitializer || needCheckWidenedType) { // Don't validate for-in initializer as it is already an error @@ -63978,8 +72382,8 @@ var ts; var isJSObjectLiteralInitializer = ts.isInJSFile(node) && ts.isObjectLiteralExpression(initializer) && (initializer.properties.length === 0 || ts.isPrototypeAccess(node.name)) && - ts.hasEntries(symbol.exports); - if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 231 /* ForInStatement */) { + !!((_a = symbol.exports) === null || _a === void 0 ? void 0 : _a.size); + if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 235 /* ForInStatement */) { checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(initializer), type, node, initializer, /*headMessage*/ undefined); } } @@ -64005,22 +72409,22 @@ var ts; error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name)); } } - if (node.kind !== 159 /* PropertyDeclaration */ && node.kind !== 158 /* PropertySignature */) { + if (node.kind !== 162 /* PropertyDeclaration */ && node.kind !== 161 /* PropertySignature */) { // We know we don't have a binding pattern or computed name here checkExportsOnMergedDeclarations(node); - if (node.kind === 242 /* VariableDeclaration */ || node.kind === 191 /* BindingElement */) { + if (node.kind === 246 /* VariableDeclaration */ || node.kind === 195 /* BindingElement */) { checkVarDeclaredNamesNotShadowed(node); } checkCollisionWithRequireExportsInGeneratedCode(node, node.name); checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name); - if (!compilerOptions.noEmit && languageVersion < 99 /* ESNext */ && needCollisionCheckForIdentifier(node, node.name, "WeakMap")) { + if (languageVersion < 99 /* ESNext */ && needCollisionCheckForIdentifier(node, node.name, "WeakMap")) { potentialWeakMapCollisions.push(node); } } } function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstDeclaration, firstType, nextDeclaration, nextType) { var nextDeclarationName = ts.getNameOfDeclaration(nextDeclaration); - var message = nextDeclaration.kind === 159 /* PropertyDeclaration */ || nextDeclaration.kind === 158 /* PropertySignature */ + var message = nextDeclaration.kind === 162 /* PropertyDeclaration */ || nextDeclaration.kind === 161 /* PropertySignature */ ? ts.Diagnostics.Subsequent_property_declarations_must_have_the_same_type_Property_0_must_be_of_type_1_but_here_has_type_2 : ts.Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2; var declName = ts.declarationNameToString(nextDeclarationName); @@ -64030,8 +72434,8 @@ var ts; } } function areDeclarationFlagsIdentical(left, right) { - if ((left.kind === 156 /* Parameter */ && right.kind === 242 /* VariableDeclaration */) || - (left.kind === 242 /* VariableDeclaration */ && right.kind === 156 /* Parameter */)) { + if ((left.kind === 159 /* Parameter */ && right.kind === 246 /* VariableDeclaration */) || + (left.kind === 246 /* VariableDeclaration */ && right.kind === 159 /* Parameter */)) { // Differences in optionality between parameters and variables are allowed. return true; } @@ -64044,7 +72448,7 @@ var ts; 128 /* Abstract */ | 64 /* Readonly */ | 32 /* Static */; - return ts.getSelectedModifierFlags(left, interestingFlags) === ts.getSelectedModifierFlags(right, interestingFlags); + return ts.getSelectedEffectiveModifierFlags(left, interestingFlags) === ts.getSelectedEffectiveModifierFlags(right, interestingFlags); } function checkVariableDeclaration(node) { checkGrammarVariableDeclaration(node); @@ -64071,7 +72475,7 @@ var ts; var type = checkTruthinessExpression(node.expression); checkTestingKnownTruthyCallableType(node.expression, node.thenStatement, type); checkSourceElement(node.thenStatement); - if (node.thenStatement.kind === 224 /* EmptyStatement */) { + if (node.thenStatement.kind === 228 /* EmptyStatement */) { error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement); } checkSourceElement(node.elseStatement); @@ -64118,7 +72522,7 @@ var ts; var childExpression = childNode.parent; while (testedExpression && childExpression) { if (ts.isIdentifier(testedExpression) && ts.isIdentifier(childExpression) || - testedExpression.kind === 104 /* ThisKeyword */ && childExpression.kind === 104 /* ThisKeyword */) { + testedExpression.kind === 107 /* ThisKeyword */ && childExpression.kind === 107 /* ThisKeyword */) { return getSymbolAtLocation(testedExpression) === getSymbolAtLocation(childExpression); } if (ts.isPropertyAccessExpression(testedExpression) && ts.isPropertyAccessExpression(childExpression)) { @@ -64164,12 +72568,12 @@ var ts; function checkForStatement(node) { // Grammar checking if (!checkGrammarStatementInAmbientContext(node)) { - if (node.initializer && node.initializer.kind === 243 /* VariableDeclarationList */) { + if (node.initializer && node.initializer.kind === 247 /* VariableDeclarationList */) { checkGrammarVariableDeclarationList(node.initializer); } } if (node.initializer) { - if (node.initializer.kind === 243 /* VariableDeclarationList */) { + if (node.initializer.kind === 247 /* VariableDeclarationList */) { ts.forEach(node.initializer.declarations, checkVariableDeclaration); } else { @@ -64203,14 +72607,14 @@ var ts; // via checkRightHandSideOfForOf. // If the LHS is an expression, check the LHS, as a destructuring assignment or as a reference. // Then check that the RHS is assignable to it. - if (node.initializer.kind === 243 /* VariableDeclarationList */) { + if (node.initializer.kind === 247 /* VariableDeclarationList */) { checkForInOrForOfVariableDeclaration(node); } else { var varExpr = node.initializer; var iteratedType = checkRightHandSideOfForOf(node); // There may be a destructuring assignment on the left side - if (varExpr.kind === 192 /* ArrayLiteralExpression */ || varExpr.kind === 193 /* ObjectLiteralExpression */) { + if (varExpr.kind === 196 /* ArrayLiteralExpression */ || varExpr.kind === 197 /* ObjectLiteralExpression */) { // iteratedType may be undefined. In this case, we still want to check the structure of // varExpr, in particular making sure it's a valid LeftHandSideExpression. But we'd like // to short circuit the type relation checking as much as possible, so we pass the unknownType. @@ -64242,7 +72646,7 @@ var ts; // for (let VarDecl in Expr) Statement // VarDecl must be a variable declaration without a type annotation that declares a variable of type Any, // and Expr must be an expression of type Any, an object type, or a type parameter type. - if (node.initializer.kind === 243 /* VariableDeclarationList */) { + if (node.initializer.kind === 247 /* VariableDeclarationList */) { var variable = node.initializer.declarations[0]; if (variable && ts.isBindingPattern(variable.name)) { error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern); @@ -64256,7 +72660,7 @@ var ts; // and Expr must be an expression of type Any, an object type, or a type parameter type. var varExpr = node.initializer; var leftType = checkExpression(varExpr); - if (varExpr.kind === 192 /* ArrayLiteralExpression */ || varExpr.kind === 193 /* ObjectLiteralExpression */) { + if (varExpr.kind === 196 /* ArrayLiteralExpression */ || varExpr.kind === 197 /* ObjectLiteralExpression */) { error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern); } else if (!isTypeAssignableTo(getIndexTypeOrString(rightType), leftType)) { @@ -64659,7 +73063,7 @@ var ts; if (!ts.some(signatures)) { return setCachedIterationTypes(type, resolver.iterableCacheKey, noIterationTypes); } - var iteratorType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2 /* Subtype */); + var iteratorType = getIntersectionType(ts.map(signatures, getReturnTypeOfSignature)); var iterationTypes = (_a = getIterationTypesOfIterator(iteratorType, resolver, errorNode)) !== null && _a !== void 0 ? _a : noIterationTypes; return setCachedIterationTypes(type, resolver.iterableCacheKey, iterationTypes); } @@ -64841,7 +73245,7 @@ var ts; } // Resolve the *yield* and *return* types from the return type of the method (i.e. `IteratorResult`) var yieldType; - var methodReturnType = methodReturnTypes ? getUnionType(methodReturnTypes, 2 /* Subtype */) : neverType; + var methodReturnType = methodReturnTypes ? getIntersectionType(methodReturnTypes) : neverType; var resolvedMethodReturnType = resolver.resolveIterationType(methodReturnType, errorNode) || anyType; var iterationTypes = getIterationTypesOfIteratorResult(resolvedMethodReturnType); if (iterationTypes === noIterationTypes) { @@ -64930,12 +73334,12 @@ var ts; var functionFlags = ts.getFunctionFlags(func); if (strictNullChecks || node.expression || returnType.flags & 131072 /* Never */) { var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType; - if (func.kind === 164 /* SetAccessor */) { + if (func.kind === 167 /* SetAccessor */) { if (node.expression) { error(node, ts.Diagnostics.Setters_cannot_return_a_value); } } - else if (func.kind === 162 /* Constructor */) { + else if (func.kind === 165 /* Constructor */) { if (node.expression && !checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression)) { error(node, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class); } @@ -64953,7 +73357,7 @@ var ts; } } } - else if (func.kind !== 162 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) { + else if (func.kind !== 165 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) { // The function has a return type, but the return statement doesn't have an expression. error(node, ts.Diagnostics.Not_all_code_paths_return_a_value); } @@ -64982,7 +73386,7 @@ var ts; var expressionIsLiteral = isLiteralType(expressionType); ts.forEach(node.caseBlock.clauses, function (clause) { // Grammar check for duplicate default clauses, skip if we already report duplicate default clause - if (clause.kind === 278 /* DefaultClause */ && !hasDuplicateDefaultClause) { + if (clause.kind === 282 /* DefaultClause */ && !hasDuplicateDefaultClause) { if (firstDefaultClause === undefined) { firstDefaultClause = clause; } @@ -64991,7 +73395,7 @@ var ts; hasDuplicateDefaultClause = true; } } - if (produceDiagnostics && clause.kind === 277 /* CaseClause */) { + if (produceDiagnostics && clause.kind === 281 /* CaseClause */) { // TypeScript 1.0 spec (April 2014): 5.9 // In a 'switch' statement, each 'case' expression must be of a type that is comparable // to or from the type of the 'switch' expression. @@ -65023,7 +73427,7 @@ var ts; if (ts.isFunctionLike(current)) { return "quit"; } - if (current.kind === 238 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) { + if (current.kind === 242 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) { grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNode(node.label)); return true; } @@ -65036,7 +73440,7 @@ var ts; function checkThrowStatement(node) { // Grammar checking if (!checkGrammarStatementInAmbientContext(node)) { - if (node.expression === undefined) { + if (ts.isIdentifier(node.expression) && !node.expression.escapedText) { grammarErrorAfterFirstToken(node, ts.Diagnostics.Line_break_not_permitted_here); } } @@ -65052,8 +73456,8 @@ var ts; if (catchClause) { // Grammar checking if (catchClause.variableDeclaration) { - if (catchClause.variableDeclaration.type) { - grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_cannot_have_a_type_annotation); + if (catchClause.variableDeclaration.type && getTypeOfNode(catchClause.variableDeclaration) === errorType) { + grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_type_annotation_must_be_any_or_unknown_if_specified); } else if (catchClause.variableDeclaration.initializer) { grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer); @@ -65094,7 +73498,7 @@ var ts; // Only process instance properties with computed names here. // Static properties cannot be in conflict with indexers, // and properties with literal names were already checked. - if (!ts.hasModifier(member, 32 /* Static */) && hasNonBindableDynamicName(member)) { + if (!ts.hasSyntacticModifier(member, 32 /* Static */) && hasNonBindableDynamicName(member)) { var symbol = getSymbolOfNode(member); var propType = getTypeOfSymbol(symbol); checkIndexConstraintForProperty(symbol, propType, type, declaredStringIndexer, stringIndexType, 0 /* String */); @@ -65133,8 +73537,8 @@ var ts; // this allows us to rule out cases when both property and indexer are inherited from the base class var errorNode; if (propDeclaration && name && - (propDeclaration.kind === 209 /* BinaryExpression */ || - name.kind === 154 /* ComputedPropertyName */ || + (propDeclaration.kind === 213 /* BinaryExpression */ || + name.kind === 157 /* ComputedPropertyName */ || prop.parent === containingType.symbol)) { errorNode = propDeclaration; } @@ -65211,7 +73615,7 @@ var ts; function checkTypeParametersNotReferenced(root, typeParameters, index) { visit(root); function visit(node) { - if (node.kind === 169 /* TypeReference */) { + if (node.kind === 172 /* TypeReference */) { var type = getTypeFromTypeReference(node); if (type.flags & 262144 /* TypeParameter */) { for (var i = index; i < typeParameters.length; i++) { @@ -65297,7 +73701,7 @@ var ts; registerForUnusedIdentifiersCheck(node); } function checkClassDeclaration(node) { - if (!node.name && !ts.hasModifier(node, 512 /* Default */)) { + if (!node.name && !ts.hasSyntacticModifier(node, 512 /* Default */)) { grammarErrorOnFirstToken(node, ts.Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name); } checkClassLikeDeclaration(node); @@ -65412,7 +73816,7 @@ var ts; function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) { // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible var issuedMemberError = false; - var _loop_19 = function (member) { + var _loop_22 = function (member) { if (ts.hasStaticModifier(member)) { return "continue"; } @@ -65431,7 +73835,7 @@ var ts; }; for (var _i = 0, _a = node.members; _i < _a.length; _i++) { var member = _a[_i]; - _loop_19(member); + _loop_22(member); } if (!issuedMemberError) { // check again with diagnostics to generate a less-specific error @@ -65442,7 +73846,7 @@ var ts; var signatures = getSignaturesOfType(type, 1 /* Construct */); if (signatures.length) { var declaration = signatures[0].declaration; - if (declaration && ts.hasModifier(declaration, 8 /* Private */)) { + if (declaration && ts.hasEffectiveModifier(declaration, 8 /* Private */)) { var typeClassDeclaration = ts.getClassLikeDeclarationOfSymbol(type.symbol); if (!isNodeWithinClass(node, typeClassDeclaration)) { error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, getFullyQualifiedName(type.symbol)); @@ -65457,7 +73861,7 @@ var ts; } function getClassOrInterfaceDeclarationsOfSymbol(symbol) { return ts.filter(symbol.declarations, function (d) { - return d.kind === 245 /* ClassDeclaration */ || d.kind === 246 /* InterfaceDeclaration */; + return d.kind === 249 /* ClassDeclaration */ || d.kind === 250 /* InterfaceDeclaration */; }); } function checkKindsOfPropertyMemberOverrides(type, baseType) { @@ -65498,7 +73902,7 @@ var ts; // It is an error to inherit an abstract member without implementing it or being declared abstract. // If there is no declaration for the derived class (as in the case of class expressions), // then the class cannot be declared abstract. - if (baseDeclarationFlags & 128 /* Abstract */ && (!derivedClassDecl || !ts.hasModifier(derivedClassDecl, 128 /* Abstract */))) { + if (baseDeclarationFlags & 128 /* Abstract */ && (!derivedClassDecl || !ts.hasSyntacticModifier(derivedClassDecl, 128 /* Abstract */))) { // Searches other base types for a declaration that would satisfy the inherited abstract member. // (The class may have more than one base type via declaration merging with an interface with the // same name.) @@ -65512,7 +73916,7 @@ var ts; continue basePropertyCheck; } } - if (derivedClassDecl.kind === 214 /* ClassExpression */) { + if (derivedClassDecl.kind === 218 /* ClassExpression */) { error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType)); } else { @@ -65532,9 +73936,8 @@ var ts; var derivedPropertyFlags = derived.flags & 98308 /* PropertyOrAccessor */; if (basePropertyFlags && derivedPropertyFlags) { // property/accessor is overridden with property/accessor - if (!compilerOptions.useDefineForClassFields - || baseDeclarationFlags & 128 /* Abstract */ && !(base.valueDeclaration && ts.isPropertyDeclaration(base.valueDeclaration) && base.valueDeclaration.initializer) - || base.valueDeclaration && base.valueDeclaration.parent.kind === 246 /* InterfaceDeclaration */ + if (baseDeclarationFlags & 128 /* Abstract */ && !(base.valueDeclaration && ts.isPropertyDeclaration(base.valueDeclaration) && base.valueDeclaration.initializer) + || base.valueDeclaration && base.valueDeclaration.parent.kind === 250 /* InterfaceDeclaration */ || derived.valueDeclaration && ts.isBinaryExpression(derived.valueDeclaration)) { // when the base property is abstract or from an interface, base/derived flags don't need to match // same when the derived property is from an assignment @@ -65548,8 +73951,8 @@ var ts; ts.Diagnostics._0_is_defined_as_a_property_in_class_1_but_is_overridden_here_in_2_as_an_accessor; error(ts.getNameOfDeclaration(derived.valueDeclaration) || derived.valueDeclaration, errorMessage_1, symbolToString(base), typeToString(baseType), typeToString(type)); } - else { - var uninitialized = ts.find(derived.declarations, function (d) { return d.kind === 159 /* PropertyDeclaration */ && !d.initializer; }); + else if (compilerOptions.useDefineForClassFields) { + var uninitialized = ts.find(derived.declarations, function (d) { return d.kind === 162 /* PropertyDeclaration */ && !d.initializer; }); if (uninitialized && !(derived.flags & 33554432 /* Transient */) && !(baseDeclarationFlags & 128 /* Abstract */) @@ -65594,7 +73997,7 @@ var ts; if (!ts.length(baseTypes)) { return properties; } - var seen = ts.createUnderscoreEscapedMap(); + var seen = new ts.Map(); ts.forEach(properties, function (p) { seen.set(p.escapedName, p); }); for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) { var base = baseTypes_2[_i]; @@ -65614,7 +74017,7 @@ var ts; if (baseTypes.length < 2) { return true; } - var seen = ts.createUnderscoreEscapedMap(); + var seen = new ts.Map(); ts.forEach(resolveDeclaredMembers(type).declaredProperties, function (p) { seen.set(p.escapedName, { prop: p, containingType: type }); }); var ok = true; for (var _i = 0, baseTypes_3 = baseTypes; _i < baseTypes_3.length; _i++) { @@ -65648,7 +74051,7 @@ var ts; var constructor = findConstructorDeclaration(node); for (var _i = 0, _a = node.members; _i < _a.length; _i++) { var member = _a[_i]; - if (ts.getModifierFlags(member) & 2 /* Ambient */) { + if (ts.getEffectiveModifierFlags(member) & 2 /* Ambient */) { continue; } if (isInstancePropertyWithoutInitializer(member)) { @@ -65665,15 +74068,15 @@ var ts; } } function isInstancePropertyWithoutInitializer(node) { - return node.kind === 159 /* PropertyDeclaration */ && - !ts.hasModifier(node, 32 /* Static */ | 128 /* Abstract */) && + return node.kind === 162 /* PropertyDeclaration */ && + !ts.hasSyntacticModifier(node, 32 /* Static */ | 128 /* Abstract */) && !node.exclamationToken && !node.initializer; } function isPropertyInitializedInConstructor(propName, propType, constructor) { - var reference = ts.createPropertyAccess(ts.createThis(), propName); - reference.expression.parent = reference; - reference.parent = constructor; + var reference = ts.factory.createPropertyAccessExpression(ts.factory.createThis(), propName); + ts.setParent(reference.expression, reference); + ts.setParent(reference, constructor); reference.flowNode = constructor.returnFlowNode; var flowType = getFlowTypeOfReference(reference, propType, getOptionalType(propType)); return !(getFalsyFlags(flowType) & 32768 /* Undefined */); @@ -65689,7 +74092,7 @@ var ts; var symbol = getSymbolOfNode(node); checkTypeParameterListsIdentical(symbol); // Only check this symbol once - var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 246 /* InterfaceDeclaration */); + var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 250 /* InterfaceDeclaration */); if (node === firstInterfaceDecl) { var type = getDeclaredTypeOfSymbol(symbol); var typeWithThis = getTypeWithThisArgument(type); @@ -65801,7 +74204,7 @@ var ts; return value; function evaluate(expr) { switch (expr.kind) { - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: var value_2 = evaluate(expr.operand); if (typeof value_2 === "number") { switch (expr.operator) { @@ -65811,7 +74214,7 @@ var ts; } } break; - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: var left = evaluate(expr.left); var right = evaluate(expr.right); if (typeof left === "number" && typeof right === "number") { @@ -65840,22 +74243,22 @@ var ts; case 8 /* NumericLiteral */: checkGrammarNumericLiteral(expr); return +expr.text; - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return evaluate(expr.expression); - case 75 /* Identifier */: + case 78 /* Identifier */: var identifier = expr; if (isInfinityOrNaNString(identifier.escapedText)) { return +(identifier.escapedText); } return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText); - case 195 /* ElementAccessExpression */: - case 194 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: + case 198 /* PropertyAccessExpression */: var ex = expr; if (isConstantMemberAccess(ex)) { var type = getTypeOfExpression(ex.expression); if (type.symbol && type.symbol.flags & 384 /* Enum */) { var name = void 0; - if (ex.kind === 194 /* PropertyAccessExpression */) { + if (ex.kind === 198 /* PropertyAccessExpression */) { name = ex.name.escapedText; } else { @@ -65887,9 +74290,9 @@ var ts; } } function isConstantMemberAccess(node) { - return node.kind === 75 /* Identifier */ || - node.kind === 194 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) || - node.kind === 195 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) && + return node.kind === 78 /* Identifier */ || + node.kind === 198 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) || + node.kind === 199 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) && ts.isStringLiteralLike(node.argumentExpression); } function checkEnumDeclaration(node) { @@ -65925,7 +74328,7 @@ var ts; var seenEnumMissingInitialInitializer_1 = false; ts.forEach(enumSymbol.declarations, function (declaration) { // return true if we hit a violation of the rule, false otherwise - if (declaration.kind !== 248 /* EnumDeclaration */) { + if (declaration.kind !== 252 /* EnumDeclaration */) { return false; } var enumDeclaration = declaration; @@ -65953,8 +74356,8 @@ var ts; var declarations = symbol.declarations; for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) { var declaration = declarations_8[_i]; - if ((declaration.kind === 245 /* ClassDeclaration */ || - (declaration.kind === 244 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) && + if ((declaration.kind === 249 /* ClassDeclaration */ || + (declaration.kind === 248 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) && !(declaration.flags & 8388608 /* Ambient */)) { return declaration; } @@ -66017,7 +74420,7 @@ var ts; } // if the module merges with a class declaration in the same lexical scope, // we need to track this to ensure the correct emit. - var mergedClass = ts.getDeclarationOfKind(symbol, 245 /* ClassDeclaration */); + var mergedClass = ts.getDeclarationOfKind(symbol, 249 /* ClassDeclaration */); if (mergedClass && inSameLexicalScope(node, mergedClass)) { getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */; @@ -66067,23 +74470,23 @@ var ts; } function checkModuleAugmentationElement(node, isGlobalAugmentation) { switch (node.kind) { - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: // error each individual name in variable statement instead of marking the entire variable statement for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) { var decl = _a[_i]; checkModuleAugmentationElement(decl, isGlobalAugmentation); } break; - case 259 /* ExportAssignment */: - case 260 /* ExportDeclaration */: + case 263 /* ExportAssignment */: + case 264 /* ExportDeclaration */: grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations); break; - case 253 /* ImportEqualsDeclaration */: - case 254 /* ImportDeclaration */: + case 257 /* ImportEqualsDeclaration */: + case 258 /* ImportDeclaration */: grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module); break; - case 191 /* BindingElement */: - case 242 /* VariableDeclaration */: + case 195 /* BindingElement */: + case 246 /* VariableDeclaration */: var name = node.name; if (ts.isBindingPattern(name)) { for (var _b = 0, _c = name.elements; _b < _c.length; _b++) { @@ -66094,12 +74497,12 @@ var ts; break; } // falls through - case 245 /* ClassDeclaration */: - case 248 /* EnumDeclaration */: - case 244 /* FunctionDeclaration */: - case 246 /* InterfaceDeclaration */: - case 249 /* ModuleDeclaration */: - case 247 /* TypeAliasDeclaration */: + case 249 /* ClassDeclaration */: + case 252 /* EnumDeclaration */: + case 248 /* FunctionDeclaration */: + case 250 /* InterfaceDeclaration */: + case 253 /* ModuleDeclaration */: + case 251 /* TypeAliasDeclaration */: if (isGlobalAugmentation) { return; } @@ -66120,20 +74523,20 @@ var ts; } function getFirstNonModuleExportsIdentifier(node) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return node; - case 153 /* QualifiedName */: + case 156 /* QualifiedName */: do { node = node.left; - } while (node.kind !== 75 /* Identifier */); + } while (node.kind !== 78 /* Identifier */); return node; - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: do { if (ts.isModuleExportsAccessExpression(node.expression) && !ts.isPrivateIdentifier(node.name)) { return node.name; } node = node.expression; - } while (node.kind !== 75 /* Identifier */); + } while (node.kind !== 78 /* Identifier */); return node; } } @@ -66147,9 +74550,9 @@ var ts; error(moduleName, ts.Diagnostics.String_literal_expected); return false; } - var inAmbientExternalModule = node.parent.kind === 250 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent); - if (node.parent.kind !== 290 /* SourceFile */ && !inAmbientExternalModule) { - error(moduleName, node.kind === 260 /* ExportDeclaration */ ? + var inAmbientExternalModule = node.parent.kind === 254 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent); + if (node.parent.kind !== 294 /* SourceFile */ && !inAmbientExternalModule) { + error(moduleName, node.kind === 264 /* ExportDeclaration */ ? ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace : ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module); return false; @@ -66171,9 +74574,8 @@ var ts; function checkAliasSymbol(node) { var symbol = getSymbolOfNode(node); var target = resolveAlias(symbol); - var shouldSkipWithJSExpandoTargets = symbol.flags & 67108864 /* Assignment */; - if (!shouldSkipWithJSExpandoTargets && target !== unknownSymbol) { - // For external modules symbol represents local symbol for an alias. + if (target !== unknownSymbol) { + // For external modules, `symbol` represents the local symbol for an alias. // This local symbol will merge any other local declarations (excluding other aliases) // and symbol.flags will contains combined representation for all merged declaration. // Based on symbol.flags we can compute a set of excluded meanings (meaning that resolved alias should not have, @@ -66184,32 +74586,41 @@ var ts; (symbol.flags & 788968 /* Type */ ? 788968 /* Type */ : 0) | (symbol.flags & 1920 /* Namespace */ ? 1920 /* Namespace */ : 0); if (target.flags & excludedMeanings) { - var message = node.kind === 263 /* ExportSpecifier */ ? + var message = node.kind === 267 /* ExportSpecifier */ ? ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 : ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0; error(node, message, symbolToString(symbol)); } // Don't allow to re-export something with no value side when `--isolatedModules` is set. if (compilerOptions.isolatedModules - && node.kind === 263 /* ExportSpecifier */ + && node.kind === 267 /* ExportSpecifier */ && !node.parent.parent.isTypeOnly && !(target.flags & 111551 /* Value */) && !(node.flags & 8388608 /* Ambient */)) { error(node, ts.Diagnostics.Re_exporting_a_type_when_the_isolatedModules_flag_is_provided_requires_using_export_type); } + if (ts.isImportSpecifier(node) && ts.every(target.declarations, function (d) { return !!(ts.getCombinedNodeFlags(d) & 134217728 /* Deprecated */); })) { + errorOrSuggestion(/* isError */ false, node.name, ts.Diagnostics._0_is_deprecated, symbol.escapedName); + } } } function checkImportBinding(node) { checkCollisionWithRequireExportsInGeneratedCode(node, node.name); checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name); checkAliasSymbol(node); + if (node.kind === 262 /* ImportSpecifier */ && + ts.idText(node.propertyName || node.name) === "default" && + compilerOptions.esModuleInterop && + moduleKind !== ts.ModuleKind.System && moduleKind < ts.ModuleKind.ES2015) { + checkExternalEmitHelpers(node, 262144 /* ImportDefault */); + } } function checkImportDeclaration(node) { if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_import_declaration_can_only_be_used_in_a_namespace_or_module)) { // If we hit an import declaration in an illegal context, just bail out to avoid cascading errors. return; } - if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasModifiers(node)) { + if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasEffectiveModifiers(node)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers); } if (checkExternalImportOrExportDeclaration(node)) { @@ -66219,8 +74630,12 @@ var ts; checkImportBinding(importClause); } if (importClause.namedBindings) { - if (importClause.namedBindings.kind === 256 /* NamespaceImport */) { + if (importClause.namedBindings.kind === 260 /* NamespaceImport */) { checkImportBinding(importClause.namedBindings); + if (moduleKind !== ts.ModuleKind.System && moduleKind < ts.ModuleKind.ES2015 && compilerOptions.esModuleInterop) { + // import * as ns from "foo"; + checkExternalEmitHelpers(node, 131072 /* ImportStar */); + } } else { var moduleExisted = resolveExternalModuleName(node, node.moduleSpecifier); @@ -66240,10 +74655,10 @@ var ts; checkGrammarDecoratorsAndModifiers(node); if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) { checkImportBinding(node); - if (ts.hasModifier(node, 1 /* Export */)) { + if (ts.hasSyntacticModifier(node, 1 /* Export */)) { markExportAsReferenced(node); } - if (node.moduleReference.kind !== 265 /* ExternalModuleReference */) { + if (node.moduleReference.kind !== 269 /* ExternalModuleReference */) { var target = resolveAlias(getSymbolOfNode(node)); if (target !== unknownSymbol) { if (target.flags & 111551 /* Value */) { @@ -66271,11 +74686,11 @@ var ts; // If we hit an export in an illegal context, just bail out to avoid cascading errors. return; } - if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasModifiers(node)) { + if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasEffectiveModifiers(node)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers); } if (node.moduleSpecifier && node.exportClause && ts.isNamedExports(node.exportClause) && ts.length(node.exportClause.elements) && languageVersion === 0 /* ES3 */) { - checkExternalEmitHelpers(node, 1048576 /* CreateBinding */); + checkExternalEmitHelpers(node, 4194304 /* CreateBinding */); } checkGrammarExportDeclaration(node); if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) { @@ -66283,15 +74698,16 @@ var ts; // export { x, y } // export { x, y } from "foo" ts.forEach(node.exportClause.elements, checkExportSpecifier); - var inAmbientExternalModule = node.parent.kind === 250 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent); - var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 250 /* ModuleBlock */ && + var inAmbientExternalModule = node.parent.kind === 254 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent); + var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 254 /* ModuleBlock */ && !node.moduleSpecifier && node.flags & 8388608 /* Ambient */; - if (node.parent.kind !== 290 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) { + if (node.parent.kind !== 294 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) { error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace); } } else { // export * from "foo" + // export * as ns from "foo"; var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier); if (moduleSymbol && hasExportAssignmentSymbol(moduleSymbol)) { error(node.moduleSpecifier, ts.Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol)); @@ -66300,21 +74716,32 @@ var ts; checkAliasSymbol(node.exportClause); } if (moduleKind !== ts.ModuleKind.System && moduleKind < ts.ModuleKind.ES2015) { - checkExternalEmitHelpers(node, 65536 /* ExportStar */); + if (node.exportClause) { + // export * as ns from "foo"; + // For ES2015 modules, we emit it as a pair of `import * as a_1 ...; export { a_1 as ns }` and don't need the helper. + // We only use the helper here when in esModuleInterop + if (compilerOptions.esModuleInterop) { + checkExternalEmitHelpers(node, 131072 /* ImportStar */); + } + } + else { + // export * from "foo" + checkExternalEmitHelpers(node, 65536 /* ExportStar */); + } } } } } function checkGrammarExportDeclaration(node) { var _a; - var isTypeOnlyExportStar = node.isTypeOnly && ((_a = node.exportClause) === null || _a === void 0 ? void 0 : _a.kind) !== 261 /* NamedExports */; + var isTypeOnlyExportStar = node.isTypeOnly && ((_a = node.exportClause) === null || _a === void 0 ? void 0 : _a.kind) !== 265 /* NamedExports */; if (isTypeOnlyExportStar) { grammarErrorOnNode(node, ts.Diagnostics.Only_named_exports_may_use_export_type); } return !isTypeOnlyExportStar; } function checkGrammarModuleElementContext(node, errorMessage) { - var isInAppropriateContext = node.parent.kind === 290 /* SourceFile */ || node.parent.kind === 250 /* ModuleBlock */ || node.parent.kind === 249 /* ModuleDeclaration */; + var isInAppropriateContext = node.parent.kind === 294 /* SourceFile */ || node.parent.kind === 254 /* ModuleBlock */ || node.parent.kind === 253 /* ModuleDeclaration */; if (!isInAppropriateContext) { grammarErrorOnFirstToken(node, errorMessage); } @@ -66364,14 +74791,22 @@ var ts; } } } + else { + if (compilerOptions.esModuleInterop && + moduleKind !== ts.ModuleKind.System && + moduleKind < ts.ModuleKind.ES2015 && + ts.idText(node.propertyName || node.name) === "default") { + checkExternalEmitHelpers(node, 262144 /* ImportDefault */); + } + } } function checkExportAssignment(node) { if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_assignment_can_only_be_used_in_a_module)) { // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors. return; } - var container = node.parent.kind === 290 /* SourceFile */ ? node.parent : node.parent.parent; - if (container.kind === 249 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) { + var container = node.parent.kind === 294 /* SourceFile */ ? node.parent : node.parent.parent; + if (container.kind === 253 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) { if (node.isExportEquals) { error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace); } @@ -66381,10 +74816,10 @@ var ts; return; } // Grammar checking - if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasModifiers(node)) { + if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasEffectiveModifiers(node)) { grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers); } - if (node.expression.kind === 75 /* Identifier */) { + if (node.expression.kind === 78 /* Identifier */) { var id = node.expression; var sym = resolveEntityName(id, 67108863 /* All */, /*ignoreErrors*/ true, /*dontResolveAlias*/ true, node); if (sym) { @@ -66485,167 +74920,169 @@ var ts; // Only bother checking on a few construct kinds. We don't want to be excessively // hitting the cancellation token on every node we check. switch (kind) { - case 249 /* ModuleDeclaration */: - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: - case 244 /* FunctionDeclaration */: + case 253 /* ModuleDeclaration */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: + case 248 /* FunctionDeclaration */: cancellationToken.throwIfCancellationRequested(); } } - if (kind >= 225 /* FirstStatement */ && kind <= 241 /* LastStatement */ && node.flowNode && !isReachableFlowNode(node.flowNode)) { + if (kind >= 229 /* FirstStatement */ && kind <= 245 /* LastStatement */ && node.flowNode && !isReachableFlowNode(node.flowNode)) { errorOrSuggestion(compilerOptions.allowUnreachableCode === false, node, ts.Diagnostics.Unreachable_code_detected); } switch (kind) { - case 155 /* TypeParameter */: + case 158 /* TypeParameter */: return checkTypeParameter(node); - case 156 /* Parameter */: + case 159 /* Parameter */: return checkParameter(node); - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: return checkPropertyDeclaration(node); - case 158 /* PropertySignature */: + case 161 /* PropertySignature */: return checkPropertySignature(node); - case 170 /* FunctionType */: - case 171 /* ConstructorType */: - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 167 /* IndexSignature */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 170 /* IndexSignature */: return checkSignatureDeclaration(node); - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: return checkMethodDeclaration(node); - case 162 /* Constructor */: + case 165 /* Constructor */: return checkConstructorDeclaration(node); - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return checkAccessorDeclaration(node); - case 169 /* TypeReference */: + case 172 /* TypeReference */: return checkTypeReferenceNode(node); - case 168 /* TypePredicate */: + case 171 /* TypePredicate */: return checkTypePredicate(node); - case 172 /* TypeQuery */: + case 175 /* TypeQuery */: return checkTypeQuery(node); - case 173 /* TypeLiteral */: + case 176 /* TypeLiteral */: return checkTypeLiteral(node); - case 174 /* ArrayType */: + case 177 /* ArrayType */: return checkArrayType(node); - case 175 /* TupleType */: + case 178 /* TupleType */: return checkTupleType(node); - case 178 /* UnionType */: - case 179 /* IntersectionType */: + case 181 /* UnionType */: + case 182 /* IntersectionType */: return checkUnionOrIntersectionType(node); - case 182 /* ParenthesizedType */: - case 176 /* OptionalType */: - case 177 /* RestType */: + case 185 /* ParenthesizedType */: + case 179 /* OptionalType */: + case 180 /* RestType */: return checkSourceElement(node.type); - case 183 /* ThisType */: + case 186 /* ThisType */: return checkThisType(node); - case 184 /* TypeOperator */: + case 187 /* TypeOperator */: return checkTypeOperator(node); - case 180 /* ConditionalType */: + case 183 /* ConditionalType */: return checkConditionalType(node); - case 181 /* InferType */: + case 184 /* InferType */: return checkInferType(node); - case 188 /* ImportType */: + case 192 /* ImportType */: return checkImportType(node); - case 307 /* JSDocAugmentsTag */: + case 191 /* NamedTupleMember */: + return checkNamedTupleMember(node); + case 311 /* JSDocAugmentsTag */: return checkJSDocAugmentsTag(node); - case 308 /* JSDocImplementsTag */: + case 312 /* JSDocImplementsTag */: return checkJSDocImplementsTag(node); - case 322 /* JSDocTypedefTag */: - case 315 /* JSDocCallbackTag */: - case 316 /* JSDocEnumTag */: + case 327 /* JSDocTypedefTag */: + case 320 /* JSDocCallbackTag */: + case 321 /* JSDocEnumTag */: return checkJSDocTypeAliasTag(node); - case 321 /* JSDocTemplateTag */: + case 326 /* JSDocTemplateTag */: return checkJSDocTemplateTag(node); - case 320 /* JSDocTypeTag */: + case 325 /* JSDocTypeTag */: return checkJSDocTypeTag(node); - case 317 /* JSDocParameterTag */: + case 322 /* JSDocParameterTag */: return checkJSDocParameterTag(node); - case 323 /* JSDocPropertyTag */: + case 328 /* JSDocPropertyTag */: return checkJSDocPropertyTag(node); - case 300 /* JSDocFunctionType */: + case 304 /* JSDocFunctionType */: checkJSDocFunctionType(node); // falls through - case 298 /* JSDocNonNullableType */: - case 297 /* JSDocNullableType */: - case 295 /* JSDocAllType */: - case 296 /* JSDocUnknownType */: - case 304 /* JSDocTypeLiteral */: + case 302 /* JSDocNonNullableType */: + case 301 /* JSDocNullableType */: + case 299 /* JSDocAllType */: + case 300 /* JSDocUnknownType */: + case 308 /* JSDocTypeLiteral */: checkJSDocTypeIsInJsFile(node); ts.forEachChild(node, checkSourceElement); return; - case 301 /* JSDocVariadicType */: + case 305 /* JSDocVariadicType */: checkJSDocVariadicType(node); return; - case 294 /* JSDocTypeExpression */: + case 298 /* JSDocTypeExpression */: return checkSourceElement(node.type); - case 185 /* IndexedAccessType */: + case 188 /* IndexedAccessType */: return checkIndexedAccessType(node); - case 186 /* MappedType */: + case 189 /* MappedType */: return checkMappedType(node); - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: return checkFunctionDeclaration(node); - case 223 /* Block */: - case 250 /* ModuleBlock */: + case 227 /* Block */: + case 254 /* ModuleBlock */: return checkBlock(node); - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: return checkVariableStatement(node); - case 226 /* ExpressionStatement */: + case 230 /* ExpressionStatement */: return checkExpressionStatement(node); - case 227 /* IfStatement */: + case 231 /* IfStatement */: return checkIfStatement(node); - case 228 /* DoStatement */: + case 232 /* DoStatement */: return checkDoStatement(node); - case 229 /* WhileStatement */: + case 233 /* WhileStatement */: return checkWhileStatement(node); - case 230 /* ForStatement */: + case 234 /* ForStatement */: return checkForStatement(node); - case 231 /* ForInStatement */: + case 235 /* ForInStatement */: return checkForInStatement(node); - case 232 /* ForOfStatement */: + case 236 /* ForOfStatement */: return checkForOfStatement(node); - case 233 /* ContinueStatement */: - case 234 /* BreakStatement */: + case 237 /* ContinueStatement */: + case 238 /* BreakStatement */: return checkBreakOrContinueStatement(node); - case 235 /* ReturnStatement */: + case 239 /* ReturnStatement */: return checkReturnStatement(node); - case 236 /* WithStatement */: + case 240 /* WithStatement */: return checkWithStatement(node); - case 237 /* SwitchStatement */: + case 241 /* SwitchStatement */: return checkSwitchStatement(node); - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: return checkLabeledStatement(node); - case 239 /* ThrowStatement */: + case 243 /* ThrowStatement */: return checkThrowStatement(node); - case 240 /* TryStatement */: + case 244 /* TryStatement */: return checkTryStatement(node); - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return checkVariableDeclaration(node); - case 191 /* BindingElement */: + case 195 /* BindingElement */: return checkBindingElement(node); - case 245 /* ClassDeclaration */: + case 249 /* ClassDeclaration */: return checkClassDeclaration(node); - case 246 /* InterfaceDeclaration */: + case 250 /* InterfaceDeclaration */: return checkInterfaceDeclaration(node); - case 247 /* TypeAliasDeclaration */: + case 251 /* TypeAliasDeclaration */: return checkTypeAliasDeclaration(node); - case 248 /* EnumDeclaration */: + case 252 /* EnumDeclaration */: return checkEnumDeclaration(node); - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: return checkModuleDeclaration(node); - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: return checkImportDeclaration(node); - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return checkImportEqualsDeclaration(node); - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: return checkExportDeclaration(node); - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: return checkExportAssignment(node); - case 224 /* EmptyStatement */: - case 241 /* DebuggerStatement */: + case 228 /* EmptyStatement */: + case 245 /* DebuggerStatement */: checkGrammarStatementInAmbientContext(node); return; - case 264 /* MissingDeclaration */: + case 268 /* MissingDeclaration */: return checkMissingDeclaration(node); } } @@ -66724,8 +75161,8 @@ var ts; var enclosingFile = ts.getSourceFileOfNode(node); var links = getNodeLinks(enclosingFile); if (!(links.flags & 1 /* TypeChecked */)) { - links.deferredNodes = links.deferredNodes || ts.createMap(); - var id = "" + getNodeId(node); + links.deferredNodes = links.deferredNodes || new ts.Map(); + var id = getNodeId(node); links.deferredNodes.set(id, node); } } @@ -66740,33 +75177,33 @@ var ts; currentNode = node; instantiationCount = 0; switch (node.kind) { - case 196 /* CallExpression */: - case 197 /* NewExpression */: - case 198 /* TaggedTemplateExpression */: - case 157 /* Decorator */: - case 268 /* JsxOpeningElement */: + case 200 /* CallExpression */: + case 201 /* NewExpression */: + case 202 /* TaggedTemplateExpression */: + case 160 /* Decorator */: + case 272 /* JsxOpeningElement */: // These node kinds are deferred checked when overload resolution fails // To save on work, we ensure the arguments are checked just once, in // a deferred way resolveUntypedCall(node); break; - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: checkFunctionExpressionOrObjectLiteralMethodDeferred(node); break; - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: checkAccessorDeclaration(node); break; - case 214 /* ClassExpression */: + case 218 /* ClassExpression */: checkClassExpressionDeferred(node); break; - case 267 /* JsxSelfClosingElement */: + case 271 /* JsxSelfClosingElement */: checkJsxSelfClosingElementDeferred(node); break; - case 266 /* JsxElement */: + case 270 /* JsxElement */: checkJsxElementDeferred(node); break; } @@ -66909,17 +75346,17 @@ var ts; copySymbols(location.locals, meaning); } switch (location.kind) { - case 290 /* SourceFile */: + case 294 /* SourceFile */: if (!ts.isExternalOrCommonJsModule(location)) break; // falls through - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: copySymbols(getSymbolOfNode(location).exports, meaning & 2623475 /* ModuleMember */); break; - case 248 /* EnumDeclaration */: + case 252 /* EnumDeclaration */: copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */); break; - case 214 /* ClassExpression */: + case 218 /* ClassExpression */: var className = location.name; if (className) { copySymbol(location.symbol, meaning); @@ -66927,8 +75364,8 @@ var ts; // this fall-through is necessary because we would like to handle // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration. // falls through - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: // If we didn't come from static member of class or interface, // add the type parameters into the symbol table // (type parameters of classDeclaration/classExpression and interface are in member property of the symbol. @@ -66937,7 +75374,7 @@ var ts; copySymbols(getMembersOfSymbol(getSymbolOfNode(location)), meaning & 788968 /* Type */); } break; - case 201 /* FunctionExpression */: + case 205 /* FunctionExpression */: var funcName = location.name; if (funcName) { copySymbol(location.symbol, meaning); @@ -66947,7 +75384,7 @@ var ts; if (ts.introducesArgumentsExoticObject(location)) { copySymbol(argumentsSymbol, meaning); } - isStatic = ts.hasModifier(location, 32 /* Static */); + isStatic = ts.hasSyntacticModifier(location, 32 /* Static */); location = location.parent; } copySymbols(globals, meaning); @@ -66979,22 +75416,25 @@ var ts; } } function isTypeDeclarationName(name) { - return name.kind === 75 /* Identifier */ && + return name.kind === 78 /* Identifier */ && isTypeDeclaration(name.parent) && - name.parent.name === name; + ts.getNameOfDeclaration(name.parent) === name; } function isTypeDeclaration(node) { switch (node.kind) { - case 155 /* TypeParameter */: - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 248 /* EnumDeclaration */: + case 158 /* TypeParameter */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 252 /* EnumDeclaration */: + case 327 /* JSDocTypedefTag */: + case 320 /* JSDocCallbackTag */: + case 321 /* JSDocEnumTag */: return true; - case 255 /* ImportClause */: + case 259 /* ImportClause */: return node.isTypeOnly; - case 258 /* ImportSpecifier */: - case 263 /* ExportSpecifier */: + case 262 /* ImportSpecifier */: + case 267 /* ExportSpecifier */: return node.parent.parent.isTypeOnly; default: return false; @@ -67002,16 +75442,16 @@ var ts; } // True if the given identifier is part of a type reference function isTypeReferenceIdentifier(node) { - while (node.parent.kind === 153 /* QualifiedName */) { + while (node.parent.kind === 156 /* QualifiedName */) { node = node.parent; } - return node.parent.kind === 169 /* TypeReference */; + return node.parent.kind === 172 /* TypeReference */; } function isHeritageClauseElementIdentifier(node) { - while (node.parent.kind === 194 /* PropertyAccessExpression */) { + while (node.parent.kind === 198 /* PropertyAccessExpression */) { node = node.parent; } - return node.parent.kind === 216 /* ExpressionWithTypeArguments */; + return node.parent.kind === 220 /* ExpressionWithTypeArguments */; } function forEachEnclosingClass(node, callback) { var result; @@ -67039,13 +75479,13 @@ var ts; return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; }); } function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) { - while (nodeOnRightSide.parent.kind === 153 /* QualifiedName */) { + while (nodeOnRightSide.parent.kind === 156 /* QualifiedName */) { nodeOnRightSide = nodeOnRightSide.parent; } - if (nodeOnRightSide.parent.kind === 253 /* ImportEqualsDeclaration */) { + if (nodeOnRightSide.parent.kind === 257 /* ImportEqualsDeclaration */) { return nodeOnRightSide.parent.moduleReference === nodeOnRightSide ? nodeOnRightSide.parent : undefined; } - if (nodeOnRightSide.parent.kind === 259 /* ExportAssignment */) { + if (nodeOnRightSide.parent.kind === 263 /* ExportAssignment */) { return nodeOnRightSide.parent.expression === nodeOnRightSide ? nodeOnRightSide.parent : undefined; } return undefined; @@ -67071,7 +75511,7 @@ var ts; node = parent; parent = parent.parent; } - if (parent && parent.kind === 188 /* ImportType */ && parent.qualifier === node) { + if (parent && parent.kind === 192 /* ImportType */ && parent.qualifier === node) { return parent; } return undefined; @@ -67081,7 +75521,7 @@ var ts; return getSymbolOfNode(name.parent); } if (ts.isInJSFile(name) && - name.parent.kind === 194 /* PropertyAccessExpression */ && + name.parent.kind === 198 /* PropertyAccessExpression */ && name.parent === name.parent.parent.left) { // Check if this is a special property assignment if (!ts.isPrivateIdentifier(name)) { @@ -67091,7 +75531,7 @@ var ts; } } } - if (name.parent.kind === 259 /* ExportAssignment */ && ts.isEntityNameExpression(name)) { + if (name.parent.kind === 263 /* ExportAssignment */ && ts.isEntityNameExpression(name)) { // Even an entity name expression that doesn't resolve as an entityname may still typecheck as a property access expression var success = resolveEntityName(name, /*all meanings*/ 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*ignoreErrors*/ true); @@ -67101,7 +75541,7 @@ var ts; } else if (!ts.isPropertyAccessExpression(name) && !ts.isPrivateIdentifier(name) && isInRightSideOfImportOrExportAssignment(name)) { // Since we already checked for ExportAssignment, this really could only be an Import - var importEqualsDeclaration = ts.getAncestor(name, 253 /* ImportEqualsDeclaration */); + var importEqualsDeclaration = ts.getAncestor(name, 257 /* ImportEqualsDeclaration */); ts.Debug.assert(importEqualsDeclaration !== undefined); return getSymbolOfPartOfRightHandSideOfImportEquals(name, /*dontResolveAlias*/ true); } @@ -67119,7 +75559,7 @@ var ts; if (isHeritageClauseElementIdentifier(name)) { var meaning = 0 /* None */; // In an interface or class, we're definitely interested in a type. - if (name.parent.kind === 216 /* ExpressionWithTypeArguments */) { + if (name.parent.kind === 220 /* ExpressionWithTypeArguments */) { meaning = 788968 /* Type */; // In a class 'extends' clause we are also looking for a value. if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(name.parent)) { @@ -67135,10 +75575,10 @@ var ts; return entityNameSymbol; } } - if (name.parent.kind === 317 /* JSDocParameterTag */) { + if (name.parent.kind === 322 /* JSDocParameterTag */) { return ts.getParameterSymbolFromJSDoc(name.parent); } - if (name.parent.kind === 155 /* TypeParameter */ && name.parent.parent.kind === 321 /* JSDocTemplateTag */) { + if (name.parent.kind === 158 /* TypeParameter */ && name.parent.parent.kind === 326 /* JSDocTemplateTag */) { ts.Debug.assert(!ts.isInJSFile(name)); // Otherwise `isDeclarationName` would have been true. var typeParameter = ts.getTypeParameterFromJsDoc(name.parent); return typeParameter && typeParameter.symbol; @@ -67148,19 +75588,19 @@ var ts; // Missing entity name. return undefined; } - if (name.kind === 75 /* Identifier */) { + if (name.kind === 78 /* Identifier */) { if (ts.isJSXTagName(name) && isJsxIntrinsicIdentifier(name)) { var symbol = getIntrinsicTagSymbol(name.parent); return symbol === unknownSymbol ? undefined : symbol; } return resolveEntityName(name, 111551 /* Value */, /*ignoreErrors*/ false, /*dontResolveAlias*/ true); } - else if (name.kind === 194 /* PropertyAccessExpression */ || name.kind === 153 /* QualifiedName */) { + else if (name.kind === 198 /* PropertyAccessExpression */ || name.kind === 156 /* QualifiedName */) { var links = getNodeLinks(name); if (links.resolvedSymbol) { return links.resolvedSymbol; } - if (name.kind === 194 /* PropertyAccessExpression */) { + if (name.kind === 198 /* PropertyAccessExpression */) { checkPropertyAccessExpression(name); } else { @@ -67170,17 +75610,17 @@ var ts; } } else if (isTypeReferenceIdentifier(name)) { - var meaning = name.parent.kind === 169 /* TypeReference */ ? 788968 /* Type */ : 1920 /* Namespace */; + var meaning = name.parent.kind === 172 /* TypeReference */ ? 788968 /* Type */ : 1920 /* Namespace */; return resolveEntityName(name, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true); } - if (name.parent.kind === 168 /* TypePredicate */) { + if (name.parent.kind === 171 /* TypePredicate */) { return resolveEntityName(name, /*meaning*/ 1 /* FunctionScopedVariable */); } // Do we want to return undefined here? return undefined; } function getSymbolAtLocation(node, ignoreErrors) { - if (node.kind === 290 /* SourceFile */) { + if (node.kind === 294 /* SourceFile */) { return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined; } var parent = node.parent; @@ -67199,12 +75639,12 @@ var ts; else if (ts.isLiteralComputedPropertyDeclarationName(node)) { return getSymbolOfNode(parent.parent); } - if (node.kind === 75 /* Identifier */) { + if (node.kind === 78 /* Identifier */) { if (isInRightSideOfImportOrExportAssignment(node)) { return getSymbolOfNameOrPropertyAccessExpression(node); } - else if (parent.kind === 191 /* BindingElement */ && - grandParent.kind === 189 /* ObjectBindingPattern */ && + else if (parent.kind === 195 /* BindingElement */ && + grandParent.kind === 193 /* ObjectBindingPattern */ && node === parent.propertyName) { var typeOfPattern = getTypeOfNode(grandParent); var propertyDeclaration = getPropertyOfType(typeOfPattern, node.escapedText); @@ -67214,12 +75654,12 @@ var ts; } } switch (node.kind) { - case 75 /* Identifier */: - case 76 /* PrivateIdentifier */: - case 194 /* PropertyAccessExpression */: - case 153 /* QualifiedName */: + case 78 /* Identifier */: + case 79 /* PrivateIdentifier */: + case 198 /* PropertyAccessExpression */: + case 156 /* QualifiedName */: return getSymbolOfNameOrPropertyAccessExpression(node); - case 104 /* ThisKeyword */: + case 107 /* ThisKeyword */: var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false); if (ts.isFunctionLike(container)) { var sig = getSignatureFromDeclaration(container); @@ -67231,14 +75671,14 @@ var ts; return checkExpression(node).symbol; } // falls through - case 183 /* ThisType */: + case 186 /* ThisType */: return getTypeFromThisTypeNode(node).symbol; - case 102 /* SuperKeyword */: + case 105 /* SuperKeyword */: return checkExpression(node).symbol; - case 129 /* ConstructorKeyword */: + case 132 /* ConstructorKeyword */: // constructor keyword for an overload, should take us to the definition if it exist var constructorDeclaration = node.parent; - if (constructorDeclaration && constructorDeclaration.kind === 162 /* Constructor */) { + if (constructorDeclaration && constructorDeclaration.kind === 165 /* Constructor */) { return constructorDeclaration.parent.symbol; } return undefined; @@ -67249,7 +75689,7 @@ var ts; // 3). Dynamic import call or require in javascript // 4). type A = import("./f/*gotToDefinitionHere*/oo") if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) || - ((node.parent.kind === 254 /* ImportDeclaration */ || node.parent.kind === 260 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) || + ((node.parent.kind === 258 /* ImportDeclaration */ || node.parent.kind === 264 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) || ((ts.isInJSFile(node) && ts.isRequireCall(node.parent, /*checkArgumentIsStringLiteralLike*/ false)) || ts.isImportCall(node.parent)) || (ts.isLiteralTypeNode(node.parent) && ts.isLiteralImportTypeNode(node.parent.parent) && node.parent.parent.argument === node.parent)) { return resolveExternalModuleName(node, node, ignoreErrors); @@ -67266,21 +75706,21 @@ var ts; ? getTypeFromTypeNode(grandParent.objectType) : undefined; return objectType && getPropertyOfType(objectType, ts.escapeLeadingUnderscores(node.text)); - case 84 /* DefaultKeyword */: - case 94 /* FunctionKeyword */: + case 87 /* DefaultKeyword */: + case 97 /* FunctionKeyword */: case 38 /* EqualsGreaterThanToken */: - case 80 /* ClassKeyword */: + case 83 /* ClassKeyword */: return getSymbolOfNode(node.parent); - case 188 /* ImportType */: + case 192 /* ImportType */: return ts.isLiteralImportTypeNode(node) ? getSymbolAtLocation(node.argument.literal, ignoreErrors) : undefined; - case 89 /* ExportKeyword */: + case 92 /* ExportKeyword */: return ts.isExportAssignment(node.parent) ? ts.Debug.checkDefined(node.parent.symbol) : undefined; default: return undefined; } } function getShorthandAssignmentValueSymbol(location) { - if (location && location.kind === 282 /* ShorthandPropertyAssignment */) { + if (location && location.kind === 286 /* ShorthandPropertyAssignment */) { return resolveEntityName(location.name, 111551 /* Value */ | 2097152 /* Alias */); } return undefined; @@ -67351,27 +75791,27 @@ var ts; // [ a ] from // [a] = [ some array ...] function getTypeOfAssignmentPattern(expr) { - ts.Debug.assert(expr.kind === 193 /* ObjectLiteralExpression */ || expr.kind === 192 /* ArrayLiteralExpression */); + ts.Debug.assert(expr.kind === 197 /* ObjectLiteralExpression */ || expr.kind === 196 /* ArrayLiteralExpression */); // If this is from "for of" // for ( { a } of elems) { // } - if (expr.parent.kind === 232 /* ForOfStatement */) { + if (expr.parent.kind === 236 /* ForOfStatement */) { var iteratedType = checkRightHandSideOfForOf(expr.parent); return checkDestructuringAssignment(expr, iteratedType || errorType); } // If this is from "for" initializer // for ({a } = elems[0];.....) { } - if (expr.parent.kind === 209 /* BinaryExpression */) { + if (expr.parent.kind === 213 /* BinaryExpression */) { var iteratedType = getTypeOfExpression(expr.parent.right); return checkDestructuringAssignment(expr, iteratedType || errorType); } // If this is from nested object binding pattern // for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) { - if (expr.parent.kind === 281 /* PropertyAssignment */) { - var node_4 = ts.cast(expr.parent.parent, ts.isObjectLiteralExpression); - var typeOfParentObjectLiteral = getTypeOfAssignmentPattern(node_4) || errorType; - var propertyIndex = ts.indexOfNode(node_4.properties, expr.parent); - return checkObjectLiteralDestructuringPropertyAssignment(node_4, typeOfParentObjectLiteral, propertyIndex); + if (expr.parent.kind === 285 /* PropertyAssignment */) { + var node_2 = ts.cast(expr.parent.parent, ts.isObjectLiteralExpression); + var typeOfParentObjectLiteral = getTypeOfAssignmentPattern(node_2) || errorType; + var propertyIndex = ts.indexOfNode(node_2.properties, expr.parent); + return checkObjectLiteralDestructuringPropertyAssignment(node_2, typeOfParentObjectLiteral, propertyIndex); } // Array literal assignment - array destructuring pattern var node = ts.cast(expr.parent, ts.isArrayLiteralExpression); @@ -67403,19 +75843,19 @@ var ts; */ function getParentTypeOfClassElement(node) { var classSymbol = getSymbolOfNode(node.parent); - return ts.hasModifier(node, 32 /* Static */) + return ts.hasSyntacticModifier(node, 32 /* Static */) ? getTypeOfSymbol(classSymbol) : getDeclaredTypeOfSymbol(classSymbol); } function getClassElementPropertyKeyType(element) { var name = element.name; switch (name.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return getLiteralType(ts.idText(name)); case 8 /* NumericLiteral */: case 10 /* StringLiteral */: return getLiteralType(name.text); - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: var nameType = checkComputedPropertyName(name); return isTypeAssignableToKind(nameType, 12288 /* ESSymbolLike */) ? nameType : stringType; default: @@ -67468,14 +75908,19 @@ var ts; } // Emitter support function isArgumentsLocalBinding(nodeIn) { - if (!ts.isGeneratedIdentifier(nodeIn)) { - var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier); - if (node) { - var isPropertyName_1 = node.parent.kind === 194 /* PropertyAccessExpression */ && node.parent.name === node; - return !isPropertyName_1 && getReferencedValueSymbol(node) === argumentsSymbol; - } - } - return false; + // Note: does not handle isShorthandPropertyAssignment (and probably a few more) + if (ts.isGeneratedIdentifier(nodeIn)) + return false; + var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier); + if (!node) + return false; + var parent = node.parent; + if (!parent) + return false; + var isPropertyName = ((ts.isPropertyAccessExpression(parent) + || ts.isPropertyAssignment(parent)) + && parent.name === node); + return !isPropertyName && getReferencedValueSymbol(node) === argumentsSymbol; } function moduleExportsSomeValue(moduleReferenceExpression) { var moduleSymbol = resolveExternalModuleName(moduleReferenceExpression.parent, moduleReferenceExpression); @@ -67527,7 +75972,7 @@ var ts; } var parentSymbol_1 = getParentOfSymbol(symbol); if (parentSymbol_1) { - if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 290 /* SourceFile */) { + if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 294 /* SourceFile */) { var symbolFile = parentSymbol_1.valueDeclaration; var referenceFile = ts.getSourceFileOfNode(node); // If `node` accesses an export and that export isn't in the same file, then symbol is a namespace export, so return undefined. @@ -67555,7 +76000,7 @@ var ts; } function isSymbolOfDestructuredElementOfCatchBinding(symbol) { return ts.isBindingElement(symbol.valueDeclaration) - && ts.walkUpBindingElementsAndPatterns(symbol.valueDeclaration).parent.kind === 280 /* CatchClause */; + && ts.walkUpBindingElementsAndPatterns(symbol.valueDeclaration).parent.kind === 284 /* CatchClause */; } function isSymbolOfDeclarationWithCollidingName(symbol) { if (symbol.flags & 418 /* BlockScoped */ && !ts.isSourceFile(symbol.valueDeclaration)) { @@ -67586,7 +76031,7 @@ var ts; // they will not collide with anything var isDeclaredInLoop = nodeLinks_1.flags & 524288 /* BlockScopedBindingInLoop */; var inLoopInitializer = ts.isIterationStatement(container, /*lookInLabeledStatements*/ false); - var inLoopBodyBlock = container.kind === 223 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false); + var inLoopBodyBlock = container.kind === 227 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false); links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock)); } else { @@ -67627,20 +76072,20 @@ var ts; } function isValueAliasDeclaration(node) { switch (node.kind) { - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol); - case 255 /* ImportClause */: - case 256 /* NamespaceImport */: - case 258 /* ImportSpecifier */: - case 263 /* ExportSpecifier */: + case 259 /* ImportClause */: + case 260 /* NamespaceImport */: + case 262 /* ImportSpecifier */: + case 267 /* ExportSpecifier */: var symbol = getSymbolOfNode(node) || unknownSymbol; return isAliasResolvedToValue(symbol) && !getTypeOnlyAliasDeclaration(symbol); - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: var exportClause = node.exportClause; return !!exportClause && (ts.isNamespaceExport(exportClause) || ts.some(exportClause.elements, isValueAliasDeclaration)); - case 259 /* ExportAssignment */: - return node.expression && node.expression.kind === 75 /* Identifier */ ? + case 263 /* ExportAssignment */: + return node.expression && node.expression.kind === 78 /* Identifier */ ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol) : true; } @@ -67648,7 +76093,7 @@ var ts; } function isTopLevelValueImportEqualsWithEntityName(nodeIn) { var node = ts.getParseTreeNode(nodeIn, ts.isImportEqualsDeclaration); - if (node === undefined || node.parent.kind !== 290 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) { + if (node === undefined || node.parent.kind !== 294 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) { // parent is not source file or it is not reference to internal module return false; } @@ -67675,7 +76120,7 @@ var ts; return true; } var target = getSymbolLinks(symbol).target; // TODO: GH#18217 - if (target && ts.getModifierFlags(node) & 1 /* Export */ && + if (target && ts.getEffectiveModifierFlags(node) & 1 /* Export */ && target.flags & 111551 /* Value */ && (compilerOptions.preserveConstEnums || !isConstEnumOrConstEnumOnlyModule(target))) { // An `export import ... =` of a value symbol is always considered referenced @@ -67714,13 +76159,18 @@ var ts; !isOptionalParameter(parameter) && !ts.isJSDocParameterTag(parameter) && !!parameter.initializer && - !ts.hasModifier(parameter, 92 /* ParameterPropertyModifier */); + !ts.hasSyntacticModifier(parameter, 92 /* ParameterPropertyModifier */); } function isOptionalUninitializedParameterProperty(parameter) { return strictNullChecks && isOptionalParameter(parameter) && !parameter.initializer && - ts.hasModifier(parameter, 92 /* ParameterPropertyModifier */); + ts.hasSyntacticModifier(parameter, 92 /* ParameterPropertyModifier */); + } + function isOptionalUninitializedParameter(parameter) { + return !!strictNullChecks && + isOptionalParameter(parameter) && + !parameter.initializer; } function isExpandoFunctionDeclaration(node) { var declaration = ts.getParseTreeNode(node, ts.isFunctionDeclaration); @@ -67750,15 +76200,15 @@ var ts; } function canHaveConstantValue(node) { switch (node.kind) { - case 284 /* EnumMember */: - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: + case 288 /* EnumMember */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: return true; } return false; } function getConstantValue(node) { - if (node.kind === 284 /* EnumMember */) { + if (node.kind === 288 /* EnumMember */) { return getEnumMemberValue(node); } var symbol = getNodeLinks(node).resolvedSymbol; @@ -67775,6 +76225,7 @@ var ts; return !!(type.flags & 524288 /* Object */) && getSignaturesOfType(type, 0 /* Call */).length > 0; } function getTypeReferenceSerializationKind(typeNameIn, location) { + var _a; // ensure both `typeName` and `location` are parse tree nodes. var typeName = ts.getParseTreeNode(typeNameIn, ts.isEntityName); if (!typeName) @@ -67785,26 +76236,28 @@ var ts; return ts.TypeReferenceSerializationKind.Unknown; } // Resolve the symbol as a value to ensure the type can be reached at runtime during emit. - var valueSymbol = resolveEntityName(typeName, 111551 /* Value */, /*ignoreErrors*/ true, /*dontResolveAlias*/ false, location); + var valueSymbol = resolveEntityName(typeName, 111551 /* Value */, /*ignoreErrors*/ true, /*dontResolveAlias*/ true, location); + var isTypeOnly = ((_a = valueSymbol === null || valueSymbol === void 0 ? void 0 : valueSymbol.declarations) === null || _a === void 0 ? void 0 : _a.every(ts.isTypeOnlyImportOrExportDeclaration)) || false; + var resolvedSymbol = valueSymbol && valueSymbol.flags & 2097152 /* Alias */ ? resolveAlias(valueSymbol) : valueSymbol; // Resolve the symbol as a type so that we can provide a more useful hint for the type serializer. var typeSymbol = resolveEntityName(typeName, 788968 /* Type */, /*ignoreErrors*/ true, /*dontResolveAlias*/ false, location); - if (valueSymbol && valueSymbol === typeSymbol) { + if (resolvedSymbol && resolvedSymbol === typeSymbol) { var globalPromiseSymbol = getGlobalPromiseConstructorSymbol(/*reportErrors*/ false); - if (globalPromiseSymbol && valueSymbol === globalPromiseSymbol) { + if (globalPromiseSymbol && resolvedSymbol === globalPromiseSymbol) { return ts.TypeReferenceSerializationKind.Promise; } - var constructorType = getTypeOfSymbol(valueSymbol); + var constructorType = getTypeOfSymbol(resolvedSymbol); if (constructorType && isConstructorType(constructorType)) { - return ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue; + return isTypeOnly ? ts.TypeReferenceSerializationKind.TypeWithCallSignature : ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue; } } // We might not be able to resolve type symbol so use unknown type in that case (eg error case) if (!typeSymbol) { - return ts.TypeReferenceSerializationKind.Unknown; + return isTypeOnly ? ts.TypeReferenceSerializationKind.ObjectType : ts.TypeReferenceSerializationKind.Unknown; } var type = getDeclaredTypeOfSymbol(typeSymbol); if (type === errorType) { - return ts.TypeReferenceSerializationKind.Unknown; + return isTypeOnly ? ts.TypeReferenceSerializationKind.ObjectType : ts.TypeReferenceSerializationKind.Unknown; } else if (type.flags & 3 /* AnyOrUnknown */) { return ts.TypeReferenceSerializationKind.ObjectType; @@ -67843,7 +76296,7 @@ var ts; function createTypeOfDeclaration(declarationIn, enclosingDeclaration, flags, tracker, addUndefined) { var declaration = ts.getParseTreeNode(declarationIn, ts.isVariableLikeOrAccessor); if (!declaration) { - return ts.createToken(125 /* AnyKeyword */); + return ts.factory.createToken(128 /* AnyKeyword */); } // Get type of the symbol if this is the valid symbol otherwise get type at location var symbol = getSymbolOfNode(declaration); @@ -67862,7 +76315,7 @@ var ts; function createReturnTypeOfSignatureDeclaration(signatureDeclarationIn, enclosingDeclaration, flags, tracker) { var signatureDeclaration = ts.getParseTreeNode(signatureDeclarationIn, ts.isFunctionLike); if (!signatureDeclaration) { - return ts.createToken(125 /* AnyKeyword */); + return ts.factory.createToken(128 /* AnyKeyword */); } var signature = getSignatureFromDeclaration(signatureDeclaration); return nodeBuilder.typeToTypeNode(getReturnTypeOfSignature(signature), enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker); @@ -67870,7 +76323,7 @@ var ts; function createTypeOfExpression(exprIn, enclosingDeclaration, flags, tracker) { var expr = ts.getParseTreeNode(exprIn, ts.isExpression); if (!expr) { - return ts.createToken(125 /* AnyKeyword */); + return ts.factory.createToken(128 /* AnyKeyword */); } var type = getWidenedType(getRegularTypeOfExpression(expr)); return nodeBuilder.typeToTypeNode(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker); @@ -67914,8 +76367,13 @@ var ts; } function literalTypeToNode(type, enclosing, tracker) { var enumResult = type.flags & 1024 /* EnumLiteral */ ? nodeBuilder.symbolToExpression(type.symbol, 111551 /* Value */, enclosing, /*flags*/ undefined, tracker) - : type === trueType ? ts.createTrue() : type === falseType && ts.createFalse(); - return enumResult || ts.createLiteral(type.value); + : type === trueType ? ts.factory.createTrue() : type === falseType && ts.factory.createFalse(); + if (enumResult) + return enumResult; + var literalValue = type.value; + return typeof literalValue === "object" ? ts.factory.createBigIntLiteral(literalValue) : + typeof literalValue === "number" ? ts.factory.createNumericLiteral(literalValue) : + ts.factory.createStringLiteral(literalValue); } function createLiteralConstValue(node, tracker) { var type = getTypeOfSymbol(getSymbolOfNode(node)); @@ -67924,6 +76382,25 @@ var ts; function getJsxFactoryEntity(location) { return location ? (getJsxNamespace(location), (ts.getSourceFileOfNode(location).localJsxFactory || _jsxFactoryEntity)) : _jsxFactoryEntity; } + function getJsxFragmentFactoryEntity(location) { + if (location) { + var file = ts.getSourceFileOfNode(location); + if (file) { + if (file.localJsxFragmentFactory) { + return file.localJsxFragmentFactory; + } + var jsxFragPragmas = file.pragmas.get("jsxfrag"); + var jsxFragPragma = ts.isArray(jsxFragPragmas) ? jsxFragPragmas[0] : jsxFragPragmas; + if (jsxFragPragma) { + file.localJsxFragmentFactory = ts.parseIsolatedEntityName(jsxFragPragma.arguments.factory, languageVersion); + return file.localJsxFragmentFactory; + } + } + } + if (compilerOptions.jsxFragmentFactory) { + return ts.parseIsolatedEntityName(compilerOptions.jsxFragmentFactory, languageVersion); + } + } function createResolver() { // this variable and functions that use it are deliberately moved here from the outer scope // to avoid scope pollution @@ -67931,7 +76408,7 @@ var ts; var fileToDirective; if (resolvedTypeReferenceDirectives) { // populate reverse mapping: file path -> type reference directive that was resolved to this file - fileToDirective = ts.createMap(); + fileToDirective = new ts.Map(); resolvedTypeReferenceDirectives.forEach(function (resolvedDirective, key) { if (!resolvedDirective || !resolvedDirective.resolvedFileName) { return; @@ -67949,19 +76426,19 @@ var ts; getReferencedImportDeclaration: getReferencedImportDeclaration, getReferencedDeclarationWithCollidingName: getReferencedDeclarationWithCollidingName, isDeclarationWithCollidingName: isDeclarationWithCollidingName, - isValueAliasDeclaration: function (node) { - node = ts.getParseTreeNode(node); + isValueAliasDeclaration: function (nodeIn) { + var node = ts.getParseTreeNode(nodeIn); // Synthesized nodes are always treated like values. return node ? isValueAliasDeclaration(node) : true; }, hasGlobalName: hasGlobalName, - isReferencedAliasDeclaration: function (node, checkChildren) { - node = ts.getParseTreeNode(node); + isReferencedAliasDeclaration: function (nodeIn, checkChildren) { + var node = ts.getParseTreeNode(nodeIn); // Synthesized nodes are always treated as referenced. return node ? isReferencedAliasDeclaration(node, checkChildren) : true; }, - getNodeCheckFlags: function (node) { - node = ts.getParseTreeNode(node); + getNodeCheckFlags: function (nodeIn) { + var node = ts.getParseTreeNode(nodeIn); return node ? getNodeCheckFlags(node) : 0; }, isTopLevelValueImportEqualsWithEntityName: isTopLevelValueImportEqualsWithEntityName, @@ -67997,14 +76474,15 @@ var ts; return !!(symbol && ts.getCheckFlags(symbol) & 4096 /* Late */); }, getJsxFactoryEntity: getJsxFactoryEntity, + getJsxFragmentFactoryEntity: getJsxFragmentFactoryEntity, getAllAccessorDeclarations: function (accessor) { accessor = ts.getParseTreeNode(accessor, ts.isGetOrSetAccessorDeclaration); // TODO: GH#18217 - var otherKind = accessor.kind === 164 /* SetAccessor */ ? 163 /* GetAccessor */ : 164 /* SetAccessor */; + var otherKind = accessor.kind === 167 /* SetAccessor */ ? 166 /* GetAccessor */ : 167 /* SetAccessor */; var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(accessor), otherKind); var firstAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? otherAccessor : accessor; var secondAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? accessor : otherAccessor; - var setAccessor = accessor.kind === 164 /* SetAccessor */ ? accessor : otherAccessor; - var getAccessor = accessor.kind === 163 /* GetAccessor */ ? accessor : otherAccessor; + var setAccessor = accessor.kind === 167 /* SetAccessor */ ? accessor : otherAccessor; + var getAccessor = accessor.kind === 166 /* GetAccessor */ ? accessor : otherAccessor; return { firstAccessor: firstAccessor, secondAccessor: secondAccessor, @@ -68020,7 +76498,7 @@ var ts; }, getDeclarationStatementsForSourceFile: function (node, flags, tracker, bundled) { var n = ts.getParseTreeNode(node); - ts.Debug.assert(n && n.kind === 290 /* SourceFile */, "Non-sourcefile node passed into getDeclarationsForSourceFile"); + ts.Debug.assert(n && n.kind === 294 /* SourceFile */, "Non-sourcefile node passed into getDeclarationsForSourceFile"); var sym = getSymbolOfNode(node); if (!sym) { return !node.locals ? [] : nodeBuilder.symbolTableToDeclarationStatements(node.locals, node, flags, tracker, bundled); @@ -68055,7 +76533,7 @@ var ts; return false; } function isInHeritageClause(node) { - return node.parent && node.parent.kind === 216 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 279 /* HeritageClause */; + return node.parent && node.parent.kind === 220 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 283 /* HeritageClause */; } // defined here to avoid outer scope pollution function getTypeReferenceDirectivesForEntityName(node) { @@ -68067,7 +76545,7 @@ var ts; // qualified names can only be used as types\namespaces // identifiers are treated as values only if they appear in type queries var meaning = 788968 /* Type */ | 1920 /* Namespace */; - if ((node.kind === 75 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 194 /* PropertyAccessExpression */ && !isInHeritageClause(node))) { + if ((node.kind === 78 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 198 /* PropertyAccessExpression */ && !isInHeritageClause(node))) { meaning = 111551 /* Value */ | 1048576 /* ExportValue */; } var symbol = resolveEntityName(node, meaning, /*ignoreErrors*/ true); @@ -68118,7 +76596,7 @@ var ts; break; } } - if (current.valueDeclaration && current.valueDeclaration.kind === 290 /* SourceFile */ && current.flags & 512 /* ValueModule */) { + if (current.valueDeclaration && current.valueDeclaration.kind === 294 /* SourceFile */ && current.flags & 512 /* ValueModule */) { return false; } // check that at least one declaration of top level symbol originates from type declaration file @@ -68137,7 +76615,7 @@ var ts; fileToDirective.set(file.path, key); for (var _i = 0, _a = file.referencedFiles; _i < _a.length; _i++) { var fileName = _a[_i].fileName; - var resolvedFile = ts.resolveTripleslashReference(fileName, file.originalFileName); + var resolvedFile = ts.resolveTripleslashReference(fileName, file.fileName); var referencedFile = host.getSourceFile(resolvedFile); if (referencedFile) { addReferencedFilesToTypeDirective(referencedFile, key); @@ -68146,12 +76624,12 @@ var ts; } } function getExternalModuleFileFromDeclaration(declaration) { - var specifier = declaration.kind === 249 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration); + var specifier = declaration.kind === 253 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration); var moduleSymbol = resolveExternalModuleNameWorker(specifier, specifier, /*moduleNotFoundError*/ undefined); // TODO: GH#18217 if (!moduleSymbol) { return undefined; } - return ts.getDeclarationOfKind(moduleSymbol, 290 /* SourceFile */); + return ts.getDeclarationOfKind(moduleSymbol, 294 /* SourceFile */); } function initializeTypeChecker() { // Bind all source files and propagate errors @@ -68159,7 +76637,7 @@ var ts; var file = _a[_i]; ts.bindSourceFile(file, compilerOptions); } - amalgamatedDuplicates = ts.createMap(); + amalgamatedDuplicates = new ts.Map(); // Initialize global symbol table var augmentations; for (var _b = 0, _c = host.getSourceFiles(); _b < _c.length; _b++) { @@ -68288,7 +76766,7 @@ var ts; var helpersModule = resolveHelpersModule(sourceFile, location); if (helpersModule !== unknownSymbol) { var uncheckedHelpers = helpers & ~requestedExternalEmitHelpers; - for (var helper = 1 /* FirstEmitHelper */; helper <= 1048576 /* LastEmitHelper */; helper <<= 1) { + for (var helper = 1 /* FirstEmitHelper */; helper <= 4194304 /* LastEmitHelper */; helper <<= 1) { if (uncheckedHelpers & helper) { var name = getHelperName(helper); var symbol = getSymbol(helpersModule.exports, ts.escapeLeadingUnderscores(name), 111551 /* Value */); @@ -68321,10 +76799,12 @@ var ts; case 16384 /* AsyncDelegator */: return "__asyncDelegator"; case 32768 /* AsyncValues */: return "__asyncValues"; case 65536 /* ExportStar */: return "__exportStar"; - case 131072 /* MakeTemplateObject */: return "__makeTemplateObject"; - case 262144 /* ClassPrivateFieldGet */: return "__classPrivateFieldGet"; - case 524288 /* ClassPrivateFieldSet */: return "__classPrivateFieldSet"; - case 1048576 /* CreateBinding */: return "__createBinding"; + case 131072 /* ImportStar */: return "__importStar"; + case 262144 /* ImportDefault */: return "__importDefault"; + case 524288 /* MakeTemplateObject */: return "__makeTemplateObject"; + case 1048576 /* ClassPrivateFieldGet */: return "__classPrivateFieldGet"; + case 2097152 /* ClassPrivateFieldSet */: return "__classPrivateFieldSet"; + case 4194304 /* CreateBinding */: return "__createBinding"; default: return ts.Debug.fail("Unrecognized helper"); } } @@ -68343,14 +76823,14 @@ var ts; return false; } if (!ts.nodeCanBeDecorated(node, node.parent, node.parent.parent)) { - if (node.kind === 161 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) { + if (node.kind === 164 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) { return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload); } else { return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here); } } - else if (node.kind === 163 /* GetAccessor */ || node.kind === 164 /* SetAccessor */) { + else if (node.kind === 166 /* GetAccessor */ || node.kind === 167 /* SetAccessor */) { var accessors = ts.getAllAccessorDeclarations(node.parent.members, node); if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) { return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name); @@ -68367,23 +76847,23 @@ var ts; var flags = 0 /* None */; for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) { var modifier = _a[_i]; - if (modifier.kind !== 138 /* ReadonlyKeyword */) { - if (node.kind === 158 /* PropertySignature */ || node.kind === 160 /* MethodSignature */) { + if (modifier.kind !== 141 /* ReadonlyKeyword */) { + if (node.kind === 161 /* PropertySignature */ || node.kind === 163 /* MethodSignature */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind)); } - if (node.kind === 167 /* IndexSignature */) { + if (node.kind === 170 /* IndexSignature */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind)); } } switch (modifier.kind) { - case 81 /* ConstKeyword */: - if (node.kind !== 248 /* EnumDeclaration */) { - return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(81 /* ConstKeyword */)); + case 84 /* ConstKeyword */: + if (node.kind !== 252 /* EnumDeclaration */) { + return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(84 /* ConstKeyword */)); } break; - case 119 /* PublicKeyword */: - case 118 /* ProtectedKeyword */: - case 117 /* PrivateKeyword */: + case 122 /* PublicKeyword */: + case 121 /* ProtectedKeyword */: + case 120 /* PrivateKeyword */: var text = visibilityToString(ts.modifierToFlag(modifier.kind)); if (flags & 28 /* AccessibilityModifier */) { return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen); @@ -68397,11 +76877,11 @@ var ts; else if (flags & 256 /* Async */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async"); } - else if (node.parent.kind === 250 /* ModuleBlock */ || node.parent.kind === 290 /* SourceFile */) { + else if (node.parent.kind === 254 /* ModuleBlock */ || node.parent.kind === 294 /* SourceFile */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text); } else if (flags & 128 /* Abstract */) { - if (modifier.kind === 117 /* PrivateKeyword */) { + if (modifier.kind === 120 /* PrivateKeyword */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract"); } else { @@ -68413,7 +76893,7 @@ var ts; } flags |= ts.modifierToFlag(modifier.kind); break; - case 120 /* StaticKeyword */: + case 123 /* StaticKeyword */: if (flags & 32 /* Static */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static"); } @@ -68423,10 +76903,10 @@ var ts; else if (flags & 256 /* Async */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async"); } - else if (node.parent.kind === 250 /* ModuleBlock */ || node.parent.kind === 290 /* SourceFile */) { + else if (node.parent.kind === 254 /* ModuleBlock */ || node.parent.kind === 294 /* SourceFile */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static"); } - else if (node.kind === 156 /* Parameter */) { + else if (node.kind === 159 /* Parameter */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static"); } else if (flags & 128 /* Abstract */) { @@ -68438,18 +76918,18 @@ var ts; flags |= 32 /* Static */; lastStatic = modifier; break; - case 138 /* ReadonlyKeyword */: + case 141 /* ReadonlyKeyword */: if (flags & 64 /* Readonly */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly"); } - else if (node.kind !== 159 /* PropertyDeclaration */ && node.kind !== 158 /* PropertySignature */ && node.kind !== 167 /* IndexSignature */ && node.kind !== 156 /* Parameter */) { + else if (node.kind !== 162 /* PropertyDeclaration */ && node.kind !== 161 /* PropertySignature */ && node.kind !== 170 /* IndexSignature */ && node.kind !== 159 /* Parameter */) { // If node.kind === SyntaxKind.Parameter, checkParameter report an error if it's not a parameter property. return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature); } flags |= 64 /* Readonly */; lastReadonly = modifier; break; - case 89 /* ExportKeyword */: + case 92 /* ExportKeyword */: if (flags & 1 /* Export */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export"); } @@ -68465,19 +76945,19 @@ var ts; else if (ts.isClassLike(node.parent)) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export"); } - else if (node.kind === 156 /* Parameter */) { + else if (node.kind === 159 /* Parameter */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export"); } flags |= 1 /* Export */; break; - case 84 /* DefaultKeyword */: - var container = node.parent.kind === 290 /* SourceFile */ ? node.parent : node.parent.parent; - if (container.kind === 249 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) { + case 87 /* DefaultKeyword */: + var container = node.parent.kind === 294 /* SourceFile */ ? node.parent : node.parent.parent; + if (container.kind === 253 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) { return grammarErrorOnNode(modifier, ts.Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module); } flags |= 512 /* Default */; break; - case 130 /* DeclareKeyword */: + case 133 /* DeclareKeyword */: if (flags & 2 /* Ambient */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare"); } @@ -68487,10 +76967,10 @@ var ts; else if (ts.isClassLike(node.parent) && !ts.isPropertyDeclaration(node)) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare"); } - else if (node.kind === 156 /* Parameter */) { + else if (node.kind === 159 /* Parameter */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare"); } - else if ((node.parent.flags & 8388608 /* Ambient */) && node.parent.kind === 250 /* ModuleBlock */) { + else if ((node.parent.flags & 8388608 /* Ambient */) && node.parent.kind === 254 /* ModuleBlock */) { return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context); } else if (ts.isPrivateIdentifierPropertyDeclaration(node)) { @@ -68499,18 +76979,18 @@ var ts; flags |= 2 /* Ambient */; lastDeclare = modifier; break; - case 122 /* AbstractKeyword */: + case 125 /* AbstractKeyword */: if (flags & 128 /* Abstract */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract"); } - if (node.kind !== 245 /* ClassDeclaration */) { - if (node.kind !== 161 /* MethodDeclaration */ && - node.kind !== 159 /* PropertyDeclaration */ && - node.kind !== 163 /* GetAccessor */ && - node.kind !== 164 /* SetAccessor */) { + if (node.kind !== 249 /* ClassDeclaration */) { + if (node.kind !== 164 /* MethodDeclaration */ && + node.kind !== 162 /* PropertyDeclaration */ && + node.kind !== 166 /* GetAccessor */ && + node.kind !== 167 /* SetAccessor */) { return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration); } - if (!(node.parent.kind === 245 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) { + if (!(node.parent.kind === 249 /* ClassDeclaration */ && ts.hasSyntacticModifier(node.parent, 128 /* Abstract */))) { return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class); } if (flags & 32 /* Static */) { @@ -68520,19 +77000,19 @@ var ts; return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "private", "abstract"); } } - if (ts.isNamedDeclaration(node) && node.name.kind === 76 /* PrivateIdentifier */) { + if (ts.isNamedDeclaration(node) && node.name.kind === 79 /* PrivateIdentifier */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_a_private_identifier, "abstract"); } flags |= 128 /* Abstract */; break; - case 126 /* AsyncKeyword */: + case 129 /* AsyncKeyword */: if (flags & 256 /* Async */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async"); } else if (flags & 2 /* Ambient */ || node.parent.flags & 8388608 /* Ambient */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async"); } - else if (node.kind === 156 /* Parameter */) { + else if (node.kind === 159 /* Parameter */) { return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async"); } flags |= 256 /* Async */; @@ -68540,7 +77020,7 @@ var ts; break; } } - if (node.kind === 162 /* Constructor */) { + if (node.kind === 165 /* Constructor */) { if (flags & 32 /* Static */) { return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static"); } @@ -68555,13 +77035,13 @@ var ts; } return false; } - else if ((node.kind === 254 /* ImportDeclaration */ || node.kind === 253 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) { + else if ((node.kind === 258 /* ImportDeclaration */ || node.kind === 257 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) { return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare"); } - else if (node.kind === 156 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) { + else if (node.kind === 159 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) { return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_declared_using_a_binding_pattern); } - else if (node.kind === 156 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) { + else if (node.kind === 159 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) { return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter); } if (flags & 256 /* Async */) { @@ -68582,38 +77062,38 @@ var ts; } function shouldReportBadModifier(node) { switch (node.kind) { - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 162 /* Constructor */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 167 /* IndexSignature */: - case 249 /* ModuleDeclaration */: - case 254 /* ImportDeclaration */: - case 253 /* ImportEqualsDeclaration */: - case 260 /* ExportDeclaration */: - case 259 /* ExportAssignment */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: - case 156 /* Parameter */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 165 /* Constructor */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 170 /* IndexSignature */: + case 253 /* ModuleDeclaration */: + case 258 /* ImportDeclaration */: + case 257 /* ImportEqualsDeclaration */: + case 264 /* ExportDeclaration */: + case 263 /* ExportAssignment */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 159 /* Parameter */: return false; default: - if (node.parent.kind === 250 /* ModuleBlock */ || node.parent.kind === 290 /* SourceFile */) { + if (node.parent.kind === 254 /* ModuleBlock */ || node.parent.kind === 294 /* SourceFile */) { return false; } switch (node.kind) { - case 244 /* FunctionDeclaration */: - return nodeHasAnyModifiersExcept(node, 126 /* AsyncKeyword */); - case 245 /* ClassDeclaration */: - return nodeHasAnyModifiersExcept(node, 122 /* AbstractKeyword */); - case 246 /* InterfaceDeclaration */: - case 225 /* VariableStatement */: - case 247 /* TypeAliasDeclaration */: + case 248 /* FunctionDeclaration */: + return nodeHasAnyModifiersExcept(node, 129 /* AsyncKeyword */); + case 249 /* ClassDeclaration */: + return nodeHasAnyModifiersExcept(node, 125 /* AbstractKeyword */); + case 250 /* InterfaceDeclaration */: + case 229 /* VariableStatement */: + case 251 /* TypeAliasDeclaration */: return true; - case 248 /* EnumDeclaration */: - return nodeHasAnyModifiersExcept(node, 81 /* ConstKeyword */); + case 252 /* EnumDeclaration */: + return nodeHasAnyModifiersExcept(node, 84 /* ConstKeyword */); default: ts.Debug.fail(); return false; @@ -68625,10 +77105,10 @@ var ts; } function checkGrammarAsyncModifier(node, asyncModifier) { switch (node.kind) { - case 161 /* MethodDeclaration */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 164 /* MethodDeclaration */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: return false; } return grammarErrorOnNode(asyncModifier, ts.Diagnostics._0_modifier_cannot_be_used_here, "async"); @@ -68667,9 +77147,9 @@ var ts; return grammarErrorOnNode(parameter.name, ts.Diagnostics.A_rest_parameter_cannot_have_an_initializer); } } - else if (parameter.questionToken) { + else if (isOptionalParameter(parameter)) { seenOptionalParameter = true; - if (parameter.initializer) { + if (parameter.questionToken && parameter.initializer) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.Parameter_cannot_have_question_mark_and_initializer); } } @@ -68690,8 +77170,8 @@ var ts; ts.forEach(nonSimpleParameters, function (parameter) { ts.addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here)); }); - var diagnostics_1 = nonSimpleParameters.map(function (parameter, index) { return (index === 0 ? ts.createDiagnosticForNode(parameter, ts.Diagnostics.Non_simple_parameter_declared_here) : ts.createDiagnosticForNode(parameter, ts.Diagnostics.and_here)); }); - ts.addRelatedInfo.apply(void 0, __spreadArrays([error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)], diagnostics_1)); + var diagnostics_2 = nonSimpleParameters.map(function (parameter, index) { return (index === 0 ? ts.createDiagnosticForNode(parameter, ts.Diagnostics.Non_simple_parameter_declared_here) : ts.createDiagnosticForNode(parameter, ts.Diagnostics.and_here)); }); + ts.addRelatedInfo.apply(void 0, __spreadArrays([error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)], diagnostics_2)); return true; } } @@ -68701,13 +77181,16 @@ var ts; function checkGrammarFunctionLikeDeclaration(node) { // Prevent cascading error by short-circuit var file = ts.getSourceFileOfNode(node); - return checkGrammarDecoratorsAndModifiers(node) || checkGrammarTypeParameterList(node.typeParameters, file) || - checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file) || + return checkGrammarDecoratorsAndModifiers(node) || + checkGrammarTypeParameterList(node.typeParameters, file) || + checkGrammarParameterList(node.parameters) || + checkGrammarArrowFunction(node, file) || (ts.isFunctionLikeDeclaration(node) && checkGrammarForUseStrictSimpleParameterList(node)); } function checkGrammarClassLikeDeclaration(node) { var file = ts.getSourceFileOfNode(node); - return checkGrammarClassDeclarationHeritageClauses(node) || checkGrammarTypeParameterList(node.typeParameters, file); + return checkGrammarClassDeclarationHeritageClauses(node) || + checkGrammarTypeParameterList(node.typeParameters, file); } function checkGrammarArrowFunction(node, file) { if (!ts.isArrowFunction(node)) { @@ -68732,7 +77215,7 @@ var ts; if (parameter.dotDotDotToken) { return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter); } - if (ts.hasModifiers(parameter)) { + if (ts.hasEffectiveModifiers(parameter)) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier); } if (parameter.questionToken) { @@ -68744,7 +77227,7 @@ var ts; if (!parameter.type) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation); } - if (parameter.type.kind !== 143 /* StringKeyword */ && parameter.type.kind !== 140 /* NumberKeyword */) { + if (parameter.type.kind !== 146 /* StringKeyword */ && parameter.type.kind !== 143 /* NumberKeyword */) { var type = getTypeFromTypeNode(parameter.type); if (type.flags & 4 /* String */ || type.flags & 8 /* Number */) { return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(node.type ? getTypeFromTypeNode(node.type) : anyType)); @@ -68786,7 +77269,7 @@ var ts; if (args) { for (var _i = 0, args_4 = args; _i < args_4.length; _i++) { var arg = args_4[_i]; - if (arg.kind === 215 /* OmittedExpression */) { + if (arg.kind === 219 /* OmittedExpression */) { return grammarErrorAtPos(arg, arg.pos, 0, ts.Diagnostics.Argument_expression_expected); } } @@ -68816,7 +77299,7 @@ var ts; if (!checkGrammarDecoratorsAndModifiers(node) && node.heritageClauses) { for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) { var heritageClause = _a[_i]; - if (heritageClause.token === 90 /* ExtendsKeyword */) { + if (heritageClause.token === 93 /* ExtendsKeyword */) { if (seenExtendsClause) { return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen); } @@ -68829,7 +77312,7 @@ var ts; seenExtendsClause = true; } else { - ts.Debug.assert(heritageClause.token === 113 /* ImplementsKeyword */); + ts.Debug.assert(heritageClause.token === 116 /* ImplementsKeyword */); if (seenImplementsClause) { return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen); } @@ -68845,14 +77328,14 @@ var ts; if (node.heritageClauses) { for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) { var heritageClause = _a[_i]; - if (heritageClause.token === 90 /* ExtendsKeyword */) { + if (heritageClause.token === 93 /* ExtendsKeyword */) { if (seenExtendsClause) { return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen); } seenExtendsClause = true; } else { - ts.Debug.assert(heritageClause.token === 113 /* ImplementsKeyword */); + ts.Debug.assert(heritageClause.token === 116 /* ImplementsKeyword */); return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause); } // Grammar checking heritageClause inside class declaration @@ -68863,20 +77346,20 @@ var ts; } function checkGrammarComputedPropertyName(node) { // If node is not a computedPropertyName, just skip the grammar checking - if (node.kind !== 154 /* ComputedPropertyName */) { + if (node.kind !== 157 /* ComputedPropertyName */) { return false; } var computedPropertyName = node; - if (computedPropertyName.expression.kind === 209 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) { + if (computedPropertyName.expression.kind === 213 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) { return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name); } return false; } function checkGrammarForGenerator(node) { if (node.asteriskToken) { - ts.Debug.assert(node.kind === 244 /* FunctionDeclaration */ || - node.kind === 201 /* FunctionExpression */ || - node.kind === 161 /* MethodDeclaration */); + ts.Debug.assert(node.kind === 248 /* FunctionDeclaration */ || + node.kind === 205 /* FunctionExpression */ || + node.kind === 164 /* MethodDeclaration */); if (node.flags & 8388608 /* Ambient */) { return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context); } @@ -68892,10 +77375,10 @@ var ts; return !!exclamationToken && grammarErrorOnNode(exclamationToken, message); } function checkGrammarObjectLiteralExpression(node, inDestructuring) { - var seen = ts.createUnderscoreEscapedMap(); + var seen = new ts.Map(); for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { var prop = _a[_i]; - if (prop.kind === 283 /* SpreadAssignment */) { + if (prop.kind === 287 /* SpreadAssignment */) { if (inDestructuring) { // a rest property cannot be destructured any further var expression = ts.skipParentheses(prop.expression); @@ -68906,16 +77389,16 @@ var ts; continue; } var name = prop.name; - if (name.kind === 154 /* ComputedPropertyName */) { + if (name.kind === 157 /* ComputedPropertyName */) { // If the name is not a ComputedPropertyName, the grammar checking will skip it checkGrammarComputedPropertyName(name); } - if (prop.kind === 282 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) { + if (prop.kind === 286 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) { // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern // outside of destructuring it is a syntax error - return grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment); + return grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern); } - if (name.kind === 76 /* PrivateIdentifier */) { + if (name.kind === 79 /* PrivateIdentifier */) { return grammarErrorOnNode(name, ts.Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies); } // Modifiers are never allowed on properties except for 'async' on a method declaration @@ -68923,7 +77406,7 @@ var ts; // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955 var mod = _c[_b]; - if (mod.kind !== 126 /* AsyncKeyword */ || prop.kind !== 161 /* MethodDeclaration */) { + if (mod.kind !== 129 /* AsyncKeyword */ || prop.kind !== 164 /* MethodDeclaration */) { grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod)); } } @@ -68938,10 +77421,10 @@ var ts; // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields var currentKind = void 0; switch (prop.kind) { - case 282 /* ShorthandPropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: checkGrammarForInvalidExclamationToken(prop.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context); // falls through - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: // Grammar checking for computedPropertyName and shorthandPropertyAssignment checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional); if (name.kind === 8 /* NumericLiteral */) { @@ -68949,13 +77432,13 @@ var ts; } currentKind = 4 /* PropertyAssignment */; break; - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: currentKind = 8 /* Method */; break; - case 163 /* GetAccessor */: + case 166 /* GetAccessor */: currentKind = 1 /* GetAccessor */; break; - case 164 /* SetAccessor */: + case 167 /* SetAccessor */: currentKind = 2 /* SetAccessor */; break; default: @@ -68991,10 +77474,10 @@ var ts; } function checkGrammarJsxElement(node) { checkGrammarTypeArguments(node, node.typeArguments); - var seen = ts.createUnderscoreEscapedMap(); + var seen = new ts.Map(); for (var _i = 0, _a = node.attributes.properties; _i < _a.length; _i++) { var attr = _a[_i]; - if (attr.kind === 275 /* JsxSpreadAttribute */) { + if (attr.kind === 279 /* JsxSpreadAttribute */) { continue; } var name = attr.name, initializer = attr.initializer; @@ -69004,7 +77487,7 @@ var ts; else { return grammarErrorOnNode(name, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name); } - if (initializer && initializer.kind === 276 /* JsxExpression */ && !initializer.expression) { + if (initializer && initializer.kind === 280 /* JsxExpression */ && !initializer.expression) { return grammarErrorOnNode(initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression); } } @@ -69018,14 +77501,14 @@ var ts; if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) { return true; } - if (forInOrOfStatement.kind === 232 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) { + if (forInOrOfStatement.kind === 236 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) { if ((forInOrOfStatement.flags & 32768 /* AwaitContext */) === 0 /* None */) { // use of 'for-await-of' in non-async function var sourceFile = ts.getSourceFileOfNode(forInOrOfStatement); if (!hasParseDiagnostics(sourceFile)) { var diagnostic = ts.createDiagnosticForNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator); var func = ts.getContainingFunction(forInOrOfStatement); - if (func && func.kind !== 162 /* Constructor */) { + if (func && func.kind !== 165 /* Constructor */) { ts.Debug.assert((ts.getFunctionFlags(func) & 2 /* Async */) === 0, "Enclosing function should never be an async function."); var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async); ts.addRelatedInfo(diagnostic, relatedInfo); @@ -69036,7 +77519,7 @@ var ts; return false; } } - if (forInOrOfStatement.initializer.kind === 243 /* VariableDeclarationList */) { + if (forInOrOfStatement.initializer.kind === 247 /* VariableDeclarationList */) { var variableList = forInOrOfStatement.initializer; if (!checkGrammarVariableDeclarationList(variableList)) { var declarations = variableList.declarations; @@ -69051,20 +77534,20 @@ var ts; return false; } if (declarations.length > 1) { - var diagnostic = forInOrOfStatement.kind === 231 /* ForInStatement */ + var diagnostic = forInOrOfStatement.kind === 235 /* ForInStatement */ ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement; return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic); } var firstDeclaration = declarations[0]; if (firstDeclaration.initializer) { - var diagnostic = forInOrOfStatement.kind === 231 /* ForInStatement */ + var diagnostic = forInOrOfStatement.kind === 235 /* ForInStatement */ ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer; return grammarErrorOnNode(firstDeclaration.name, diagnostic); } if (firstDeclaration.type) { - var diagnostic = forInOrOfStatement.kind === 231 /* ForInStatement */ + var diagnostic = forInOrOfStatement.kind === 235 /* ForInStatement */ ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation; return grammarErrorOnNode(firstDeclaration, diagnostic); @@ -69078,22 +77561,22 @@ var ts; if (languageVersion < 1 /* ES5 */) { return grammarErrorOnNode(accessor.name, ts.Diagnostics.Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher); } - if (accessor.body === undefined && !ts.hasModifier(accessor, 128 /* Abstract */)) { + if (accessor.body === undefined && !ts.hasSyntacticModifier(accessor, 128 /* Abstract */)) { return grammarErrorAtPos(accessor, accessor.end - 1, ";".length, ts.Diagnostics._0_expected, "{"); } } - if (accessor.body && ts.hasModifier(accessor, 128 /* Abstract */)) { + if (accessor.body && ts.hasSyntacticModifier(accessor, 128 /* Abstract */)) { return grammarErrorOnNode(accessor, ts.Diagnostics.An_abstract_accessor_cannot_have_an_implementation); } if (accessor.typeParameters) { return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters); } if (!doesAccessorHaveCorrectParameterCount(accessor)) { - return grammarErrorOnNode(accessor.name, accessor.kind === 163 /* GetAccessor */ ? + return grammarErrorOnNode(accessor.name, accessor.kind === 166 /* GetAccessor */ ? ts.Diagnostics.A_get_accessor_cannot_have_parameters : ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter); } - if (accessor.kind === 164 /* SetAccessor */) { + if (accessor.kind === 167 /* SetAccessor */) { if (accessor.type) { return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation); } @@ -69115,23 +77598,30 @@ var ts; * A set accessor has one parameter or a `this` parameter and one more parameter. */ function doesAccessorHaveCorrectParameterCount(accessor) { - return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 163 /* GetAccessor */ ? 0 : 1); + return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 166 /* GetAccessor */ ? 0 : 1); } function getAccessorThisParameter(accessor) { - if (accessor.parameters.length === (accessor.kind === 163 /* GetAccessor */ ? 1 : 2)) { + if (accessor.parameters.length === (accessor.kind === 166 /* GetAccessor */ ? 1 : 2)) { return ts.getThisParameter(accessor); } } function checkGrammarTypeOperatorNode(node) { - if (node.operator === 147 /* UniqueKeyword */) { - if (node.type.kind !== 144 /* SymbolKeyword */) { - return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(144 /* SymbolKeyword */)); + if (node.operator === 150 /* UniqueKeyword */) { + if (node.type.kind !== 147 /* SymbolKeyword */) { + return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(147 /* SymbolKeyword */)); } var parent = ts.walkUpParenthesizedTypes(node.parent); + if (ts.isInJSFile(parent) && ts.isJSDocTypeExpression(parent)) { + parent = parent.parent; + if (ts.isJSDocTypeTag(parent)) { + // walk up past JSDoc comment node + parent = parent.parent.parent; + } + } switch (parent.kind) { - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: var decl = parent; - if (decl.name.kind !== 75 /* Identifier */) { + if (decl.name.kind !== 78 /* Identifier */) { return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_may_not_be_used_on_a_variable_declaration_with_a_binding_name); } if (!ts.isVariableDeclarationInVariableStatement(decl)) { @@ -69141,14 +77631,14 @@ var ts; return grammarErrorOnNode(parent.name, ts.Diagnostics.A_variable_whose_type_is_a_unique_symbol_type_must_be_const); } break; - case 159 /* PropertyDeclaration */: - if (!ts.hasModifier(parent, 32 /* Static */) || - !ts.hasModifier(parent, 64 /* Readonly */)) { + case 162 /* PropertyDeclaration */: + if (!ts.hasSyntacticModifier(parent, 32 /* Static */) || + !ts.hasEffectiveModifier(parent, 64 /* Readonly */)) { return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_a_class_whose_type_is_a_unique_symbol_type_must_be_both_static_and_readonly); } break; - case 158 /* PropertySignature */: - if (!ts.hasModifier(parent, 64 /* Readonly */)) { + case 161 /* PropertySignature */: + if (!ts.hasSyntacticModifier(parent, 64 /* Readonly */)) { return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_an_interface_or_type_literal_whose_type_is_a_unique_symbol_type_must_be_readonly); } break; @@ -69156,9 +77646,9 @@ var ts; return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_are_not_allowed_here); } } - else if (node.operator === 138 /* ReadonlyKeyword */) { - if (node.type.kind !== 174 /* ArrayType */ && node.type.kind !== 175 /* TupleType */) { - return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(144 /* SymbolKeyword */)); + else if (node.operator === 141 /* ReadonlyKeyword */) { + if (node.type.kind !== 177 /* ArrayType */ && node.type.kind !== 178 /* TupleType */) { + return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(147 /* SymbolKeyword */)); } } } @@ -69171,10 +77661,10 @@ var ts; if (checkGrammarFunctionLikeDeclaration(node)) { return true; } - if (node.kind === 161 /* MethodDeclaration */) { - if (node.parent.kind === 193 /* ObjectLiteralExpression */) { + if (node.kind === 164 /* MethodDeclaration */) { + if (node.parent.kind === 197 /* ObjectLiteralExpression */) { // We only disallow modifier on a method declaration if it is a property of object-literal-expression - if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 126 /* AsyncKeyword */)) { + if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 129 /* AsyncKeyword */)) { return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here); } else if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) { @@ -69200,14 +77690,14 @@ var ts; if (node.flags & 8388608 /* Ambient */) { return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type); } - else if (node.kind === 161 /* MethodDeclaration */ && !node.body) { + else if (node.kind === 164 /* MethodDeclaration */ && !node.body) { return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type); } } - else if (node.parent.kind === 246 /* InterfaceDeclaration */) { + else if (node.parent.kind === 250 /* InterfaceDeclaration */) { return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type); } - else if (node.parent.kind === 173 /* TypeLiteral */) { + else if (node.parent.kind === 176 /* TypeLiteral */) { return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type); } } @@ -69218,11 +77708,11 @@ var ts; return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary); } switch (current.kind) { - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: if (node.label && current.label.escapedText === node.label.escapedText) { // found matching label - verify that label usage is correct // continue can only target labels that are on iteration statements - var isMisplacedContinueLabel = node.kind === 233 /* ContinueStatement */ + var isMisplacedContinueLabel = node.kind === 237 /* ContinueStatement */ && !ts.isIterationStatement(current.statement, /*lookInLabeledStatement*/ true); if (isMisplacedContinueLabel) { return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement); @@ -69230,8 +77720,8 @@ var ts; return false; } break; - case 237 /* SwitchStatement */: - if (node.kind === 234 /* BreakStatement */ && !node.label) { + case 241 /* SwitchStatement */: + if (node.kind === 238 /* BreakStatement */ && !node.label) { // unlabeled break within switch statement - ok return false; } @@ -69246,13 +77736,13 @@ var ts; current = current.parent; } if (node.label) { - var message = node.kind === 234 /* BreakStatement */ + var message = node.kind === 238 /* BreakStatement */ ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement; return grammarErrorOnNode(node, message); } else { - var message = node.kind === 234 /* BreakStatement */ + var message = node.kind === 238 /* BreakStatement */ ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement; return grammarErrorOnNode(node, message); @@ -69268,20 +77758,20 @@ var ts; if (node.propertyName) { return grammarErrorOnNode(node.name, ts.Diagnostics.A_rest_element_cannot_have_a_property_name); } - if (node.initializer) { - // Error on equals token which immediately precedes the initializer - return grammarErrorAtPos(node, node.initializer.pos - 1, 1, ts.Diagnostics.A_rest_element_cannot_have_an_initializer); - } + } + if (node.dotDotDotToken && node.initializer) { + // Error on equals token which immediately precedes the initializer + return grammarErrorAtPos(node, node.initializer.pos - 1, 1, ts.Diagnostics.A_rest_element_cannot_have_an_initializer); } } function isStringOrNumberLiteralExpression(expr) { return ts.isStringOrNumericLiteralLike(expr) || - expr.kind === 207 /* PrefixUnaryExpression */ && expr.operator === 40 /* MinusToken */ && + expr.kind === 211 /* PrefixUnaryExpression */ && expr.operator === 40 /* MinusToken */ && expr.operand.kind === 8 /* NumericLiteral */; } function isBigIntLiteralExpression(expr) { return expr.kind === 9 /* BigIntLiteral */ || - expr.kind === 207 /* PrefixUnaryExpression */ && expr.operator === 40 /* MinusToken */ && + expr.kind === 211 /* PrefixUnaryExpression */ && expr.operator === 40 /* MinusToken */ && expr.operand.kind === 9 /* BigIntLiteral */; } function isSimpleLiteralEnumReference(expr) { @@ -69295,7 +77785,7 @@ var ts; if (initializer) { var isInvalidInitializer = !(isStringOrNumberLiteralExpression(initializer) || isSimpleLiteralEnumReference(initializer) || - initializer.kind === 106 /* TrueKeyword */ || initializer.kind === 91 /* FalseKeyword */ || + initializer.kind === 109 /* TrueKeyword */ || initializer.kind === 94 /* FalseKeyword */ || isBigIntLiteralExpression(initializer)); var isConstOrReadonly = ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node); if (isConstOrReadonly && !node.type) { @@ -69312,7 +77802,7 @@ var ts; } } function checkGrammarVariableDeclaration(node) { - if (node.parent.parent.kind !== 231 /* ForInStatement */ && node.parent.parent.kind !== 232 /* ForOfStatement */) { + if (node.parent.parent.kind !== 235 /* ForInStatement */ && node.parent.parent.kind !== 236 /* ForOfStatement */) { if (node.flags & 8388608 /* Ambient */) { checkAmbientInitializer(node); } @@ -69325,12 +77815,12 @@ var ts; } } } - if (node.exclamationToken && (node.parent.parent.kind !== 225 /* VariableStatement */ || !node.type || node.initializer || node.flags & 8388608 /* Ambient */)) { + if (node.exclamationToken && (node.parent.parent.kind !== 229 /* VariableStatement */ || !node.type || node.initializer || node.flags & 8388608 /* Ambient */)) { return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation); } var moduleKind = ts.getEmitModuleKind(compilerOptions); - if (moduleKind < ts.ModuleKind.ES2015 && moduleKind !== ts.ModuleKind.System && !compilerOptions.noEmit && - !(node.parent.parent.flags & 8388608 /* Ambient */) && ts.hasModifier(node.parent.parent, 1 /* Export */)) { + if (moduleKind < ts.ModuleKind.ES2015 && moduleKind !== ts.ModuleKind.System && + !(node.parent.parent.flags & 8388608 /* Ambient */) && ts.hasSyntacticModifier(node.parent.parent, 1 /* Export */)) { checkESModuleMarker(node.name); } var checkLetConstNames = (ts.isLet(node) || ts.isVarConst(node)); @@ -69343,9 +77833,9 @@ var ts; return checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name); } function checkESModuleMarker(name) { - if (name.kind === 75 /* Identifier */) { + if (name.kind === 78 /* Identifier */) { if (ts.idText(name) === "__esModule") { - return grammarErrorOnNode(name, ts.Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules); + return grammarErrorOnNodeSkippedOn("noEmit", name, ts.Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules); } } else { @@ -69360,8 +77850,8 @@ var ts; return false; } function checkGrammarNameInLetOrConstDeclarations(name) { - if (name.kind === 75 /* Identifier */) { - if (name.originalKeywordKind === 115 /* LetKeyword */) { + if (name.kind === 78 /* Identifier */) { + if (name.originalKeywordKind === 118 /* LetKeyword */) { return grammarErrorOnNode(name, ts.Diagnostics.let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations); } } @@ -69388,15 +77878,15 @@ var ts; } function allowLetAndConstDeclarations(parent) { switch (parent.kind) { - case 227 /* IfStatement */: - case 228 /* DoStatement */: - case 229 /* WhileStatement */: - case 236 /* WithStatement */: - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: + case 231 /* IfStatement */: + case 232 /* DoStatement */: + case 233 /* WhileStatement */: + case 240 /* WithStatement */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: return false; - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: return allowLetAndConstDeclarations(parent.parent); } return true; @@ -69414,12 +77904,12 @@ var ts; function checkGrammarMetaProperty(node) { var escapedText = node.name.escapedText; switch (node.keywordToken) { - case 99 /* NewKeyword */: + case 102 /* NewKeyword */: if (escapedText !== "target") { return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "target"); } break; - case 96 /* ImportKeyword */: + case 99 /* ImportKeyword */: if (escapedText !== "meta") { return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "meta"); } @@ -69446,6 +77936,14 @@ var ts; } return false; } + function grammarErrorOnNodeSkippedOn(key, node, message, arg0, arg1, arg2) { + var sourceFile = ts.getSourceFileOfNode(node); + if (!hasParseDiagnostics(sourceFile)) { + errorSkippedOn(key, node, message, arg0, arg1, arg2); + return true; + } + return false; + } function grammarErrorOnNode(node, message, arg0, arg1, arg2) { var sourceFile = ts.getSourceFileOfNode(node); if (!hasParseDiagnostics(sourceFile)) { @@ -69480,7 +77978,7 @@ var ts; return grammarErrorOnNode(node.name, ts.Diagnostics.Private_identifiers_are_only_available_when_targeting_ECMAScript_2015_and_higher); } } - else if (node.parent.kind === 246 /* InterfaceDeclaration */) { + else if (node.parent.kind === 250 /* InterfaceDeclaration */) { if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) { return true; } @@ -69488,7 +77986,7 @@ var ts; return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer); } } - else if (node.parent.kind === 173 /* TypeLiteral */) { + else if (node.parent.kind === 176 /* TypeLiteral */) { if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) { return true; } @@ -69500,7 +77998,7 @@ var ts; checkAmbientInitializer(node); } if (ts.isPropertyDeclaration(node) && node.exclamationToken && (!ts.isClassLike(node.parent) || !node.type || node.initializer || - node.flags & 8388608 /* Ambient */ || ts.hasModifier(node, 32 /* Static */ | 128 /* Abstract */))) { + node.flags & 8388608 /* Ambient */ || ts.hasSyntacticModifier(node, 32 /* Static */ | 128 /* Abstract */))) { return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context); } } @@ -69517,14 +78015,14 @@ var ts; // export_opt AmbientDeclaration // // TODO: The spec needs to be amended to reflect this grammar. - if (node.kind === 246 /* InterfaceDeclaration */ || - node.kind === 247 /* TypeAliasDeclaration */ || - node.kind === 254 /* ImportDeclaration */ || - node.kind === 253 /* ImportEqualsDeclaration */ || - node.kind === 260 /* ExportDeclaration */ || - node.kind === 259 /* ExportAssignment */ || - node.kind === 252 /* NamespaceExportDeclaration */ || - ts.hasModifier(node, 2 /* Ambient */ | 1 /* Export */ | 512 /* Default */)) { + if (node.kind === 250 /* InterfaceDeclaration */ || + node.kind === 251 /* TypeAliasDeclaration */ || + node.kind === 258 /* ImportDeclaration */ || + node.kind === 257 /* ImportEqualsDeclaration */ || + node.kind === 264 /* ExportDeclaration */ || + node.kind === 263 /* ExportAssignment */ || + node.kind === 256 /* NamespaceExportDeclaration */ || + ts.hasSyntacticModifier(node, 2 /* Ambient */ | 1 /* Export */ | 512 /* Default */)) { return false; } return grammarErrorOnFirstToken(node, ts.Diagnostics.Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier); @@ -69532,7 +78030,7 @@ var ts; function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) { for (var _i = 0, _a = file.statements; _i < _a.length; _i++) { var decl = _a[_i]; - if (ts.isDeclaration(decl) || decl.kind === 225 /* VariableStatement */) { + if (ts.isDeclaration(decl) || decl.kind === 229 /* VariableStatement */) { if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) { return true; } @@ -69555,7 +78053,7 @@ var ts; // to prevent noisiness. So use a bit on the block to indicate if // this has already been reported, and don't report if it has. // - if (node.parent.kind === 223 /* Block */ || node.parent.kind === 250 /* ModuleBlock */ || node.parent.kind === 290 /* SourceFile */) { + if (node.parent.kind === 227 /* Block */ || node.parent.kind === 254 /* ModuleBlock */ || node.parent.kind === 294 /* SourceFile */) { var links_2 = getNodeLinks(node.parent); // Check if the containing block ever report this error if (!links_2.hasReportedStatementInAmbientContext) { @@ -69577,10 +78075,10 @@ var ts; if (languageVersion >= 1 /* ES5 */) { diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0; } - else if (ts.isChildOfNodeWithKind(node, 187 /* LiteralType */)) { + else if (ts.isChildOfNodeWithKind(node, 190 /* LiteralType */)) { diagnosticMessage = ts.Diagnostics.Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0; } - else if (ts.isChildOfNodeWithKind(node, 284 /* EnumMember */)) { + else if (ts.isChildOfNodeWithKind(node, 288 /* EnumMember */)) { diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0; } if (diagnosticMessage) { @@ -69755,14 +78253,14 @@ var ts; return !ts.isAccessor(declaration); } function isNotOverload(declaration) { - return (declaration.kind !== 244 /* FunctionDeclaration */ && declaration.kind !== 161 /* MethodDeclaration */) || + return (declaration.kind !== 248 /* FunctionDeclaration */ && declaration.kind !== 164 /* MethodDeclaration */) || !!declaration.body; } /** Like 'isDeclarationName', but returns true for LHS of `import { x as y }` or `export { x as y }`. */ function isDeclarationNameOrImportPropertyName(name) { switch (name.parent.kind) { - case 258 /* ImportSpecifier */: - case 263 /* ExportSpecifier */: + case 262 /* ImportSpecifier */: + case 267 /* ExportSpecifier */: return ts.isIdentifier(name); default: return ts.isDeclarationName(name); @@ -69770,14 +78268,14 @@ var ts; } function isSomeImportDeclaration(decl) { switch (decl.kind) { - case 255 /* ImportClause */: // For default import - case 253 /* ImportEqualsDeclaration */: - case 256 /* NamespaceImport */: - case 258 /* ImportSpecifier */: // For rename import `x as y` + case 259 /* ImportClause */: // For default import + case 257 /* ImportEqualsDeclaration */: + case 260 /* NamespaceImport */: + case 262 /* ImportSpecifier */: // For rename import `x as y` return true; - case 75 /* Identifier */: + case 78 /* Identifier */: // For regular import, `decl` is an Identifier under the ImportSpecifier. - return decl.parent.kind === 258 /* ImportSpecifier */; + return decl.parent.kind === 262 /* ImportSpecifier */; default: return false; } @@ -69811,4990 +78309,12 @@ var ts; ts.signatureHasLiteralTypes = signatureHasLiteralTypes; })(ts || (ts = {})); var ts; -(function (ts) { - function createSynthesizedNode(kind) { - var node = ts.createNode(kind, -1, -1); - node.flags |= 8 /* Synthesized */; - return node; - } - /* @internal */ - function updateNode(updated, original) { - if (updated !== original) { - setOriginalNode(updated, original); - setTextRange(updated, original); - ts.aggregateTransformFlags(updated); - } - return updated; - } - ts.updateNode = updateNode; - /** - * Make `elements` into a `NodeArray`. If `elements` is `undefined`, returns an empty `NodeArray`. - */ - function createNodeArray(elements, hasTrailingComma) { - if (!elements || elements === ts.emptyArray) { - elements = []; - } - else if (ts.isNodeArray(elements)) { - return elements; - } - var array = elements; - array.pos = -1; - array.end = -1; - array.hasTrailingComma = hasTrailingComma; - return array; - } - ts.createNodeArray = createNodeArray; - /** - * Creates a shallow, memberwise clone of a node with no source map location. - */ - /* @internal */ - function getSynthesizedClone(node) { - // We don't use "clone" from core.ts here, as we need to preserve the prototype chain of - // the original node. We also need to exclude specific properties and only include own- - // properties (to skip members already defined on the shared prototype). - if (node === undefined) { - return node; - } - var clone = createSynthesizedNode(node.kind); - clone.flags |= node.flags; - setOriginalNode(clone, node); - for (var key in node) { - if (clone.hasOwnProperty(key) || !node.hasOwnProperty(key)) { - continue; - } - clone[key] = node[key]; - } - return clone; - } - ts.getSynthesizedClone = getSynthesizedClone; - function createLiteral(value, isSingleQuote) { - if (typeof value === "number") { - return createNumericLiteral(value + ""); - } - // eslint-disable-next-line no-in-operator - if (typeof value === "object" && "base10Value" in value) { // PseudoBigInt - return createBigIntLiteral(ts.pseudoBigIntToString(value) + "n"); - } - if (typeof value === "boolean") { - return value ? createTrue() : createFalse(); - } - if (ts.isString(value)) { - var res = createStringLiteral(value); - if (isSingleQuote) - res.singleQuote = true; - return res; - } - return createLiteralFromNode(value); - } - ts.createLiteral = createLiteral; - function createNumericLiteral(value, numericLiteralFlags) { - if (numericLiteralFlags === void 0) { numericLiteralFlags = 0 /* None */; } - var node = createSynthesizedNode(8 /* NumericLiteral */); - node.text = value; - node.numericLiteralFlags = numericLiteralFlags; - return node; - } - ts.createNumericLiteral = createNumericLiteral; - function createBigIntLiteral(value) { - var node = createSynthesizedNode(9 /* BigIntLiteral */); - node.text = value; - return node; - } - ts.createBigIntLiteral = createBigIntLiteral; - function createStringLiteral(text) { - var node = createSynthesizedNode(10 /* StringLiteral */); - node.text = text; - return node; - } - ts.createStringLiteral = createStringLiteral; - function createRegularExpressionLiteral(text) { - var node = createSynthesizedNode(13 /* RegularExpressionLiteral */); - node.text = text; - return node; - } - ts.createRegularExpressionLiteral = createRegularExpressionLiteral; - function createLiteralFromNode(sourceNode) { - var node = createStringLiteral(ts.getTextOfIdentifierOrLiteral(sourceNode)); - node.textSourceNode = sourceNode; - return node; - } - function createIdentifier(text, typeArguments) { - var node = createSynthesizedNode(75 /* Identifier */); - node.escapedText = ts.escapeLeadingUnderscores(text); - node.originalKeywordKind = text ? ts.stringToToken(text) : 0 /* Unknown */; - node.autoGenerateFlags = 0 /* None */; - node.autoGenerateId = 0; - if (typeArguments) { - node.typeArguments = createNodeArray(typeArguments); - } - return node; - } - ts.createIdentifier = createIdentifier; - function updateIdentifier(node, typeArguments) { - return node.typeArguments !== typeArguments - ? updateNode(createIdentifier(ts.idText(node), typeArguments), node) - : node; - } - ts.updateIdentifier = updateIdentifier; - var nextAutoGenerateId = 0; - function createTempVariable(recordTempVariable, reservedInNestedScopes) { - var name = createIdentifier(""); - name.autoGenerateFlags = 1 /* Auto */; - name.autoGenerateId = nextAutoGenerateId; - nextAutoGenerateId++; - if (recordTempVariable) { - recordTempVariable(name); - } - if (reservedInNestedScopes) { - name.autoGenerateFlags |= 8 /* ReservedInNestedScopes */; - } - return name; - } - ts.createTempVariable = createTempVariable; - /** Create a unique temporary variable for use in a loop. */ - function createLoopVariable() { - var name = createIdentifier(""); - name.autoGenerateFlags = 2 /* Loop */; - name.autoGenerateId = nextAutoGenerateId; - nextAutoGenerateId++; - return name; - } - ts.createLoopVariable = createLoopVariable; - /** Create a unique name based on the supplied text. */ - function createUniqueName(text) { - var name = createIdentifier(text); - name.autoGenerateFlags = 3 /* Unique */; - name.autoGenerateId = nextAutoGenerateId; - nextAutoGenerateId++; - return name; - } - ts.createUniqueName = createUniqueName; - function createOptimisticUniqueName(text) { - var name = createIdentifier(text); - name.autoGenerateFlags = 3 /* Unique */ | 16 /* Optimistic */; - name.autoGenerateId = nextAutoGenerateId; - nextAutoGenerateId++; - return name; - } - ts.createOptimisticUniqueName = createOptimisticUniqueName; - /** Create a unique name based on the supplied text. This does not consider names injected by the transformer. */ - function createFileLevelUniqueName(text) { - var name = createOptimisticUniqueName(text); - name.autoGenerateFlags |= 32 /* FileLevel */; - return name; - } - ts.createFileLevelUniqueName = createFileLevelUniqueName; - function getGeneratedNameForNode(node, flags) { - var name = createIdentifier(node && ts.isIdentifier(node) ? ts.idText(node) : ""); - name.autoGenerateFlags = 4 /* Node */ | flags; - name.autoGenerateId = nextAutoGenerateId; - name.original = node; - nextAutoGenerateId++; - return name; - } - ts.getGeneratedNameForNode = getGeneratedNameForNode; - // Private Identifiers - function createPrivateIdentifier(text) { - if (text[0] !== "#") { - ts.Debug.fail("First character of private identifier must be #: " + text); - } - var node = createSynthesizedNode(76 /* PrivateIdentifier */); - node.escapedText = ts.escapeLeadingUnderscores(text); - return node; - } - ts.createPrivateIdentifier = createPrivateIdentifier; - // Punctuation - function createToken(token) { - return createSynthesizedNode(token); - } - ts.createToken = createToken; - // Reserved words - function createSuper() { - return createSynthesizedNode(102 /* SuperKeyword */); - } - ts.createSuper = createSuper; - function createThis() { - return createSynthesizedNode(104 /* ThisKeyword */); - } - ts.createThis = createThis; - function createNull() { - return createSynthesizedNode(100 /* NullKeyword */); - } - ts.createNull = createNull; - function createTrue() { - return createSynthesizedNode(106 /* TrueKeyword */); - } - ts.createTrue = createTrue; - function createFalse() { - return createSynthesizedNode(91 /* FalseKeyword */); - } - ts.createFalse = createFalse; - // Modifiers - function createModifier(kind) { - return createToken(kind); - } - ts.createModifier = createModifier; - function createModifiersFromModifierFlags(flags) { - var result = []; - if (flags & 1 /* Export */) { - result.push(createModifier(89 /* ExportKeyword */)); - } - if (flags & 2 /* Ambient */) { - result.push(createModifier(130 /* DeclareKeyword */)); - } - if (flags & 512 /* Default */) { - result.push(createModifier(84 /* DefaultKeyword */)); - } - if (flags & 2048 /* Const */) { - result.push(createModifier(81 /* ConstKeyword */)); - } - if (flags & 4 /* Public */) { - result.push(createModifier(119 /* PublicKeyword */)); - } - if (flags & 8 /* Private */) { - result.push(createModifier(117 /* PrivateKeyword */)); - } - if (flags & 16 /* Protected */) { - result.push(createModifier(118 /* ProtectedKeyword */)); - } - if (flags & 128 /* Abstract */) { - result.push(createModifier(122 /* AbstractKeyword */)); - } - if (flags & 32 /* Static */) { - result.push(createModifier(120 /* StaticKeyword */)); - } - if (flags & 64 /* Readonly */) { - result.push(createModifier(138 /* ReadonlyKeyword */)); - } - if (flags & 256 /* Async */) { - result.push(createModifier(126 /* AsyncKeyword */)); - } - return result; - } - ts.createModifiersFromModifierFlags = createModifiersFromModifierFlags; - // Names - function createQualifiedName(left, right) { - var node = createSynthesizedNode(153 /* QualifiedName */); - node.left = left; - node.right = asName(right); - return node; - } - ts.createQualifiedName = createQualifiedName; - function updateQualifiedName(node, left, right) { - return node.left !== left - || node.right !== right - ? updateNode(createQualifiedName(left, right), node) - : node; - } - ts.updateQualifiedName = updateQualifiedName; - function parenthesizeForComputedName(expression) { - return ts.isCommaSequence(expression) - ? createParen(expression) - : expression; - } - function createComputedPropertyName(expression) { - var node = createSynthesizedNode(154 /* ComputedPropertyName */); - node.expression = parenthesizeForComputedName(expression); - return node; - } - ts.createComputedPropertyName = createComputedPropertyName; - function updateComputedPropertyName(node, expression) { - return node.expression !== expression - ? updateNode(createComputedPropertyName(expression), node) - : node; - } - ts.updateComputedPropertyName = updateComputedPropertyName; - // Signature elements - function createTypeParameterDeclaration(name, constraint, defaultType) { - var node = createSynthesizedNode(155 /* TypeParameter */); - node.name = asName(name); - node.constraint = constraint; - node.default = defaultType; - return node; - } - ts.createTypeParameterDeclaration = createTypeParameterDeclaration; - function updateTypeParameterDeclaration(node, name, constraint, defaultType) { - return node.name !== name - || node.constraint !== constraint - || node.default !== defaultType - ? updateNode(createTypeParameterDeclaration(name, constraint, defaultType), node) - : node; - } - ts.updateTypeParameterDeclaration = updateTypeParameterDeclaration; - function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) { - var node = createSynthesizedNode(156 /* Parameter */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.dotDotDotToken = dotDotDotToken; - node.name = asName(name); - node.questionToken = questionToken; - node.type = type; - node.initializer = initializer ? ts.parenthesizeExpressionForList(initializer) : undefined; - return node; - } - ts.createParameter = createParameter; - function updateParameter(node, decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.dotDotDotToken !== dotDotDotToken - || node.name !== name - || node.questionToken !== questionToken - || node.type !== type - || node.initializer !== initializer - ? updateNode(createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer), node) - : node; - } - ts.updateParameter = updateParameter; - function createDecorator(expression) { - var node = createSynthesizedNode(157 /* Decorator */); - node.expression = ts.parenthesizeForAccess(expression); - return node; - } - ts.createDecorator = createDecorator; - function updateDecorator(node, expression) { - return node.expression !== expression - ? updateNode(createDecorator(expression), node) - : node; - } - ts.updateDecorator = updateDecorator; - // Type Elements - function createPropertySignature(modifiers, name, questionToken, type, initializer) { - var node = createSynthesizedNode(158 /* PropertySignature */); - node.modifiers = asNodeArray(modifiers); - node.name = asName(name); - node.questionToken = questionToken; - node.type = type; - node.initializer = initializer; - return node; - } - ts.createPropertySignature = createPropertySignature; - function updatePropertySignature(node, modifiers, name, questionToken, type, initializer) { - return node.modifiers !== modifiers - || node.name !== name - || node.questionToken !== questionToken - || node.type !== type - || node.initializer !== initializer - ? updateNode(createPropertySignature(modifiers, name, questionToken, type, initializer), node) - : node; - } - ts.updatePropertySignature = updatePropertySignature; - function createProperty(decorators, modifiers, name, questionOrExclamationToken, type, initializer) { - var node = createSynthesizedNode(159 /* PropertyDeclaration */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.name = asName(name); - node.questionToken = questionOrExclamationToken !== undefined && questionOrExclamationToken.kind === 57 /* QuestionToken */ ? questionOrExclamationToken : undefined; - node.exclamationToken = questionOrExclamationToken !== undefined && questionOrExclamationToken.kind === 53 /* ExclamationToken */ ? questionOrExclamationToken : undefined; - node.type = type; - node.initializer = initializer; - return node; - } - ts.createProperty = createProperty; - function updateProperty(node, decorators, modifiers, name, questionOrExclamationToken, type, initializer) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.name !== name - || node.questionToken !== (questionOrExclamationToken !== undefined && questionOrExclamationToken.kind === 57 /* QuestionToken */ ? questionOrExclamationToken : undefined) - || node.exclamationToken !== (questionOrExclamationToken !== undefined && questionOrExclamationToken.kind === 53 /* ExclamationToken */ ? questionOrExclamationToken : undefined) - || node.type !== type - || node.initializer !== initializer - ? updateNode(createProperty(decorators, modifiers, name, questionOrExclamationToken, type, initializer), node) - : node; - } - ts.updateProperty = updateProperty; - function createMethodSignature(typeParameters, parameters, type, name, questionToken) { - var node = createSignatureDeclaration(160 /* MethodSignature */, typeParameters, parameters, type); - node.name = asName(name); - node.questionToken = questionToken; - return node; - } - ts.createMethodSignature = createMethodSignature; - function updateMethodSignature(node, typeParameters, parameters, type, name, questionToken) { - return node.typeParameters !== typeParameters - || node.parameters !== parameters - || node.type !== type - || node.name !== name - || node.questionToken !== questionToken - ? updateNode(createMethodSignature(typeParameters, parameters, type, name, questionToken), node) - : node; - } - ts.updateMethodSignature = updateMethodSignature; - function createMethod(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) { - var node = createSynthesizedNode(161 /* MethodDeclaration */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.asteriskToken = asteriskToken; - node.name = asName(name); - node.questionToken = questionToken; - node.typeParameters = asNodeArray(typeParameters); - node.parameters = createNodeArray(parameters); - node.type = type; - node.body = body; - return node; - } - ts.createMethod = createMethod; - function createMethodCall(object, methodName, argumentsList) { - return createCall(createPropertyAccess(object, asName(methodName)), - /*typeArguments*/ undefined, argumentsList); - } - function createGlobalMethodCall(globalObjectName, methodName, argumentsList) { - return createMethodCall(createIdentifier(globalObjectName), methodName, argumentsList); - } - /* @internal */ - function createObjectDefinePropertyCall(target, propertyName, attributes) { - return createGlobalMethodCall("Object", "defineProperty", [target, asExpression(propertyName), attributes]); - } - ts.createObjectDefinePropertyCall = createObjectDefinePropertyCall; - function tryAddPropertyAssignment(properties, propertyName, expression) { - if (expression) { - properties.push(createPropertyAssignment(propertyName, expression)); - return true; - } - return false; - } - /* @internal */ - function createPropertyDescriptor(attributes, singleLine) { - var properties = []; - tryAddPropertyAssignment(properties, "enumerable", asExpression(attributes.enumerable)); - tryAddPropertyAssignment(properties, "configurable", asExpression(attributes.configurable)); - var isData = tryAddPropertyAssignment(properties, "writable", asExpression(attributes.writable)); - isData = tryAddPropertyAssignment(properties, "value", attributes.value) || isData; - var isAccessor = tryAddPropertyAssignment(properties, "get", attributes.get); - isAccessor = tryAddPropertyAssignment(properties, "set", attributes.set) || isAccessor; - ts.Debug.assert(!(isData && isAccessor), "A PropertyDescriptor may not be both an accessor descriptor and a data descriptor."); - return createObjectLiteral(properties, !singleLine); - } - ts.createPropertyDescriptor = createPropertyDescriptor; - function updateMethod(node, decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.asteriskToken !== asteriskToken - || node.name !== name - || node.questionToken !== questionToken - || node.typeParameters !== typeParameters - || node.parameters !== parameters - || node.type !== type - || node.body !== body - ? updateNode(createMethod(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body), node) - : node; - } - ts.updateMethod = updateMethod; - function createConstructor(decorators, modifiers, parameters, body) { - var node = createSynthesizedNode(162 /* Constructor */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.typeParameters = undefined; - node.parameters = createNodeArray(parameters); - node.type = undefined; - node.body = body; - return node; - } - ts.createConstructor = createConstructor; - function updateConstructor(node, decorators, modifiers, parameters, body) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.parameters !== parameters - || node.body !== body - ? updateNode(createConstructor(decorators, modifiers, parameters, body), node) - : node; - } - ts.updateConstructor = updateConstructor; - function createGetAccessor(decorators, modifiers, name, parameters, type, body) { - var node = createSynthesizedNode(163 /* GetAccessor */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.name = asName(name); - node.typeParameters = undefined; - node.parameters = createNodeArray(parameters); - node.type = type; - node.body = body; - return node; - } - ts.createGetAccessor = createGetAccessor; - function updateGetAccessor(node, decorators, modifiers, name, parameters, type, body) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.name !== name - || node.parameters !== parameters - || node.type !== type - || node.body !== body - ? updateNode(createGetAccessor(decorators, modifiers, name, parameters, type, body), node) - : node; - } - ts.updateGetAccessor = updateGetAccessor; - function createSetAccessor(decorators, modifiers, name, parameters, body) { - var node = createSynthesizedNode(164 /* SetAccessor */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.name = asName(name); - node.typeParameters = undefined; - node.parameters = createNodeArray(parameters); - node.body = body; - return node; - } - ts.createSetAccessor = createSetAccessor; - function updateSetAccessor(node, decorators, modifiers, name, parameters, body) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.name !== name - || node.parameters !== parameters - || node.body !== body - ? updateNode(createSetAccessor(decorators, modifiers, name, parameters, body), node) - : node; - } - ts.updateSetAccessor = updateSetAccessor; - function createCallSignature(typeParameters, parameters, type) { - return createSignatureDeclaration(165 /* CallSignature */, typeParameters, parameters, type); - } - ts.createCallSignature = createCallSignature; - function updateCallSignature(node, typeParameters, parameters, type) { - return updateSignatureDeclaration(node, typeParameters, parameters, type); - } - ts.updateCallSignature = updateCallSignature; - function createConstructSignature(typeParameters, parameters, type) { - return createSignatureDeclaration(166 /* ConstructSignature */, typeParameters, parameters, type); - } - ts.createConstructSignature = createConstructSignature; - function updateConstructSignature(node, typeParameters, parameters, type) { - return updateSignatureDeclaration(node, typeParameters, parameters, type); - } - ts.updateConstructSignature = updateConstructSignature; - function createIndexSignature(decorators, modifiers, parameters, type) { - var node = createSynthesizedNode(167 /* IndexSignature */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.parameters = createNodeArray(parameters); - node.type = type; - return node; - } - ts.createIndexSignature = createIndexSignature; - function updateIndexSignature(node, decorators, modifiers, parameters, type) { - return node.parameters !== parameters - || node.type !== type - || node.decorators !== decorators - || node.modifiers !== modifiers - ? updateNode(createIndexSignature(decorators, modifiers, parameters, type), node) - : node; - } - ts.updateIndexSignature = updateIndexSignature; - /* @internal */ - function createSignatureDeclaration(kind, typeParameters, parameters, type, typeArguments) { - var node = createSynthesizedNode(kind); - node.typeParameters = asNodeArray(typeParameters); - node.parameters = asNodeArray(parameters); - node.type = type; - node.typeArguments = asNodeArray(typeArguments); - return node; - } - ts.createSignatureDeclaration = createSignatureDeclaration; - function updateSignatureDeclaration(node, typeParameters, parameters, type) { - return node.typeParameters !== typeParameters - || node.parameters !== parameters - || node.type !== type - ? updateNode(createSignatureDeclaration(node.kind, typeParameters, parameters, type), node) - : node; - } - // Types - function createKeywordTypeNode(kind) { - return createSynthesizedNode(kind); - } - ts.createKeywordTypeNode = createKeywordTypeNode; - function createTypePredicateNode(parameterName, type) { - return createTypePredicateNodeWithModifier(/*assertsModifier*/ undefined, parameterName, type); - } - ts.createTypePredicateNode = createTypePredicateNode; - function createTypePredicateNodeWithModifier(assertsModifier, parameterName, type) { - var node = createSynthesizedNode(168 /* TypePredicate */); - node.assertsModifier = assertsModifier; - node.parameterName = asName(parameterName); - node.type = type; - return node; - } - ts.createTypePredicateNodeWithModifier = createTypePredicateNodeWithModifier; - function updateTypePredicateNode(node, parameterName, type) { - return updateTypePredicateNodeWithModifier(node, node.assertsModifier, parameterName, type); - } - ts.updateTypePredicateNode = updateTypePredicateNode; - function updateTypePredicateNodeWithModifier(node, assertsModifier, parameterName, type) { - return node.assertsModifier !== assertsModifier - || node.parameterName !== parameterName - || node.type !== type - ? updateNode(createTypePredicateNodeWithModifier(assertsModifier, parameterName, type), node) - : node; - } - ts.updateTypePredicateNodeWithModifier = updateTypePredicateNodeWithModifier; - function createTypeReferenceNode(typeName, typeArguments) { - var node = createSynthesizedNode(169 /* TypeReference */); - node.typeName = asName(typeName); - node.typeArguments = typeArguments && ts.parenthesizeTypeParameters(typeArguments); - return node; - } - ts.createTypeReferenceNode = createTypeReferenceNode; - function updateTypeReferenceNode(node, typeName, typeArguments) { - return node.typeName !== typeName - || node.typeArguments !== typeArguments - ? updateNode(createTypeReferenceNode(typeName, typeArguments), node) - : node; - } - ts.updateTypeReferenceNode = updateTypeReferenceNode; - function createFunctionTypeNode(typeParameters, parameters, type) { - return createSignatureDeclaration(170 /* FunctionType */, typeParameters, parameters, type); - } - ts.createFunctionTypeNode = createFunctionTypeNode; - function updateFunctionTypeNode(node, typeParameters, parameters, type) { - return updateSignatureDeclaration(node, typeParameters, parameters, type); - } - ts.updateFunctionTypeNode = updateFunctionTypeNode; - function createConstructorTypeNode(typeParameters, parameters, type) { - return createSignatureDeclaration(171 /* ConstructorType */, typeParameters, parameters, type); - } - ts.createConstructorTypeNode = createConstructorTypeNode; - function updateConstructorTypeNode(node, typeParameters, parameters, type) { - return updateSignatureDeclaration(node, typeParameters, parameters, type); - } - ts.updateConstructorTypeNode = updateConstructorTypeNode; - function createTypeQueryNode(exprName) { - var node = createSynthesizedNode(172 /* TypeQuery */); - node.exprName = exprName; - return node; - } - ts.createTypeQueryNode = createTypeQueryNode; - function updateTypeQueryNode(node, exprName) { - return node.exprName !== exprName - ? updateNode(createTypeQueryNode(exprName), node) - : node; - } - ts.updateTypeQueryNode = updateTypeQueryNode; - function createTypeLiteralNode(members) { - var node = createSynthesizedNode(173 /* TypeLiteral */); - node.members = createNodeArray(members); - return node; - } - ts.createTypeLiteralNode = createTypeLiteralNode; - function updateTypeLiteralNode(node, members) { - return node.members !== members - ? updateNode(createTypeLiteralNode(members), node) - : node; - } - ts.updateTypeLiteralNode = updateTypeLiteralNode; - function createArrayTypeNode(elementType) { - var node = createSynthesizedNode(174 /* ArrayType */); - node.elementType = ts.parenthesizeArrayTypeMember(elementType); - return node; - } - ts.createArrayTypeNode = createArrayTypeNode; - function updateArrayTypeNode(node, elementType) { - return node.elementType !== elementType - ? updateNode(createArrayTypeNode(elementType), node) - : node; - } - ts.updateArrayTypeNode = updateArrayTypeNode; - function createTupleTypeNode(elementTypes) { - var node = createSynthesizedNode(175 /* TupleType */); - node.elementTypes = createNodeArray(elementTypes); - return node; - } - ts.createTupleTypeNode = createTupleTypeNode; - function updateTupleTypeNode(node, elementTypes) { - return node.elementTypes !== elementTypes - ? updateNode(createTupleTypeNode(elementTypes), node) - : node; - } - ts.updateTupleTypeNode = updateTupleTypeNode; - function createOptionalTypeNode(type) { - var node = createSynthesizedNode(176 /* OptionalType */); - node.type = ts.parenthesizeArrayTypeMember(type); - return node; - } - ts.createOptionalTypeNode = createOptionalTypeNode; - function updateOptionalTypeNode(node, type) { - return node.type !== type - ? updateNode(createOptionalTypeNode(type), node) - : node; - } - ts.updateOptionalTypeNode = updateOptionalTypeNode; - function createRestTypeNode(type) { - var node = createSynthesizedNode(177 /* RestType */); - node.type = type; - return node; - } - ts.createRestTypeNode = createRestTypeNode; - function updateRestTypeNode(node, type) { - return node.type !== type - ? updateNode(createRestTypeNode(type), node) - : node; - } - ts.updateRestTypeNode = updateRestTypeNode; - function createUnionTypeNode(types) { - return createUnionOrIntersectionTypeNode(178 /* UnionType */, types); - } - ts.createUnionTypeNode = createUnionTypeNode; - function updateUnionTypeNode(node, types) { - return updateUnionOrIntersectionTypeNode(node, types); - } - ts.updateUnionTypeNode = updateUnionTypeNode; - function createIntersectionTypeNode(types) { - return createUnionOrIntersectionTypeNode(179 /* IntersectionType */, types); - } - ts.createIntersectionTypeNode = createIntersectionTypeNode; - function updateIntersectionTypeNode(node, types) { - return updateUnionOrIntersectionTypeNode(node, types); - } - ts.updateIntersectionTypeNode = updateIntersectionTypeNode; - function createUnionOrIntersectionTypeNode(kind, types) { - var node = createSynthesizedNode(kind); - node.types = ts.parenthesizeElementTypeMembers(types); - return node; - } - ts.createUnionOrIntersectionTypeNode = createUnionOrIntersectionTypeNode; - function updateUnionOrIntersectionTypeNode(node, types) { - return node.types !== types - ? updateNode(createUnionOrIntersectionTypeNode(node.kind, types), node) - : node; - } - function createConditionalTypeNode(checkType, extendsType, trueType, falseType) { - var node = createSynthesizedNode(180 /* ConditionalType */); - node.checkType = ts.parenthesizeConditionalTypeMember(checkType); - node.extendsType = ts.parenthesizeConditionalTypeMember(extendsType); - node.trueType = trueType; - node.falseType = falseType; - return node; - } - ts.createConditionalTypeNode = createConditionalTypeNode; - function updateConditionalTypeNode(node, checkType, extendsType, trueType, falseType) { - return node.checkType !== checkType - || node.extendsType !== extendsType - || node.trueType !== trueType - || node.falseType !== falseType - ? updateNode(createConditionalTypeNode(checkType, extendsType, trueType, falseType), node) - : node; - } - ts.updateConditionalTypeNode = updateConditionalTypeNode; - function createInferTypeNode(typeParameter) { - var node = createSynthesizedNode(181 /* InferType */); - node.typeParameter = typeParameter; - return node; - } - ts.createInferTypeNode = createInferTypeNode; - function updateInferTypeNode(node, typeParameter) { - return node.typeParameter !== typeParameter - ? updateNode(createInferTypeNode(typeParameter), node) - : node; - } - ts.updateInferTypeNode = updateInferTypeNode; - function createImportTypeNode(argument, qualifier, typeArguments, isTypeOf) { - var node = createSynthesizedNode(188 /* ImportType */); - node.argument = argument; - node.qualifier = qualifier; - node.typeArguments = ts.parenthesizeTypeParameters(typeArguments); - node.isTypeOf = isTypeOf; - return node; - } - ts.createImportTypeNode = createImportTypeNode; - function updateImportTypeNode(node, argument, qualifier, typeArguments, isTypeOf) { - return node.argument !== argument - || node.qualifier !== qualifier - || node.typeArguments !== typeArguments - || node.isTypeOf !== isTypeOf - ? updateNode(createImportTypeNode(argument, qualifier, typeArguments, isTypeOf), node) - : node; - } - ts.updateImportTypeNode = updateImportTypeNode; - function createParenthesizedType(type) { - var node = createSynthesizedNode(182 /* ParenthesizedType */); - node.type = type; - return node; - } - ts.createParenthesizedType = createParenthesizedType; - function updateParenthesizedType(node, type) { - return node.type !== type - ? updateNode(createParenthesizedType(type), node) - : node; - } - ts.updateParenthesizedType = updateParenthesizedType; - function createThisTypeNode() { - return createSynthesizedNode(183 /* ThisType */); - } - ts.createThisTypeNode = createThisTypeNode; - function createTypeOperatorNode(operatorOrType, type) { - var node = createSynthesizedNode(184 /* TypeOperator */); - node.operator = typeof operatorOrType === "number" ? operatorOrType : 134 /* KeyOfKeyword */; - node.type = ts.parenthesizeElementTypeMember(typeof operatorOrType === "number" ? type : operatorOrType); - return node; - } - ts.createTypeOperatorNode = createTypeOperatorNode; - function updateTypeOperatorNode(node, type) { - return node.type !== type ? updateNode(createTypeOperatorNode(node.operator, type), node) : node; - } - ts.updateTypeOperatorNode = updateTypeOperatorNode; - function createIndexedAccessTypeNode(objectType, indexType) { - var node = createSynthesizedNode(185 /* IndexedAccessType */); - node.objectType = ts.parenthesizeElementTypeMember(objectType); - node.indexType = indexType; - return node; - } - ts.createIndexedAccessTypeNode = createIndexedAccessTypeNode; - function updateIndexedAccessTypeNode(node, objectType, indexType) { - return node.objectType !== objectType - || node.indexType !== indexType - ? updateNode(createIndexedAccessTypeNode(objectType, indexType), node) - : node; - } - ts.updateIndexedAccessTypeNode = updateIndexedAccessTypeNode; - function createMappedTypeNode(readonlyToken, typeParameter, questionToken, type) { - var node = createSynthesizedNode(186 /* MappedType */); - node.readonlyToken = readonlyToken; - node.typeParameter = typeParameter; - node.questionToken = questionToken; - node.type = type; - return node; - } - ts.createMappedTypeNode = createMappedTypeNode; - function updateMappedTypeNode(node, readonlyToken, typeParameter, questionToken, type) { - return node.readonlyToken !== readonlyToken - || node.typeParameter !== typeParameter - || node.questionToken !== questionToken - || node.type !== type - ? updateNode(createMappedTypeNode(readonlyToken, typeParameter, questionToken, type), node) - : node; - } - ts.updateMappedTypeNode = updateMappedTypeNode; - function createLiteralTypeNode(literal) { - var node = createSynthesizedNode(187 /* LiteralType */); - node.literal = literal; - return node; - } - ts.createLiteralTypeNode = createLiteralTypeNode; - function updateLiteralTypeNode(node, literal) { - return node.literal !== literal - ? updateNode(createLiteralTypeNode(literal), node) - : node; - } - ts.updateLiteralTypeNode = updateLiteralTypeNode; - // Binding Patterns - function createObjectBindingPattern(elements) { - var node = createSynthesizedNode(189 /* ObjectBindingPattern */); - node.elements = createNodeArray(elements); - return node; - } - ts.createObjectBindingPattern = createObjectBindingPattern; - function updateObjectBindingPattern(node, elements) { - return node.elements !== elements - ? updateNode(createObjectBindingPattern(elements), node) - : node; - } - ts.updateObjectBindingPattern = updateObjectBindingPattern; - function createArrayBindingPattern(elements) { - var node = createSynthesizedNode(190 /* ArrayBindingPattern */); - node.elements = createNodeArray(elements); - return node; - } - ts.createArrayBindingPattern = createArrayBindingPattern; - function updateArrayBindingPattern(node, elements) { - return node.elements !== elements - ? updateNode(createArrayBindingPattern(elements), node) - : node; - } - ts.updateArrayBindingPattern = updateArrayBindingPattern; - function createBindingElement(dotDotDotToken, propertyName, name, initializer) { - var node = createSynthesizedNode(191 /* BindingElement */); - node.dotDotDotToken = dotDotDotToken; - node.propertyName = asName(propertyName); - node.name = asName(name); - node.initializer = initializer; - return node; - } - ts.createBindingElement = createBindingElement; - function updateBindingElement(node, dotDotDotToken, propertyName, name, initializer) { - return node.propertyName !== propertyName - || node.dotDotDotToken !== dotDotDotToken - || node.name !== name - || node.initializer !== initializer - ? updateNode(createBindingElement(dotDotDotToken, propertyName, name, initializer), node) - : node; - } - ts.updateBindingElement = updateBindingElement; - // Expression - function createArrayLiteral(elements, multiLine) { - var node = createSynthesizedNode(192 /* ArrayLiteralExpression */); - node.elements = ts.parenthesizeListElements(createNodeArray(elements)); - if (multiLine) - node.multiLine = true; - return node; - } - ts.createArrayLiteral = createArrayLiteral; - function updateArrayLiteral(node, elements) { - return node.elements !== elements - ? updateNode(createArrayLiteral(elements, node.multiLine), node) - : node; - } - ts.updateArrayLiteral = updateArrayLiteral; - function createObjectLiteral(properties, multiLine) { - var node = createSynthesizedNode(193 /* ObjectLiteralExpression */); - node.properties = createNodeArray(properties); - if (multiLine) - node.multiLine = true; - return node; - } - ts.createObjectLiteral = createObjectLiteral; - function updateObjectLiteral(node, properties) { - return node.properties !== properties - ? updateNode(createObjectLiteral(properties, node.multiLine), node) - : node; - } - ts.updateObjectLiteral = updateObjectLiteral; - function createPropertyAccess(expression, name) { - var node = createSynthesizedNode(194 /* PropertyAccessExpression */); - node.expression = ts.parenthesizeForAccess(expression); - node.name = asName(name); - setEmitFlags(node, 131072 /* NoIndentation */); - return node; - } - ts.createPropertyAccess = createPropertyAccess; - function updatePropertyAccess(node, expression, name) { - if (ts.isPropertyAccessChain(node)) { - return updatePropertyAccessChain(node, expression, node.questionDotToken, ts.cast(name, ts.isIdentifier)); - } - // Because we are updating existed propertyAccess we want to inherit its emitFlags - // instead of using the default from createPropertyAccess - return node.expression !== expression - || node.name !== name - ? updateNode(setEmitFlags(createPropertyAccess(expression, name), ts.getEmitFlags(node)), node) - : node; - } - ts.updatePropertyAccess = updatePropertyAccess; - function createPropertyAccessChain(expression, questionDotToken, name) { - var node = createSynthesizedNode(194 /* PropertyAccessExpression */); - node.flags |= 32 /* OptionalChain */; - node.expression = ts.parenthesizeForAccess(expression); - node.questionDotToken = questionDotToken; - node.name = asName(name); - setEmitFlags(node, 131072 /* NoIndentation */); - return node; - } - ts.createPropertyAccessChain = createPropertyAccessChain; - function updatePropertyAccessChain(node, expression, questionDotToken, name) { - ts.Debug.assert(!!(node.flags & 32 /* OptionalChain */), "Cannot update a PropertyAccessExpression using updatePropertyAccessChain. Use updatePropertyAccess instead."); - // Because we are updating an existing PropertyAccessChain we want to inherit its emitFlags - // instead of using the default from createPropertyAccess - return node.expression !== expression - || node.questionDotToken !== questionDotToken - || node.name !== name - ? updateNode(setEmitFlags(createPropertyAccessChain(expression, questionDotToken, name), ts.getEmitFlags(node)), node) - : node; - } - ts.updatePropertyAccessChain = updatePropertyAccessChain; - function createElementAccess(expression, index) { - var node = createSynthesizedNode(195 /* ElementAccessExpression */); - node.expression = ts.parenthesizeForAccess(expression); - node.argumentExpression = asExpression(index); - return node; - } - ts.createElementAccess = createElementAccess; - function updateElementAccess(node, expression, argumentExpression) { - if (ts.isOptionalChain(node)) { - return updateElementAccessChain(node, expression, node.questionDotToken, argumentExpression); - } - return node.expression !== expression - || node.argumentExpression !== argumentExpression - ? updateNode(createElementAccess(expression, argumentExpression), node) - : node; - } - ts.updateElementAccess = updateElementAccess; - function createElementAccessChain(expression, questionDotToken, index) { - var node = createSynthesizedNode(195 /* ElementAccessExpression */); - node.flags |= 32 /* OptionalChain */; - node.expression = ts.parenthesizeForAccess(expression); - node.questionDotToken = questionDotToken; - node.argumentExpression = asExpression(index); - return node; - } - ts.createElementAccessChain = createElementAccessChain; - function updateElementAccessChain(node, expression, questionDotToken, argumentExpression) { - ts.Debug.assert(!!(node.flags & 32 /* OptionalChain */), "Cannot update an ElementAccessExpression using updateElementAccessChain. Use updateElementAccess instead."); - return node.expression !== expression - || node.questionDotToken !== questionDotToken - || node.argumentExpression !== argumentExpression - ? updateNode(createElementAccessChain(expression, questionDotToken, argumentExpression), node) - : node; - } - ts.updateElementAccessChain = updateElementAccessChain; - function createCall(expression, typeArguments, argumentsArray) { - var node = createSynthesizedNode(196 /* CallExpression */); - node.expression = ts.parenthesizeForAccess(expression); - node.typeArguments = asNodeArray(typeArguments); - node.arguments = ts.parenthesizeListElements(createNodeArray(argumentsArray)); - return node; - } - ts.createCall = createCall; - function updateCall(node, expression, typeArguments, argumentsArray) { - if (ts.isOptionalChain(node)) { - return updateCallChain(node, expression, node.questionDotToken, typeArguments, argumentsArray); - } - return node.expression !== expression - || node.typeArguments !== typeArguments - || node.arguments !== argumentsArray - ? updateNode(createCall(expression, typeArguments, argumentsArray), node) - : node; - } - ts.updateCall = updateCall; - function createCallChain(expression, questionDotToken, typeArguments, argumentsArray) { - var node = createSynthesizedNode(196 /* CallExpression */); - node.flags |= 32 /* OptionalChain */; - node.expression = ts.parenthesizeForAccess(expression); - node.questionDotToken = questionDotToken; - node.typeArguments = asNodeArray(typeArguments); - node.arguments = ts.parenthesizeListElements(createNodeArray(argumentsArray)); - return node; - } - ts.createCallChain = createCallChain; - function updateCallChain(node, expression, questionDotToken, typeArguments, argumentsArray) { - ts.Debug.assert(!!(node.flags & 32 /* OptionalChain */), "Cannot update a CallExpression using updateCallChain. Use updateCall instead."); - return node.expression !== expression - || node.questionDotToken !== questionDotToken - || node.typeArguments !== typeArguments - || node.arguments !== argumentsArray - ? updateNode(createCallChain(expression, questionDotToken, typeArguments, argumentsArray), node) - : node; - } - ts.updateCallChain = updateCallChain; - function createNew(expression, typeArguments, argumentsArray) { - var node = createSynthesizedNode(197 /* NewExpression */); - node.expression = ts.parenthesizeForNew(expression); - node.typeArguments = asNodeArray(typeArguments); - node.arguments = argumentsArray ? ts.parenthesizeListElements(createNodeArray(argumentsArray)) : undefined; - return node; - } - ts.createNew = createNew; - function updateNew(node, expression, typeArguments, argumentsArray) { - return node.expression !== expression - || node.typeArguments !== typeArguments - || node.arguments !== argumentsArray - ? updateNode(createNew(expression, typeArguments, argumentsArray), node) - : node; - } - ts.updateNew = updateNew; - function createTaggedTemplate(tag, typeArgumentsOrTemplate, template) { - var node = createSynthesizedNode(198 /* TaggedTemplateExpression */); - node.tag = ts.parenthesizeForAccess(tag); - if (template) { - node.typeArguments = asNodeArray(typeArgumentsOrTemplate); - node.template = template; - } - else { - node.typeArguments = undefined; - node.template = typeArgumentsOrTemplate; - } - return node; - } - ts.createTaggedTemplate = createTaggedTemplate; - function updateTaggedTemplate(node, tag, typeArgumentsOrTemplate, template) { - return node.tag !== tag - || (template - ? node.typeArguments !== typeArgumentsOrTemplate || node.template !== template - : node.typeArguments !== undefined || node.template !== typeArgumentsOrTemplate) - ? updateNode(createTaggedTemplate(tag, typeArgumentsOrTemplate, template), node) - : node; - } - ts.updateTaggedTemplate = updateTaggedTemplate; - function createTypeAssertion(type, expression) { - var node = createSynthesizedNode(199 /* TypeAssertionExpression */); - node.type = type; - node.expression = ts.parenthesizePrefixOperand(expression); - return node; - } - ts.createTypeAssertion = createTypeAssertion; - function updateTypeAssertion(node, type, expression) { - return node.type !== type - || node.expression !== expression - ? updateNode(createTypeAssertion(type, expression), node) - : node; - } - ts.updateTypeAssertion = updateTypeAssertion; - function createParen(expression) { - var node = createSynthesizedNode(200 /* ParenthesizedExpression */); - node.expression = expression; - return node; - } - ts.createParen = createParen; - function updateParen(node, expression) { - return node.expression !== expression - ? updateNode(createParen(expression), node) - : node; - } - ts.updateParen = updateParen; - function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body) { - var node = createSynthesizedNode(201 /* FunctionExpression */); - node.modifiers = asNodeArray(modifiers); - node.asteriskToken = asteriskToken; - node.name = asName(name); - node.typeParameters = asNodeArray(typeParameters); - node.parameters = createNodeArray(parameters); - node.type = type; - node.body = body; - return node; - } - ts.createFunctionExpression = createFunctionExpression; - function updateFunctionExpression(node, modifiers, asteriskToken, name, typeParameters, parameters, type, body) { - return node.name !== name - || node.modifiers !== modifiers - || node.asteriskToken !== asteriskToken - || node.typeParameters !== typeParameters - || node.parameters !== parameters - || node.type !== type - || node.body !== body - ? updateNode(createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body), node) - : node; - } - ts.updateFunctionExpression = updateFunctionExpression; - function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) { - var node = createSynthesizedNode(202 /* ArrowFunction */); - node.modifiers = asNodeArray(modifiers); - node.typeParameters = asNodeArray(typeParameters); - node.parameters = createNodeArray(parameters); - node.type = type; - node.equalsGreaterThanToken = equalsGreaterThanToken || createToken(38 /* EqualsGreaterThanToken */); - node.body = ts.parenthesizeConciseBody(body); - return node; - } - ts.createArrowFunction = createArrowFunction; - function updateArrowFunction(node, modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) { - return node.modifiers !== modifiers - || node.typeParameters !== typeParameters - || node.parameters !== parameters - || node.type !== type - || node.equalsGreaterThanToken !== equalsGreaterThanToken - || node.body !== body - ? updateNode(createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body), node) - : node; - } - ts.updateArrowFunction = updateArrowFunction; - function createDelete(expression) { - var node = createSynthesizedNode(203 /* DeleteExpression */); - node.expression = ts.parenthesizePrefixOperand(expression); - return node; - } - ts.createDelete = createDelete; - function updateDelete(node, expression) { - return node.expression !== expression - ? updateNode(createDelete(expression), node) - : node; - } - ts.updateDelete = updateDelete; - function createTypeOf(expression) { - var node = createSynthesizedNode(204 /* TypeOfExpression */); - node.expression = ts.parenthesizePrefixOperand(expression); - return node; - } - ts.createTypeOf = createTypeOf; - function updateTypeOf(node, expression) { - return node.expression !== expression - ? updateNode(createTypeOf(expression), node) - : node; - } - ts.updateTypeOf = updateTypeOf; - function createVoid(expression) { - var node = createSynthesizedNode(205 /* VoidExpression */); - node.expression = ts.parenthesizePrefixOperand(expression); - return node; - } - ts.createVoid = createVoid; - function updateVoid(node, expression) { - return node.expression !== expression - ? updateNode(createVoid(expression), node) - : node; - } - ts.updateVoid = updateVoid; - function createAwait(expression) { - var node = createSynthesizedNode(206 /* AwaitExpression */); - node.expression = ts.parenthesizePrefixOperand(expression); - return node; - } - ts.createAwait = createAwait; - function updateAwait(node, expression) { - return node.expression !== expression - ? updateNode(createAwait(expression), node) - : node; - } - ts.updateAwait = updateAwait; - function createPrefix(operator, operand) { - var node = createSynthesizedNode(207 /* PrefixUnaryExpression */); - node.operator = operator; - node.operand = ts.parenthesizePrefixOperand(operand); - return node; - } - ts.createPrefix = createPrefix; - function updatePrefix(node, operand) { - return node.operand !== operand - ? updateNode(createPrefix(node.operator, operand), node) - : node; - } - ts.updatePrefix = updatePrefix; - function createPostfix(operand, operator) { - var node = createSynthesizedNode(208 /* PostfixUnaryExpression */); - node.operand = ts.parenthesizePostfixOperand(operand); - node.operator = operator; - return node; - } - ts.createPostfix = createPostfix; - function updatePostfix(node, operand) { - return node.operand !== operand - ? updateNode(createPostfix(operand, node.operator), node) - : node; - } - ts.updatePostfix = updatePostfix; - function createBinary(left, operator, right) { - var node = createSynthesizedNode(209 /* BinaryExpression */); - var operatorToken = asToken(operator); - var operatorKind = operatorToken.kind; - node.left = ts.parenthesizeBinaryOperand(operatorKind, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined); - node.operatorToken = operatorToken; - node.right = ts.parenthesizeBinaryOperand(operatorKind, right, /*isLeftSideOfBinary*/ false, node.left); - return node; - } - ts.createBinary = createBinary; - function updateBinary(node, left, right, operator) { - return node.left !== left - || node.right !== right - ? updateNode(createBinary(left, operator || node.operatorToken, right), node) - : node; - } - ts.updateBinary = updateBinary; - function createConditional(condition, questionTokenOrWhenTrue, whenTrueOrWhenFalse, colonToken, whenFalse) { - var node = createSynthesizedNode(210 /* ConditionalExpression */); - node.condition = ts.parenthesizeForConditionalHead(condition); - node.questionToken = whenFalse ? questionTokenOrWhenTrue : createToken(57 /* QuestionToken */); - node.whenTrue = ts.parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenTrueOrWhenFalse : questionTokenOrWhenTrue); - node.colonToken = whenFalse ? colonToken : createToken(58 /* ColonToken */); - node.whenFalse = ts.parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenFalse : whenTrueOrWhenFalse); - return node; - } - ts.createConditional = createConditional; - function updateConditional(node, condition, questionToken, whenTrue, colonToken, whenFalse) { - return node.condition !== condition - || node.questionToken !== questionToken - || node.whenTrue !== whenTrue - || node.colonToken !== colonToken - || node.whenFalse !== whenFalse - ? updateNode(createConditional(condition, questionToken, whenTrue, colonToken, whenFalse), node) - : node; - } - ts.updateConditional = updateConditional; - function createTemplateExpression(head, templateSpans) { - var node = createSynthesizedNode(211 /* TemplateExpression */); - node.head = head; - node.templateSpans = createNodeArray(templateSpans); - return node; - } - ts.createTemplateExpression = createTemplateExpression; - function updateTemplateExpression(node, head, templateSpans) { - return node.head !== head - || node.templateSpans !== templateSpans - ? updateNode(createTemplateExpression(head, templateSpans), node) - : node; - } - ts.updateTemplateExpression = updateTemplateExpression; - var rawTextScanner; - var invalidValueSentinel = {}; - function getCookedText(kind, rawText) { - if (!rawTextScanner) { - rawTextScanner = ts.createScanner(99 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */); - } - switch (kind) { - case 14 /* NoSubstitutionTemplateLiteral */: - rawTextScanner.setText("`" + rawText + "`"); - break; - case 15 /* TemplateHead */: - rawTextScanner.setText("`" + rawText + "${"); - break; - case 16 /* TemplateMiddle */: - rawTextScanner.setText("}" + rawText + "${"); - break; - case 17 /* TemplateTail */: - rawTextScanner.setText("}" + rawText + "`"); - break; - } - var token = rawTextScanner.scan(); - if (token === 23 /* CloseBracketToken */) { - token = rawTextScanner.reScanTemplateToken(/* isTaggedTemplate */ false); - } - if (rawTextScanner.isUnterminated()) { - rawTextScanner.setText(undefined); - return invalidValueSentinel; - } - var tokenValue; - switch (token) { - case 14 /* NoSubstitutionTemplateLiteral */: - case 15 /* TemplateHead */: - case 16 /* TemplateMiddle */: - case 17 /* TemplateTail */: - tokenValue = rawTextScanner.getTokenValue(); - break; - } - if (rawTextScanner.scan() !== 1 /* EndOfFileToken */) { - rawTextScanner.setText(undefined); - return invalidValueSentinel; - } - rawTextScanner.setText(undefined); - return tokenValue; - } - function createTemplateLiteralLikeNode(kind, text, rawText) { - var node = createSynthesizedNode(kind); - node.text = text; - if (rawText === undefined || text === rawText) { - node.rawText = rawText; - } - else { - var cooked = getCookedText(kind, rawText); - if (typeof cooked === "object") { - return ts.Debug.fail("Invalid raw text"); - } - ts.Debug.assert(text === cooked, "Expected argument 'text' to be the normalized (i.e. 'cooked') version of argument 'rawText'."); - node.rawText = rawText; - } - return node; - } - function createTemplateHead(text, rawText) { - var node = createTemplateLiteralLikeNode(15 /* TemplateHead */, text, rawText); - node.text = text; - return node; - } - ts.createTemplateHead = createTemplateHead; - function createTemplateMiddle(text, rawText) { - var node = createTemplateLiteralLikeNode(16 /* TemplateMiddle */, text, rawText); - node.text = text; - return node; - } - ts.createTemplateMiddle = createTemplateMiddle; - function createTemplateTail(text, rawText) { - var node = createTemplateLiteralLikeNode(17 /* TemplateTail */, text, rawText); - node.text = text; - return node; - } - ts.createTemplateTail = createTemplateTail; - function createNoSubstitutionTemplateLiteral(text, rawText) { - var node = createTemplateLiteralLikeNode(14 /* NoSubstitutionTemplateLiteral */, text, rawText); - return node; - } - ts.createNoSubstitutionTemplateLiteral = createNoSubstitutionTemplateLiteral; - function createYield(asteriskTokenOrExpression, expression) { - var asteriskToken = asteriskTokenOrExpression && asteriskTokenOrExpression.kind === 41 /* AsteriskToken */ ? asteriskTokenOrExpression : undefined; - expression = asteriskTokenOrExpression && asteriskTokenOrExpression.kind !== 41 /* AsteriskToken */ ? asteriskTokenOrExpression : expression; - var node = createSynthesizedNode(212 /* YieldExpression */); - node.asteriskToken = asteriskToken; - node.expression = expression && ts.parenthesizeExpressionForList(expression); - return node; - } - ts.createYield = createYield; - function updateYield(node, asteriskToken, expression) { - return node.expression !== expression - || node.asteriskToken !== asteriskToken - ? updateNode(createYield(asteriskToken, expression), node) - : node; - } - ts.updateYield = updateYield; - function createSpread(expression) { - var node = createSynthesizedNode(213 /* SpreadElement */); - node.expression = ts.parenthesizeExpressionForList(expression); - return node; - } - ts.createSpread = createSpread; - function updateSpread(node, expression) { - return node.expression !== expression - ? updateNode(createSpread(expression), node) - : node; - } - ts.updateSpread = updateSpread; - function createClassExpression(modifiers, name, typeParameters, heritageClauses, members) { - var node = createSynthesizedNode(214 /* ClassExpression */); - node.decorators = undefined; - node.modifiers = asNodeArray(modifiers); - node.name = asName(name); - node.typeParameters = asNodeArray(typeParameters); - node.heritageClauses = asNodeArray(heritageClauses); - node.members = createNodeArray(members); - return node; - } - ts.createClassExpression = createClassExpression; - function updateClassExpression(node, modifiers, name, typeParameters, heritageClauses, members) { - return node.modifiers !== modifiers - || node.name !== name - || node.typeParameters !== typeParameters - || node.heritageClauses !== heritageClauses - || node.members !== members - ? updateNode(createClassExpression(modifiers, name, typeParameters, heritageClauses, members), node) - : node; - } - ts.updateClassExpression = updateClassExpression; - function createOmittedExpression() { - return createSynthesizedNode(215 /* OmittedExpression */); - } - ts.createOmittedExpression = createOmittedExpression; - function createExpressionWithTypeArguments(typeArguments, expression) { - var node = createSynthesizedNode(216 /* ExpressionWithTypeArguments */); - node.expression = ts.parenthesizeForAccess(expression); - node.typeArguments = asNodeArray(typeArguments); - return node; - } - ts.createExpressionWithTypeArguments = createExpressionWithTypeArguments; - function updateExpressionWithTypeArguments(node, typeArguments, expression) { - return node.typeArguments !== typeArguments - || node.expression !== expression - ? updateNode(createExpressionWithTypeArguments(typeArguments, expression), node) - : node; - } - ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments; - function createAsExpression(expression, type) { - var node = createSynthesizedNode(217 /* AsExpression */); - node.expression = expression; - node.type = type; - return node; - } - ts.createAsExpression = createAsExpression; - function updateAsExpression(node, expression, type) { - return node.expression !== expression - || node.type !== type - ? updateNode(createAsExpression(expression, type), node) - : node; - } - ts.updateAsExpression = updateAsExpression; - function createNonNullExpression(expression) { - var node = createSynthesizedNode(218 /* NonNullExpression */); - node.expression = ts.parenthesizeForAccess(expression); - return node; - } - ts.createNonNullExpression = createNonNullExpression; - function updateNonNullExpression(node, expression) { - if (ts.isNonNullChain(node)) { - return updateNonNullChain(node, expression); - } - return node.expression !== expression - ? updateNode(createNonNullExpression(expression), node) - : node; - } - ts.updateNonNullExpression = updateNonNullExpression; - function createNonNullChain(expression) { - var node = createSynthesizedNode(218 /* NonNullExpression */); - node.flags |= 32 /* OptionalChain */; - node.expression = ts.parenthesizeForAccess(expression); - return node; - } - ts.createNonNullChain = createNonNullChain; - function updateNonNullChain(node, expression) { - ts.Debug.assert(!!(node.flags & 32 /* OptionalChain */), "Cannot update a NonNullExpression using updateNonNullChain. Use updateNonNullExpression instead."); - return node.expression !== expression - ? updateNode(createNonNullChain(expression), node) - : node; - } - ts.updateNonNullChain = updateNonNullChain; - function createMetaProperty(keywordToken, name) { - var node = createSynthesizedNode(219 /* MetaProperty */); - node.keywordToken = keywordToken; - node.name = name; - return node; - } - ts.createMetaProperty = createMetaProperty; - function updateMetaProperty(node, name) { - return node.name !== name - ? updateNode(createMetaProperty(node.keywordToken, name), node) - : node; - } - ts.updateMetaProperty = updateMetaProperty; - // Misc - function createTemplateSpan(expression, literal) { - var node = createSynthesizedNode(221 /* TemplateSpan */); - node.expression = expression; - node.literal = literal; - return node; - } - ts.createTemplateSpan = createTemplateSpan; - function updateTemplateSpan(node, expression, literal) { - return node.expression !== expression - || node.literal !== literal - ? updateNode(createTemplateSpan(expression, literal), node) - : node; - } - ts.updateTemplateSpan = updateTemplateSpan; - function createSemicolonClassElement() { - return createSynthesizedNode(222 /* SemicolonClassElement */); - } - ts.createSemicolonClassElement = createSemicolonClassElement; - // Element - function createBlock(statements, multiLine) { - var block = createSynthesizedNode(223 /* Block */); - block.statements = createNodeArray(statements); - if (multiLine) - block.multiLine = multiLine; - return block; - } - ts.createBlock = createBlock; - function updateBlock(node, statements) { - return node.statements !== statements - ? updateNode(createBlock(statements, node.multiLine), node) - : node; - } - ts.updateBlock = updateBlock; - function createVariableStatement(modifiers, declarationList) { - var node = createSynthesizedNode(225 /* VariableStatement */); - node.decorators = undefined; - node.modifiers = asNodeArray(modifiers); - node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList; - return node; - } - ts.createVariableStatement = createVariableStatement; - function updateVariableStatement(node, modifiers, declarationList) { - return node.modifiers !== modifiers - || node.declarationList !== declarationList - ? updateNode(createVariableStatement(modifiers, declarationList), node) - : node; - } - ts.updateVariableStatement = updateVariableStatement; - function createEmptyStatement() { - return createSynthesizedNode(224 /* EmptyStatement */); - } - ts.createEmptyStatement = createEmptyStatement; - function createExpressionStatement(expression) { - var node = createSynthesizedNode(226 /* ExpressionStatement */); - node.expression = ts.parenthesizeExpressionForExpressionStatement(expression); - return node; - } - ts.createExpressionStatement = createExpressionStatement; - function updateExpressionStatement(node, expression) { - return node.expression !== expression - ? updateNode(createExpressionStatement(expression), node) - : node; - } - ts.updateExpressionStatement = updateExpressionStatement; - /** @deprecated Use `createExpressionStatement` instead. */ - ts.createStatement = createExpressionStatement; - /** @deprecated Use `updateExpressionStatement` instead. */ - ts.updateStatement = updateExpressionStatement; - function createIf(expression, thenStatement, elseStatement) { - var node = createSynthesizedNode(227 /* IfStatement */); - node.expression = expression; - node.thenStatement = asEmbeddedStatement(thenStatement); - node.elseStatement = asEmbeddedStatement(elseStatement); - return node; - } - ts.createIf = createIf; - function updateIf(node, expression, thenStatement, elseStatement) { - return node.expression !== expression - || node.thenStatement !== thenStatement - || node.elseStatement !== elseStatement - ? updateNode(createIf(expression, thenStatement, elseStatement), node) - : node; - } - ts.updateIf = updateIf; - function createDo(statement, expression) { - var node = createSynthesizedNode(228 /* DoStatement */); - node.statement = asEmbeddedStatement(statement); - node.expression = expression; - return node; - } - ts.createDo = createDo; - function updateDo(node, statement, expression) { - return node.statement !== statement - || node.expression !== expression - ? updateNode(createDo(statement, expression), node) - : node; - } - ts.updateDo = updateDo; - function createWhile(expression, statement) { - var node = createSynthesizedNode(229 /* WhileStatement */); - node.expression = expression; - node.statement = asEmbeddedStatement(statement); - return node; - } - ts.createWhile = createWhile; - function updateWhile(node, expression, statement) { - return node.expression !== expression - || node.statement !== statement - ? updateNode(createWhile(expression, statement), node) - : node; - } - ts.updateWhile = updateWhile; - function createFor(initializer, condition, incrementor, statement) { - var node = createSynthesizedNode(230 /* ForStatement */); - node.initializer = initializer; - node.condition = condition; - node.incrementor = incrementor; - node.statement = asEmbeddedStatement(statement); - return node; - } - ts.createFor = createFor; - function updateFor(node, initializer, condition, incrementor, statement) { - return node.initializer !== initializer - || node.condition !== condition - || node.incrementor !== incrementor - || node.statement !== statement - ? updateNode(createFor(initializer, condition, incrementor, statement), node) - : node; - } - ts.updateFor = updateFor; - function createForIn(initializer, expression, statement) { - var node = createSynthesizedNode(231 /* ForInStatement */); - node.initializer = initializer; - node.expression = expression; - node.statement = asEmbeddedStatement(statement); - return node; - } - ts.createForIn = createForIn; - function updateForIn(node, initializer, expression, statement) { - return node.initializer !== initializer - || node.expression !== expression - || node.statement !== statement - ? updateNode(createForIn(initializer, expression, statement), node) - : node; - } - ts.updateForIn = updateForIn; - function createForOf(awaitModifier, initializer, expression, statement) { - var node = createSynthesizedNode(232 /* ForOfStatement */); - node.awaitModifier = awaitModifier; - node.initializer = initializer; - node.expression = ts.isCommaSequence(expression) ? createParen(expression) : expression; - node.statement = asEmbeddedStatement(statement); - return node; - } - ts.createForOf = createForOf; - function updateForOf(node, awaitModifier, initializer, expression, statement) { - return node.awaitModifier !== awaitModifier - || node.initializer !== initializer - || node.expression !== expression - || node.statement !== statement - ? updateNode(createForOf(awaitModifier, initializer, expression, statement), node) - : node; - } - ts.updateForOf = updateForOf; - function createContinue(label) { - var node = createSynthesizedNode(233 /* ContinueStatement */); - node.label = asName(label); - return node; - } - ts.createContinue = createContinue; - function updateContinue(node, label) { - return node.label !== label - ? updateNode(createContinue(label), node) - : node; - } - ts.updateContinue = updateContinue; - function createBreak(label) { - var node = createSynthesizedNode(234 /* BreakStatement */); - node.label = asName(label); - return node; - } - ts.createBreak = createBreak; - function updateBreak(node, label) { - return node.label !== label - ? updateNode(createBreak(label), node) - : node; - } - ts.updateBreak = updateBreak; - function createReturn(expression) { - var node = createSynthesizedNode(235 /* ReturnStatement */); - node.expression = expression; - return node; - } - ts.createReturn = createReturn; - function updateReturn(node, expression) { - return node.expression !== expression - ? updateNode(createReturn(expression), node) - : node; - } - ts.updateReturn = updateReturn; - function createWith(expression, statement) { - var node = createSynthesizedNode(236 /* WithStatement */); - node.expression = expression; - node.statement = asEmbeddedStatement(statement); - return node; - } - ts.createWith = createWith; - function updateWith(node, expression, statement) { - return node.expression !== expression - || node.statement !== statement - ? updateNode(createWith(expression, statement), node) - : node; - } - ts.updateWith = updateWith; - function createSwitch(expression, caseBlock) { - var node = createSynthesizedNode(237 /* SwitchStatement */); - node.expression = ts.parenthesizeExpressionForList(expression); - node.caseBlock = caseBlock; - return node; - } - ts.createSwitch = createSwitch; - function updateSwitch(node, expression, caseBlock) { - return node.expression !== expression - || node.caseBlock !== caseBlock - ? updateNode(createSwitch(expression, caseBlock), node) - : node; - } - ts.updateSwitch = updateSwitch; - function createLabel(label, statement) { - var node = createSynthesizedNode(238 /* LabeledStatement */); - node.label = asName(label); - node.statement = asEmbeddedStatement(statement); - return node; - } - ts.createLabel = createLabel; - function updateLabel(node, label, statement) { - return node.label !== label - || node.statement !== statement - ? updateNode(createLabel(label, statement), node) - : node; - } - ts.updateLabel = updateLabel; - function createThrow(expression) { - var node = createSynthesizedNode(239 /* ThrowStatement */); - node.expression = expression; - return node; - } - ts.createThrow = createThrow; - function updateThrow(node, expression) { - return node.expression !== expression - ? updateNode(createThrow(expression), node) - : node; - } - ts.updateThrow = updateThrow; - function createTry(tryBlock, catchClause, finallyBlock) { - var node = createSynthesizedNode(240 /* TryStatement */); - node.tryBlock = tryBlock; - node.catchClause = catchClause; - node.finallyBlock = finallyBlock; - return node; - } - ts.createTry = createTry; - function updateTry(node, tryBlock, catchClause, finallyBlock) { - return node.tryBlock !== tryBlock - || node.catchClause !== catchClause - || node.finallyBlock !== finallyBlock - ? updateNode(createTry(tryBlock, catchClause, finallyBlock), node) - : node; - } - ts.updateTry = updateTry; - function createDebuggerStatement() { - return createSynthesizedNode(241 /* DebuggerStatement */); - } - ts.createDebuggerStatement = createDebuggerStatement; - function createVariableDeclaration(name, type, initializer) { - /* Internally, one should probably use createTypeScriptVariableDeclaration instead and handle definite assignment assertions */ - var node = createSynthesizedNode(242 /* VariableDeclaration */); - node.name = asName(name); - node.type = type; - node.initializer = initializer !== undefined ? ts.parenthesizeExpressionForList(initializer) : undefined; - return node; - } - ts.createVariableDeclaration = createVariableDeclaration; - function updateVariableDeclaration(node, name, type, initializer) { - /* Internally, one should probably use updateTypeScriptVariableDeclaration instead and handle definite assignment assertions */ - return node.name !== name - || node.type !== type - || node.initializer !== initializer - ? updateNode(createVariableDeclaration(name, type, initializer), node) - : node; - } - ts.updateVariableDeclaration = updateVariableDeclaration; - /* @internal */ - function createTypeScriptVariableDeclaration(name, exclaimationToken, type, initializer) { - var node = createSynthesizedNode(242 /* VariableDeclaration */); - node.name = asName(name); - node.type = type; - node.initializer = initializer !== undefined ? ts.parenthesizeExpressionForList(initializer) : undefined; - node.exclamationToken = exclaimationToken; - return node; - } - ts.createTypeScriptVariableDeclaration = createTypeScriptVariableDeclaration; - /* @internal */ - function updateTypeScriptVariableDeclaration(node, name, exclaimationToken, type, initializer) { - return node.name !== name - || node.type !== type - || node.initializer !== initializer - || node.exclamationToken !== exclaimationToken - ? updateNode(createTypeScriptVariableDeclaration(name, exclaimationToken, type, initializer), node) - : node; - } - ts.updateTypeScriptVariableDeclaration = updateTypeScriptVariableDeclaration; - function createVariableDeclarationList(declarations, flags) { - if (flags === void 0) { flags = 0 /* None */; } - var node = createSynthesizedNode(243 /* VariableDeclarationList */); - node.flags |= flags & 3 /* BlockScoped */; - node.declarations = createNodeArray(declarations); - return node; - } - ts.createVariableDeclarationList = createVariableDeclarationList; - function updateVariableDeclarationList(node, declarations) { - return node.declarations !== declarations - ? updateNode(createVariableDeclarationList(declarations, node.flags), node) - : node; - } - ts.updateVariableDeclarationList = updateVariableDeclarationList; - function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) { - var node = createSynthesizedNode(244 /* FunctionDeclaration */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.asteriskToken = asteriskToken; - node.name = asName(name); - node.typeParameters = asNodeArray(typeParameters); - node.parameters = createNodeArray(parameters); - node.type = type; - node.body = body; - return node; - } - ts.createFunctionDeclaration = createFunctionDeclaration; - function updateFunctionDeclaration(node, decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.asteriskToken !== asteriskToken - || node.name !== name - || node.typeParameters !== typeParameters - || node.parameters !== parameters - || node.type !== type - || node.body !== body - ? updateNode(createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body), node) - : node; - } - ts.updateFunctionDeclaration = updateFunctionDeclaration; - /* @internal */ - function updateFunctionLikeBody(declaration, body) { - switch (declaration.kind) { - case 244 /* FunctionDeclaration */: - return createFunctionDeclaration(declaration.decorators, declaration.modifiers, declaration.asteriskToken, declaration.name, declaration.typeParameters, declaration.parameters, declaration.type, body); - case 161 /* MethodDeclaration */: - return createMethod(declaration.decorators, declaration.modifiers, declaration.asteriskToken, declaration.name, declaration.questionToken, declaration.typeParameters, declaration.parameters, declaration.type, body); - case 163 /* GetAccessor */: - return createGetAccessor(declaration.decorators, declaration.modifiers, declaration.name, declaration.parameters, declaration.type, body); - case 164 /* SetAccessor */: - return createSetAccessor(declaration.decorators, declaration.modifiers, declaration.name, declaration.parameters, body); - case 162 /* Constructor */: - return createConstructor(declaration.decorators, declaration.modifiers, declaration.parameters, body); - case 201 /* FunctionExpression */: - return createFunctionExpression(declaration.modifiers, declaration.asteriskToken, declaration.name, declaration.typeParameters, declaration.parameters, declaration.type, body); - case 202 /* ArrowFunction */: - return createArrowFunction(declaration.modifiers, declaration.typeParameters, declaration.parameters, declaration.type, declaration.equalsGreaterThanToken, body); - } - } - ts.updateFunctionLikeBody = updateFunctionLikeBody; - function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) { - var node = createSynthesizedNode(245 /* ClassDeclaration */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.name = asName(name); - node.typeParameters = asNodeArray(typeParameters); - node.heritageClauses = asNodeArray(heritageClauses); - node.members = createNodeArray(members); - return node; - } - ts.createClassDeclaration = createClassDeclaration; - function updateClassDeclaration(node, decorators, modifiers, name, typeParameters, heritageClauses, members) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.name !== name - || node.typeParameters !== typeParameters - || node.heritageClauses !== heritageClauses - || node.members !== members - ? updateNode(createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members), node) - : node; - } - ts.updateClassDeclaration = updateClassDeclaration; - function createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) { - var node = createSynthesizedNode(246 /* InterfaceDeclaration */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.name = asName(name); - node.typeParameters = asNodeArray(typeParameters); - node.heritageClauses = asNodeArray(heritageClauses); - node.members = createNodeArray(members); - return node; - } - ts.createInterfaceDeclaration = createInterfaceDeclaration; - function updateInterfaceDeclaration(node, decorators, modifiers, name, typeParameters, heritageClauses, members) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.name !== name - || node.typeParameters !== typeParameters - || node.heritageClauses !== heritageClauses - || node.members !== members - ? updateNode(createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members), node) - : node; - } - ts.updateInterfaceDeclaration = updateInterfaceDeclaration; - function createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type) { - var node = createSynthesizedNode(247 /* TypeAliasDeclaration */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.name = asName(name); - node.typeParameters = asNodeArray(typeParameters); - node.type = type; - return node; - } - ts.createTypeAliasDeclaration = createTypeAliasDeclaration; - function updateTypeAliasDeclaration(node, decorators, modifiers, name, typeParameters, type) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.name !== name - || node.typeParameters !== typeParameters - || node.type !== type - ? updateNode(createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type), node) - : node; - } - ts.updateTypeAliasDeclaration = updateTypeAliasDeclaration; - function createEnumDeclaration(decorators, modifiers, name, members) { - var node = createSynthesizedNode(248 /* EnumDeclaration */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.name = asName(name); - node.members = createNodeArray(members); - return node; - } - ts.createEnumDeclaration = createEnumDeclaration; - function updateEnumDeclaration(node, decorators, modifiers, name, members) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.name !== name - || node.members !== members - ? updateNode(createEnumDeclaration(decorators, modifiers, name, members), node) - : node; - } - ts.updateEnumDeclaration = updateEnumDeclaration; - function createModuleDeclaration(decorators, modifiers, name, body, flags) { - if (flags === void 0) { flags = 0 /* None */; } - var node = createSynthesizedNode(249 /* ModuleDeclaration */); - node.flags |= flags & (16 /* Namespace */ | 4 /* NestedNamespace */ | 1024 /* GlobalAugmentation */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.name = name; - node.body = body; - return node; - } - ts.createModuleDeclaration = createModuleDeclaration; - function updateModuleDeclaration(node, decorators, modifiers, name, body) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.name !== name - || node.body !== body - ? updateNode(createModuleDeclaration(decorators, modifiers, name, body, node.flags), node) - : node; - } - ts.updateModuleDeclaration = updateModuleDeclaration; - function createModuleBlock(statements) { - var node = createSynthesizedNode(250 /* ModuleBlock */); - node.statements = createNodeArray(statements); - return node; - } - ts.createModuleBlock = createModuleBlock; - function updateModuleBlock(node, statements) { - return node.statements !== statements - ? updateNode(createModuleBlock(statements), node) - : node; - } - ts.updateModuleBlock = updateModuleBlock; - function createCaseBlock(clauses) { - var node = createSynthesizedNode(251 /* CaseBlock */); - node.clauses = createNodeArray(clauses); - return node; - } - ts.createCaseBlock = createCaseBlock; - function updateCaseBlock(node, clauses) { - return node.clauses !== clauses - ? updateNode(createCaseBlock(clauses), node) - : node; - } - ts.updateCaseBlock = updateCaseBlock; - function createNamespaceExportDeclaration(name) { - var node = createSynthesizedNode(252 /* NamespaceExportDeclaration */); - node.name = asName(name); - return node; - } - ts.createNamespaceExportDeclaration = createNamespaceExportDeclaration; - function updateNamespaceExportDeclaration(node, name) { - return node.name !== name - ? updateNode(createNamespaceExportDeclaration(name), node) - : node; - } - ts.updateNamespaceExportDeclaration = updateNamespaceExportDeclaration; - function createImportEqualsDeclaration(decorators, modifiers, name, moduleReference) { - var node = createSynthesizedNode(253 /* ImportEqualsDeclaration */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.name = asName(name); - node.moduleReference = moduleReference; - return node; - } - ts.createImportEqualsDeclaration = createImportEqualsDeclaration; - function updateImportEqualsDeclaration(node, decorators, modifiers, name, moduleReference) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.name !== name - || node.moduleReference !== moduleReference - ? updateNode(createImportEqualsDeclaration(decorators, modifiers, name, moduleReference), node) - : node; - } - ts.updateImportEqualsDeclaration = updateImportEqualsDeclaration; - function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier) { - var node = createSynthesizedNode(254 /* ImportDeclaration */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.importClause = importClause; - node.moduleSpecifier = moduleSpecifier; - return node; - } - ts.createImportDeclaration = createImportDeclaration; - function updateImportDeclaration(node, decorators, modifiers, importClause, moduleSpecifier) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.importClause !== importClause - || node.moduleSpecifier !== moduleSpecifier - ? updateNode(createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier), node) - : node; - } - ts.updateImportDeclaration = updateImportDeclaration; - function createImportClause(name, namedBindings, isTypeOnly) { - if (isTypeOnly === void 0) { isTypeOnly = false; } - var node = createSynthesizedNode(255 /* ImportClause */); - node.name = name; - node.namedBindings = namedBindings; - node.isTypeOnly = isTypeOnly; - return node; - } - ts.createImportClause = createImportClause; - function updateImportClause(node, name, namedBindings, isTypeOnly) { - return node.name !== name - || node.namedBindings !== namedBindings - || node.isTypeOnly !== isTypeOnly - ? updateNode(createImportClause(name, namedBindings, isTypeOnly), node) - : node; - } - ts.updateImportClause = updateImportClause; - function createNamespaceImport(name) { - var node = createSynthesizedNode(256 /* NamespaceImport */); - node.name = name; - return node; - } - ts.createNamespaceImport = createNamespaceImport; - function createNamespaceExport(name) { - var node = createSynthesizedNode(262 /* NamespaceExport */); - node.name = name; - return node; - } - ts.createNamespaceExport = createNamespaceExport; - function updateNamespaceImport(node, name) { - return node.name !== name - ? updateNode(createNamespaceImport(name), node) - : node; - } - ts.updateNamespaceImport = updateNamespaceImport; - function updateNamespaceExport(node, name) { - return node.name !== name - ? updateNode(createNamespaceExport(name), node) - : node; - } - ts.updateNamespaceExport = updateNamespaceExport; - function createNamedImports(elements) { - var node = createSynthesizedNode(257 /* NamedImports */); - node.elements = createNodeArray(elements); - return node; - } - ts.createNamedImports = createNamedImports; - function updateNamedImports(node, elements) { - return node.elements !== elements - ? updateNode(createNamedImports(elements), node) - : node; - } - ts.updateNamedImports = updateNamedImports; - function createImportSpecifier(propertyName, name) { - var node = createSynthesizedNode(258 /* ImportSpecifier */); - node.propertyName = propertyName; - node.name = name; - return node; - } - ts.createImportSpecifier = createImportSpecifier; - function updateImportSpecifier(node, propertyName, name) { - return node.propertyName !== propertyName - || node.name !== name - ? updateNode(createImportSpecifier(propertyName, name), node) - : node; - } - ts.updateImportSpecifier = updateImportSpecifier; - function createExportAssignment(decorators, modifiers, isExportEquals, expression) { - var node = createSynthesizedNode(259 /* ExportAssignment */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.isExportEquals = isExportEquals; - node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(62 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression); - return node; - } - ts.createExportAssignment = createExportAssignment; - function updateExportAssignment(node, decorators, modifiers, expression) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.expression !== expression - ? updateNode(createExportAssignment(decorators, modifiers, node.isExportEquals, expression), node) - : node; - } - ts.updateExportAssignment = updateExportAssignment; - function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier, isTypeOnly) { - if (isTypeOnly === void 0) { isTypeOnly = false; } - var node = createSynthesizedNode(260 /* ExportDeclaration */); - node.decorators = asNodeArray(decorators); - node.modifiers = asNodeArray(modifiers); - node.isTypeOnly = isTypeOnly; - node.exportClause = exportClause; - node.moduleSpecifier = moduleSpecifier; - return node; - } - ts.createExportDeclaration = createExportDeclaration; - function updateExportDeclaration(node, decorators, modifiers, exportClause, moduleSpecifier, isTypeOnly) { - return node.decorators !== decorators - || node.modifiers !== modifiers - || node.isTypeOnly !== isTypeOnly - || node.exportClause !== exportClause - || node.moduleSpecifier !== moduleSpecifier - ? updateNode(createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier, isTypeOnly), node) - : node; - } - ts.updateExportDeclaration = updateExportDeclaration; - /* @internal */ - function createEmptyExports() { - return createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createNamedExports([]), /*moduleSpecifier*/ undefined); - } - ts.createEmptyExports = createEmptyExports; - function createNamedExports(elements) { - var node = createSynthesizedNode(261 /* NamedExports */); - node.elements = createNodeArray(elements); - return node; - } - ts.createNamedExports = createNamedExports; - function updateNamedExports(node, elements) { - return node.elements !== elements - ? updateNode(createNamedExports(elements), node) - : node; - } - ts.updateNamedExports = updateNamedExports; - function createExportSpecifier(propertyName, name) { - var node = createSynthesizedNode(263 /* ExportSpecifier */); - node.propertyName = asName(propertyName); - node.name = asName(name); - return node; - } - ts.createExportSpecifier = createExportSpecifier; - function updateExportSpecifier(node, propertyName, name) { - return node.propertyName !== propertyName - || node.name !== name - ? updateNode(createExportSpecifier(propertyName, name), node) - : node; - } - ts.updateExportSpecifier = updateExportSpecifier; - // Module references - function createExternalModuleReference(expression) { - var node = createSynthesizedNode(265 /* ExternalModuleReference */); - node.expression = expression; - return node; - } - ts.createExternalModuleReference = createExternalModuleReference; - function updateExternalModuleReference(node, expression) { - return node.expression !== expression - ? updateNode(createExternalModuleReference(expression), node) - : node; - } - ts.updateExternalModuleReference = updateExternalModuleReference; - // JSDoc - /* @internal */ - function createJSDocTypeExpression(type) { - var node = createSynthesizedNode(294 /* JSDocTypeExpression */); - node.type = type; - return node; - } - ts.createJSDocTypeExpression = createJSDocTypeExpression; - /* @internal */ - function createJSDocTypeTag(typeExpression, comment) { - var tag = createJSDocTag(320 /* JSDocTypeTag */, "type"); - tag.typeExpression = typeExpression; - tag.comment = comment; - return tag; - } - ts.createJSDocTypeTag = createJSDocTypeTag; - /* @internal */ - function createJSDocReturnTag(typeExpression, comment) { - var tag = createJSDocTag(318 /* JSDocReturnTag */, "returns"); - tag.typeExpression = typeExpression; - tag.comment = comment; - return tag; - } - ts.createJSDocReturnTag = createJSDocReturnTag; - /** @internal */ - function createJSDocThisTag(typeExpression) { - var tag = createJSDocTag(319 /* JSDocThisTag */, "this"); - tag.typeExpression = typeExpression; - return tag; - } - ts.createJSDocThisTag = createJSDocThisTag; - /* @internal */ - function createJSDocParamTag(name, isBracketed, typeExpression, comment) { - var tag = createJSDocTag(317 /* JSDocParameterTag */, "param"); - tag.typeExpression = typeExpression; - tag.name = name; - tag.isBracketed = isBracketed; - tag.comment = comment; - return tag; - } - ts.createJSDocParamTag = createJSDocParamTag; - /* @internal */ - function createJSDocClassTag() { - return createJSDocTag(310 /* JSDocClassTag */, "class"); - } - ts.createJSDocClassTag = createJSDocClassTag; - /* @internal */ - function createJSDocComment(comment, tags) { - var node = createSynthesizedNode(303 /* JSDocComment */); - node.comment = comment; - node.tags = tags; - return node; - } - ts.createJSDocComment = createJSDocComment; - /* @internal */ - function createJSDocTag(kind, tagName) { - var node = createSynthesizedNode(kind); - node.tagName = createIdentifier(tagName); - return node; - } - // JSX - function createJsxElement(openingElement, children, closingElement) { - var node = createSynthesizedNode(266 /* JsxElement */); - node.openingElement = openingElement; - node.children = createNodeArray(children); - node.closingElement = closingElement; - return node; - } - ts.createJsxElement = createJsxElement; - function updateJsxElement(node, openingElement, children, closingElement) { - return node.openingElement !== openingElement - || node.children !== children - || node.closingElement !== closingElement - ? updateNode(createJsxElement(openingElement, children, closingElement), node) - : node; - } - ts.updateJsxElement = updateJsxElement; - function createJsxSelfClosingElement(tagName, typeArguments, attributes) { - var node = createSynthesizedNode(267 /* JsxSelfClosingElement */); - node.tagName = tagName; - node.typeArguments = asNodeArray(typeArguments); - node.attributes = attributes; - return node; - } - ts.createJsxSelfClosingElement = createJsxSelfClosingElement; - function updateJsxSelfClosingElement(node, tagName, typeArguments, attributes) { - return node.tagName !== tagName - || node.typeArguments !== typeArguments - || node.attributes !== attributes - ? updateNode(createJsxSelfClosingElement(tagName, typeArguments, attributes), node) - : node; - } - ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement; - function createJsxOpeningElement(tagName, typeArguments, attributes) { - var node = createSynthesizedNode(268 /* JsxOpeningElement */); - node.tagName = tagName; - node.typeArguments = asNodeArray(typeArguments); - node.attributes = attributes; - return node; - } - ts.createJsxOpeningElement = createJsxOpeningElement; - function updateJsxOpeningElement(node, tagName, typeArguments, attributes) { - return node.tagName !== tagName - || node.typeArguments !== typeArguments - || node.attributes !== attributes - ? updateNode(createJsxOpeningElement(tagName, typeArguments, attributes), node) - : node; - } - ts.updateJsxOpeningElement = updateJsxOpeningElement; - function createJsxClosingElement(tagName) { - var node = createSynthesizedNode(269 /* JsxClosingElement */); - node.tagName = tagName; - return node; - } - ts.createJsxClosingElement = createJsxClosingElement; - function updateJsxClosingElement(node, tagName) { - return node.tagName !== tagName - ? updateNode(createJsxClosingElement(tagName), node) - : node; - } - ts.updateJsxClosingElement = updateJsxClosingElement; - function createJsxFragment(openingFragment, children, closingFragment) { - var node = createSynthesizedNode(270 /* JsxFragment */); - node.openingFragment = openingFragment; - node.children = createNodeArray(children); - node.closingFragment = closingFragment; - return node; - } - ts.createJsxFragment = createJsxFragment; - function createJsxText(text, containsOnlyTriviaWhiteSpaces) { - var node = createSynthesizedNode(11 /* JsxText */); - node.text = text; - node.containsOnlyTriviaWhiteSpaces = !!containsOnlyTriviaWhiteSpaces; - return node; - } - ts.createJsxText = createJsxText; - function updateJsxText(node, text, containsOnlyTriviaWhiteSpaces) { - return node.text !== text - || node.containsOnlyTriviaWhiteSpaces !== containsOnlyTriviaWhiteSpaces - ? updateNode(createJsxText(text, containsOnlyTriviaWhiteSpaces), node) - : node; - } - ts.updateJsxText = updateJsxText; - function createJsxOpeningFragment() { - return createSynthesizedNode(271 /* JsxOpeningFragment */); - } - ts.createJsxOpeningFragment = createJsxOpeningFragment; - function createJsxJsxClosingFragment() { - return createSynthesizedNode(272 /* JsxClosingFragment */); - } - ts.createJsxJsxClosingFragment = createJsxJsxClosingFragment; - function updateJsxFragment(node, openingFragment, children, closingFragment) { - return node.openingFragment !== openingFragment - || node.children !== children - || node.closingFragment !== closingFragment - ? updateNode(createJsxFragment(openingFragment, children, closingFragment), node) - : node; - } - ts.updateJsxFragment = updateJsxFragment; - function createJsxAttribute(name, initializer) { - var node = createSynthesizedNode(273 /* JsxAttribute */); - node.name = name; - node.initializer = initializer; - return node; - } - ts.createJsxAttribute = createJsxAttribute; - function updateJsxAttribute(node, name, initializer) { - return node.name !== name - || node.initializer !== initializer - ? updateNode(createJsxAttribute(name, initializer), node) - : node; - } - ts.updateJsxAttribute = updateJsxAttribute; - function createJsxAttributes(properties) { - var node = createSynthesizedNode(274 /* JsxAttributes */); - node.properties = createNodeArray(properties); - return node; - } - ts.createJsxAttributes = createJsxAttributes; - function updateJsxAttributes(node, properties) { - return node.properties !== properties - ? updateNode(createJsxAttributes(properties), node) - : node; - } - ts.updateJsxAttributes = updateJsxAttributes; - function createJsxSpreadAttribute(expression) { - var node = createSynthesizedNode(275 /* JsxSpreadAttribute */); - node.expression = expression; - return node; - } - ts.createJsxSpreadAttribute = createJsxSpreadAttribute; - function updateJsxSpreadAttribute(node, expression) { - return node.expression !== expression - ? updateNode(createJsxSpreadAttribute(expression), node) - : node; - } - ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute; - function createJsxExpression(dotDotDotToken, expression) { - var node = createSynthesizedNode(276 /* JsxExpression */); - node.dotDotDotToken = dotDotDotToken; - node.expression = expression; - return node; - } - ts.createJsxExpression = createJsxExpression; - function updateJsxExpression(node, expression) { - return node.expression !== expression - ? updateNode(createJsxExpression(node.dotDotDotToken, expression), node) - : node; - } - ts.updateJsxExpression = updateJsxExpression; - // Clauses - function createCaseClause(expression, statements) { - var node = createSynthesizedNode(277 /* CaseClause */); - node.expression = ts.parenthesizeExpressionForList(expression); - node.statements = createNodeArray(statements); - return node; - } - ts.createCaseClause = createCaseClause; - function updateCaseClause(node, expression, statements) { - return node.expression !== expression - || node.statements !== statements - ? updateNode(createCaseClause(expression, statements), node) - : node; - } - ts.updateCaseClause = updateCaseClause; - function createDefaultClause(statements) { - var node = createSynthesizedNode(278 /* DefaultClause */); - node.statements = createNodeArray(statements); - return node; - } - ts.createDefaultClause = createDefaultClause; - function updateDefaultClause(node, statements) { - return node.statements !== statements - ? updateNode(createDefaultClause(statements), node) - : node; - } - ts.updateDefaultClause = updateDefaultClause; - function createHeritageClause(token, types) { - var node = createSynthesizedNode(279 /* HeritageClause */); - node.token = token; - node.types = createNodeArray(types); - return node; - } - ts.createHeritageClause = createHeritageClause; - function updateHeritageClause(node, types) { - return node.types !== types - ? updateNode(createHeritageClause(node.token, types), node) - : node; - } - ts.updateHeritageClause = updateHeritageClause; - function createCatchClause(variableDeclaration, block) { - var node = createSynthesizedNode(280 /* CatchClause */); - node.variableDeclaration = ts.isString(variableDeclaration) ? createVariableDeclaration(variableDeclaration) : variableDeclaration; - node.block = block; - return node; - } - ts.createCatchClause = createCatchClause; - function updateCatchClause(node, variableDeclaration, block) { - return node.variableDeclaration !== variableDeclaration - || node.block !== block - ? updateNode(createCatchClause(variableDeclaration, block), node) - : node; - } - ts.updateCatchClause = updateCatchClause; - // Property assignments - function createPropertyAssignment(name, initializer) { - var node = createSynthesizedNode(281 /* PropertyAssignment */); - node.name = asName(name); - node.questionToken = undefined; - node.initializer = ts.parenthesizeExpressionForList(initializer); - return node; - } - ts.createPropertyAssignment = createPropertyAssignment; - function updatePropertyAssignment(node, name, initializer) { - return node.name !== name - || node.initializer !== initializer - ? updateNode(createPropertyAssignment(name, initializer), node) - : node; - } - ts.updatePropertyAssignment = updatePropertyAssignment; - function createShorthandPropertyAssignment(name, objectAssignmentInitializer) { - var node = createSynthesizedNode(282 /* ShorthandPropertyAssignment */); - node.name = asName(name); - node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? ts.parenthesizeExpressionForList(objectAssignmentInitializer) : undefined; - return node; - } - ts.createShorthandPropertyAssignment = createShorthandPropertyAssignment; - function updateShorthandPropertyAssignment(node, name, objectAssignmentInitializer) { - return node.name !== name - || node.objectAssignmentInitializer !== objectAssignmentInitializer - ? updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer), node) - : node; - } - ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment; - function createSpreadAssignment(expression) { - var node = createSynthesizedNode(283 /* SpreadAssignment */); - node.expression = ts.parenthesizeExpressionForList(expression); - return node; - } - ts.createSpreadAssignment = createSpreadAssignment; - function updateSpreadAssignment(node, expression) { - return node.expression !== expression - ? updateNode(createSpreadAssignment(expression), node) - : node; - } - ts.updateSpreadAssignment = updateSpreadAssignment; - // Enum - function createEnumMember(name, initializer) { - var node = createSynthesizedNode(284 /* EnumMember */); - node.name = asName(name); - node.initializer = initializer && ts.parenthesizeExpressionForList(initializer); - return node; - } - ts.createEnumMember = createEnumMember; - function updateEnumMember(node, name, initializer) { - return node.name !== name - || node.initializer !== initializer - ? updateNode(createEnumMember(name, initializer), node) - : node; - } - ts.updateEnumMember = updateEnumMember; - // Top-level nodes - function updateSourceFileNode(node, statements, isDeclarationFile, referencedFiles, typeReferences, hasNoDefaultLib, libReferences) { - if (node.statements !== statements || - (isDeclarationFile !== undefined && node.isDeclarationFile !== isDeclarationFile) || - (referencedFiles !== undefined && node.referencedFiles !== referencedFiles) || - (typeReferences !== undefined && node.typeReferenceDirectives !== typeReferences) || - (libReferences !== undefined && node.libReferenceDirectives !== libReferences) || - (hasNoDefaultLib !== undefined && node.hasNoDefaultLib !== hasNoDefaultLib)) { - var updated = createSynthesizedNode(290 /* SourceFile */); - updated.flags |= node.flags; - updated.statements = createNodeArray(statements); - updated.endOfFileToken = node.endOfFileToken; - updated.fileName = node.fileName; - updated.path = node.path; - updated.text = node.text; - updated.isDeclarationFile = isDeclarationFile === undefined ? node.isDeclarationFile : isDeclarationFile; - updated.referencedFiles = referencedFiles === undefined ? node.referencedFiles : referencedFiles; - updated.typeReferenceDirectives = typeReferences === undefined ? node.typeReferenceDirectives : typeReferences; - updated.hasNoDefaultLib = hasNoDefaultLib === undefined ? node.hasNoDefaultLib : hasNoDefaultLib; - updated.libReferenceDirectives = libReferences === undefined ? node.libReferenceDirectives : libReferences; - if (node.amdDependencies !== undefined) - updated.amdDependencies = node.amdDependencies; - if (node.moduleName !== undefined) - updated.moduleName = node.moduleName; - if (node.languageVariant !== undefined) - updated.languageVariant = node.languageVariant; - if (node.renamedDependencies !== undefined) - updated.renamedDependencies = node.renamedDependencies; - if (node.languageVersion !== undefined) - updated.languageVersion = node.languageVersion; - if (node.scriptKind !== undefined) - updated.scriptKind = node.scriptKind; - if (node.externalModuleIndicator !== undefined) - updated.externalModuleIndicator = node.externalModuleIndicator; - if (node.commonJsModuleIndicator !== undefined) - updated.commonJsModuleIndicator = node.commonJsModuleIndicator; - if (node.identifiers !== undefined) - updated.identifiers = node.identifiers; - if (node.nodeCount !== undefined) - updated.nodeCount = node.nodeCount; - if (node.identifierCount !== undefined) - updated.identifierCount = node.identifierCount; - if (node.symbolCount !== undefined) - updated.symbolCount = node.symbolCount; - if (node.parseDiagnostics !== undefined) - updated.parseDiagnostics = node.parseDiagnostics; - if (node.bindDiagnostics !== undefined) - updated.bindDiagnostics = node.bindDiagnostics; - if (node.bindSuggestionDiagnostics !== undefined) - updated.bindSuggestionDiagnostics = node.bindSuggestionDiagnostics; - if (node.lineMap !== undefined) - updated.lineMap = node.lineMap; - if (node.classifiableNames !== undefined) - updated.classifiableNames = node.classifiableNames; - if (node.resolvedModules !== undefined) - updated.resolvedModules = node.resolvedModules; - if (node.resolvedTypeReferenceDirectiveNames !== undefined) - updated.resolvedTypeReferenceDirectiveNames = node.resolvedTypeReferenceDirectiveNames; - if (node.imports !== undefined) - updated.imports = node.imports; - if (node.moduleAugmentations !== undefined) - updated.moduleAugmentations = node.moduleAugmentations; - if (node.pragmas !== undefined) - updated.pragmas = node.pragmas; - if (node.localJsxFactory !== undefined) - updated.localJsxFactory = node.localJsxFactory; - if (node.localJsxNamespace !== undefined) - updated.localJsxNamespace = node.localJsxNamespace; - return updateNode(updated, node); - } - return node; - } - ts.updateSourceFileNode = updateSourceFileNode; - /** - * Creates a shallow, memberwise clone of a node for mutation. - */ - function getMutableClone(node) { - var clone = getSynthesizedClone(node); - clone.pos = node.pos; - clone.end = node.end; - clone.parent = node.parent; - return clone; - } - ts.getMutableClone = getMutableClone; - // Transformation nodes - /** - * Creates a synthetic statement to act as a placeholder for a not-emitted statement in - * order to preserve comments. - * - * @param original The original statement. - */ - function createNotEmittedStatement(original) { - var node = createSynthesizedNode(325 /* NotEmittedStatement */); - node.original = original; - setTextRange(node, original); - return node; - } - ts.createNotEmittedStatement = createNotEmittedStatement; - /** - * Creates a synthetic element to act as a placeholder for the end of an emitted declaration in - * order to properly emit exports. - */ - /* @internal */ - function createEndOfDeclarationMarker(original) { - var node = createSynthesizedNode(329 /* EndOfDeclarationMarker */); - node.emitNode = {}; - node.original = original; - return node; - } - ts.createEndOfDeclarationMarker = createEndOfDeclarationMarker; - /** - * Creates a synthetic element to act as a placeholder for the beginning of a merged declaration in - * order to properly emit exports. - */ - /* @internal */ - function createMergeDeclarationMarker(original) { - var node = createSynthesizedNode(328 /* MergeDeclarationMarker */); - node.emitNode = {}; - node.original = original; - return node; - } - ts.createMergeDeclarationMarker = createMergeDeclarationMarker; - /** - * Creates a synthetic expression to act as a placeholder for a not-emitted expression in - * order to preserve comments or sourcemap positions. - * - * @param expression The inner expression to emit. - * @param original The original outer expression. - * @param location The location for the expression. Defaults to the positions from "original" if provided. - */ - function createPartiallyEmittedExpression(expression, original) { - var node = createSynthesizedNode(326 /* PartiallyEmittedExpression */); - node.expression = expression; - node.original = original; - setTextRange(node, original); - return node; - } - ts.createPartiallyEmittedExpression = createPartiallyEmittedExpression; - function updatePartiallyEmittedExpression(node, expression) { - if (node.expression !== expression) { - return updateNode(createPartiallyEmittedExpression(expression, node.original), node); - } - return node; - } - ts.updatePartiallyEmittedExpression = updatePartiallyEmittedExpression; - function flattenCommaElements(node) { - if (ts.nodeIsSynthesized(node) && !ts.isParseTreeNode(node) && !node.original && !node.emitNode && !node.id) { - if (node.kind === 327 /* CommaListExpression */) { - return node.elements; - } - if (ts.isBinaryExpression(node) && node.operatorToken.kind === 27 /* CommaToken */) { - return [node.left, node.right]; - } - } - return node; - } - function createCommaList(elements) { - var node = createSynthesizedNode(327 /* CommaListExpression */); - node.elements = createNodeArray(ts.sameFlatMap(elements, flattenCommaElements)); - return node; - } - ts.createCommaList = createCommaList; - function updateCommaList(node, elements) { - return node.elements !== elements - ? updateNode(createCommaList(elements), node) - : node; - } - ts.updateCommaList = updateCommaList; - /* @internal */ - function createSyntheticReferenceExpression(expression, thisArg) { - var node = createSynthesizedNode(330 /* SyntheticReferenceExpression */); - node.expression = expression; - node.thisArg = thisArg; - return node; - } - ts.createSyntheticReferenceExpression = createSyntheticReferenceExpression; - /* @internal */ - function updateSyntheticReferenceExpression(node, expression, thisArg) { - return node.expression !== expression - || node.thisArg !== thisArg - ? updateNode(createSyntheticReferenceExpression(expression, thisArg), node) - : node; - } - ts.updateSyntheticReferenceExpression = updateSyntheticReferenceExpression; - function createBundle(sourceFiles, prepends) { - if (prepends === void 0) { prepends = ts.emptyArray; } - var node = ts.createNode(291 /* Bundle */); - node.prepends = prepends; - node.sourceFiles = sourceFiles; - return node; - } - ts.createBundle = createBundle; - var allUnscopedEmitHelpers; - function getAllUnscopedEmitHelpers() { - return allUnscopedEmitHelpers || (allUnscopedEmitHelpers = ts.arrayToMap([ - ts.valuesHelper, - ts.readHelper, - ts.spreadHelper, - ts.spreadArraysHelper, - ts.restHelper, - ts.decorateHelper, - ts.metadataHelper, - ts.paramHelper, - ts.awaiterHelper, - ts.assignHelper, - ts.awaitHelper, - ts.asyncGeneratorHelper, - ts.asyncDelegator, - ts.asyncValues, - ts.extendsHelper, - ts.templateObjectHelper, - ts.generatorHelper, - ts.importStarHelper, - ts.importDefaultHelper, - ts.classPrivateFieldGetHelper, - ts.classPrivateFieldSetHelper, - ts.createBindingHelper, - ts.setModuleDefaultHelper - ], function (helper) { return helper.name; })); - } - function createUnparsedSource() { - var node = ts.createNode(292 /* UnparsedSource */); - node.prologues = ts.emptyArray; - node.referencedFiles = ts.emptyArray; - node.libReferenceDirectives = ts.emptyArray; - node.getLineAndCharacterOfPosition = function (pos) { return ts.getLineAndCharacterOfPosition(node, pos); }; - return node; - } - function createUnparsedSourceFile(textOrInputFiles, mapPathOrType, mapTextOrStripInternal) { - var node = createUnparsedSource(); - var stripInternal; - var bundleFileInfo; - if (!ts.isString(textOrInputFiles)) { - ts.Debug.assert(mapPathOrType === "js" || mapPathOrType === "dts"); - node.fileName = (mapPathOrType === "js" ? textOrInputFiles.javascriptPath : textOrInputFiles.declarationPath) || ""; - node.sourceMapPath = mapPathOrType === "js" ? textOrInputFiles.javascriptMapPath : textOrInputFiles.declarationMapPath; - Object.defineProperties(node, { - text: { get: function () { return mapPathOrType === "js" ? textOrInputFiles.javascriptText : textOrInputFiles.declarationText; } }, - sourceMapText: { get: function () { return mapPathOrType === "js" ? textOrInputFiles.javascriptMapText : textOrInputFiles.declarationMapText; } }, - }); - if (textOrInputFiles.buildInfo && textOrInputFiles.buildInfo.bundle) { - node.oldFileOfCurrentEmit = textOrInputFiles.oldFileOfCurrentEmit; - ts.Debug.assert(mapTextOrStripInternal === undefined || typeof mapTextOrStripInternal === "boolean"); - stripInternal = mapTextOrStripInternal; - bundleFileInfo = mapPathOrType === "js" ? textOrInputFiles.buildInfo.bundle.js : textOrInputFiles.buildInfo.bundle.dts; - if (node.oldFileOfCurrentEmit) { - parseOldFileOfCurrentEmit(node, ts.Debug.checkDefined(bundleFileInfo)); - return node; - } - } - } - else { - node.fileName = ""; - node.text = textOrInputFiles; - node.sourceMapPath = mapPathOrType; - node.sourceMapText = mapTextOrStripInternal; - } - ts.Debug.assert(!node.oldFileOfCurrentEmit); - parseUnparsedSourceFile(node, bundleFileInfo, stripInternal); - return node; - } - ts.createUnparsedSourceFile = createUnparsedSourceFile; - function parseUnparsedSourceFile(node, bundleFileInfo, stripInternal) { - var prologues; - var helpers; - var referencedFiles; - var typeReferenceDirectives; - var libReferenceDirectives; - var texts; - for (var _i = 0, _a = bundleFileInfo ? bundleFileInfo.sections : ts.emptyArray; _i < _a.length; _i++) { - var section = _a[_i]; - switch (section.kind) { - case "prologue" /* Prologue */: - (prologues || (prologues = [])).push(createUnparsedNode(section, node)); - break; - case "emitHelpers" /* EmitHelpers */: - (helpers || (helpers = [])).push(getAllUnscopedEmitHelpers().get(section.data)); - break; - case "no-default-lib" /* NoDefaultLib */: - node.hasNoDefaultLib = true; - break; - case "reference" /* Reference */: - (referencedFiles || (referencedFiles = [])).push({ pos: -1, end: -1, fileName: section.data }); - break; - case "type" /* Type */: - (typeReferenceDirectives || (typeReferenceDirectives = [])).push(section.data); - break; - case "lib" /* Lib */: - (libReferenceDirectives || (libReferenceDirectives = [])).push({ pos: -1, end: -1, fileName: section.data }); - break; - case "prepend" /* Prepend */: - var prependNode = createUnparsedNode(section, node); - var prependTexts = void 0; - for (var _b = 0, _c = section.texts; _b < _c.length; _b++) { - var text = _c[_b]; - if (!stripInternal || text.kind !== "internal" /* Internal */) { - (prependTexts || (prependTexts = [])).push(createUnparsedNode(text, node)); - } - } - prependNode.texts = prependTexts || ts.emptyArray; - (texts || (texts = [])).push(prependNode); - break; - case "internal" /* Internal */: - if (stripInternal) { - if (!texts) - texts = []; - break; - } - // falls through - case "text" /* Text */: - (texts || (texts = [])).push(createUnparsedNode(section, node)); - break; - default: - ts.Debug.assertNever(section); - } - } - node.prologues = prologues || ts.emptyArray; - node.helpers = helpers; - node.referencedFiles = referencedFiles || ts.emptyArray; - node.typeReferenceDirectives = typeReferenceDirectives; - node.libReferenceDirectives = libReferenceDirectives || ts.emptyArray; - node.texts = texts || [createUnparsedNode({ kind: "text" /* Text */, pos: 0, end: node.text.length }, node)]; - } - function parseOldFileOfCurrentEmit(node, bundleFileInfo) { - ts.Debug.assert(!!node.oldFileOfCurrentEmit); - var texts; - var syntheticReferences; - for (var _i = 0, _a = bundleFileInfo.sections; _i < _a.length; _i++) { - var section = _a[_i]; - switch (section.kind) { - case "internal" /* Internal */: - case "text" /* Text */: - (texts || (texts = [])).push(createUnparsedNode(section, node)); - break; - case "no-default-lib" /* NoDefaultLib */: - case "reference" /* Reference */: - case "type" /* Type */: - case "lib" /* Lib */: - (syntheticReferences || (syntheticReferences = [])).push(createUnparsedSyntheticReference(section, node)); - break; - // Ignore - case "prologue" /* Prologue */: - case "emitHelpers" /* EmitHelpers */: - case "prepend" /* Prepend */: - break; - default: - ts.Debug.assertNever(section); - } - } - node.texts = texts || ts.emptyArray; - node.helpers = ts.map(bundleFileInfo.sources && bundleFileInfo.sources.helpers, function (name) { return getAllUnscopedEmitHelpers().get(name); }); - node.syntheticReferences = syntheticReferences; - return node; - } - function mapBundleFileSectionKindToSyntaxKind(kind) { - switch (kind) { - case "prologue" /* Prologue */: return 285 /* UnparsedPrologue */; - case "prepend" /* Prepend */: return 286 /* UnparsedPrepend */; - case "internal" /* Internal */: return 288 /* UnparsedInternalText */; - case "text" /* Text */: return 287 /* UnparsedText */; - case "emitHelpers" /* EmitHelpers */: - case "no-default-lib" /* NoDefaultLib */: - case "reference" /* Reference */: - case "type" /* Type */: - case "lib" /* Lib */: - return ts.Debug.fail("BundleFileSectionKind: " + kind + " not yet mapped to SyntaxKind"); - default: - return ts.Debug.assertNever(kind); - } - } - function createUnparsedNode(section, parent) { - var node = ts.createNode(mapBundleFileSectionKindToSyntaxKind(section.kind), section.pos, section.end); - node.parent = parent; - node.data = section.data; - return node; - } - function createUnparsedSyntheticReference(section, parent) { - var node = ts.createNode(289 /* UnparsedSyntheticReference */, section.pos, section.end); - node.parent = parent; - node.data = section.data; - node.section = section; - return node; - } - function createInputFiles(javascriptTextOrReadFileText, declarationTextOrJavascriptPath, javascriptMapPath, javascriptMapTextOrDeclarationPath, declarationMapPath, declarationMapTextOrBuildInfoPath, javascriptPath, declarationPath, buildInfoPath, buildInfo, oldFileOfCurrentEmit) { - var node = ts.createNode(293 /* InputFiles */); - if (!ts.isString(javascriptTextOrReadFileText)) { - var cache_1 = ts.createMap(); - var textGetter_1 = function (path) { - if (path === undefined) - return undefined; - var value = cache_1.get(path); - if (value === undefined) { - value = javascriptTextOrReadFileText(path); - cache_1.set(path, value !== undefined ? value : false); - } - return value !== false ? value : undefined; - }; - var definedTextGetter_1 = function (path) { - var result = textGetter_1(path); - return result !== undefined ? result : "/* Input file " + path + " was missing */\r\n"; - }; - var buildInfo_1; - var getAndCacheBuildInfo_1 = function (getText) { - if (buildInfo_1 === undefined) { - var result = getText(); - buildInfo_1 = result !== undefined ? ts.getBuildInfo(result) : false; - } - return buildInfo_1 || undefined; - }; - node.javascriptPath = declarationTextOrJavascriptPath; - node.javascriptMapPath = javascriptMapPath; - node.declarationPath = ts.Debug.checkDefined(javascriptMapTextOrDeclarationPath); - node.declarationMapPath = declarationMapPath; - node.buildInfoPath = declarationMapTextOrBuildInfoPath; - Object.defineProperties(node, { - javascriptText: { get: function () { return definedTextGetter_1(declarationTextOrJavascriptPath); } }, - javascriptMapText: { get: function () { return textGetter_1(javascriptMapPath); } }, - declarationText: { get: function () { return definedTextGetter_1(ts.Debug.checkDefined(javascriptMapTextOrDeclarationPath)); } }, - declarationMapText: { get: function () { return textGetter_1(declarationMapPath); } }, - buildInfo: { get: function () { return getAndCacheBuildInfo_1(function () { return textGetter_1(declarationMapTextOrBuildInfoPath); }); } } - }); - } - else { - node.javascriptText = javascriptTextOrReadFileText; - node.javascriptMapPath = javascriptMapPath; - node.javascriptMapText = javascriptMapTextOrDeclarationPath; - node.declarationText = declarationTextOrJavascriptPath; - node.declarationMapPath = declarationMapPath; - node.declarationMapText = declarationMapTextOrBuildInfoPath; - node.javascriptPath = javascriptPath; - node.declarationPath = declarationPath; - node.buildInfoPath = buildInfoPath; - node.buildInfo = buildInfo; - node.oldFileOfCurrentEmit = oldFileOfCurrentEmit; - } - return node; - } - ts.createInputFiles = createInputFiles; - function updateBundle(node, sourceFiles, prepends) { - if (prepends === void 0) { prepends = ts.emptyArray; } - if (node.sourceFiles !== sourceFiles || node.prepends !== prepends) { - return createBundle(sourceFiles, prepends); - } - return node; - } - ts.updateBundle = updateBundle; - function createImmediatelyInvokedFunctionExpression(statements, param, paramValue) { - return createCall(createFunctionExpression( - /*modifiers*/ undefined, - /*asteriskToken*/ undefined, - /*name*/ undefined, - /*typeParameters*/ undefined, - /*parameters*/ param ? [param] : [], - /*type*/ undefined, createBlock(statements, /*multiLine*/ true)), - /*typeArguments*/ undefined, - /*argumentsArray*/ paramValue ? [paramValue] : []); - } - ts.createImmediatelyInvokedFunctionExpression = createImmediatelyInvokedFunctionExpression; - function createImmediatelyInvokedArrowFunction(statements, param, paramValue) { - return createCall(createArrowFunction( - /*modifiers*/ undefined, - /*typeParameters*/ undefined, - /*parameters*/ param ? [param] : [], - /*type*/ undefined, - /*equalsGreaterThanToken*/ undefined, createBlock(statements, /*multiLine*/ true)), - /*typeArguments*/ undefined, - /*argumentsArray*/ paramValue ? [paramValue] : []); - } - ts.createImmediatelyInvokedArrowFunction = createImmediatelyInvokedArrowFunction; - function createComma(left, right) { - return createBinary(left, 27 /* CommaToken */, right); - } - ts.createComma = createComma; - function createLessThan(left, right) { - return createBinary(left, 29 /* LessThanToken */, right); - } - ts.createLessThan = createLessThan; - function createAssignment(left, right) { - return createBinary(left, 62 /* EqualsToken */, right); - } - ts.createAssignment = createAssignment; - function createStrictEquality(left, right) { - return createBinary(left, 36 /* EqualsEqualsEqualsToken */, right); - } - ts.createStrictEquality = createStrictEquality; - function createStrictInequality(left, right) { - return createBinary(left, 37 /* ExclamationEqualsEqualsToken */, right); - } - ts.createStrictInequality = createStrictInequality; - function createAdd(left, right) { - return createBinary(left, 39 /* PlusToken */, right); - } - ts.createAdd = createAdd; - function createSubtract(left, right) { - return createBinary(left, 40 /* MinusToken */, right); - } - ts.createSubtract = createSubtract; - function createPostfixIncrement(operand) { - return createPostfix(operand, 45 /* PlusPlusToken */); - } - ts.createPostfixIncrement = createPostfixIncrement; - function createLogicalAnd(left, right) { - return createBinary(left, 55 /* AmpersandAmpersandToken */, right); - } - ts.createLogicalAnd = createLogicalAnd; - function createLogicalOr(left, right) { - return createBinary(left, 56 /* BarBarToken */, right); - } - ts.createLogicalOr = createLogicalOr; - function createNullishCoalesce(left, right) { - return createBinary(left, 60 /* QuestionQuestionToken */, right); - } - ts.createNullishCoalesce = createNullishCoalesce; - function createLogicalNot(operand) { - return createPrefix(53 /* ExclamationToken */, operand); - } - ts.createLogicalNot = createLogicalNot; - function createVoidZero() { - return createVoid(createLiteral(0)); - } - ts.createVoidZero = createVoidZero; - function createExportDefault(expression) { - return createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, /*isExportEquals*/ false, expression); - } - ts.createExportDefault = createExportDefault; - function createExternalModuleExport(exportName) { - return createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createNamedExports([createExportSpecifier(/*propertyName*/ undefined, exportName)])); - } - ts.createExternalModuleExport = createExternalModuleExport; - // Utilities - function asName(name) { - return ts.isString(name) ? createIdentifier(name) : name; - } - function asExpression(value) { - return typeof value === "string" ? createStringLiteral(value) : - typeof value === "number" ? createNumericLiteral("" + value) : - typeof value === "boolean" ? value ? createTrue() : createFalse() : - value; - } - function asNodeArray(array) { - return array ? createNodeArray(array) : undefined; - } - function asToken(value) { - return typeof value === "number" ? createToken(value) : value; - } - function asEmbeddedStatement(statement) { - return statement && ts.isNotEmittedStatement(statement) ? setTextRange(setOriginalNode(createEmptyStatement(), statement), statement) : statement; - } - /** - * Clears any EmitNode entries from parse-tree nodes. - * @param sourceFile A source file. - */ - function disposeEmitNodes(sourceFile) { - // During transformation we may need to annotate a parse tree node with transient - // transformation properties. As parse tree nodes live longer than transformation - // nodes, we need to make sure we reclaim any memory allocated for custom ranges - // from these nodes to ensure we do not hold onto entire subtrees just for position - // information. We also need to reset these nodes to a pre-transformation state - // for incremental parsing scenarios so that we do not impact later emit. - sourceFile = ts.getSourceFileOfNode(ts.getParseTreeNode(sourceFile)); - var emitNode = sourceFile && sourceFile.emitNode; - var annotatedNodes = emitNode && emitNode.annotatedNodes; - if (annotatedNodes) { - for (var _i = 0, annotatedNodes_1 = annotatedNodes; _i < annotatedNodes_1.length; _i++) { - var node = annotatedNodes_1[_i]; - node.emitNode = undefined; - } - } - } - ts.disposeEmitNodes = disposeEmitNodes; - /** - * Associates a node with the current transformation, initializing - * various transient transformation properties. - */ - /* @internal */ - function getOrCreateEmitNode(node) { - if (!node.emitNode) { - if (ts.isParseTreeNode(node)) { - // To avoid holding onto transformation artifacts, we keep track of any - // parse tree node we are annotating. This allows us to clean them up after - // all transformations have completed. - if (node.kind === 290 /* SourceFile */) { - return node.emitNode = { annotatedNodes: [node] }; - } - var sourceFile = ts.getSourceFileOfNode(ts.getParseTreeNode(ts.getSourceFileOfNode(node))); - getOrCreateEmitNode(sourceFile).annotatedNodes.push(node); - } - node.emitNode = {}; - } - return node.emitNode; - } - ts.getOrCreateEmitNode = getOrCreateEmitNode; - /** - * Sets `EmitFlags.NoComments` on a node and removes any leading and trailing synthetic comments. - * @internal - */ - function removeAllComments(node) { - var emitNode = getOrCreateEmitNode(node); - emitNode.flags |= 1536 /* NoComments */; - emitNode.leadingComments = undefined; - emitNode.trailingComments = undefined; - return node; - } - ts.removeAllComments = removeAllComments; - function setTextRange(range, location) { - if (location) { - range.pos = location.pos; - range.end = location.end; - } - return range; - } - ts.setTextRange = setTextRange; - /** - * Sets flags that control emit behavior of a node. - */ - function setEmitFlags(node, emitFlags) { - getOrCreateEmitNode(node).flags = emitFlags; - return node; - } - ts.setEmitFlags = setEmitFlags; - /** - * Sets flags that control emit behavior of a node. - */ - /* @internal */ - function addEmitFlags(node, emitFlags) { - var emitNode = getOrCreateEmitNode(node); - emitNode.flags = emitNode.flags | emitFlags; - return node; - } - ts.addEmitFlags = addEmitFlags; - /** - * Gets a custom text range to use when emitting source maps. - */ - function getSourceMapRange(node) { - var emitNode = node.emitNode; - return (emitNode && emitNode.sourceMapRange) || node; - } - ts.getSourceMapRange = getSourceMapRange; - /** - * Sets a custom text range to use when emitting source maps. - */ - function setSourceMapRange(node, range) { - getOrCreateEmitNode(node).sourceMapRange = range; - return node; - } - ts.setSourceMapRange = setSourceMapRange; - var SourceMapSource; - /** - * Create an external source map source file reference - */ - function createSourceMapSource(fileName, text, skipTrivia) { - return new (SourceMapSource || (SourceMapSource = ts.objectAllocator.getSourceMapSourceConstructor()))(fileName, text, skipTrivia); - } - ts.createSourceMapSource = createSourceMapSource; - /** - * Gets the TextRange to use for source maps for a token of a node. - */ - function getTokenSourceMapRange(node, token) { - var emitNode = node.emitNode; - var tokenSourceMapRanges = emitNode && emitNode.tokenSourceMapRanges; - return tokenSourceMapRanges && tokenSourceMapRanges[token]; - } - ts.getTokenSourceMapRange = getTokenSourceMapRange; - /** - * Sets the TextRange to use for source maps for a token of a node. - */ - function setTokenSourceMapRange(node, token, range) { - var emitNode = getOrCreateEmitNode(node); - var tokenSourceMapRanges = emitNode.tokenSourceMapRanges || (emitNode.tokenSourceMapRanges = []); - tokenSourceMapRanges[token] = range; - return node; - } - ts.setTokenSourceMapRange = setTokenSourceMapRange; - /** - * Gets a custom text range to use when emitting comments. - */ - /*@internal*/ - function getStartsOnNewLine(node) { - var emitNode = node.emitNode; - return emitNode && emitNode.startsOnNewLine; - } - ts.getStartsOnNewLine = getStartsOnNewLine; - /** - * Sets a custom text range to use when emitting comments. - */ - /*@internal*/ - function setStartsOnNewLine(node, newLine) { - getOrCreateEmitNode(node).startsOnNewLine = newLine; - return node; - } - ts.setStartsOnNewLine = setStartsOnNewLine; - /** - * Gets a custom text range to use when emitting comments. - */ - function getCommentRange(node) { - var emitNode = node.emitNode; - return (emitNode && emitNode.commentRange) || node; - } - ts.getCommentRange = getCommentRange; - /** - * Sets a custom text range to use when emitting comments. - */ - function setCommentRange(node, range) { - getOrCreateEmitNode(node).commentRange = range; - return node; - } - ts.setCommentRange = setCommentRange; - function getSyntheticLeadingComments(node) { - var emitNode = node.emitNode; - return emitNode && emitNode.leadingComments; - } - ts.getSyntheticLeadingComments = getSyntheticLeadingComments; - function setSyntheticLeadingComments(node, comments) { - getOrCreateEmitNode(node).leadingComments = comments; - return node; - } - ts.setSyntheticLeadingComments = setSyntheticLeadingComments; - function addSyntheticLeadingComment(node, kind, text, hasTrailingNewLine) { - return setSyntheticLeadingComments(node, ts.append(getSyntheticLeadingComments(node), { kind: kind, pos: -1, end: -1, hasTrailingNewLine: hasTrailingNewLine, text: text })); - } - ts.addSyntheticLeadingComment = addSyntheticLeadingComment; - function getSyntheticTrailingComments(node) { - var emitNode = node.emitNode; - return emitNode && emitNode.trailingComments; - } - ts.getSyntheticTrailingComments = getSyntheticTrailingComments; - function setSyntheticTrailingComments(node, comments) { - getOrCreateEmitNode(node).trailingComments = comments; - return node; - } - ts.setSyntheticTrailingComments = setSyntheticTrailingComments; - function addSyntheticTrailingComment(node, kind, text, hasTrailingNewLine) { - return setSyntheticTrailingComments(node, ts.append(getSyntheticTrailingComments(node), { kind: kind, pos: -1, end: -1, hasTrailingNewLine: hasTrailingNewLine, text: text })); - } - ts.addSyntheticTrailingComment = addSyntheticTrailingComment; - function moveSyntheticComments(node, original) { - setSyntheticLeadingComments(node, getSyntheticLeadingComments(original)); - setSyntheticTrailingComments(node, getSyntheticTrailingComments(original)); - var emit = getOrCreateEmitNode(original); - emit.leadingComments = undefined; - emit.trailingComments = undefined; - return node; - } - ts.moveSyntheticComments = moveSyntheticComments; - /** @internal */ - function ignoreSourceNewlines(node) { - getOrCreateEmitNode(node).flags |= 134217728 /* IgnoreSourceNewlines */; - return node; - } - ts.ignoreSourceNewlines = ignoreSourceNewlines; - /** - * Gets the constant value to emit for an expression. - */ - function getConstantValue(node) { - var emitNode = node.emitNode; - return emitNode && emitNode.constantValue; - } - ts.getConstantValue = getConstantValue; - /** - * Sets the constant value to emit for an expression. - */ - function setConstantValue(node, value) { - var emitNode = getOrCreateEmitNode(node); - emitNode.constantValue = value; - return node; - } - ts.setConstantValue = setConstantValue; - /** - * Adds an EmitHelper to a node. - */ - function addEmitHelper(node, helper) { - var emitNode = getOrCreateEmitNode(node); - emitNode.helpers = ts.append(emitNode.helpers, helper); - return node; - } - ts.addEmitHelper = addEmitHelper; - /** - * Add EmitHelpers to a node. - */ - function addEmitHelpers(node, helpers) { - if (ts.some(helpers)) { - var emitNode = getOrCreateEmitNode(node); - for (var _i = 0, helpers_1 = helpers; _i < helpers_1.length; _i++) { - var helper = helpers_1[_i]; - emitNode.helpers = ts.appendIfUnique(emitNode.helpers, helper); - } - } - return node; - } - ts.addEmitHelpers = addEmitHelpers; - /** - * Removes an EmitHelper from a node. - */ - function removeEmitHelper(node, helper) { - var emitNode = node.emitNode; - if (emitNode) { - var helpers = emitNode.helpers; - if (helpers) { - return ts.orderedRemoveItem(helpers, helper); - } - } - return false; - } - ts.removeEmitHelper = removeEmitHelper; - /** - * Gets the EmitHelpers of a node. - */ - function getEmitHelpers(node) { - var emitNode = node.emitNode; - return emitNode && emitNode.helpers; - } - ts.getEmitHelpers = getEmitHelpers; - /** - * Moves matching emit helpers from a source node to a target node. - */ - function moveEmitHelpers(source, target, predicate) { - var sourceEmitNode = source.emitNode; - var sourceEmitHelpers = sourceEmitNode && sourceEmitNode.helpers; - if (!ts.some(sourceEmitHelpers)) - return; - var targetEmitNode = getOrCreateEmitNode(target); - var helpersRemoved = 0; - for (var i = 0; i < sourceEmitHelpers.length; i++) { - var helper = sourceEmitHelpers[i]; - if (predicate(helper)) { - helpersRemoved++; - targetEmitNode.helpers = ts.appendIfUnique(targetEmitNode.helpers, helper); - } - else if (helpersRemoved > 0) { - sourceEmitHelpers[i - helpersRemoved] = helper; - } - } - if (helpersRemoved > 0) { - sourceEmitHelpers.length -= helpersRemoved; - } - } - ts.moveEmitHelpers = moveEmitHelpers; - /* @internal */ - function compareEmitHelpers(x, y) { - if (x === y) - return 0 /* EqualTo */; - if (x.priority === y.priority) - return 0 /* EqualTo */; - if (x.priority === undefined) - return 1 /* GreaterThan */; - if (y.priority === undefined) - return -1 /* LessThan */; - return ts.compareValues(x.priority, y.priority); - } - ts.compareEmitHelpers = compareEmitHelpers; - function setOriginalNode(node, original) { - node.original = original; - if (original) { - var emitNode = original.emitNode; - if (emitNode) - node.emitNode = mergeEmitNode(emitNode, node.emitNode); - } - return node; - } - ts.setOriginalNode = setOriginalNode; - function mergeEmitNode(sourceEmitNode, destEmitNode) { - var flags = sourceEmitNode.flags, leadingComments = sourceEmitNode.leadingComments, trailingComments = sourceEmitNode.trailingComments, commentRange = sourceEmitNode.commentRange, sourceMapRange = sourceEmitNode.sourceMapRange, tokenSourceMapRanges = sourceEmitNode.tokenSourceMapRanges, constantValue = sourceEmitNode.constantValue, helpers = sourceEmitNode.helpers, startsOnNewLine = sourceEmitNode.startsOnNewLine; - if (!destEmitNode) - destEmitNode = {}; - // We are using `.slice()` here in case `destEmitNode.leadingComments` is pushed to later. - if (leadingComments) - destEmitNode.leadingComments = ts.addRange(leadingComments.slice(), destEmitNode.leadingComments); - if (trailingComments) - destEmitNode.trailingComments = ts.addRange(trailingComments.slice(), destEmitNode.trailingComments); - if (flags) - destEmitNode.flags = flags; - if (commentRange) - destEmitNode.commentRange = commentRange; - if (sourceMapRange) - destEmitNode.sourceMapRange = sourceMapRange; - if (tokenSourceMapRanges) - destEmitNode.tokenSourceMapRanges = mergeTokenSourceMapRanges(tokenSourceMapRanges, destEmitNode.tokenSourceMapRanges); - if (constantValue !== undefined) - destEmitNode.constantValue = constantValue; - if (helpers) - destEmitNode.helpers = ts.addRange(destEmitNode.helpers, helpers); - if (startsOnNewLine !== undefined) - destEmitNode.startsOnNewLine = startsOnNewLine; - return destEmitNode; - } - function mergeTokenSourceMapRanges(sourceRanges, destRanges) { - if (!destRanges) - destRanges = []; - for (var key in sourceRanges) { - destRanges[key] = sourceRanges[key]; - } - return destRanges; - } -})(ts || (ts = {})); -/* @internal */ -var ts; -(function (ts) { - ts.nullTransformationContext = { - enableEmitNotification: ts.noop, - enableSubstitution: ts.noop, - endLexicalEnvironment: ts.returnUndefined, - getCompilerOptions: function () { return ({}); }, - getEmitHost: ts.notImplemented, - getEmitResolver: ts.notImplemented, - setLexicalEnvironmentFlags: ts.noop, - getLexicalEnvironmentFlags: function () { return 0; }, - hoistFunctionDeclaration: ts.noop, - hoistVariableDeclaration: ts.noop, - addInitializationStatement: ts.noop, - isEmitNotificationEnabled: ts.notImplemented, - isSubstitutionEnabled: ts.notImplemented, - onEmitNode: ts.noop, - onSubstituteNode: ts.notImplemented, - readEmitHelpers: ts.notImplemented, - requestEmitHelper: ts.noop, - resumeLexicalEnvironment: ts.noop, - startLexicalEnvironment: ts.noop, - suspendLexicalEnvironment: ts.noop, - addDiagnostic: ts.noop, - }; - function createTypeCheck(value, tag) { - return tag === "undefined" - ? ts.createStrictEquality(value, ts.createVoidZero()) - : ts.createStrictEquality(ts.createTypeOf(value), ts.createLiteral(tag)); - } - ts.createTypeCheck = createTypeCheck; - function createMemberAccessForPropertyName(target, memberName, location) { - if (ts.isComputedPropertyName(memberName)) { - return ts.setTextRange(ts.createElementAccess(target, memberName.expression), location); - } - else { - var expression = ts.setTextRange((ts.isIdentifier(memberName) || ts.isPrivateIdentifier(memberName)) - ? ts.createPropertyAccess(target, memberName) - : ts.createElementAccess(target, memberName), memberName); - ts.getOrCreateEmitNode(expression).flags |= 64 /* NoNestedSourceMaps */; - return expression; - } - } - ts.createMemberAccessForPropertyName = createMemberAccessForPropertyName; - function createFunctionCall(func, thisArg, argumentsList, location) { - return ts.setTextRange(ts.createCall(ts.createPropertyAccess(func, "call"), - /*typeArguments*/ undefined, __spreadArrays([ - thisArg - ], argumentsList)), location); - } - ts.createFunctionCall = createFunctionCall; - function createFunctionApply(func, thisArg, argumentsExpression, location) { - return ts.setTextRange(ts.createCall(ts.createPropertyAccess(func, "apply"), - /*typeArguments*/ undefined, [ - thisArg, - argumentsExpression - ]), location); - } - ts.createFunctionApply = createFunctionApply; - function createArraySlice(array, start) { - var argumentsList = []; - if (start !== undefined) { - argumentsList.push(typeof start === "number" ? ts.createLiteral(start) : start); - } - return ts.createCall(ts.createPropertyAccess(array, "slice"), /*typeArguments*/ undefined, argumentsList); - } - ts.createArraySlice = createArraySlice; - function createArrayConcat(array, values) { - return ts.createCall(ts.createPropertyAccess(array, "concat"), - /*typeArguments*/ undefined, values); - } - ts.createArrayConcat = createArrayConcat; - function createMathPow(left, right, location) { - return ts.setTextRange(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Math"), "pow"), - /*typeArguments*/ undefined, [left, right]), location); - } - ts.createMathPow = createMathPow; - function createReactNamespace(reactNamespace, parent) { - // To ensure the emit resolver can properly resolve the namespace, we need to - // treat this identifier as if it were a source tree node by clearing the `Synthesized` - // flag and setting a parent node. - var react = ts.createIdentifier(reactNamespace || "React"); - react.flags &= ~8 /* Synthesized */; - // Set the parent that is in parse tree - // this makes sure that parent chain is intact for checker to traverse complete scope tree - react.parent = ts.getParseTreeNode(parent); - return react; - } - function createJsxFactoryExpressionFromEntityName(jsxFactory, parent) { - if (ts.isQualifiedName(jsxFactory)) { - var left = createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent); - var right = ts.createIdentifier(ts.idText(jsxFactory.right)); - right.escapedText = jsxFactory.right.escapedText; - return ts.createPropertyAccess(left, right); - } - else { - return createReactNamespace(ts.idText(jsxFactory), parent); - } - } - function createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parent) { - return jsxFactoryEntity ? - createJsxFactoryExpressionFromEntityName(jsxFactoryEntity, parent) : - ts.createPropertyAccess(createReactNamespace(reactNamespace, parent), "createElement"); - } - function createExpressionForJsxElement(jsxFactoryEntity, reactNamespace, tagName, props, children, parentElement, location) { - var argumentsList = [tagName]; - if (props) { - argumentsList.push(props); - } - if (children && children.length > 0) { - if (!props) { - argumentsList.push(ts.createNull()); - } - if (children.length > 1) { - for (var _i = 0, children_2 = children; _i < children_2.length; _i++) { - var child = children_2[_i]; - startOnNewLine(child); - argumentsList.push(child); - } - } - else { - argumentsList.push(children[0]); - } - } - return ts.setTextRange(ts.createCall(createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement), - /*typeArguments*/ undefined, argumentsList), location); - } - ts.createExpressionForJsxElement = createExpressionForJsxElement; - function createExpressionForJsxFragment(jsxFactoryEntity, reactNamespace, children, parentElement, location) { - var tagName = ts.createPropertyAccess(createReactNamespace(reactNamespace, parentElement), "Fragment"); - var argumentsList = [tagName]; - argumentsList.push(ts.createNull()); - if (children && children.length > 0) { - if (children.length > 1) { - for (var _i = 0, children_3 = children; _i < children_3.length; _i++) { - var child = children_3[_i]; - startOnNewLine(child); - argumentsList.push(child); - } - } - else { - argumentsList.push(children[0]); - } - } - return ts.setTextRange(ts.createCall(createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement), - /*typeArguments*/ undefined, argumentsList), location); - } - ts.createExpressionForJsxFragment = createExpressionForJsxFragment; - // Helpers - /** - * Gets an identifier for the name of an *unscoped* emit helper. - */ - function getUnscopedHelperName(name) { - return ts.setEmitFlags(ts.createIdentifier(name), 4096 /* HelperName */ | 2 /* AdviseOnEmitNode */); - } - ts.getUnscopedHelperName = getUnscopedHelperName; - ts.valuesHelper = { - name: "typescript:values", - importName: "__values", - scoped: false, - text: "\n var __values = (this && this.__values) || function(o) {\n var s = typeof Symbol === \"function\" && Symbol.iterator, m = s && o[s], i = 0;\n if (m) return m.call(o);\n if (o && typeof o.length === \"number\") return {\n next: function () {\n if (o && i >= o.length) o = void 0;\n return { value: o && o[i++], done: !o };\n }\n };\n throw new TypeError(s ? \"Object is not iterable.\" : \"Symbol.iterator is not defined.\");\n };" - }; - function createValuesHelper(context, expression, location) { - context.requestEmitHelper(ts.valuesHelper); - return ts.setTextRange(ts.createCall(getUnscopedHelperName("__values"), - /*typeArguments*/ undefined, [expression]), location); - } - ts.createValuesHelper = createValuesHelper; - ts.readHelper = { - name: "typescript:read", - importName: "__read", - scoped: false, - text: "\n var __read = (this && this.__read) || function (o, n) {\n var m = typeof Symbol === \"function\" && o[Symbol.iterator];\n if (!m) return o;\n var i = m.call(o), r, ar = [], e;\n try {\n while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);\n }\n catch (error) { e = { error: error }; }\n finally {\n try {\n if (r && !r.done && (m = i[\"return\"])) m.call(i);\n }\n finally { if (e) throw e.error; }\n }\n return ar;\n };" - }; - function createReadHelper(context, iteratorRecord, count, location) { - context.requestEmitHelper(ts.readHelper); - return ts.setTextRange(ts.createCall(getUnscopedHelperName("__read"), - /*typeArguments*/ undefined, count !== undefined - ? [iteratorRecord, ts.createLiteral(count)] - : [iteratorRecord]), location); - } - ts.createReadHelper = createReadHelper; - ts.spreadHelper = { - name: "typescript:spread", - importName: "__spread", - scoped: false, - dependencies: [ts.readHelper], - text: "\n var __spread = (this && this.__spread) || function () {\n for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));\n return ar;\n };" - }; - function createSpreadHelper(context, argumentList, location) { - context.requestEmitHelper(ts.spreadHelper); - return ts.setTextRange(ts.createCall(getUnscopedHelperName("__spread"), - /*typeArguments*/ undefined, argumentList), location); - } - ts.createSpreadHelper = createSpreadHelper; - ts.spreadArraysHelper = { - name: "typescript:spreadArrays", - importName: "__spreadArrays", - scoped: false, - text: "\n var __spreadArrays = (this && this.__spreadArrays) || function () {\n for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;\n for (var r = Array(s), k = 0, i = 0; i < il; i++)\n for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)\n r[k] = a[j];\n return r;\n };" - }; - function createSpreadArraysHelper(context, argumentList, location) { - context.requestEmitHelper(ts.spreadArraysHelper); - return ts.setTextRange(ts.createCall(getUnscopedHelperName("__spreadArrays"), - /*typeArguments*/ undefined, argumentList), location); - } - ts.createSpreadArraysHelper = createSpreadArraysHelper; - // Utilities - function createForOfBindingStatement(node, boundValue) { - if (ts.isVariableDeclarationList(node)) { - var firstDeclaration = ts.first(node.declarations); - var updatedDeclaration = ts.updateVariableDeclaration(firstDeclaration, firstDeclaration.name, - /*typeNode*/ undefined, boundValue); - return ts.setTextRange(ts.createVariableStatement( - /*modifiers*/ undefined, ts.updateVariableDeclarationList(node, [updatedDeclaration])), - /*location*/ node); - } - else { - var updatedExpression = ts.setTextRange(ts.createAssignment(node, boundValue), /*location*/ node); - return ts.setTextRange(ts.createStatement(updatedExpression), /*location*/ node); - } - } - ts.createForOfBindingStatement = createForOfBindingStatement; - function insertLeadingStatement(dest, source) { - if (ts.isBlock(dest)) { - return ts.updateBlock(dest, ts.setTextRange(ts.createNodeArray(__spreadArrays([source], dest.statements)), dest.statements)); - } - else { - return ts.createBlock(ts.createNodeArray([dest, source]), /*multiLine*/ true); - } - } - ts.insertLeadingStatement = insertLeadingStatement; - function restoreEnclosingLabel(node, outermostLabeledStatement, afterRestoreLabelCallback) { - if (!outermostLabeledStatement) { - return node; - } - var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 238 /* LabeledStatement */ - ? restoreEnclosingLabel(node, outermostLabeledStatement.statement) - : node); - if (afterRestoreLabelCallback) { - afterRestoreLabelCallback(outermostLabeledStatement); - } - return updated; - } - ts.restoreEnclosingLabel = restoreEnclosingLabel; - function shouldBeCapturedInTempVariable(node, cacheIdentifiers) { - var target = ts.skipParentheses(node); - switch (target.kind) { - case 75 /* Identifier */: - return cacheIdentifiers; - case 104 /* ThisKeyword */: - case 8 /* NumericLiteral */: - case 9 /* BigIntLiteral */: - case 10 /* StringLiteral */: - return false; - case 192 /* ArrayLiteralExpression */: - var elements = target.elements; - if (elements.length === 0) { - return false; - } - return true; - case 193 /* ObjectLiteralExpression */: - return target.properties.length > 0; - default: - return true; - } - } - function createCallBinding(expression, recordTempVariable, languageVersion, cacheIdentifiers) { - if (cacheIdentifiers === void 0) { cacheIdentifiers = false; } - var callee = skipOuterExpressions(expression, 15 /* All */); - var thisArg; - var target; - if (ts.isSuperProperty(callee)) { - thisArg = ts.createThis(); - target = callee; - } - else if (callee.kind === 102 /* SuperKeyword */) { - thisArg = ts.createThis(); - target = languageVersion < 2 /* ES2015 */ - ? ts.setTextRange(ts.createIdentifier("_super"), callee) - : callee; - } - else if (ts.getEmitFlags(callee) & 4096 /* HelperName */) { - thisArg = ts.createVoidZero(); - target = parenthesizeForAccess(callee); - } - else { - switch (callee.kind) { - case 194 /* PropertyAccessExpression */: { - if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) { - // for `a.b()` target is `(_a = a).b` and thisArg is `_a` - thisArg = ts.createTempVariable(recordTempVariable); - target = ts.createPropertyAccess(ts.setTextRange(ts.createAssignment(thisArg, callee.expression), callee.expression), callee.name); - ts.setTextRange(target, callee); - } - else { - thisArg = callee.expression; - target = callee; - } - break; - } - case 195 /* ElementAccessExpression */: { - if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) { - // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a` - thisArg = ts.createTempVariable(recordTempVariable); - target = ts.createElementAccess(ts.setTextRange(ts.createAssignment(thisArg, callee.expression), callee.expression), callee.argumentExpression); - ts.setTextRange(target, callee); - } - else { - thisArg = callee.expression; - target = callee; - } - break; - } - default: { - // for `a()` target is `a` and thisArg is `void 0` - thisArg = ts.createVoidZero(); - target = parenthesizeForAccess(expression); - break; - } - } - } - return { target: target, thisArg: thisArg }; - } - ts.createCallBinding = createCallBinding; - function inlineExpressions(expressions) { - // Avoid deeply nested comma expressions as traversing them during emit can result in "Maximum call - // stack size exceeded" errors. - return expressions.length > 10 - ? ts.createCommaList(expressions) - : ts.reduceLeft(expressions, ts.createComma); - } - ts.inlineExpressions = inlineExpressions; - function createExpressionFromEntityName(node) { - if (ts.isQualifiedName(node)) { - var left = createExpressionFromEntityName(node.left); - var right = ts.getMutableClone(node.right); - return ts.setTextRange(ts.createPropertyAccess(left, right), node); - } - else { - return ts.getMutableClone(node); - } - } - ts.createExpressionFromEntityName = createExpressionFromEntityName; - function createExpressionForPropertyName(memberName) { - if (ts.isIdentifier(memberName)) { - return ts.createLiteral(memberName); - } - else if (ts.isComputedPropertyName(memberName)) { - return ts.getMutableClone(memberName.expression); - } - else { - return ts.getMutableClone(memberName); - } - } - ts.createExpressionForPropertyName = createExpressionForPropertyName; - function createExpressionForObjectLiteralElementLike(node, property, receiver) { - if (property.name && ts.isPrivateIdentifier(property.name)) { - ts.Debug.failBadSyntaxKind(property.name, "Private identifiers are not allowed in object literals."); - } - switch (property.kind) { - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - return createExpressionForAccessorDeclaration(node.properties, property, receiver, !!node.multiLine); - case 281 /* PropertyAssignment */: - return createExpressionForPropertyAssignment(property, receiver); - case 282 /* ShorthandPropertyAssignment */: - return createExpressionForShorthandPropertyAssignment(property, receiver); - case 161 /* MethodDeclaration */: - return createExpressionForMethodDeclaration(property, receiver); - } - } - ts.createExpressionForObjectLiteralElementLike = createExpressionForObjectLiteralElementLike; - function createExpressionForAccessorDeclaration(properties, property, receiver, multiLine) { - var _a = ts.getAllAccessorDeclarations(properties, property), firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor; - if (property === firstAccessor) { - var properties_7 = []; - if (getAccessor) { - var getterFunction = ts.createFunctionExpression(getAccessor.modifiers, - /*asteriskToken*/ undefined, - /*name*/ undefined, - /*typeParameters*/ undefined, getAccessor.parameters, - /*type*/ undefined, getAccessor.body // TODO: GH#18217 - ); - ts.setTextRange(getterFunction, getAccessor); - ts.setOriginalNode(getterFunction, getAccessor); - var getter = ts.createPropertyAssignment("get", getterFunction); - properties_7.push(getter); - } - if (setAccessor) { - var setterFunction = ts.createFunctionExpression(setAccessor.modifiers, - /*asteriskToken*/ undefined, - /*name*/ undefined, - /*typeParameters*/ undefined, setAccessor.parameters, - /*type*/ undefined, setAccessor.body // TODO: GH#18217 - ); - ts.setTextRange(setterFunction, setAccessor); - ts.setOriginalNode(setterFunction, setAccessor); - var setter = ts.createPropertyAssignment("set", setterFunction); - properties_7.push(setter); - } - properties_7.push(ts.createPropertyAssignment("enumerable", getAccessor || setAccessor ? ts.createFalse() : ts.createTrue())); - properties_7.push(ts.createPropertyAssignment("configurable", ts.createTrue())); - var expression = ts.setTextRange(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), - /*typeArguments*/ undefined, [ - receiver, - createExpressionForPropertyName(property.name), - ts.createObjectLiteral(properties_7, multiLine) - ]), - /*location*/ firstAccessor); - return ts.aggregateTransformFlags(expression); - } - return undefined; - } - function createExpressionForPropertyAssignment(property, receiver) { - return ts.aggregateTransformFlags(ts.setOriginalNode(ts.setTextRange(ts.createAssignment(createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name), property.initializer), property), property)); - } - function createExpressionForShorthandPropertyAssignment(property, receiver) { - return ts.aggregateTransformFlags(ts.setOriginalNode(ts.setTextRange(ts.createAssignment(createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name), ts.getSynthesizedClone(property.name)), - /*location*/ property), - /*original*/ property)); - } - function createExpressionForMethodDeclaration(method, receiver) { - return ts.aggregateTransformFlags(ts.setOriginalNode(ts.setTextRange(ts.createAssignment(createMemberAccessForPropertyName(receiver, method.name, /*location*/ method.name), ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression(method.modifiers, method.asteriskToken, - /*name*/ undefined, - /*typeParameters*/ undefined, method.parameters, - /*type*/ undefined, method.body // TODO: GH#18217 - ), - /*location*/ method), - /*original*/ method)), - /*location*/ method), - /*original*/ method)); - } - /** - * Gets the internal name of a declaration. This is primarily used for declarations that can be - * referred to by name in the body of an ES5 class function body. An internal name will *never* - * be prefixed with an module or namespace export modifier like "exports." when emitted as an - * expression. An internal name will also *never* be renamed due to a collision with a block - * scoped variable. - * - * @param node The declaration. - * @param allowComments A value indicating whether comments may be emitted for the name. - * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. - */ - function getInternalName(node, allowComments, allowSourceMaps) { - return getName(node, allowComments, allowSourceMaps, 16384 /* LocalName */ | 32768 /* InternalName */); - } - ts.getInternalName = getInternalName; - /** - * Gets whether an identifier should only be referred to by its internal name. - */ - function isInternalName(node) { - return (ts.getEmitFlags(node) & 32768 /* InternalName */) !== 0; - } - ts.isInternalName = isInternalName; - /** - * Gets the local name of a declaration. This is primarily used for declarations that can be - * referred to by name in the declaration's immediate scope (classes, enums, namespaces). A - * local name will *never* be prefixed with an module or namespace export modifier like - * "exports." when emitted as an expression. - * - * @param node The declaration. - * @param allowComments A value indicating whether comments may be emitted for the name. - * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. - */ - function getLocalName(node, allowComments, allowSourceMaps) { - return getName(node, allowComments, allowSourceMaps, 16384 /* LocalName */); - } - ts.getLocalName = getLocalName; - /** - * Gets whether an identifier should only be referred to by its local name. - */ - function isLocalName(node) { - return (ts.getEmitFlags(node) & 16384 /* LocalName */) !== 0; - } - ts.isLocalName = isLocalName; - /** - * Gets the export name of a declaration. This is primarily used for declarations that can be - * referred to by name in the declaration's immediate scope (classes, enums, namespaces). An - * export name will *always* be prefixed with an module or namespace export modifier like - * `"exports."` when emitted as an expression if the name points to an exported symbol. - * - * @param node The declaration. - * @param allowComments A value indicating whether comments may be emitted for the name. - * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. - */ - function getExportName(node, allowComments, allowSourceMaps) { - return getName(node, allowComments, allowSourceMaps, 8192 /* ExportName */); - } - ts.getExportName = getExportName; - /** - * Gets whether an identifier should only be referred to by its export representation if the - * name points to an exported symbol. - */ - function isExportName(node) { - return (ts.getEmitFlags(node) & 8192 /* ExportName */) !== 0; - } - ts.isExportName = isExportName; - /** - * Gets the name of a declaration for use in declarations. - * - * @param node The declaration. - * @param allowComments A value indicating whether comments may be emitted for the name. - * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. - */ - function getDeclarationName(node, allowComments, allowSourceMaps) { - return getName(node, allowComments, allowSourceMaps); - } - ts.getDeclarationName = getDeclarationName; - function getName(node, allowComments, allowSourceMaps, emitFlags) { - if (emitFlags === void 0) { emitFlags = 0; } - var nodeName = ts.getNameOfDeclaration(node); - if (nodeName && ts.isIdentifier(nodeName) && !ts.isGeneratedIdentifier(nodeName)) { - var name = ts.getMutableClone(nodeName); - emitFlags |= ts.getEmitFlags(nodeName); - if (!allowSourceMaps) - emitFlags |= 48 /* NoSourceMap */; - if (!allowComments) - emitFlags |= 1536 /* NoComments */; - if (emitFlags) - ts.setEmitFlags(name, emitFlags); - return name; - } - return ts.getGeneratedNameForNode(node); - } - /** - * Gets the exported name of a declaration for use in expressions. - * - * An exported name will *always* be prefixed with an module or namespace export modifier like - * "exports." if the name points to an exported symbol. - * - * @param ns The namespace identifier. - * @param node The declaration. - * @param allowComments A value indicating whether comments may be emitted for the name. - * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. - */ - function getExternalModuleOrNamespaceExportName(ns, node, allowComments, allowSourceMaps) { - if (ns && ts.hasModifier(node, 1 /* Export */)) { - return getNamespaceMemberName(ns, getName(node), allowComments, allowSourceMaps); - } - return getExportName(node, allowComments, allowSourceMaps); - } - ts.getExternalModuleOrNamespaceExportName = getExternalModuleOrNamespaceExportName; - /** - * Gets a namespace-qualified name for use in expressions. - * - * @param ns The namespace identifier. - * @param name The name. - * @param allowComments A value indicating whether comments may be emitted for the name. - * @param allowSourceMaps A value indicating whether source maps may be emitted for the name. - */ - function getNamespaceMemberName(ns, name, allowComments, allowSourceMaps) { - var qualifiedName = ts.createPropertyAccess(ns, ts.nodeIsSynthesized(name) ? name : ts.getSynthesizedClone(name)); - ts.setTextRange(qualifiedName, name); - var emitFlags = 0; - if (!allowSourceMaps) - emitFlags |= 48 /* NoSourceMap */; - if (!allowComments) - emitFlags |= 1536 /* NoComments */; - if (emitFlags) - ts.setEmitFlags(qualifiedName, emitFlags); - return qualifiedName; - } - ts.getNamespaceMemberName = getNamespaceMemberName; - function convertToFunctionBody(node, multiLine) { - return ts.isBlock(node) ? node : ts.setTextRange(ts.createBlock([ts.setTextRange(ts.createReturn(node), node)], multiLine), node); - } - ts.convertToFunctionBody = convertToFunctionBody; - function convertFunctionDeclarationToExpression(node) { - if (!node.body) - return ts.Debug.fail(); - var updated = ts.createFunctionExpression(node.modifiers, node.asteriskToken, node.name, node.typeParameters, node.parameters, node.type, node.body); - ts.setOriginalNode(updated, node); - ts.setTextRange(updated, node); - if (ts.getStartsOnNewLine(node)) { - ts.setStartsOnNewLine(updated, /*newLine*/ true); - } - ts.aggregateTransformFlags(updated); - return updated; - } - ts.convertFunctionDeclarationToExpression = convertFunctionDeclarationToExpression; - function isUseStrictPrologue(node) { - return ts.isStringLiteral(node.expression) && node.expression.text === "use strict"; - } - /** - * Add any necessary prologue-directives into target statement-array. - * The function needs to be called during each transformation step. - * This function needs to be called whenever we transform the statement - * list of a source file, namespace, or function-like body. - * - * @param target: result statements array - * @param source: origin statements array - * @param ensureUseStrict: boolean determining whether the function need to add prologue-directives - * @param visitor: Optional callback used to visit any custom prologue directives. - */ - function addPrologue(target, source, ensureUseStrict, visitor) { - var offset = addStandardPrologue(target, source, ensureUseStrict); - return addCustomPrologue(target, source, offset, visitor); - } - ts.addPrologue = addPrologue; - /** - * Add just the standard (string-expression) prologue-directives into target statement-array. - * The function needs to be called during each transformation step. - * This function needs to be called whenever we transform the statement - * list of a source file, namespace, or function-like body. - */ - function addStandardPrologue(target, source, ensureUseStrict) { - ts.Debug.assert(target.length === 0, "Prologue directives should be at the first statement in the target statements array"); - var foundUseStrict = false; - var statementOffset = 0; - var numStatements = source.length; - while (statementOffset < numStatements) { - var statement = source[statementOffset]; - if (ts.isPrologueDirective(statement)) { - if (isUseStrictPrologue(statement)) { - foundUseStrict = true; - } - target.push(statement); - } - else { - break; - } - statementOffset++; - } - if (ensureUseStrict && !foundUseStrict) { - target.push(startOnNewLine(ts.createStatement(ts.createLiteral("use strict")))); - } - return statementOffset; - } - ts.addStandardPrologue = addStandardPrologue; - function addCustomPrologue(target, source, statementOffset, visitor, filter) { - if (filter === void 0) { filter = ts.returnTrue; } - var numStatements = source.length; - while (statementOffset !== undefined && statementOffset < numStatements) { - var statement = source[statementOffset]; - if (ts.getEmitFlags(statement) & 1048576 /* CustomPrologue */ && filter(statement)) { - ts.append(target, visitor ? ts.visitNode(statement, visitor, ts.isStatement) : statement); - } - else { - break; - } - statementOffset++; - } - return statementOffset; - } - ts.addCustomPrologue = addCustomPrologue; - function findUseStrictPrologue(statements) { - for (var _i = 0, statements_4 = statements; _i < statements_4.length; _i++) { - var statement = statements_4[_i]; - if (ts.isPrologueDirective(statement)) { - if (isUseStrictPrologue(statement)) { - return statement; - } - } - else { - break; - } - } - return undefined; - } - ts.findUseStrictPrologue = findUseStrictPrologue; - function startsWithUseStrict(statements) { - var firstStatement = ts.firstOrUndefined(statements); - return firstStatement !== undefined - && ts.isPrologueDirective(firstStatement) - && isUseStrictPrologue(firstStatement); - } - ts.startsWithUseStrict = startsWithUseStrict; - /** - * Ensures "use strict" directive is added - * - * @param statements An array of statements - */ - function ensureUseStrict(statements) { - var foundUseStrict = findUseStrictPrologue(statements); - if (!foundUseStrict) { - return ts.setTextRange(ts.createNodeArray(__spreadArrays([ - startOnNewLine(ts.createStatement(ts.createLiteral("use strict"))) - ], statements)), statements); - } - return statements; - } - ts.ensureUseStrict = ensureUseStrict; - /** - * Wraps the operand to a BinaryExpression in parentheses if they are needed to preserve the intended - * order of operations. - * - * @param binaryOperator The operator for the BinaryExpression. - * @param operand The operand for the BinaryExpression. - * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the - * BinaryExpression. - */ - function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) { - var skipped = ts.skipPartiallyEmittedExpressions(operand); - // If the resulting expression is already parenthesized, we do not need to do any further processing. - if (skipped.kind === 200 /* ParenthesizedExpression */) { - return operand; - } - return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand) - ? ts.createParen(operand) - : operand; - } - ts.parenthesizeBinaryOperand = parenthesizeBinaryOperand; - /** - * Determines whether the operand to a BinaryExpression needs to be parenthesized. - * - * @param binaryOperator The operator for the BinaryExpression. - * @param operand The operand for the BinaryExpression. - * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the - * BinaryExpression. - */ - function binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand) { - // If the operand has lower precedence, then it needs to be parenthesized to preserve the - // intent of the expression. For example, if the operand is `a + b` and the operator is - // `*`, then we need to parenthesize the operand to preserve the intended order of - // operations: `(a + b) * x`. - // - // If the operand has higher precedence, then it does not need to be parenthesized. For - // example, if the operand is `a * b` and the operator is `+`, then we do not need to - // parenthesize to preserve the intended order of operations: `a * b + x`. - // - // If the operand has the same precedence, then we need to check the associativity of - // the operator based on whether this is the left or right operand of the expression. - // - // For example, if `a / d` is on the right of operator `*`, we need to parenthesize - // to preserve the intended order of operations: `x * (a / d)` - // - // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve - // the intended order of operations: `(a ** b) ** c` - var binaryOperatorPrecedence = ts.getOperatorPrecedence(209 /* BinaryExpression */, binaryOperator); - var binaryOperatorAssociativity = ts.getOperatorAssociativity(209 /* BinaryExpression */, binaryOperator); - var emittedOperand = ts.skipPartiallyEmittedExpressions(operand); - if (!isLeftSideOfBinary && operand.kind === 202 /* ArrowFunction */ && binaryOperatorPrecedence > 3) { - // We need to parenthesize arrow functions on the right side to avoid it being - // parsed as parenthesized expression: `a && (() => {})` - return true; - } - var operandPrecedence = ts.getExpressionPrecedence(emittedOperand); - switch (ts.compareValues(operandPrecedence, binaryOperatorPrecedence)) { - case -1 /* LessThan */: - // If the operand is the right side of a right-associative binary operation - // and is a yield expression, then we do not need parentheses. - if (!isLeftSideOfBinary - && binaryOperatorAssociativity === 1 /* Right */ - && operand.kind === 212 /* YieldExpression */) { - return false; - } - return true; - case 1 /* GreaterThan */: - return false; - case 0 /* EqualTo */: - if (isLeftSideOfBinary) { - // No need to parenthesize the left operand when the binary operator is - // left associative: - // (a*b)/x -> a*b/x - // (a**b)/x -> a**b/x - // - // Parentheses are needed for the left operand when the binary operator is - // right associative: - // (a/b)**x -> (a/b)**x - // (a**b)**x -> (a**b)**x - return binaryOperatorAssociativity === 1 /* Right */; - } - else { - if (ts.isBinaryExpression(emittedOperand) - && emittedOperand.operatorToken.kind === binaryOperator) { - // No need to parenthesize the right operand when the binary operator and - // operand are the same and one of the following: - // x*(a*b) => x*a*b - // x|(a|b) => x|a|b - // x&(a&b) => x&a&b - // x^(a^b) => x^a^b - if (operatorHasAssociativeProperty(binaryOperator)) { - return false; - } - // No need to parenthesize the right operand when the binary operator - // is plus (+) if both the left and right operands consist solely of either - // literals of the same kind or binary plus (+) expressions for literals of - // the same kind (recursively). - // "a"+(1+2) => "a"+(1+2) - // "a"+("b"+"c") => "a"+"b"+"c" - if (binaryOperator === 39 /* PlusToken */) { - var leftKind = leftOperand ? getLiteralKindOfBinaryPlusOperand(leftOperand) : 0 /* Unknown */; - if (ts.isLiteralKind(leftKind) && leftKind === getLiteralKindOfBinaryPlusOperand(emittedOperand)) { - return false; - } - } - } - // No need to parenthesize the right operand when the operand is right - // associative: - // x/(a**b) -> x/a**b - // x**(a**b) -> x**a**b - // - // Parentheses are needed for the right operand when the operand is left - // associative: - // x/(a*b) -> x/(a*b) - // x**(a/b) -> x**(a/b) - var operandAssociativity = ts.getExpressionAssociativity(emittedOperand); - return operandAssociativity === 0 /* Left */; - } - } - } - /** - * Determines whether a binary operator is mathematically associative. - * - * @param binaryOperator The binary operator. - */ - function operatorHasAssociativeProperty(binaryOperator) { - // The following operators are associative in JavaScript: - // (a*b)*c -> a*(b*c) -> a*b*c - // (a|b)|c -> a|(b|c) -> a|b|c - // (a&b)&c -> a&(b&c) -> a&b&c - // (a^b)^c -> a^(b^c) -> a^b^c - // - // While addition is associative in mathematics, JavaScript's `+` is not - // guaranteed to be associative as it is overloaded with string concatenation. - return binaryOperator === 41 /* AsteriskToken */ - || binaryOperator === 51 /* BarToken */ - || binaryOperator === 50 /* AmpersandToken */ - || binaryOperator === 52 /* CaretToken */; - } - /** - * This function determines whether an expression consists of a homogeneous set of - * literal expressions or binary plus expressions that all share the same literal kind. - * It is used to determine whether the right-hand operand of a binary plus expression can be - * emitted without parentheses. - */ - function getLiteralKindOfBinaryPlusOperand(node) { - node = ts.skipPartiallyEmittedExpressions(node); - if (ts.isLiteralKind(node.kind)) { - return node.kind; - } - if (node.kind === 209 /* BinaryExpression */ && node.operatorToken.kind === 39 /* PlusToken */) { - if (node.cachedLiteralKind !== undefined) { - return node.cachedLiteralKind; - } - var leftKind = getLiteralKindOfBinaryPlusOperand(node.left); - var literalKind = ts.isLiteralKind(leftKind) && leftKind === getLiteralKindOfBinaryPlusOperand(node.right) ? leftKind : - 0 /* Unknown */; - node.cachedLiteralKind = literalKind; - return literalKind; - } - return 0 /* Unknown */; - } - function parenthesizeForConditionalHead(condition) { - var conditionalPrecedence = ts.getOperatorPrecedence(210 /* ConditionalExpression */, 57 /* QuestionToken */); - var emittedCondition = ts.skipPartiallyEmittedExpressions(condition); - var conditionPrecedence = ts.getExpressionPrecedence(emittedCondition); - if (ts.compareValues(conditionPrecedence, conditionalPrecedence) !== 1 /* GreaterThan */) { - return ts.createParen(condition); - } - return condition; - } - ts.parenthesizeForConditionalHead = parenthesizeForConditionalHead; - function parenthesizeSubexpressionOfConditionalExpression(e) { - // per ES grammar both 'whenTrue' and 'whenFalse' parts of conditional expression are assignment expressions - // so in case when comma expression is introduced as a part of previous transformations - // if should be wrapped in parens since comma operator has the lowest precedence - var emittedExpression = ts.skipPartiallyEmittedExpressions(e); - return isCommaSequence(emittedExpression) - ? ts.createParen(e) - : e; - } - ts.parenthesizeSubexpressionOfConditionalExpression = parenthesizeSubexpressionOfConditionalExpression; - /** - * [Per the spec](https://tc39.github.io/ecma262/#prod-ExportDeclaration), `export default` accepts _AssigmentExpression_ but - * has a lookahead restriction for `function`, `async function`, and `class`. - * - * Basically, that means we need to parenthesize in the following cases: - * - * - BinaryExpression of CommaToken - * - CommaList (synthetic list of multiple comma expressions) - * - FunctionExpression - * - ClassExpression - */ - function parenthesizeDefaultExpression(e) { - var check = ts.skipPartiallyEmittedExpressions(e); - var needsParens = isCommaSequence(check); - if (!needsParens) { - switch (getLeftmostExpression(check, /*stopAtCallExpression*/ false).kind) { - case 214 /* ClassExpression */: - case 201 /* FunctionExpression */: - needsParens = true; - } - } - return needsParens ? ts.createParen(e) : e; - } - ts.parenthesizeDefaultExpression = parenthesizeDefaultExpression; - /** - * Wraps an expression in parentheses if it is needed in order to use the expression - * as the expression of a NewExpression node. - * - * @param expression The Expression node. - */ - function parenthesizeForNew(expression) { - var leftmostExpr = getLeftmostExpression(expression, /*stopAtCallExpressions*/ true); - switch (leftmostExpr.kind) { - case 196 /* CallExpression */: - return ts.createParen(expression); - case 197 /* NewExpression */: - return !leftmostExpr.arguments - ? ts.createParen(expression) - : expression; - } - return parenthesizeForAccess(expression); - } - ts.parenthesizeForNew = parenthesizeForNew; - /** - * Wraps an expression in parentheses if it is needed in order to use the expression for - * property or element access. - * - * @param expr The expression node. - */ - function parenthesizeForAccess(expression) { - // isLeftHandSideExpression is almost the correct criterion for when it is not necessary - // to parenthesize the expression before a dot. The known exception is: - // - // NewExpression: - // new C.x -> not the same as (new C).x - // - var emittedExpression = ts.skipPartiallyEmittedExpressions(expression); - if (ts.isLeftHandSideExpression(emittedExpression) - && (emittedExpression.kind !== 197 /* NewExpression */ || emittedExpression.arguments)) { - return expression; - } - return ts.setTextRange(ts.createParen(expression), expression); - } - ts.parenthesizeForAccess = parenthesizeForAccess; - function parenthesizePostfixOperand(operand) { - return ts.isLeftHandSideExpression(operand) - ? operand - : ts.setTextRange(ts.createParen(operand), operand); - } - ts.parenthesizePostfixOperand = parenthesizePostfixOperand; - function parenthesizePrefixOperand(operand) { - return ts.isUnaryExpression(operand) - ? operand - : ts.setTextRange(ts.createParen(operand), operand); - } - ts.parenthesizePrefixOperand = parenthesizePrefixOperand; - function parenthesizeListElements(elements) { - var result; - for (var i = 0; i < elements.length; i++) { - var element = parenthesizeExpressionForList(elements[i]); - if (result !== undefined || element !== elements[i]) { - if (result === undefined) { - result = elements.slice(0, i); - } - result.push(element); - } - } - if (result !== undefined) { - return ts.setTextRange(ts.createNodeArray(result, elements.hasTrailingComma), elements); - } - return elements; - } - ts.parenthesizeListElements = parenthesizeListElements; - function parenthesizeExpressionForList(expression) { - var emittedExpression = ts.skipPartiallyEmittedExpressions(expression); - var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression); - var commaPrecedence = ts.getOperatorPrecedence(209 /* BinaryExpression */, 27 /* CommaToken */); - return expressionPrecedence > commaPrecedence - ? expression - : ts.setTextRange(ts.createParen(expression), expression); - } - ts.parenthesizeExpressionForList = parenthesizeExpressionForList; - function parenthesizeExpressionForExpressionStatement(expression) { - var emittedExpression = ts.skipPartiallyEmittedExpressions(expression); - if (ts.isCallExpression(emittedExpression)) { - var callee = emittedExpression.expression; - var kind = ts.skipPartiallyEmittedExpressions(callee).kind; - if (kind === 201 /* FunctionExpression */ || kind === 202 /* ArrowFunction */) { - var mutableCall = ts.getMutableClone(emittedExpression); - mutableCall.expression = ts.setTextRange(ts.createParen(callee), callee); - return recreateOuterExpressions(expression, mutableCall, 8 /* PartiallyEmittedExpressions */); - } - } - var leftmostExpressionKind = getLeftmostExpression(emittedExpression, /*stopAtCallExpressions*/ false).kind; - if (leftmostExpressionKind === 193 /* ObjectLiteralExpression */ || leftmostExpressionKind === 201 /* FunctionExpression */) { - return ts.setTextRange(ts.createParen(expression), expression); - } - return expression; - } - ts.parenthesizeExpressionForExpressionStatement = parenthesizeExpressionForExpressionStatement; - function parenthesizeConditionalTypeMember(member) { - return member.kind === 180 /* ConditionalType */ ? ts.createParenthesizedType(member) : member; - } - ts.parenthesizeConditionalTypeMember = parenthesizeConditionalTypeMember; - function parenthesizeElementTypeMember(member) { - switch (member.kind) { - case 178 /* UnionType */: - case 179 /* IntersectionType */: - case 170 /* FunctionType */: - case 171 /* ConstructorType */: - return ts.createParenthesizedType(member); - } - return parenthesizeConditionalTypeMember(member); - } - ts.parenthesizeElementTypeMember = parenthesizeElementTypeMember; - function parenthesizeArrayTypeMember(member) { - switch (member.kind) { - case 172 /* TypeQuery */: - case 184 /* TypeOperator */: - case 181 /* InferType */: - return ts.createParenthesizedType(member); - } - return parenthesizeElementTypeMember(member); - } - ts.parenthesizeArrayTypeMember = parenthesizeArrayTypeMember; - function parenthesizeElementTypeMembers(members) { - return ts.createNodeArray(ts.sameMap(members, parenthesizeElementTypeMember)); - } - ts.parenthesizeElementTypeMembers = parenthesizeElementTypeMembers; - function parenthesizeTypeParameters(typeParameters) { - if (ts.some(typeParameters)) { - var params = []; - for (var i = 0; i < typeParameters.length; ++i) { - var entry = typeParameters[i]; - params.push(i === 0 && ts.isFunctionOrConstructorTypeNode(entry) && entry.typeParameters ? - ts.createParenthesizedType(entry) : - entry); - } - return ts.createNodeArray(params); - } - } - ts.parenthesizeTypeParameters = parenthesizeTypeParameters; - function getLeftmostExpression(node, stopAtCallExpressions) { - while (true) { - switch (node.kind) { - case 208 /* PostfixUnaryExpression */: - node = node.operand; - continue; - case 209 /* BinaryExpression */: - node = node.left; - continue; - case 210 /* ConditionalExpression */: - node = node.condition; - continue; - case 198 /* TaggedTemplateExpression */: - node = node.tag; - continue; - case 196 /* CallExpression */: - if (stopAtCallExpressions) { - return node; - } - // falls through - case 217 /* AsExpression */: - case 195 /* ElementAccessExpression */: - case 194 /* PropertyAccessExpression */: - case 218 /* NonNullExpression */: - case 326 /* PartiallyEmittedExpression */: - node = node.expression; - continue; - } - return node; - } - } - ts.getLeftmostExpression = getLeftmostExpression; - function parenthesizeConciseBody(body) { - if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 193 /* ObjectLiteralExpression */)) { - return ts.setTextRange(ts.createParen(body), body); - } - return body; - } - ts.parenthesizeConciseBody = parenthesizeConciseBody; - function isCommaSequence(node) { - return node.kind === 209 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ || - node.kind === 327 /* CommaListExpression */; - } - ts.isCommaSequence = isCommaSequence; - var OuterExpressionKinds; - (function (OuterExpressionKinds) { - OuterExpressionKinds[OuterExpressionKinds["Parentheses"] = 1] = "Parentheses"; - OuterExpressionKinds[OuterExpressionKinds["TypeAssertions"] = 2] = "TypeAssertions"; - OuterExpressionKinds[OuterExpressionKinds["NonNullAssertions"] = 4] = "NonNullAssertions"; - OuterExpressionKinds[OuterExpressionKinds["PartiallyEmittedExpressions"] = 8] = "PartiallyEmittedExpressions"; - OuterExpressionKinds[OuterExpressionKinds["Assertions"] = 6] = "Assertions"; - OuterExpressionKinds[OuterExpressionKinds["All"] = 15] = "All"; - })(OuterExpressionKinds = ts.OuterExpressionKinds || (ts.OuterExpressionKinds = {})); - function isOuterExpression(node, kinds) { - if (kinds === void 0) { kinds = 15 /* All */; } - switch (node.kind) { - case 200 /* ParenthesizedExpression */: - return (kinds & 1 /* Parentheses */) !== 0; - case 199 /* TypeAssertionExpression */: - case 217 /* AsExpression */: - return (kinds & 2 /* TypeAssertions */) !== 0; - case 218 /* NonNullExpression */: - return (kinds & 4 /* NonNullAssertions */) !== 0; - case 326 /* PartiallyEmittedExpression */: - return (kinds & 8 /* PartiallyEmittedExpressions */) !== 0; - } - return false; - } - ts.isOuterExpression = isOuterExpression; - function skipOuterExpressions(node, kinds) { - if (kinds === void 0) { kinds = 15 /* All */; } - while (isOuterExpression(node, kinds)) { - node = node.expression; - } - return node; - } - ts.skipOuterExpressions = skipOuterExpressions; - function skipAssertions(node) { - return skipOuterExpressions(node, 6 /* Assertions */); - } - ts.skipAssertions = skipAssertions; - function updateOuterExpression(outerExpression, expression) { - switch (outerExpression.kind) { - case 200 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression); - case 199 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression); - case 217 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type); - case 218 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression); - case 326 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression); - } - } - /** - * Determines whether a node is a parenthesized expression that can be ignored when recreating outer expressions. - * - * A parenthesized expression can be ignored when all of the following are true: - * - * - It's `pos` and `end` are not -1 - * - It does not have a custom source map range - * - It does not have a custom comment range - * - It does not have synthetic leading or trailing comments - * - * If an outermost parenthesized expression is ignored, but the containing expression requires a parentheses around - * the expression to maintain precedence, a new parenthesized expression should be created automatically when - * the containing expression is created/updated. - */ - function isIgnorableParen(node) { - return node.kind === 200 /* ParenthesizedExpression */ - && ts.nodeIsSynthesized(node) - && ts.nodeIsSynthesized(ts.getSourceMapRange(node)) - && ts.nodeIsSynthesized(ts.getCommentRange(node)) - && !ts.some(ts.getSyntheticLeadingComments(node)) - && !ts.some(ts.getSyntheticTrailingComments(node)); - } - function recreateOuterExpressions(outerExpression, innerExpression, kinds) { - if (kinds === void 0) { kinds = 15 /* All */; } - if (outerExpression && isOuterExpression(outerExpression, kinds) && !isIgnorableParen(outerExpression)) { - return updateOuterExpression(outerExpression, recreateOuterExpressions(outerExpression.expression, innerExpression)); - } - return innerExpression; - } - ts.recreateOuterExpressions = recreateOuterExpressions; - function startOnNewLine(node) { - return ts.setStartsOnNewLine(node, /*newLine*/ true); - } - ts.startOnNewLine = startOnNewLine; - function getExternalHelpersModuleName(node) { - var parseNode = ts.getOriginalNode(node, ts.isSourceFile); - var emitNode = parseNode && parseNode.emitNode; - return emitNode && emitNode.externalHelpersModuleName; - } - ts.getExternalHelpersModuleName = getExternalHelpersModuleName; - function hasRecordedExternalHelpers(sourceFile) { - var parseNode = ts.getOriginalNode(sourceFile, ts.isSourceFile); - var emitNode = parseNode && parseNode.emitNode; - return !!emitNode && (!!emitNode.externalHelpersModuleName || !!emitNode.externalHelpers); - } - ts.hasRecordedExternalHelpers = hasRecordedExternalHelpers; - function createExternalHelpersImportDeclarationIfNeeded(sourceFile, compilerOptions, hasExportStarsToExportValues, hasImportStar, hasImportDefault) { - if (compilerOptions.importHelpers && ts.isEffectiveExternalModule(sourceFile, compilerOptions)) { - var namedBindings = void 0; - var moduleKind = ts.getEmitModuleKind(compilerOptions); - if (moduleKind >= ts.ModuleKind.ES2015 && moduleKind <= ts.ModuleKind.ESNext) { - // use named imports - var helpers = ts.getEmitHelpers(sourceFile); - if (helpers) { - var helperNames = []; - for (var _i = 0, helpers_2 = helpers; _i < helpers_2.length; _i++) { - var helper = helpers_2[_i]; - if (!helper.scoped) { - var importName = helper.importName; - if (importName) { - ts.pushIfUnique(helperNames, importName); - } - } - } - if (ts.some(helperNames)) { - helperNames.sort(ts.compareStringsCaseSensitive); - // Alias the imports if the names are used somewhere in the file. - // NOTE: We don't need to care about global import collisions as this is a module. - namedBindings = ts.createNamedImports(ts.map(helperNames, function (name) { return ts.isFileLevelUniqueName(sourceFile, name) - ? ts.createImportSpecifier(/*propertyName*/ undefined, ts.createIdentifier(name)) - : ts.createImportSpecifier(ts.createIdentifier(name), getUnscopedHelperName(name)); })); - var parseNode = ts.getOriginalNode(sourceFile, ts.isSourceFile); - var emitNode = ts.getOrCreateEmitNode(parseNode); - emitNode.externalHelpers = true; - } - } - } - else { - // use a namespace import - var externalHelpersModuleName = getOrCreateExternalHelpersModuleNameIfNeeded(sourceFile, compilerOptions, hasExportStarsToExportValues, hasImportStar || hasImportDefault); - if (externalHelpersModuleName) { - namedBindings = ts.createNamespaceImport(externalHelpersModuleName); - } - } - if (namedBindings) { - var externalHelpersImportDeclaration = ts.createImportDeclaration( - /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createImportClause(/*name*/ undefined, namedBindings), ts.createLiteral(ts.externalHelpersModuleNameText)); - ts.addEmitFlags(externalHelpersImportDeclaration, 67108864 /* NeverApplyImportHelper */); - return externalHelpersImportDeclaration; - } - } - } - ts.createExternalHelpersImportDeclarationIfNeeded = createExternalHelpersImportDeclarationIfNeeded; - function getOrCreateExternalHelpersModuleNameIfNeeded(node, compilerOptions, hasExportStarsToExportValues, hasImportStarOrImportDefault) { - if (compilerOptions.importHelpers && ts.isEffectiveExternalModule(node, compilerOptions)) { - var externalHelpersModuleName = getExternalHelpersModuleName(node); - if (externalHelpersModuleName) { - return externalHelpersModuleName; - } - var moduleKind = ts.getEmitModuleKind(compilerOptions); - var create = (hasExportStarsToExportValues || (compilerOptions.esModuleInterop && hasImportStarOrImportDefault)) - && moduleKind !== ts.ModuleKind.System - && moduleKind < ts.ModuleKind.ES2015; - if (!create) { - var helpers = ts.getEmitHelpers(node); - if (helpers) { - for (var _i = 0, helpers_3 = helpers; _i < helpers_3.length; _i++) { - var helper = helpers_3[_i]; - if (!helper.scoped) { - create = true; - break; - } - } - } - } - if (create) { - var parseNode = ts.getOriginalNode(node, ts.isSourceFile); - var emitNode = ts.getOrCreateEmitNode(parseNode); - return emitNode.externalHelpersModuleName || (emitNode.externalHelpersModuleName = ts.createUniqueName(ts.externalHelpersModuleNameText)); - } - } - } - ts.getOrCreateExternalHelpersModuleNameIfNeeded = getOrCreateExternalHelpersModuleNameIfNeeded; - /** - * Get the name of that target module from an import or export declaration - */ - function getLocalNameForExternalImport(node, sourceFile) { - var namespaceDeclaration = ts.getNamespaceDeclarationNode(node); - if (namespaceDeclaration && !ts.isDefaultImport(node)) { - var name = namespaceDeclaration.name; - return ts.isGeneratedIdentifier(name) ? name : ts.createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, name) || ts.idText(name)); - } - if (node.kind === 254 /* ImportDeclaration */ && node.importClause) { - return ts.getGeneratedNameForNode(node); - } - if (node.kind === 260 /* ExportDeclaration */ && node.moduleSpecifier) { - return ts.getGeneratedNameForNode(node); - } - return undefined; - } - ts.getLocalNameForExternalImport = getLocalNameForExternalImport; - /** - * Get the name of a target module from an import/export declaration as should be written in the emitted output. - * The emitted output name can be different from the input if: - * 1. The module has a /// - * 2. --out or --outFile is used, making the name relative to the rootDir - * 3- The containing SourceFile has an entry in renamedDependencies for the import as requested by some module loaders (e.g. System). - * Otherwise, a new StringLiteral node representing the module name will be returned. - */ - function getExternalModuleNameLiteral(importNode, sourceFile, host, resolver, compilerOptions) { - var moduleName = ts.getExternalModuleName(importNode); // TODO: GH#18217 - if (moduleName.kind === 10 /* StringLiteral */) { - return tryGetModuleNameFromDeclaration(importNode, host, resolver, compilerOptions) - || tryRenameExternalModule(moduleName, sourceFile) - || ts.getSynthesizedClone(moduleName); - } - return undefined; - } - ts.getExternalModuleNameLiteral = getExternalModuleNameLiteral; - /** - * Some bundlers (SystemJS builder) sometimes want to rename dependencies. - * Here we check if alternative name was provided for a given moduleName and return it if possible. - */ - function tryRenameExternalModule(moduleName, sourceFile) { - var rename = sourceFile.renamedDependencies && sourceFile.renamedDependencies.get(moduleName.text); - return rename && ts.createLiteral(rename); - } - /** - * Get the name of a module as should be written in the emitted output. - * The emitted output name can be different from the input if: - * 1. The module has a /// - * 2. --out or --outFile is used, making the name relative to the rootDir - * Otherwise, a new StringLiteral node representing the module name will be returned. - */ - function tryGetModuleNameFromFile(file, host, options) { - if (!file) { - return undefined; - } - if (file.moduleName) { - return ts.createLiteral(file.moduleName); - } - if (!file.isDeclarationFile && (options.out || options.outFile)) { - return ts.createLiteral(ts.getExternalModuleNameFromPath(host, file.fileName)); - } - return undefined; - } - ts.tryGetModuleNameFromFile = tryGetModuleNameFromFile; - function tryGetModuleNameFromDeclaration(declaration, host, resolver, compilerOptions) { - return tryGetModuleNameFromFile(resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions); - } - /** - * Gets the initializer of an BindingOrAssignmentElement. - */ - function getInitializerOfBindingOrAssignmentElement(bindingElement) { - if (ts.isDeclarationBindingElement(bindingElement)) { - // `1` in `let { a = 1 } = ...` - // `1` in `let { a: b = 1 } = ...` - // `1` in `let { a: {b} = 1 } = ...` - // `1` in `let { a: [b] = 1 } = ...` - // `1` in `let [a = 1] = ...` - // `1` in `let [{a} = 1] = ...` - // `1` in `let [[a] = 1] = ...` - return bindingElement.initializer; - } - if (ts.isPropertyAssignment(bindingElement)) { - // `1` in `({ a: b = 1 } = ...)` - // `1` in `({ a: {b} = 1 } = ...)` - // `1` in `({ a: [b] = 1 } = ...)` - var initializer = bindingElement.initializer; - return ts.isAssignmentExpression(initializer, /*excludeCompoundAssignment*/ true) - ? initializer.right - : undefined; - } - if (ts.isShorthandPropertyAssignment(bindingElement)) { - // `1` in `({ a = 1 } = ...)` - return bindingElement.objectAssignmentInitializer; - } - if (ts.isAssignmentExpression(bindingElement, /*excludeCompoundAssignment*/ true)) { - // `1` in `[a = 1] = ...` - // `1` in `[{a} = 1] = ...` - // `1` in `[[a] = 1] = ...` - return bindingElement.right; - } - if (ts.isSpreadElement(bindingElement)) { - // Recovery consistent with existing emit. - return getInitializerOfBindingOrAssignmentElement(bindingElement.expression); - } - } - ts.getInitializerOfBindingOrAssignmentElement = getInitializerOfBindingOrAssignmentElement; - /** - * Gets the name of an BindingOrAssignmentElement. - */ - function getTargetOfBindingOrAssignmentElement(bindingElement) { - if (ts.isDeclarationBindingElement(bindingElement)) { - // `a` in `let { a } = ...` - // `a` in `let { a = 1 } = ...` - // `b` in `let { a: b } = ...` - // `b` in `let { a: b = 1 } = ...` - // `a` in `let { ...a } = ...` - // `{b}` in `let { a: {b} } = ...` - // `{b}` in `let { a: {b} = 1 } = ...` - // `[b]` in `let { a: [b] } = ...` - // `[b]` in `let { a: [b] = 1 } = ...` - // `a` in `let [a] = ...` - // `a` in `let [a = 1] = ...` - // `a` in `let [...a] = ...` - // `{a}` in `let [{a}] = ...` - // `{a}` in `let [{a} = 1] = ...` - // `[a]` in `let [[a]] = ...` - // `[a]` in `let [[a] = 1] = ...` - return bindingElement.name; - } - if (ts.isObjectLiteralElementLike(bindingElement)) { - switch (bindingElement.kind) { - case 281 /* PropertyAssignment */: - // `b` in `({ a: b } = ...)` - // `b` in `({ a: b = 1 } = ...)` - // `{b}` in `({ a: {b} } = ...)` - // `{b}` in `({ a: {b} = 1 } = ...)` - // `[b]` in `({ a: [b] } = ...)` - // `[b]` in `({ a: [b] = 1 } = ...)` - // `b.c` in `({ a: b.c } = ...)` - // `b.c` in `({ a: b.c = 1 } = ...)` - // `b[0]` in `({ a: b[0] } = ...)` - // `b[0]` in `({ a: b[0] = 1 } = ...)` - return getTargetOfBindingOrAssignmentElement(bindingElement.initializer); - case 282 /* ShorthandPropertyAssignment */: - // `a` in `({ a } = ...)` - // `a` in `({ a = 1 } = ...)` - return bindingElement.name; - case 283 /* SpreadAssignment */: - // `a` in `({ ...a } = ...)` - return getTargetOfBindingOrAssignmentElement(bindingElement.expression); - } - // no target - return undefined; - } - if (ts.isAssignmentExpression(bindingElement, /*excludeCompoundAssignment*/ true)) { - // `a` in `[a = 1] = ...` - // `{a}` in `[{a} = 1] = ...` - // `[a]` in `[[a] = 1] = ...` - // `a.b` in `[a.b = 1] = ...` - // `a[0]` in `[a[0] = 1] = ...` - return getTargetOfBindingOrAssignmentElement(bindingElement.left); - } - if (ts.isSpreadElement(bindingElement)) { - // `a` in `[...a] = ...` - return getTargetOfBindingOrAssignmentElement(bindingElement.expression); - } - // `a` in `[a] = ...` - // `{a}` in `[{a}] = ...` - // `[a]` in `[[a]] = ...` - // `a.b` in `[a.b] = ...` - // `a[0]` in `[a[0]] = ...` - return bindingElement; - } - ts.getTargetOfBindingOrAssignmentElement = getTargetOfBindingOrAssignmentElement; - /** - * Determines whether an BindingOrAssignmentElement is a rest element. - */ - function getRestIndicatorOfBindingOrAssignmentElement(bindingElement) { - switch (bindingElement.kind) { - case 156 /* Parameter */: - case 191 /* BindingElement */: - // `...` in `let [...a] = ...` - return bindingElement.dotDotDotToken; - case 213 /* SpreadElement */: - case 283 /* SpreadAssignment */: - // `...` in `[...a] = ...` - return bindingElement; - } - return undefined; - } - ts.getRestIndicatorOfBindingOrAssignmentElement = getRestIndicatorOfBindingOrAssignmentElement; - /** - * Gets the property name of a BindingOrAssignmentElement - */ - function getPropertyNameOfBindingOrAssignmentElement(bindingElement) { - var propertyName = tryGetPropertyNameOfBindingOrAssignmentElement(bindingElement); - ts.Debug.assert(!!propertyName || ts.isSpreadAssignment(bindingElement), "Invalid property name for binding element."); - return propertyName; - } - ts.getPropertyNameOfBindingOrAssignmentElement = getPropertyNameOfBindingOrAssignmentElement; - function tryGetPropertyNameOfBindingOrAssignmentElement(bindingElement) { - switch (bindingElement.kind) { - case 191 /* BindingElement */: - // `a` in `let { a: b } = ...` - // `[a]` in `let { [a]: b } = ...` - // `"a"` in `let { "a": b } = ...` - // `1` in `let { 1: b } = ...` - if (bindingElement.propertyName) { - var propertyName = bindingElement.propertyName; - if (ts.isPrivateIdentifier(propertyName)) { - return ts.Debug.failBadSyntaxKind(propertyName); - } - return ts.isComputedPropertyName(propertyName) && isStringOrNumericLiteral(propertyName.expression) - ? propertyName.expression - : propertyName; - } - break; - case 281 /* PropertyAssignment */: - // `a` in `({ a: b } = ...)` - // `[a]` in `({ [a]: b } = ...)` - // `"a"` in `({ "a": b } = ...)` - // `1` in `({ 1: b } = ...)` - if (bindingElement.name) { - var propertyName = bindingElement.name; - if (ts.isPrivateIdentifier(propertyName)) { - return ts.Debug.failBadSyntaxKind(propertyName); - } - return ts.isComputedPropertyName(propertyName) && isStringOrNumericLiteral(propertyName.expression) - ? propertyName.expression - : propertyName; - } - break; - case 283 /* SpreadAssignment */: - // `a` in `({ ...a } = ...)` - if (bindingElement.name && ts.isPrivateIdentifier(bindingElement.name)) { - return ts.Debug.failBadSyntaxKind(bindingElement.name); - } - return bindingElement.name; - } - var target = getTargetOfBindingOrAssignmentElement(bindingElement); - if (target && ts.isPropertyName(target)) { - return target; - } - } - ts.tryGetPropertyNameOfBindingOrAssignmentElement = tryGetPropertyNameOfBindingOrAssignmentElement; - function isStringOrNumericLiteral(node) { - var kind = node.kind; - return kind === 10 /* StringLiteral */ - || kind === 8 /* NumericLiteral */; - } - /** - * Gets the elements of a BindingOrAssignmentPattern - */ - function getElementsOfBindingOrAssignmentPattern(name) { - switch (name.kind) { - case 189 /* ObjectBindingPattern */: - case 190 /* ArrayBindingPattern */: - case 192 /* ArrayLiteralExpression */: - // `a` in `{a}` - // `a` in `[a]` - return name.elements; - case 193 /* ObjectLiteralExpression */: - // `a` in `{a}` - return name.properties; - } - } - ts.getElementsOfBindingOrAssignmentPattern = getElementsOfBindingOrAssignmentPattern; - function convertToArrayAssignmentElement(element) { - if (ts.isBindingElement(element)) { - if (element.dotDotDotToken) { - ts.Debug.assertNode(element.name, ts.isIdentifier); - return ts.setOriginalNode(ts.setTextRange(ts.createSpread(element.name), element), element); - } - var expression = convertToAssignmentElementTarget(element.name); - return element.initializer - ? ts.setOriginalNode(ts.setTextRange(ts.createAssignment(expression, element.initializer), element), element) - : expression; - } - ts.Debug.assertNode(element, ts.isExpression); - return element; - } - ts.convertToArrayAssignmentElement = convertToArrayAssignmentElement; - function convertToObjectAssignmentElement(element) { - if (ts.isBindingElement(element)) { - if (element.dotDotDotToken) { - ts.Debug.assertNode(element.name, ts.isIdentifier); - return ts.setOriginalNode(ts.setTextRange(ts.createSpreadAssignment(element.name), element), element); - } - if (element.propertyName) { - var expression = convertToAssignmentElementTarget(element.name); - return ts.setOriginalNode(ts.setTextRange(ts.createPropertyAssignment(element.propertyName, element.initializer ? ts.createAssignment(expression, element.initializer) : expression), element), element); - } - ts.Debug.assertNode(element.name, ts.isIdentifier); - return ts.setOriginalNode(ts.setTextRange(ts.createShorthandPropertyAssignment(element.name, element.initializer), element), element); - } - ts.Debug.assertNode(element, ts.isObjectLiteralElementLike); - return element; - } - ts.convertToObjectAssignmentElement = convertToObjectAssignmentElement; - function convertToAssignmentPattern(node) { - switch (node.kind) { - case 190 /* ArrayBindingPattern */: - case 192 /* ArrayLiteralExpression */: - return convertToArrayAssignmentPattern(node); - case 189 /* ObjectBindingPattern */: - case 193 /* ObjectLiteralExpression */: - return convertToObjectAssignmentPattern(node); - } - } - ts.convertToAssignmentPattern = convertToAssignmentPattern; - function convertToObjectAssignmentPattern(node) { - if (ts.isObjectBindingPattern(node)) { - return ts.setOriginalNode(ts.setTextRange(ts.createObjectLiteral(ts.map(node.elements, convertToObjectAssignmentElement)), node), node); - } - ts.Debug.assertNode(node, ts.isObjectLiteralExpression); - return node; - } - ts.convertToObjectAssignmentPattern = convertToObjectAssignmentPattern; - function convertToArrayAssignmentPattern(node) { - if (ts.isArrayBindingPattern(node)) { - return ts.setOriginalNode(ts.setTextRange(ts.createArrayLiteral(ts.map(node.elements, convertToArrayAssignmentElement)), node), node); - } - ts.Debug.assertNode(node, ts.isArrayLiteralExpression); - return node; - } - ts.convertToArrayAssignmentPattern = convertToArrayAssignmentPattern; - function convertToAssignmentElementTarget(node) { - if (ts.isBindingPattern(node)) { - return convertToAssignmentPattern(node); - } - ts.Debug.assertNode(node, ts.isExpression); - return node; - } - ts.convertToAssignmentElementTarget = convertToAssignmentElementTarget; -})(ts || (ts = {})); -var ts; (function (ts) { var isTypeNodeOrTypeParameterDeclaration = ts.or(ts.isTypeNode, ts.isTypeParameterDeclaration); function visitNode(node, visitor, test, lift) { if (node === undefined || visitor === undefined) { return node; } - ts.aggregateTransformFlags(node); var visited = visitor(node); if (visited === node) { return node; @@ -74810,7 +78330,6 @@ var ts; visitedNode = visited; } ts.Debug.assertNode(visitedNode, test); - ts.aggregateTransformFlags(visitedNode); return visitedNode; } ts.visitNode = visitNode; @@ -74836,53 +78355,63 @@ var ts; if (count === undefined || count > length - start) { count = length - start; } + var hasTrailingComma; + var pos = -1; + var end = -1; if (start > 0 || count < length) { // If we are not visiting all of the original nodes, we must always create a new array. // Since this is a fragment of a node array, we do not copy over the previous location // and will only copy over `hasTrailingComma` if we are including the last element. - updated = ts.createNodeArray([], /*hasTrailingComma*/ nodes.hasTrailingComma && start + count === length); + updated = []; + hasTrailingComma = nodes.hasTrailingComma && start + count === length; } // Visit each original node. for (var i = 0; i < count; i++) { var node = nodes[i + start]; - ts.aggregateTransformFlags(node); var visited = node !== undefined ? visitor(node) : undefined; if (updated !== undefined || visited === undefined || visited !== node) { if (updated === undefined) { // Ensure we have a copy of `nodes`, up to the current index. - updated = ts.createNodeArray(nodes.slice(0, i), nodes.hasTrailingComma); - ts.setTextRange(updated, nodes); + updated = nodes.slice(0, i); + hasTrailingComma = nodes.hasTrailingComma; + pos = nodes.pos; + end = nodes.end; } if (visited) { if (ts.isArray(visited)) { for (var _i = 0, visited_1 = visited; _i < visited_1.length; _i++) { var visitedNode = visited_1[_i]; - ts.Debug.assertNode(visitedNode, test); - ts.aggregateTransformFlags(visitedNode); + void ts.Debug.assertNode(visitedNode, test); updated.push(visitedNode); } } else { - ts.Debug.assertNode(visited, test); - ts.aggregateTransformFlags(visited); + void ts.Debug.assertNode(visited, test); updated.push(visited); } } } } - return updated || nodes; + if (updated) { + // TODO(rbuckton): Remove dependency on `ts.factory` in favor of a provided factory. + var updatedArray = ts.factory.createNodeArray(updated, hasTrailingComma); + ts.setTextRangePosEnd(updatedArray, pos, end); + return updatedArray; + } + return nodes; } ts.visitNodes = visitNodes; /** * Starts a new lexical environment and visits a statement list, ending the lexical environment * and merging hoisted declarations upon completion. */ - function visitLexicalEnvironment(statements, visitor, context, start, ensureUseStrict) { + function visitLexicalEnvironment(statements, visitor, context, start, ensureUseStrict, nodesVisitor) { + if (nodesVisitor === void 0) { nodesVisitor = visitNodes; } context.startLexicalEnvironment(); - statements = visitNodes(statements, visitor, ts.isStatement, start); + statements = nodesVisitor(statements, visitor, ts.isStatement, start); if (ensureUseStrict) - statements = ts.ensureUseStrict(statements); // eslint-disable-line @typescript-eslint/no-unnecessary-qualifier - return ts.mergeLexicalEnvironment(statements, context.endLexicalEnvironment()); + statements = context.factory.ensureUseStrict(statements); + return ts.factory.mergeLexicalEnvironment(statements, context.endLexicalEnvironment()); } ts.visitLexicalEnvironment = visitLexicalEnvironment; function visitParameterList(nodes, visitor, context, nodesVisitor) { @@ -74920,7 +78449,7 @@ var ts; } } if (result) { - return ts.setTextRange(ts.createNodeArray(result, parameters.hasTrailingComma), parameters); + return ts.setTextRange(context.factory.createNodeArray(result, parameters.hasTrailingComma), parameters); } return parameters; } @@ -74933,325 +78462,341 @@ var ts; parameter; } function addDefaultValueAssignmentForBindingPattern(parameter, context) { - context.addInitializationStatement(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(parameter.name, parameter.type, parameter.initializer ? - ts.createConditional(ts.createStrictEquality(ts.getGeneratedNameForNode(parameter), ts.createVoidZero()), parameter.initializer, ts.getGeneratedNameForNode(parameter)) : - ts.getGeneratedNameForNode(parameter)), + var factory = context.factory; + context.addInitializationStatement(factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList([ + factory.createVariableDeclaration(parameter.name, + /*exclamationToken*/ undefined, parameter.type, parameter.initializer ? + factory.createConditionalExpression(factory.createStrictEquality(factory.getGeneratedNameForNode(parameter), factory.createVoidZero()), + /*questionToken*/ undefined, parameter.initializer, + /*colonToken*/ undefined, factory.getGeneratedNameForNode(parameter)) : + factory.getGeneratedNameForNode(parameter)), ]))); - return ts.updateParameter(parameter, parameter.decorators, parameter.modifiers, parameter.dotDotDotToken, ts.getGeneratedNameForNode(parameter), parameter.questionToken, parameter.type, + return factory.updateParameterDeclaration(parameter, parameter.decorators, parameter.modifiers, parameter.dotDotDotToken, factory.getGeneratedNameForNode(parameter), parameter.questionToken, parameter.type, /*initializer*/ undefined); } function addDefaultValueAssignmentForInitializer(parameter, name, initializer, context) { - context.addInitializationStatement(ts.createIf(ts.createTypeCheck(ts.getSynthesizedClone(name), "undefined"), ts.setEmitFlags(ts.setTextRange(ts.createBlock([ - ts.createExpressionStatement(ts.setEmitFlags(ts.setTextRange(ts.createAssignment(ts.setEmitFlags(ts.getMutableClone(name), 48 /* NoSourceMap */), ts.setEmitFlags(initializer, 48 /* NoSourceMap */ | ts.getEmitFlags(initializer) | 1536 /* NoComments */)), parameter), 1536 /* NoComments */)) + var factory = context.factory; + context.addInitializationStatement(factory.createIfStatement(factory.createTypeCheck(factory.cloneNode(name), "undefined"), ts.setEmitFlags(ts.setTextRange(factory.createBlock([ + factory.createExpressionStatement(ts.setEmitFlags(ts.setTextRange(factory.createAssignment(ts.setEmitFlags(factory.cloneNode(name), 48 /* NoSourceMap */), ts.setEmitFlags(initializer, 48 /* NoSourceMap */ | ts.getEmitFlags(initializer) | 1536 /* NoComments */)), parameter), 1536 /* NoComments */)) ]), parameter), 1 /* SingleLine */ | 32 /* NoTrailingSourceMap */ | 384 /* NoTokenSourceMaps */ | 1536 /* NoComments */))); - return ts.updateParameter(parameter, parameter.decorators, parameter.modifiers, parameter.dotDotDotToken, parameter.name, parameter.questionToken, parameter.type, + return factory.updateParameterDeclaration(parameter, parameter.decorators, parameter.modifiers, parameter.dotDotDotToken, parameter.name, parameter.questionToken, parameter.type, /*initializer*/ undefined); } - function visitFunctionBody(node, visitor, context) { + function visitFunctionBody(node, visitor, context, nodeVisitor) { + if (nodeVisitor === void 0) { nodeVisitor = visitNode; } context.resumeLexicalEnvironment(); - var updated = visitNode(node, visitor, ts.isConciseBody); + var updated = nodeVisitor(node, visitor, ts.isConciseBody); var declarations = context.endLexicalEnvironment(); if (ts.some(declarations)) { - var block = ts.convertToFunctionBody(updated); - var statements = ts.mergeLexicalEnvironment(block.statements, declarations); - return ts.updateBlock(block, statements); + if (!updated) { + return context.factory.createBlock(declarations); + } + var block = context.factory.converters.convertToFunctionBlock(updated); + var statements = ts.factory.mergeLexicalEnvironment(block.statements, declarations); + return context.factory.updateBlock(block, statements); } return updated; } ts.visitFunctionBody = visitFunctionBody; - function visitEachChild(node, visitor, context, nodesVisitor, tokenVisitor) { + function visitEachChild(node, visitor, context, nodesVisitor, tokenVisitor, nodeVisitor) { if (nodesVisitor === void 0) { nodesVisitor = visitNodes; } + if (nodeVisitor === void 0) { nodeVisitor = visitNode; } if (node === undefined) { return undefined; } var kind = node.kind; // No need to visit nodes with no children. - if ((kind > 0 /* FirstToken */ && kind <= 152 /* LastToken */) || kind === 183 /* ThisType */) { + if ((kind > 0 /* FirstToken */ && kind <= 155 /* LastToken */) || kind === 186 /* ThisType */) { return node; } + var factory = context.factory; switch (kind) { // Names - case 75 /* Identifier */: - return ts.updateIdentifier(node, nodesVisitor(node.typeArguments, visitor, isTypeNodeOrTypeParameterDeclaration)); - case 153 /* QualifiedName */: - return ts.updateQualifiedName(node, visitNode(node.left, visitor, ts.isEntityName), visitNode(node.right, visitor, ts.isIdentifier)); - case 154 /* ComputedPropertyName */: - return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression)); + case 78 /* Identifier */: + return factory.updateIdentifier(node, nodesVisitor(node.typeArguments, visitor, isTypeNodeOrTypeParameterDeclaration)); + case 156 /* QualifiedName */: + return factory.updateQualifiedName(node, nodeVisitor(node.left, visitor, ts.isEntityName), nodeVisitor(node.right, visitor, ts.isIdentifier)); + case 157 /* ComputedPropertyName */: + return factory.updateComputedPropertyName(node, nodeVisitor(node.expression, visitor, ts.isExpression)); // Signature elements - case 155 /* TypeParameter */: - return ts.updateTypeParameterDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.constraint, visitor, ts.isTypeNode), visitNode(node.default, visitor, ts.isTypeNode)); - case 156 /* Parameter */: - return ts.updateParameter(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression)); - case 157 /* Decorator */: - return ts.updateDecorator(node, visitNode(node.expression, visitor, ts.isExpression)); + case 158 /* TypeParameter */: + return factory.updateTypeParameterDeclaration(node, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.constraint, visitor, ts.isTypeNode), nodeVisitor(node.default, visitor, ts.isTypeNode)); + case 159 /* Parameter */: + return factory.updateParameterDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.dotDotDotToken, tokenVisitor, ts.isToken), nodeVisitor(node.name, visitor, ts.isBindingName), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.initializer, visitor, ts.isExpression)); + case 160 /* Decorator */: + return factory.updateDecorator(node, nodeVisitor(node.expression, visitor, ts.isExpression)); // Type elements - case 158 /* PropertySignature */: - return ts.updatePropertySignature(node, nodesVisitor(node.modifiers, visitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression)); - case 159 /* PropertyDeclaration */: - return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), + case 161 /* PropertySignature */: + return factory.updatePropertySignature(node, nodesVisitor(node.modifiers, visitor, ts.isToken), nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 162 /* PropertyDeclaration */: + return factory.updatePropertyDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isPropertyName), // QuestionToken and ExclamationToken is uniqued in Property Declaration and the signature of 'updateProperty' is that too - visitNode(node.questionToken || node.exclamationToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression)); - case 160 /* MethodSignature */: - return ts.updateMethodSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken)); - case 161 /* MethodDeclaration */: - return ts.updateMethod(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context)); - case 162 /* Constructor */: - return ts.updateConstructor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context)); - case 163 /* GetAccessor */: - return ts.updateGetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context)); - case 164 /* SetAccessor */: - return ts.updateSetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context)); - case 165 /* CallSignature */: - return ts.updateCallSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode)); - case 166 /* ConstructSignature */: - return ts.updateConstructSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode)); - case 167 /* IndexSignature */: - return ts.updateIndexSignature(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode)); + nodeVisitor(node.questionToken || node.exclamationToken, tokenVisitor, ts.isToken), nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.initializer, visitor, ts.isExpression)); + case 163 /* MethodSignature */: + return factory.updateMethodSignature(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 164 /* MethodDeclaration */: + return factory.updateMethodDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.asteriskToken, tokenVisitor, ts.isToken), nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), nodeVisitor(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context, nodeVisitor)); + case 165 /* Constructor */: + return factory.updateConstructorDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context, nodeVisitor)); + case 166 /* GetAccessor */: + return factory.updateGetAccessorDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), nodeVisitor(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context, nodeVisitor)); + case 167 /* SetAccessor */: + return factory.updateSetAccessorDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context, nodeVisitor)); + case 168 /* CallSignature */: + return factory.updateCallSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 169 /* ConstructSignature */: + return factory.updateConstructSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 170 /* IndexSignature */: + return factory.updateIndexSignature(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode)); // Types - case 168 /* TypePredicate */: - return ts.updateTypePredicateNodeWithModifier(node, visitNode(node.assertsModifier, visitor), visitNode(node.parameterName, visitor), visitNode(node.type, visitor, ts.isTypeNode)); - case 169 /* TypeReference */: - return ts.updateTypeReferenceNode(node, visitNode(node.typeName, visitor, ts.isEntityName), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode)); - case 170 /* FunctionType */: - return ts.updateFunctionTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode)); - case 171 /* ConstructorType */: - return ts.updateConstructorTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode)); - case 172 /* TypeQuery */: - return ts.updateTypeQueryNode(node, visitNode(node.exprName, visitor, ts.isEntityName)); - case 173 /* TypeLiteral */: - return ts.updateTypeLiteralNode(node, nodesVisitor(node.members, visitor, ts.isTypeElement)); - case 174 /* ArrayType */: - return ts.updateArrayTypeNode(node, visitNode(node.elementType, visitor, ts.isTypeNode)); - case 175 /* TupleType */: - return ts.updateTupleTypeNode(node, nodesVisitor(node.elementTypes, visitor, ts.isTypeNode)); - case 176 /* OptionalType */: - return ts.updateOptionalTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode)); - case 177 /* RestType */: - return ts.updateRestTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode)); - case 178 /* UnionType */: - return ts.updateUnionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode)); - case 179 /* IntersectionType */: - return ts.updateIntersectionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode)); - case 180 /* ConditionalType */: - return ts.updateConditionalTypeNode(node, visitNode(node.checkType, visitor, ts.isTypeNode), visitNode(node.extendsType, visitor, ts.isTypeNode), visitNode(node.trueType, visitor, ts.isTypeNode), visitNode(node.falseType, visitor, ts.isTypeNode)); - case 181 /* InferType */: - return ts.updateInferTypeNode(node, visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration)); - case 188 /* ImportType */: - return ts.updateImportTypeNode(node, visitNode(node.argument, visitor, ts.isTypeNode), visitNode(node.qualifier, visitor, ts.isEntityName), visitNodes(node.typeArguments, visitor, ts.isTypeNode), node.isTypeOf); - case 182 /* ParenthesizedType */: - return ts.updateParenthesizedType(node, visitNode(node.type, visitor, ts.isTypeNode)); - case 184 /* TypeOperator */: - return ts.updateTypeOperatorNode(node, visitNode(node.type, visitor, ts.isTypeNode)); - case 185 /* IndexedAccessType */: - return ts.updateIndexedAccessTypeNode(node, visitNode(node.objectType, visitor, ts.isTypeNode), visitNode(node.indexType, visitor, ts.isTypeNode)); - case 186 /* MappedType */: - return ts.updateMappedTypeNode(node, visitNode(node.readonlyToken, tokenVisitor, ts.isToken), visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode)); - case 187 /* LiteralType */: - return ts.updateLiteralTypeNode(node, visitNode(node.literal, visitor, ts.isExpression)); + case 171 /* TypePredicate */: + return factory.updateTypePredicateNode(node, nodeVisitor(node.assertsModifier, visitor), nodeVisitor(node.parameterName, visitor), nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 172 /* TypeReference */: + return factory.updateTypeReferenceNode(node, nodeVisitor(node.typeName, visitor, ts.isEntityName), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode)); + case 173 /* FunctionType */: + return factory.updateFunctionTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 174 /* ConstructorType */: + return factory.updateConstructorTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 175 /* TypeQuery */: + return factory.updateTypeQueryNode(node, nodeVisitor(node.exprName, visitor, ts.isEntityName)); + case 176 /* TypeLiteral */: + return factory.updateTypeLiteralNode(node, nodesVisitor(node.members, visitor, ts.isTypeElement)); + case 177 /* ArrayType */: + return factory.updateArrayTypeNode(node, nodeVisitor(node.elementType, visitor, ts.isTypeNode)); + case 178 /* TupleType */: + return factory.updateTupleTypeNode(node, nodesVisitor(node.elements, visitor, ts.isTypeNode)); + case 179 /* OptionalType */: + return factory.updateOptionalTypeNode(node, nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 180 /* RestType */: + return factory.updateRestTypeNode(node, nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 181 /* UnionType */: + return factory.updateUnionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode)); + case 182 /* IntersectionType */: + return factory.updateIntersectionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode)); + case 183 /* ConditionalType */: + return factory.updateConditionalTypeNode(node, nodeVisitor(node.checkType, visitor, ts.isTypeNode), nodeVisitor(node.extendsType, visitor, ts.isTypeNode), nodeVisitor(node.trueType, visitor, ts.isTypeNode), nodeVisitor(node.falseType, visitor, ts.isTypeNode)); + case 184 /* InferType */: + return factory.updateInferTypeNode(node, nodeVisitor(node.typeParameter, visitor, ts.isTypeParameterDeclaration)); + case 192 /* ImportType */: + return factory.updateImportTypeNode(node, nodeVisitor(node.argument, visitor, ts.isTypeNode), nodeVisitor(node.qualifier, visitor, ts.isEntityName), visitNodes(node.typeArguments, visitor, ts.isTypeNode), node.isTypeOf); + case 191 /* NamedTupleMember */: + return factory.updateNamedTupleMember(node, visitNode(node.dotDotDotToken, visitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.questionToken, visitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode)); + case 185 /* ParenthesizedType */: + return factory.updateParenthesizedType(node, nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 187 /* TypeOperator */: + return factory.updateTypeOperatorNode(node, nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 188 /* IndexedAccessType */: + return factory.updateIndexedAccessTypeNode(node, nodeVisitor(node.objectType, visitor, ts.isTypeNode), nodeVisitor(node.indexType, visitor, ts.isTypeNode)); + case 189 /* MappedType */: + return factory.updateMappedTypeNode(node, nodeVisitor(node.readonlyToken, tokenVisitor, ts.isToken), nodeVisitor(node.typeParameter, visitor, ts.isTypeParameterDeclaration), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 190 /* LiteralType */: + return factory.updateLiteralTypeNode(node, nodeVisitor(node.literal, visitor, ts.isExpression)); // Binding patterns - case 189 /* ObjectBindingPattern */: - return ts.updateObjectBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isBindingElement)); - case 190 /* ArrayBindingPattern */: - return ts.updateArrayBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isArrayBindingElement)); - case 191 /* BindingElement */: - return ts.updateBindingElement(node, visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.propertyName, visitor, ts.isPropertyName), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression)); + case 193 /* ObjectBindingPattern */: + return factory.updateObjectBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isBindingElement)); + case 194 /* ArrayBindingPattern */: + return factory.updateArrayBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isArrayBindingElement)); + case 195 /* BindingElement */: + return factory.updateBindingElement(node, nodeVisitor(node.dotDotDotToken, tokenVisitor, ts.isToken), nodeVisitor(node.propertyName, visitor, ts.isPropertyName), nodeVisitor(node.name, visitor, ts.isBindingName), nodeVisitor(node.initializer, visitor, ts.isExpression)); // Expression - case 192 /* ArrayLiteralExpression */: - return ts.updateArrayLiteral(node, nodesVisitor(node.elements, visitor, ts.isExpression)); - case 193 /* ObjectLiteralExpression */: - return ts.updateObjectLiteral(node, nodesVisitor(node.properties, visitor, ts.isObjectLiteralElementLike)); - case 194 /* PropertyAccessExpression */: + case 196 /* ArrayLiteralExpression */: + return factory.updateArrayLiteralExpression(node, nodesVisitor(node.elements, visitor, ts.isExpression)); + case 197 /* ObjectLiteralExpression */: + return factory.updateObjectLiteralExpression(node, nodesVisitor(node.properties, visitor, ts.isObjectLiteralElementLike)); + case 198 /* PropertyAccessExpression */: if (node.flags & 32 /* OptionalChain */) { - return ts.updatePropertyAccessChain(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.questionDotToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier)); + return factory.updatePropertyAccessChain(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.questionDotToken, tokenVisitor, ts.isToken), nodeVisitor(node.name, visitor, ts.isIdentifier)); } - return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifierOrPrivateIdentifier)); - case 195 /* ElementAccessExpression */: + return factory.updatePropertyAccessExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.name, visitor, ts.isIdentifierOrPrivateIdentifier)); + case 199 /* ElementAccessExpression */: if (node.flags & 32 /* OptionalChain */) { - return ts.updateElementAccessChain(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.questionDotToken, tokenVisitor, ts.isToken), visitNode(node.argumentExpression, visitor, ts.isExpression)); + return factory.updateElementAccessChain(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.questionDotToken, tokenVisitor, ts.isToken), nodeVisitor(node.argumentExpression, visitor, ts.isExpression)); } - return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression)); - case 196 /* CallExpression */: + return factory.updateElementAccessExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.argumentExpression, visitor, ts.isExpression)); + case 200 /* CallExpression */: if (node.flags & 32 /* OptionalChain */) { - return ts.updateCallChain(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.questionDotToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression)); + return factory.updateCallChain(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.questionDotToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression)); } - return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression)); - case 197 /* NewExpression */: - return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression)); - case 198 /* TaggedTemplateExpression */: - return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral)); - case 199 /* TypeAssertionExpression */: - return ts.updateTypeAssertion(node, visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression)); - case 200 /* ParenthesizedExpression */: - return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression)); - case 201 /* FunctionExpression */: - return ts.updateFunctionExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context)); - case 202 /* ArrowFunction */: - return ts.updateArrowFunction(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.equalsGreaterThanToken, tokenVisitor, ts.isToken), visitFunctionBody(node.body, visitor, context)); - case 203 /* DeleteExpression */: - return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression)); - case 204 /* TypeOfExpression */: - return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression)); - case 205 /* VoidExpression */: - return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression)); - case 206 /* AwaitExpression */: - return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression)); - case 207 /* PrefixUnaryExpression */: - return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression)); - case 208 /* PostfixUnaryExpression */: - return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression)); - case 209 /* BinaryExpression */: - return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression), visitNode(node.operatorToken, tokenVisitor, ts.isToken)); - case 210 /* ConditionalExpression */: - return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.colonToken, tokenVisitor, ts.isToken), visitNode(node.whenFalse, visitor, ts.isExpression)); - case 211 /* TemplateExpression */: - return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateSpan)); - case 212 /* YieldExpression */: - return ts.updateYield(node, visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.expression, visitor, ts.isExpression)); - case 213 /* SpreadElement */: - return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression)); - case 214 /* ClassExpression */: - return ts.updateClassExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement)); - case 216 /* ExpressionWithTypeArguments */: - return ts.updateExpressionWithTypeArguments(node, nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression)); - case 217 /* AsExpression */: - return ts.updateAsExpression(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.type, visitor, ts.isTypeNode)); - case 218 /* NonNullExpression */: - return ts.updateNonNullExpression(node, visitNode(node.expression, visitor, ts.isExpression)); - case 219 /* MetaProperty */: - return ts.updateMetaProperty(node, visitNode(node.name, visitor, ts.isIdentifier)); + return factory.updateCallExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression)); + case 201 /* NewExpression */: + return factory.updateNewExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression)); + case 202 /* TaggedTemplateExpression */: + return factory.updateTaggedTemplateExpression(node, nodeVisitor(node.tag, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isExpression), nodeVisitor(node.template, visitor, ts.isTemplateLiteral)); + case 203 /* TypeAssertionExpression */: + return factory.updateTypeAssertion(node, nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.expression, visitor, ts.isExpression)); + case 204 /* ParenthesizedExpression */: + return factory.updateParenthesizedExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression)); + case 205 /* FunctionExpression */: + return factory.updateFunctionExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.asteriskToken, tokenVisitor, ts.isToken), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), nodeVisitor(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context, nodeVisitor)); + case 206 /* ArrowFunction */: + return factory.updateArrowFunction(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.equalsGreaterThanToken, tokenVisitor, ts.isToken), visitFunctionBody(node.body, visitor, context, nodeVisitor)); + case 207 /* DeleteExpression */: + return factory.updateDeleteExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression)); + case 208 /* TypeOfExpression */: + return factory.updateTypeOfExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression)); + case 209 /* VoidExpression */: + return factory.updateVoidExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression)); + case 210 /* AwaitExpression */: + return factory.updateAwaitExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression)); + case 211 /* PrefixUnaryExpression */: + return factory.updatePrefixUnaryExpression(node, nodeVisitor(node.operand, visitor, ts.isExpression)); + case 212 /* PostfixUnaryExpression */: + return factory.updatePostfixUnaryExpression(node, nodeVisitor(node.operand, visitor, ts.isExpression)); + case 213 /* BinaryExpression */: + return factory.updateBinaryExpression(node, nodeVisitor(node.left, visitor, ts.isExpression), nodeVisitor(node.operatorToken, tokenVisitor, ts.isToken), nodeVisitor(node.right, visitor, ts.isExpression)); + case 214 /* ConditionalExpression */: + return factory.updateConditionalExpression(node, nodeVisitor(node.condition, visitor, ts.isExpression), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodeVisitor(node.whenTrue, visitor, ts.isExpression), nodeVisitor(node.colonToken, tokenVisitor, ts.isToken), nodeVisitor(node.whenFalse, visitor, ts.isExpression)); + case 215 /* TemplateExpression */: + return factory.updateTemplateExpression(node, nodeVisitor(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateSpan)); + case 216 /* YieldExpression */: + return factory.updateYieldExpression(node, nodeVisitor(node.asteriskToken, tokenVisitor, ts.isToken), nodeVisitor(node.expression, visitor, ts.isExpression)); + case 217 /* SpreadElement */: + return factory.updateSpreadElement(node, nodeVisitor(node.expression, visitor, ts.isExpression)); + case 218 /* ClassExpression */: + return factory.updateClassExpression(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement)); + case 220 /* ExpressionWithTypeArguments */: + return factory.updateExpressionWithTypeArguments(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode)); + case 221 /* AsExpression */: + return factory.updateAsExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 222 /* NonNullExpression */: + if (node.flags & 32 /* OptionalChain */) { + return factory.updateNonNullChain(node, nodeVisitor(node.expression, visitor, ts.isExpression)); + } + return factory.updateNonNullExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression)); + case 223 /* MetaProperty */: + return factory.updateMetaProperty(node, nodeVisitor(node.name, visitor, ts.isIdentifier)); // Misc - case 221 /* TemplateSpan */: - return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail)); + case 225 /* TemplateSpan */: + return factory.updateTemplateSpan(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail)); // Element - case 223 /* Block */: - return ts.updateBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement)); - case 225 /* VariableStatement */: - return ts.updateVariableStatement(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList)); - case 226 /* ExpressionStatement */: - return ts.updateExpressionStatement(node, visitNode(node.expression, visitor, ts.isExpression)); - case 227 /* IfStatement */: - return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, ts.liftToBlock)); - case 228 /* DoStatement */: - return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.expression, visitor, ts.isExpression)); - case 229 /* WhileStatement */: - return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock)); - case 230 /* ForStatement */: - return ts.updateFor(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.condition, visitor, ts.isExpression), visitNode(node.incrementor, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock)); - case 231 /* ForInStatement */: - return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock)); - case 232 /* ForOfStatement */: - return ts.updateForOf(node, visitNode(node.awaitModifier, tokenVisitor, ts.isToken), visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock)); - case 233 /* ContinueStatement */: - return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier)); - case 234 /* BreakStatement */: - return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier)); - case 235 /* ReturnStatement */: - return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression)); - case 236 /* WithStatement */: - return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock)); - case 237 /* SwitchStatement */: - return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock)); - case 238 /* LabeledStatement */: - return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock)); - case 239 /* ThrowStatement */: - return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression)); - case 240 /* TryStatement */: - return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause), visitNode(node.finallyBlock, visitor, ts.isBlock)); - case 242 /* VariableDeclaration */: - return ts.updateTypeScriptVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.exclamationToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression)); - case 243 /* VariableDeclarationList */: - return ts.updateVariableDeclarationList(node, nodesVisitor(node.declarations, visitor, ts.isVariableDeclaration)); - case 244 /* FunctionDeclaration */: - return ts.updateFunctionDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context)); - case 245 /* ClassDeclaration */: - return ts.updateClassDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement)); - case 246 /* InterfaceDeclaration */: - return ts.updateInterfaceDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isTypeElement)); - case 247 /* TypeAliasDeclaration */: - return ts.updateTypeAliasDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode)); - case 248 /* EnumDeclaration */: - return ts.updateEnumDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.members, visitor, ts.isEnumMember)); - case 249 /* ModuleDeclaration */: - return ts.updateModuleDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.body, visitor, ts.isModuleBody)); - case 250 /* ModuleBlock */: - return ts.updateModuleBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement)); - case 251 /* CaseBlock */: - return ts.updateCaseBlock(node, nodesVisitor(node.clauses, visitor, ts.isCaseOrDefaultClause)); - case 252 /* NamespaceExportDeclaration */: - return ts.updateNamespaceExportDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier)); - case 253 /* ImportEqualsDeclaration */: - return ts.updateImportEqualsDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.moduleReference, visitor, ts.isModuleReference)); - case 254 /* ImportDeclaration */: - return ts.updateImportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause), visitNode(node.moduleSpecifier, visitor, ts.isExpression)); - case 255 /* ImportClause */: - return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings), node.isTypeOnly); - case 256 /* NamespaceImport */: - return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier)); - case 262 /* NamespaceExport */: - return ts.updateNamespaceExport(node, visitNode(node.name, visitor, ts.isIdentifier)); - case 257 /* NamedImports */: - return ts.updateNamedImports(node, nodesVisitor(node.elements, visitor, ts.isImportSpecifier)); - case 258 /* ImportSpecifier */: - return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier)); - case 259 /* ExportAssignment */: - return ts.updateExportAssignment(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression)); - case 260 /* ExportDeclaration */: - return ts.updateExportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExportBindings), visitNode(node.moduleSpecifier, visitor, ts.isExpression), node.isTypeOnly); - case 261 /* NamedExports */: - return ts.updateNamedExports(node, nodesVisitor(node.elements, visitor, ts.isExportSpecifier)); - case 263 /* ExportSpecifier */: - return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier)); + case 227 /* Block */: + return factory.updateBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement)); + case 229 /* VariableStatement */: + return factory.updateVariableStatement(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.declarationList, visitor, ts.isVariableDeclarationList)); + case 230 /* ExpressionStatement */: + return factory.updateExpressionStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression)); + case 231 /* IfStatement */: + return factory.updateIfStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.thenStatement, visitor, ts.isStatement, factory.liftToBlock), nodeVisitor(node.elseStatement, visitor, ts.isStatement, factory.liftToBlock)); + case 232 /* DoStatement */: + return factory.updateDoStatement(node, nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock), nodeVisitor(node.expression, visitor, ts.isExpression)); + case 233 /* WhileStatement */: + return factory.updateWhileStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock)); + case 234 /* ForStatement */: + return factory.updateForStatement(node, nodeVisitor(node.initializer, visitor, ts.isForInitializer), nodeVisitor(node.condition, visitor, ts.isExpression), nodeVisitor(node.incrementor, visitor, ts.isExpression), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock)); + case 235 /* ForInStatement */: + return factory.updateForInStatement(node, nodeVisitor(node.initializer, visitor, ts.isForInitializer), nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock)); + case 236 /* ForOfStatement */: + return factory.updateForOfStatement(node, nodeVisitor(node.awaitModifier, tokenVisitor, ts.isToken), nodeVisitor(node.initializer, visitor, ts.isForInitializer), nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock)); + case 237 /* ContinueStatement */: + return factory.updateContinueStatement(node, nodeVisitor(node.label, visitor, ts.isIdentifier)); + case 238 /* BreakStatement */: + return factory.updateBreakStatement(node, nodeVisitor(node.label, visitor, ts.isIdentifier)); + case 239 /* ReturnStatement */: + return factory.updateReturnStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression)); + case 240 /* WithStatement */: + return factory.updateWithStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock)); + case 241 /* SwitchStatement */: + return factory.updateSwitchStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.caseBlock, visitor, ts.isCaseBlock)); + case 242 /* LabeledStatement */: + return factory.updateLabeledStatement(node, nodeVisitor(node.label, visitor, ts.isIdentifier), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock)); + case 243 /* ThrowStatement */: + return factory.updateThrowStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression)); + case 244 /* TryStatement */: + return factory.updateTryStatement(node, nodeVisitor(node.tryBlock, visitor, ts.isBlock), nodeVisitor(node.catchClause, visitor, ts.isCatchClause), nodeVisitor(node.finallyBlock, visitor, ts.isBlock)); + case 246 /* VariableDeclaration */: + return factory.updateVariableDeclaration(node, nodeVisitor(node.name, visitor, ts.isBindingName), nodeVisitor(node.exclamationToken, tokenVisitor, ts.isToken), nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.initializer, visitor, ts.isExpression)); + case 247 /* VariableDeclarationList */: + return factory.updateVariableDeclarationList(node, nodesVisitor(node.declarations, visitor, ts.isVariableDeclaration)); + case 248 /* FunctionDeclaration */: + return factory.updateFunctionDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.asteriskToken, tokenVisitor, ts.isToken), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), nodeVisitor(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context, nodeVisitor)); + case 249 /* ClassDeclaration */: + return factory.updateClassDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement)); + case 250 /* InterfaceDeclaration */: + return factory.updateInterfaceDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isTypeElement)); + case 251 /* TypeAliasDeclaration */: + return factory.updateTypeAliasDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode)); + case 252 /* EnumDeclaration */: + return factory.updateEnumDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodesVisitor(node.members, visitor, ts.isEnumMember)); + case 253 /* ModuleDeclaration */: + return factory.updateModuleDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.body, visitor, ts.isModuleBody)); + case 254 /* ModuleBlock */: + return factory.updateModuleBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement)); + case 255 /* CaseBlock */: + return factory.updateCaseBlock(node, nodesVisitor(node.clauses, visitor, ts.isCaseOrDefaultClause)); + case 256 /* NamespaceExportDeclaration */: + return factory.updateNamespaceExportDeclaration(node, nodeVisitor(node.name, visitor, ts.isIdentifier)); + case 257 /* ImportEqualsDeclaration */: + return factory.updateImportEqualsDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.moduleReference, visitor, ts.isModuleReference)); + case 258 /* ImportDeclaration */: + return factory.updateImportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.importClause, visitor, ts.isImportClause), nodeVisitor(node.moduleSpecifier, visitor, ts.isExpression)); + case 259 /* ImportClause */: + return factory.updateImportClause(node, node.isTypeOnly, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.namedBindings, visitor, ts.isNamedImportBindings)); + case 260 /* NamespaceImport */: + return factory.updateNamespaceImport(node, nodeVisitor(node.name, visitor, ts.isIdentifier)); + case 266 /* NamespaceExport */: + return factory.updateNamespaceExport(node, nodeVisitor(node.name, visitor, ts.isIdentifier)); + case 261 /* NamedImports */: + return factory.updateNamedImports(node, nodesVisitor(node.elements, visitor, ts.isImportSpecifier)); + case 262 /* ImportSpecifier */: + return factory.updateImportSpecifier(node, nodeVisitor(node.propertyName, visitor, ts.isIdentifier), nodeVisitor(node.name, visitor, ts.isIdentifier)); + case 263 /* ExportAssignment */: + return factory.updateExportAssignment(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.expression, visitor, ts.isExpression)); + case 264 /* ExportDeclaration */: + return factory.updateExportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), node.isTypeOnly, nodeVisitor(node.exportClause, visitor, ts.isNamedExportBindings), nodeVisitor(node.moduleSpecifier, visitor, ts.isExpression)); + case 265 /* NamedExports */: + return factory.updateNamedExports(node, nodesVisitor(node.elements, visitor, ts.isExportSpecifier)); + case 267 /* ExportSpecifier */: + return factory.updateExportSpecifier(node, nodeVisitor(node.propertyName, visitor, ts.isIdentifier), nodeVisitor(node.name, visitor, ts.isIdentifier)); // Module references - case 265 /* ExternalModuleReference */: - return ts.updateExternalModuleReference(node, visitNode(node.expression, visitor, ts.isExpression)); + case 269 /* ExternalModuleReference */: + return factory.updateExternalModuleReference(node, nodeVisitor(node.expression, visitor, ts.isExpression)); // JSX - case 266 /* JsxElement */: - return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement)); - case 267 /* JsxSelfClosingElement */: - return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes)); - case 268 /* JsxOpeningElement */: - return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes)); - case 269 /* JsxClosingElement */: - return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression)); - case 270 /* JsxFragment */: - return ts.updateJsxFragment(node, visitNode(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingFragment, visitor, ts.isJsxClosingFragment)); - case 273 /* JsxAttribute */: - return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression)); - case 274 /* JsxAttributes */: - return ts.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike)); - case 275 /* JsxSpreadAttribute */: - return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression)); - case 276 /* JsxExpression */: - return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression)); + case 270 /* JsxElement */: + return factory.updateJsxElement(node, nodeVisitor(node.openingElement, visitor, ts.isJsxOpeningElement), nodesVisitor(node.children, visitor, ts.isJsxChild), nodeVisitor(node.closingElement, visitor, ts.isJsxClosingElement)); + case 271 /* JsxSelfClosingElement */: + return factory.updateJsxSelfClosingElement(node, nodeVisitor(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodeVisitor(node.attributes, visitor, ts.isJsxAttributes)); + case 272 /* JsxOpeningElement */: + return factory.updateJsxOpeningElement(node, nodeVisitor(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodeVisitor(node.attributes, visitor, ts.isJsxAttributes)); + case 273 /* JsxClosingElement */: + return factory.updateJsxClosingElement(node, nodeVisitor(node.tagName, visitor, ts.isJsxTagNameExpression)); + case 274 /* JsxFragment */: + return factory.updateJsxFragment(node, nodeVisitor(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), nodeVisitor(node.closingFragment, visitor, ts.isJsxClosingFragment)); + case 277 /* JsxAttribute */: + return factory.updateJsxAttribute(node, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.initializer, visitor, ts.isStringLiteralOrJsxExpression)); + case 278 /* JsxAttributes */: + return factory.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike)); + case 279 /* JsxSpreadAttribute */: + return factory.updateJsxSpreadAttribute(node, nodeVisitor(node.expression, visitor, ts.isExpression)); + case 280 /* JsxExpression */: + return factory.updateJsxExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression)); // Clauses - case 277 /* CaseClause */: - return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.statements, visitor, ts.isStatement)); - case 278 /* DefaultClause */: - return ts.updateDefaultClause(node, nodesVisitor(node.statements, visitor, ts.isStatement)); - case 279 /* HeritageClause */: - return ts.updateHeritageClause(node, nodesVisitor(node.types, visitor, ts.isExpressionWithTypeArguments)); - case 280 /* CatchClause */: - return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock)); + case 281 /* CaseClause */: + return factory.updateCaseClause(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodesVisitor(node.statements, visitor, ts.isStatement)); + case 282 /* DefaultClause */: + return factory.updateDefaultClause(node, nodesVisitor(node.statements, visitor, ts.isStatement)); + case 283 /* HeritageClause */: + return factory.updateHeritageClause(node, nodesVisitor(node.types, visitor, ts.isExpressionWithTypeArguments)); + case 284 /* CatchClause */: + return factory.updateCatchClause(node, nodeVisitor(node.variableDeclaration, visitor, ts.isVariableDeclaration), nodeVisitor(node.block, visitor, ts.isBlock)); // Property assignments - case 281 /* PropertyAssignment */: - return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression)); - case 282 /* ShorthandPropertyAssignment */: - return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression)); - case 283 /* SpreadAssignment */: - return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression)); + case 285 /* PropertyAssignment */: + return factory.updatePropertyAssignment(node, nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.initializer, visitor, ts.isExpression)); + case 286 /* ShorthandPropertyAssignment */: + return factory.updateShorthandPropertyAssignment(node, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.objectAssignmentInitializer, visitor, ts.isExpression)); + case 287 /* SpreadAssignment */: + return factory.updateSpreadAssignment(node, nodeVisitor(node.expression, visitor, ts.isExpression)); // Enum - case 284 /* EnumMember */: - return ts.updateEnumMember(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression)); + case 288 /* EnumMember */: + return factory.updateEnumMember(node, nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.initializer, visitor, ts.isExpression)); // Top-level nodes - case 290 /* SourceFile */: - return ts.updateSourceFileNode(node, visitLexicalEnvironment(node.statements, visitor, context)); + case 294 /* SourceFile */: + return factory.updateSourceFile(node, visitLexicalEnvironment(node.statements, visitor, context)); // Transformation nodes - case 326 /* PartiallyEmittedExpression */: - return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression)); - case 327 /* CommaListExpression */: - return ts.updateCommaList(node, nodesVisitor(node.elements, visitor, ts.isExpression)); + case 331 /* PartiallyEmittedExpression */: + return factory.updatePartiallyEmittedExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression)); + case 332 /* CommaListExpression */: + return factory.updateCommaListExpression(node, nodesVisitor(node.elements, visitor, ts.isExpression)); default: // No need to visit nodes with no children. return node; @@ -75270,602 +78815,6 @@ var ts; })(ts || (ts = {})); /* @internal */ var ts; -(function (ts) { - function reduceNode(node, f, initial) { - return node ? f(initial, node) : initial; - } - function reduceNodeArray(nodes, f, initial) { - return nodes ? f(initial, nodes) : initial; - } - /** - * Similar to `reduceLeft`, performs a reduction against each child of a node. - * NOTE: Unlike `forEachChild`, this does *not* visit every node. - * - * @param node The node containing the children to reduce. - * @param initial The initial value to supply to the reduction. - * @param f The callback function - */ - function reduceEachChild(node, initial, cbNode, cbNodeArray) { - if (node === undefined) { - return initial; - } - var reduceNodes = cbNodeArray ? reduceNodeArray : ts.reduceLeft; - var cbNodes = cbNodeArray || cbNode; - var kind = node.kind; - // No need to visit nodes with no children. - if ((kind > 0 /* FirstToken */ && kind <= 152 /* LastToken */)) { - return initial; - } - // We do not yet support types. - if ((kind >= 168 /* TypePredicate */ && kind <= 187 /* LiteralType */)) { - return initial; - } - var result = initial; - switch (node.kind) { - // Leaf nodes - case 222 /* SemicolonClassElement */: - case 224 /* EmptyStatement */: - case 215 /* OmittedExpression */: - case 241 /* DebuggerStatement */: - case 325 /* NotEmittedStatement */: - // No need to visit nodes with no children. - break; - // Names - case 153 /* QualifiedName */: - result = reduceNode(node.left, cbNode, result); - result = reduceNode(node.right, cbNode, result); - break; - case 154 /* ComputedPropertyName */: - result = reduceNode(node.expression, cbNode, result); - break; - // Signature elements - case 156 /* Parameter */: - result = reduceNodes(node.decorators, cbNodes, result); - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNode(node.type, cbNode, result); - result = reduceNode(node.initializer, cbNode, result); - break; - case 157 /* Decorator */: - result = reduceNode(node.expression, cbNode, result); - break; - // Type member - case 158 /* PropertySignature */: - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNode(node.questionToken, cbNode, result); - result = reduceNode(node.type, cbNode, result); - result = reduceNode(node.initializer, cbNode, result); - break; - case 159 /* PropertyDeclaration */: - result = reduceNodes(node.decorators, cbNodes, result); - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNode(node.type, cbNode, result); - result = reduceNode(node.initializer, cbNode, result); - break; - case 161 /* MethodDeclaration */: - result = reduceNodes(node.decorators, cbNodes, result); - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNodes(node.typeParameters, cbNodes, result); - result = reduceNodes(node.parameters, cbNodes, result); - result = reduceNode(node.type, cbNode, result); - result = reduceNode(node.body, cbNode, result); - break; - case 162 /* Constructor */: - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNodes(node.parameters, cbNodes, result); - result = reduceNode(node.body, cbNode, result); - break; - case 163 /* GetAccessor */: - result = reduceNodes(node.decorators, cbNodes, result); - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNodes(node.parameters, cbNodes, result); - result = reduceNode(node.type, cbNode, result); - result = reduceNode(node.body, cbNode, result); - break; - case 164 /* SetAccessor */: - result = reduceNodes(node.decorators, cbNodes, result); - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNodes(node.parameters, cbNodes, result); - result = reduceNode(node.body, cbNode, result); - break; - // Binding patterns - case 189 /* ObjectBindingPattern */: - case 190 /* ArrayBindingPattern */: - result = reduceNodes(node.elements, cbNodes, result); - break; - case 191 /* BindingElement */: - result = reduceNode(node.propertyName, cbNode, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNode(node.initializer, cbNode, result); - break; - // Expression - case 192 /* ArrayLiteralExpression */: - result = reduceNodes(node.elements, cbNodes, result); - break; - case 193 /* ObjectLiteralExpression */: - result = reduceNodes(node.properties, cbNodes, result); - break; - case 194 /* PropertyAccessExpression */: - result = reduceNode(node.expression, cbNode, result); - result = reduceNode(node.name, cbNode, result); - break; - case 195 /* ElementAccessExpression */: - result = reduceNode(node.expression, cbNode, result); - result = reduceNode(node.argumentExpression, cbNode, result); - break; - case 196 /* CallExpression */: - result = reduceNode(node.expression, cbNode, result); - result = reduceNodes(node.typeArguments, cbNodes, result); - result = reduceNodes(node.arguments, cbNodes, result); - break; - case 197 /* NewExpression */: - result = reduceNode(node.expression, cbNode, result); - result = reduceNodes(node.typeArguments, cbNodes, result); - result = reduceNodes(node.arguments, cbNodes, result); - break; - case 198 /* TaggedTemplateExpression */: - result = reduceNode(node.tag, cbNode, result); - result = reduceNodes(node.typeArguments, cbNodes, result); - result = reduceNode(node.template, cbNode, result); - break; - case 199 /* TypeAssertionExpression */: - result = reduceNode(node.type, cbNode, result); - result = reduceNode(node.expression, cbNode, result); - break; - case 201 /* FunctionExpression */: - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNodes(node.typeParameters, cbNodes, result); - result = reduceNodes(node.parameters, cbNodes, result); - result = reduceNode(node.type, cbNode, result); - result = reduceNode(node.body, cbNode, result); - break; - case 202 /* ArrowFunction */: - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNodes(node.typeParameters, cbNodes, result); - result = reduceNodes(node.parameters, cbNodes, result); - result = reduceNode(node.type, cbNode, result); - result = reduceNode(node.body, cbNode, result); - break; - case 200 /* ParenthesizedExpression */: - case 203 /* DeleteExpression */: - case 204 /* TypeOfExpression */: - case 205 /* VoidExpression */: - case 206 /* AwaitExpression */: - case 212 /* YieldExpression */: - case 213 /* SpreadElement */: - case 218 /* NonNullExpression */: - result = reduceNode(node.expression, cbNode, result); - break; - case 207 /* PrefixUnaryExpression */: - case 208 /* PostfixUnaryExpression */: - result = reduceNode(node.operand, cbNode, result); - break; - case 209 /* BinaryExpression */: - result = reduceNode(node.left, cbNode, result); - result = reduceNode(node.right, cbNode, result); - break; - case 210 /* ConditionalExpression */: - result = reduceNode(node.condition, cbNode, result); - result = reduceNode(node.whenTrue, cbNode, result); - result = reduceNode(node.whenFalse, cbNode, result); - break; - case 211 /* TemplateExpression */: - result = reduceNode(node.head, cbNode, result); - result = reduceNodes(node.templateSpans, cbNodes, result); - break; - case 214 /* ClassExpression */: - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNodes(node.typeParameters, cbNodes, result); - result = reduceNodes(node.heritageClauses, cbNodes, result); - result = reduceNodes(node.members, cbNodes, result); - break; - case 216 /* ExpressionWithTypeArguments */: - result = reduceNode(node.expression, cbNode, result); - result = reduceNodes(node.typeArguments, cbNodes, result); - break; - case 217 /* AsExpression */: - result = reduceNode(node.expression, cbNode, result); - result = reduceNode(node.type, cbNode, result); - break; - // Misc - case 221 /* TemplateSpan */: - result = reduceNode(node.expression, cbNode, result); - result = reduceNode(node.literal, cbNode, result); - break; - // Element - case 223 /* Block */: - result = reduceNodes(node.statements, cbNodes, result); - break; - case 225 /* VariableStatement */: - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.declarationList, cbNode, result); - break; - case 226 /* ExpressionStatement */: - result = reduceNode(node.expression, cbNode, result); - break; - case 227 /* IfStatement */: - result = reduceNode(node.expression, cbNode, result); - result = reduceNode(node.thenStatement, cbNode, result); - result = reduceNode(node.elseStatement, cbNode, result); - break; - case 228 /* DoStatement */: - result = reduceNode(node.statement, cbNode, result); - result = reduceNode(node.expression, cbNode, result); - break; - case 229 /* WhileStatement */: - case 236 /* WithStatement */: - result = reduceNode(node.expression, cbNode, result); - result = reduceNode(node.statement, cbNode, result); - break; - case 230 /* ForStatement */: - result = reduceNode(node.initializer, cbNode, result); - result = reduceNode(node.condition, cbNode, result); - result = reduceNode(node.incrementor, cbNode, result); - result = reduceNode(node.statement, cbNode, result); - break; - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - result = reduceNode(node.initializer, cbNode, result); - result = reduceNode(node.expression, cbNode, result); - result = reduceNode(node.statement, cbNode, result); - break; - case 235 /* ReturnStatement */: - case 239 /* ThrowStatement */: - result = reduceNode(node.expression, cbNode, result); - break; - case 237 /* SwitchStatement */: - result = reduceNode(node.expression, cbNode, result); - result = reduceNode(node.caseBlock, cbNode, result); - break; - case 238 /* LabeledStatement */: - result = reduceNode(node.label, cbNode, result); - result = reduceNode(node.statement, cbNode, result); - break; - case 240 /* TryStatement */: - result = reduceNode(node.tryBlock, cbNode, result); - result = reduceNode(node.catchClause, cbNode, result); - result = reduceNode(node.finallyBlock, cbNode, result); - break; - case 242 /* VariableDeclaration */: - result = reduceNode(node.name, cbNode, result); - result = reduceNode(node.type, cbNode, result); - result = reduceNode(node.initializer, cbNode, result); - break; - case 243 /* VariableDeclarationList */: - result = reduceNodes(node.declarations, cbNodes, result); - break; - case 244 /* FunctionDeclaration */: - result = reduceNodes(node.decorators, cbNodes, result); - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNodes(node.typeParameters, cbNodes, result); - result = reduceNodes(node.parameters, cbNodes, result); - result = reduceNode(node.type, cbNode, result); - result = reduceNode(node.body, cbNode, result); - break; - case 245 /* ClassDeclaration */: - result = reduceNodes(node.decorators, cbNodes, result); - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNodes(node.typeParameters, cbNodes, result); - result = reduceNodes(node.heritageClauses, cbNodes, result); - result = reduceNodes(node.members, cbNodes, result); - break; - case 248 /* EnumDeclaration */: - result = reduceNodes(node.decorators, cbNodes, result); - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNodes(node.members, cbNodes, result); - break; - case 249 /* ModuleDeclaration */: - result = reduceNodes(node.decorators, cbNodes, result); - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNode(node.body, cbNode, result); - break; - case 250 /* ModuleBlock */: - result = reduceNodes(node.statements, cbNodes, result); - break; - case 251 /* CaseBlock */: - result = reduceNodes(node.clauses, cbNodes, result); - break; - case 253 /* ImportEqualsDeclaration */: - result = reduceNodes(node.decorators, cbNodes, result); - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.name, cbNode, result); - result = reduceNode(node.moduleReference, cbNode, result); - break; - case 254 /* ImportDeclaration */: - result = reduceNodes(node.decorators, cbNodes, result); - result = reduceNodes(node.modifiers, cbNodes, result); - result = reduceNode(node.importClause, cbNode, result); - result = reduceNode(node.moduleSpecifier, cbNode, result); - break; - case 255 /* ImportClause */: - result = reduceNode(node.name, cbNode, result); - result = reduceNode(node.namedBindings, cbNode, result); - break; - case 256 /* NamespaceImport */: - result = reduceNode(node.name, cbNode, result); - break; - case 262 /* NamespaceExport */: - result = reduceNode(node.name, cbNode, result); - break; - case 257 /* NamedImports */: - case 261 /* NamedExports */: - result = reduceNodes(node.elements, cbNodes, result); - break; - case 258 /* ImportSpecifier */: - case 263 /* ExportSpecifier */: - result = reduceNode(node.propertyName, cbNode, result); - result = reduceNode(node.name, cbNode, result); - break; - case 259 /* ExportAssignment */: - result = ts.reduceLeft(node.decorators, cbNode, result); - result = ts.reduceLeft(node.modifiers, cbNode, result); - result = reduceNode(node.expression, cbNode, result); - break; - case 260 /* ExportDeclaration */: - result = ts.reduceLeft(node.decorators, cbNode, result); - result = ts.reduceLeft(node.modifiers, cbNode, result); - result = reduceNode(node.exportClause, cbNode, result); - result = reduceNode(node.moduleSpecifier, cbNode, result); - break; - // Module references - case 265 /* ExternalModuleReference */: - result = reduceNode(node.expression, cbNode, result); - break; - // JSX - case 266 /* JsxElement */: - result = reduceNode(node.openingElement, cbNode, result); - result = ts.reduceLeft(node.children, cbNode, result); - result = reduceNode(node.closingElement, cbNode, result); - break; - case 270 /* JsxFragment */: - result = reduceNode(node.openingFragment, cbNode, result); - result = ts.reduceLeft(node.children, cbNode, result); - result = reduceNode(node.closingFragment, cbNode, result); - break; - case 267 /* JsxSelfClosingElement */: - case 268 /* JsxOpeningElement */: - result = reduceNode(node.tagName, cbNode, result); - result = reduceNodes(node.typeArguments, cbNode, result); - result = reduceNode(node.attributes, cbNode, result); - break; - case 274 /* JsxAttributes */: - result = reduceNodes(node.properties, cbNodes, result); - break; - case 269 /* JsxClosingElement */: - result = reduceNode(node.tagName, cbNode, result); - break; - case 273 /* JsxAttribute */: - result = reduceNode(node.name, cbNode, result); - result = reduceNode(node.initializer, cbNode, result); - break; - case 275 /* JsxSpreadAttribute */: - result = reduceNode(node.expression, cbNode, result); - break; - case 276 /* JsxExpression */: - result = reduceNode(node.expression, cbNode, result); - break; - // Clauses - case 277 /* CaseClause */: - result = reduceNode(node.expression, cbNode, result); - // falls through - case 278 /* DefaultClause */: - result = reduceNodes(node.statements, cbNodes, result); - break; - case 279 /* HeritageClause */: - result = reduceNodes(node.types, cbNodes, result); - break; - case 280 /* CatchClause */: - result = reduceNode(node.variableDeclaration, cbNode, result); - result = reduceNode(node.block, cbNode, result); - break; - // Property assignments - case 281 /* PropertyAssignment */: - result = reduceNode(node.name, cbNode, result); - result = reduceNode(node.initializer, cbNode, result); - break; - case 282 /* ShorthandPropertyAssignment */: - result = reduceNode(node.name, cbNode, result); - result = reduceNode(node.objectAssignmentInitializer, cbNode, result); - break; - case 283 /* SpreadAssignment */: - result = reduceNode(node.expression, cbNode, result); - break; - // Enum - case 284 /* EnumMember */: - result = reduceNode(node.name, cbNode, result); - result = reduceNode(node.initializer, cbNode, result); - break; - // Top-level nodes - case 290 /* SourceFile */: - result = reduceNodes(node.statements, cbNodes, result); - break; - // Transformation nodes - case 326 /* PartiallyEmittedExpression */: - result = reduceNode(node.expression, cbNode, result); - break; - case 327 /* CommaListExpression */: - result = reduceNodes(node.elements, cbNodes, result); - break; - default: - break; - } - return result; - } - ts.reduceEachChild = reduceEachChild; - function findSpanEnd(array, test, start) { - var i = start; - while (i < array.length && test(array[i])) { - i++; - } - return i; - } - function mergeLexicalEnvironment(statements, declarations) { - if (!ts.some(declarations)) { - return statements; - } - // When we merge new lexical statements into an existing statement list, we merge them in the following manner: - // - // Given: - // - // | Left | Right | - // |------------------------------------|-------------------------------------| - // | [standard prologues (left)] | [standard prologues (right)] | - // | [hoisted functions (left)] | [hoisted functions (right)] | - // | [hoisted variables (left)] | [hoisted variables (right)] | - // | [lexical init statements (left)] | [lexical init statements (right)] | - // | [other statements (left)] | | - // - // The resulting statement list will be: - // - // | Result | - // |-------------------------------------| - // | [standard prologues (right)] | - // | [standard prologues (left)] | - // | [hoisted functions (right)] | - // | [hoisted functions (left)] | - // | [hoisted variables (right)] | - // | [hoisted variables (left)] | - // | [lexical init statements (right)] | - // | [lexical init statements (left)] | - // | [other statements (left)] | - // - // NOTE: It is expected that new lexical init statements must be evaluated before existing lexical init statements, - // as the prior transformation may depend on the evaluation of the lexical init statements to be in the correct state. - // find standard prologues on left in the following order: standard directives, hoisted functions, hoisted variables, other custom - var leftStandardPrologueEnd = findSpanEnd(statements, ts.isPrologueDirective, 0); - var leftHoistedFunctionsEnd = findSpanEnd(statements, ts.isHoistedFunction, leftStandardPrologueEnd); - var leftHoistedVariablesEnd = findSpanEnd(statements, ts.isHoistedVariableStatement, leftHoistedFunctionsEnd); - // find standard prologues on right in the following order: standard directives, hoisted functions, hoisted variables, other custom - var rightStandardPrologueEnd = findSpanEnd(declarations, ts.isPrologueDirective, 0); - var rightHoistedFunctionsEnd = findSpanEnd(declarations, ts.isHoistedFunction, rightStandardPrologueEnd); - var rightHoistedVariablesEnd = findSpanEnd(declarations, ts.isHoistedVariableStatement, rightHoistedFunctionsEnd); - var rightCustomPrologueEnd = findSpanEnd(declarations, ts.isCustomPrologue, rightHoistedVariablesEnd); - ts.Debug.assert(rightCustomPrologueEnd === declarations.length, "Expected declarations to be valid standard or custom prologues"); - // splice prologues from the right into the left. We do this in reverse order - // so that we don't need to recompute the index on the left when we insert items. - var left = ts.isNodeArray(statements) ? statements.slice() : statements; - // splice other custom prologues from right into left - if (rightCustomPrologueEnd > rightHoistedVariablesEnd) { - left.splice.apply(left, __spreadArrays([leftHoistedVariablesEnd, 0], declarations.slice(rightHoistedVariablesEnd, rightCustomPrologueEnd))); - } - // splice hoisted variables from right into left - if (rightHoistedVariablesEnd > rightHoistedFunctionsEnd) { - left.splice.apply(left, __spreadArrays([leftHoistedFunctionsEnd, 0], declarations.slice(rightHoistedFunctionsEnd, rightHoistedVariablesEnd))); - } - // splice hoisted functions from right into left - if (rightHoistedFunctionsEnd > rightStandardPrologueEnd) { - left.splice.apply(left, __spreadArrays([leftStandardPrologueEnd, 0], declarations.slice(rightStandardPrologueEnd, rightHoistedFunctionsEnd))); - } - // splice standard prologues from right into left (that are not already in left) - if (rightStandardPrologueEnd > 0) { - if (leftStandardPrologueEnd === 0) { - left.splice.apply(left, __spreadArrays([0, 0], declarations.slice(0, rightStandardPrologueEnd))); - } - else { - var leftPrologues = ts.createMap(); - for (var i = 0; i < leftStandardPrologueEnd; i++) { - var leftPrologue = statements[i]; - leftPrologues.set(leftPrologue.expression.text, true); - } - for (var i = rightStandardPrologueEnd - 1; i >= 0; i--) { - var rightPrologue = declarations[i]; - if (!leftPrologues.has(rightPrologue.expression.text)) { - left.unshift(rightPrologue); - } - } - } - } - if (ts.isNodeArray(statements)) { - return ts.setTextRange(ts.createNodeArray(left, statements.hasTrailingComma), statements); - } - return statements; - } - ts.mergeLexicalEnvironment = mergeLexicalEnvironment; - /** - * Lifts a NodeArray containing only Statement nodes to a block. - * - * @param nodes The NodeArray. - */ - function liftToBlock(nodes) { - ts.Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block."); - return ts.singleOrUndefined(nodes) || ts.createBlock(nodes); - } - ts.liftToBlock = liftToBlock; - /** - * Aggregates the TransformFlags for a Node and its subtree. - */ - function aggregateTransformFlags(node) { - aggregateTransformFlagsForNode(node); - return node; - } - ts.aggregateTransformFlags = aggregateTransformFlags; - /** - * Aggregates the TransformFlags for a Node and its subtree. The flags for the subtree are - * computed first, then the transform flags for the current node are computed from the subtree - * flags and the state of the current node. Finally, the transform flags of the node are - * returned, excluding any flags that should not be included in its parent node's subtree - * flags. - */ - function aggregateTransformFlagsForNode(node) { - if (node === undefined) { - return 0 /* None */; - } - if (node.transformFlags & 536870912 /* HasComputedFlags */) { - return node.transformFlags & ~ts.getTransformFlagsSubtreeExclusions(node.kind); - } - var subtreeFlags = aggregateTransformFlagsForSubtree(node); - return ts.computeTransformFlagsForNode(node, subtreeFlags); - } - function aggregateTransformFlagsForNodeArray(nodes) { - if (nodes === undefined) { - return 0 /* None */; - } - var subtreeFlags = 0 /* None */; - var nodeArrayFlags = 0 /* None */; - for (var _i = 0, nodes_3 = nodes; _i < nodes_3.length; _i++) { - var node = nodes_3[_i]; - subtreeFlags |= aggregateTransformFlagsForNode(node); - nodeArrayFlags |= node.transformFlags & ~536870912 /* HasComputedFlags */; - } - nodes.transformFlags = nodeArrayFlags | 536870912 /* HasComputedFlags */; - return subtreeFlags; - } - /** - * Aggregates the transform flags for the subtree of a node. - */ - function aggregateTransformFlagsForSubtree(node) { - // We do not transform ambient declarations or types, so there is no need to - // recursively aggregate transform flags. - if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 216 /* ExpressionWithTypeArguments */)) { - return 0 /* None */; - } - // Aggregate the transform flags of each child. - return reduceEachChild(node, 0 /* None */, aggregateTransformFlagsForChildNode, aggregateTransformFlagsForChildNodes); - } - /** - * Aggregates the TransformFlags of a child node with the TransformFlags of its - * siblings. - */ - function aggregateTransformFlagsForChildNode(transformFlags, node) { - return transformFlags | aggregateTransformFlagsForNode(node); - } - function aggregateTransformFlagsForChildNodes(transformFlags, nodes) { - return transformFlags | aggregateTransformFlagsForNodeArray(nodes); - } -})(ts || (ts = {})); -/* @internal */ -var ts; (function (ts) { function createSourceMapGenerator(host, file, sourceRoot, sourcesDirectoryPath, generatorOptions) { var _a = generatorOptions.extendedDiagnostics @@ -75874,7 +78823,7 @@ var ts; // Current source map file and its index in the sources list var rawSources = []; var sources = []; - var sourceToSourceIndexMap = ts.createMap(); + var sourceToSourceIndexMap = new ts.Map(); var sourcesContent; var names = []; var nameToNameIndexMap; @@ -75937,7 +78886,7 @@ var ts; function addName(name) { enter(); if (!nameToNameIndexMap) - nameToNameIndexMap = ts.createMap(); + nameToNameIndexMap = new ts.Map(); var nameIndex = nameToNameIndexMap.get(name); if (nameIndex === undefined) { nameIndex = names.length; @@ -76388,7 +79337,7 @@ var ts; var generatedAbsoluteFilePath = ts.getNormalizedAbsolutePath(map.file, mapDirectory); var generatedFile = host.getSourceFileLike(generatedAbsoluteFilePath); var sourceFileAbsolutePaths = map.sources.map(function (source) { return ts.getNormalizedAbsolutePath(source, sourceRoot); }); - var sourceToSourceIndexMap = ts.createMapFromEntries(sourceFileAbsolutePaths.map(function (source, i) { return [host.getCanonicalFileName(source), i]; })); + var sourceToSourceIndexMap = new ts.Map(sourceFileAbsolutePaths.map(function (source, i) { return [host.getCanonicalFileName(source), i]; })); var decodedMappings; var generatedMappings; var sourceMappings; @@ -76518,13 +79467,13 @@ var ts; function isNamedDefaultReference(e) { return e.propertyName !== undefined && e.propertyName.escapedText === "default" /* Default */; } - function chainBundle(transformSourceFile) { + function chainBundle(context, transformSourceFile) { return transformSourceFileOrBundle; function transformSourceFileOrBundle(node) { - return node.kind === 290 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node); + return node.kind === 294 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node); } function transformBundle(node) { - return ts.createBundle(ts.map(node.sourceFiles, transformSourceFile), node.prepends); + return context.factory.createBundle(ts.map(node.sourceFiles, transformSourceFile), node.prepends); } } ts.chainBundle = chainBundle; @@ -76558,11 +79507,11 @@ var ts; return !getImportNeedsImportStarHelper(node) && (ts.isDefaultImport(node) || (!!node.importClause && ts.isNamedImports(node.importClause.namedBindings) && containsDefaultReference(node.importClause.namedBindings))); // TODO: GH#18217 } ts.getImportNeedsImportDefaultHelper = getImportNeedsImportDefaultHelper; - function collectExternalModuleInfo(sourceFile, resolver, compilerOptions) { + function collectExternalModuleInfo(context, sourceFile, resolver, compilerOptions) { var externalImports = []; var exportSpecifiers = ts.createMultiMap(); var exportedBindings = []; - var uniqueExports = ts.createMap(); + var uniqueExports = new ts.Map(); var exportedNames; var hasExportDefault = false; var exportEquals; @@ -76572,7 +79521,7 @@ var ts; for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) { var node = _a[_i]; switch (node.kind) { - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: // import "mod" // import x from "mod" // import * as x from "mod" @@ -76585,13 +79534,13 @@ var ts; hasImportDefault = true; } break; - case 253 /* ImportEqualsDeclaration */: - if (node.moduleReference.kind === 265 /* ExternalModuleReference */) { + case 257 /* ImportEqualsDeclaration */: + if (node.moduleReference.kind === 269 /* ExternalModuleReference */) { // import x = require("mod") externalImports.push(node); } break; - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: if (node.moduleSpecifier) { if (!node.exportClause) { // export * from "mod" @@ -76602,46 +79551,46 @@ var ts; // export * as ns from "mod" // export { x, y } from "mod" externalImports.push(node); + if (ts.isNamedExports(node.exportClause)) { + addExportedNamesForExportDeclaration(node); + } + else { + var name = node.exportClause.name; + if (!uniqueExports.get(ts.idText(name))) { + multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), name); + uniqueExports.set(ts.idText(name), true); + exportedNames = ts.append(exportedNames, name); + } + // we use the same helpers for `export * as ns` as we do for `import * as ns` + hasImportStar = true; + } } } else { // export { x, y } - for (var _b = 0, _c = ts.cast(node.exportClause, ts.isNamedExports).elements; _b < _c.length; _b++) { - var specifier = _c[_b]; - if (!uniqueExports.get(ts.idText(specifier.name))) { - var name = specifier.propertyName || specifier.name; - exportSpecifiers.add(ts.idText(name), specifier); - var decl = resolver.getReferencedImportDeclaration(name) - || resolver.getReferencedValueDeclaration(name); - if (decl) { - multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(decl), specifier.name); - } - uniqueExports.set(ts.idText(specifier.name), true); - exportedNames = ts.append(exportedNames, specifier.name); - } - } + addExportedNamesForExportDeclaration(node); } break; - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: if (node.isExportEquals && !exportEquals) { // export = x exportEquals = node; } break; - case 225 /* VariableStatement */: - if (ts.hasModifier(node, 1 /* Export */)) { - for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) { - var decl = _e[_d]; + case 229 /* VariableStatement */: + if (ts.hasSyntacticModifier(node, 1 /* Export */)) { + for (var _b = 0, _c = node.declarationList.declarations; _b < _c.length; _b++) { + var decl = _c[_b]; exportedNames = collectExportedVariableInfo(decl, uniqueExports, exportedNames); } } break; - case 244 /* FunctionDeclaration */: - if (ts.hasModifier(node, 1 /* Export */)) { - if (ts.hasModifier(node, 512 /* Default */)) { + case 248 /* FunctionDeclaration */: + if (ts.hasSyntacticModifier(node, 1 /* Export */)) { + if (ts.hasSyntacticModifier(node, 512 /* Default */)) { // export default function() { } if (!hasExportDefault) { - multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node)); + multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), context.factory.getDeclarationName(node)); hasExportDefault = true; } } @@ -76656,12 +79605,12 @@ var ts; } } break; - case 245 /* ClassDeclaration */: - if (ts.hasModifier(node, 1 /* Export */)) { - if (ts.hasModifier(node, 512 /* Default */)) { + case 249 /* ClassDeclaration */: + if (ts.hasSyntacticModifier(node, 1 /* Export */)) { + if (ts.hasSyntacticModifier(node, 512 /* Default */)) { // export default class { } if (!hasExportDefault) { - multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node)); + multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), context.factory.getDeclarationName(node)); hasExportDefault = true; } } @@ -76678,11 +79627,29 @@ var ts; break; } } - var externalHelpersImportDeclaration = ts.createExternalHelpersImportDeclarationIfNeeded(sourceFile, compilerOptions, hasExportStarsToExportValues, hasImportStar, hasImportDefault); + var externalHelpersImportDeclaration = ts.createExternalHelpersImportDeclarationIfNeeded(context.factory, context.getEmitHelperFactory(), sourceFile, compilerOptions, hasExportStarsToExportValues, hasImportStar, hasImportDefault); if (externalHelpersImportDeclaration) { externalImports.unshift(externalHelpersImportDeclaration); } return { externalImports: externalImports, exportSpecifiers: exportSpecifiers, exportEquals: exportEquals, hasExportStarsToExportValues: hasExportStarsToExportValues, exportedBindings: exportedBindings, exportedNames: exportedNames, externalHelpersImportDeclaration: externalHelpersImportDeclaration }; + function addExportedNamesForExportDeclaration(node) { + for (var _i = 0, _a = ts.cast(node.exportClause, ts.isNamedExports).elements; _i < _a.length; _i++) { + var specifier = _a[_i]; + if (!uniqueExports.get(ts.idText(specifier.name))) { + var name = specifier.propertyName || specifier.name; + if (!node.moduleSpecifier) { + exportSpecifiers.add(ts.idText(name), specifier); + } + var decl = resolver.getReferencedImportDeclaration(name) + || resolver.getReferencedValueDeclaration(name); + if (decl) { + multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(decl), specifier.name); + } + uniqueExports.set(ts.idText(specifier.name), true); + exportedNames = ts.append(exportedNames, specifier.name); + } + } + } } ts.collectExternalModuleInfo = collectExternalModuleInfo; function collectExportedVariableInfo(decl, uniqueExports, exportedNames) { @@ -76738,7 +79705,7 @@ var ts; ts.isSimpleInlineableExpression = isSimpleInlineableExpression; function isCompoundAssignment(kind) { return kind >= 63 /* FirstCompoundAssignment */ - && kind <= 74 /* LastCompoundAssignment */; + && kind <= 77 /* LastCompoundAssignment */; } ts.isCompoundAssignment = isCompoundAssignment; function getNonAssignmentOperatorForCompoundAssignment(kind) { @@ -76754,7 +79721,10 @@ var ts; case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 49 /* GreaterThanGreaterThanGreaterThanToken */; case 72 /* AmpersandEqualsToken */: return 50 /* AmpersandToken */; case 73 /* BarEqualsToken */: return 51 /* BarToken */; - case 74 /* CaretEqualsToken */: return 52 /* CaretToken */; + case 77 /* CaretEqualsToken */: return 52 /* CaretToken */; + case 74 /* BarBarEqualsToken */: return 56 /* BarBarToken */; + case 75 /* AmpersandAmpersandEqualsToken */: return 55 /* AmpersandAmpersandToken */; + case 76 /* QuestionQuestionEqualsToken */: return 60 /* QuestionQuestionToken */; } } ts.getNonAssignmentOperatorForCompoundAssignment = getNonAssignmentOperatorForCompoundAssignment; @@ -76766,11 +79736,11 @@ var ts; * @param visitor The visitor to apply to each node added to the result array. * @returns index of the statement that follows super call */ - function addPrologueDirectivesAndInitialSuperCall(ctor, result, visitor) { + function addPrologueDirectivesAndInitialSuperCall(factory, ctor, result, visitor) { if (ctor.body) { var statements = ctor.body.statements; // add prologue directives to the list (if any) - var index = ts.addPrologue(result, statements, /*ensureUseStrict*/ false, visitor); + var index = factory.copyPrologue(statements, result, /*ensureUseStrict*/ false, visitor); if (index === statements.length) { // list contains nothing but prologue directives (or empty) - exit return index; @@ -76787,32 +79757,6 @@ var ts; return 0; } ts.addPrologueDirectivesAndInitialSuperCall = addPrologueDirectivesAndInitialSuperCall; - /** - * @param input Template string input strings - * @param args Names which need to be made file-level unique - */ - function helperString(input) { - var args = []; - for (var _i = 1; _i < arguments.length; _i++) { - args[_i - 1] = arguments[_i]; - } - return function (uniqueName) { - var result = ""; - for (var i = 0; i < args.length; i++) { - result += input[i]; - result += uniqueName(args[i]); - } - result += input[input.length - 1]; - return result; - }; - } - ts.helperString = helperString; - /** - * Gets all the static or all the instance property declarations of a class - * - * @param node The class node. - * @param isStatic A value indicating whether to get properties from the static or instance side of the class. - */ function getProperties(node, requireInitializer, isStatic) { return ts.filter(node.members, function (m) { return isInitializedOrStaticProperty(m, requireInitializer, isStatic); }); } @@ -76835,7 +79779,7 @@ var ts; * @param isStatic A value indicating whether the member should be a static or instance member. */ function isInitializedProperty(member) { - return member.kind === 159 /* PropertyDeclaration */ + return member.kind === 162 /* PropertyDeclaration */ && member.initializer !== undefined; } ts.isInitializedProperty = isInitializedProperty; @@ -76882,8 +79826,8 @@ var ts; hoistTempVariables: true, emitExpression: emitExpression, emitBindingOrAssignment: emitBindingOrAssignment, - createArrayBindingOrAssignmentPattern: makeArrayAssignmentPattern, - createObjectBindingOrAssignmentPattern: makeObjectAssignmentPattern, + createArrayBindingOrAssignmentPattern: function (elements) { return makeArrayAssignmentPattern(context.factory, elements); }, + createObjectBindingOrAssignmentPattern: function (elements) { return makeObjectAssignmentPattern(context.factory, elements); }, createArrayBindingOrAssignmentElement: makeAssignmentElement, visitor: visitor }; @@ -76921,16 +79865,15 @@ var ts; } expressions.push(value); } - return ts.aggregateTransformFlags(ts.inlineExpressions(expressions)) || ts.createOmittedExpression(); + return context.factory.inlineExpressions(expressions) || context.factory.createOmittedExpression(); function emitExpression(expression) { - ts.aggregateTransformFlags(expression); expressions = ts.append(expressions, expression); } function emitBindingOrAssignment(target, value, location, original) { ts.Debug.assertNode(target, createAssignmentCallback ? ts.isIdentifier : ts.isExpression); var expression = createAssignmentCallback ? createAssignmentCallback(target, value, location) - : ts.setTextRange(ts.createAssignment(ts.visitNode(target, visitor, ts.isExpression), value), location); + : ts.setTextRange(context.factory.createAssignment(ts.visitNode(target, visitor, ts.isExpression), value), location); expression.original = original; emitExpression(expression); } @@ -76990,9 +79933,9 @@ var ts; hoistTempVariables: hoistTempVariables, emitExpression: emitExpression, emitBindingOrAssignment: emitBindingOrAssignment, - createArrayBindingOrAssignmentPattern: makeArrayBindingPattern, - createObjectBindingOrAssignmentPattern: makeObjectBindingPattern, - createArrayBindingOrAssignmentElement: makeBindingElement, + createArrayBindingOrAssignmentPattern: function (elements) { return makeArrayBindingPattern(context.factory, elements); }, + createObjectBindingOrAssignmentPattern: function (elements) { return makeObjectBindingPattern(context.factory, elements); }, + createArrayBindingOrAssignmentElement: function (name) { return makeBindingElement(context.factory, name); }, visitor: visitor }; if (ts.isVariableDeclaration(node)) { @@ -77002,32 +79945,32 @@ var ts; // If the right-hand value of the assignment is also an assignment target then // we need to cache the right-hand value. initializer = ensureIdentifier(flattenContext, initializer, /*reuseIdentifierExpressions*/ false, initializer); - node = ts.updateVariableDeclaration(node, node.name, node.type, initializer); + node = context.factory.updateVariableDeclaration(node, node.name, /*exclamationToken*/ undefined, /*type*/ undefined, initializer); } } flattenBindingOrAssignmentElement(flattenContext, node, rval, node, skipInitializer); if (pendingExpressions) { - var temp = ts.createTempVariable(/*recordTempVariable*/ undefined); + var temp = context.factory.createTempVariable(/*recordTempVariable*/ undefined); if (hoistTempVariables) { - var value = ts.inlineExpressions(pendingExpressions); + var value = context.factory.inlineExpressions(pendingExpressions); pendingExpressions = undefined; emitBindingOrAssignment(temp, value, /*location*/ undefined, /*original*/ undefined); } else { context.hoistVariableDeclaration(temp); var pendingDeclaration = ts.last(pendingDeclarations); - pendingDeclaration.pendingExpressions = ts.append(pendingDeclaration.pendingExpressions, ts.createAssignment(temp, pendingDeclaration.value)); + pendingDeclaration.pendingExpressions = ts.append(pendingDeclaration.pendingExpressions, context.factory.createAssignment(temp, pendingDeclaration.value)); ts.addRange(pendingDeclaration.pendingExpressions, pendingExpressions); pendingDeclaration.value = temp; } } for (var _i = 0, pendingDeclarations_1 = pendingDeclarations; _i < pendingDeclarations_1.length; _i++) { var _a = pendingDeclarations_1[_i], pendingExpressions_1 = _a.pendingExpressions, name = _a.name, value = _a.value, location = _a.location, original = _a.original; - var variable = ts.createVariableDeclaration(name, - /*type*/ undefined, pendingExpressions_1 ? ts.inlineExpressions(ts.append(pendingExpressions_1, value)) : value); + var variable = context.factory.createVariableDeclaration(name, + /*exclamationToken*/ undefined, + /*type*/ undefined, pendingExpressions_1 ? context.factory.inlineExpressions(ts.append(pendingExpressions_1, value)) : value); variable.original = original; ts.setTextRange(variable, location); - ts.aggregateTransformFlags(variable); declarations.push(variable); } return declarations; @@ -77037,7 +79980,7 @@ var ts; function emitBindingOrAssignment(target, value, location, original) { ts.Debug.assertNode(target, ts.isBindingName); if (pendingExpressions) { - value = ts.inlineExpressions(ts.append(pendingExpressions, value)); + value = context.factory.inlineExpressions(ts.append(pendingExpressions, value)); pendingExpressions = undefined; } pendingDeclarations.push({ pendingExpressions: pendingExpressions, name: target, value: value, location: location, original: original }); @@ -77063,7 +80006,7 @@ var ts; } else if (!value) { // Use 'void 0' in absence of value and initializer - value = ts.createVoidZero(); + value = flattenContext.context.factory.createVoidZero(); } } var bindingTarget = ts.getTargetOfBindingOrAssignmentElement(element); // TODO: GH#18217 @@ -77126,7 +80069,7 @@ var ts; flattenContext.emitBindingOrAssignment(flattenContext.createObjectBindingOrAssignmentPattern(bindingElements), value, location, pattern); bindingElements = undefined; } - var rhsValue = createRestCall(flattenContext.context, value, elements, computedTempVariables, pattern); // TODO: GH#18217 + var rhsValue = flattenContext.context.getEmitHelperFactory().createRestHelper(value, elements, computedTempVariables, pattern); flattenBindingOrAssignmentElement(flattenContext, element, rhsValue, element); } } @@ -77148,9 +80091,9 @@ var ts; var numElements = elements.length; if (flattenContext.level < 1 /* ObjectRest */ && flattenContext.downlevelIteration) { // Read the elements of the iterable into an array - value = ensureIdentifier(flattenContext, ts.createReadHelper(flattenContext.context, value, numElements > 0 && ts.getRestIndicatorOfBindingOrAssignmentElement(elements[numElements - 1]) + value = ensureIdentifier(flattenContext, ts.setTextRange(flattenContext.context.getEmitHelperFactory().createReadHelper(value, numElements > 0 && ts.getRestIndicatorOfBindingOrAssignmentElement(elements[numElements - 1]) ? undefined - : numElements, location), + : numElements), location), /*reuseIdentifierExpressions*/ false, location); } else if (numElements !== 1 && (flattenContext.level < 1 /* ObjectRest */ || numElements === 0) @@ -77172,7 +80115,7 @@ var ts; // If an array pattern contains an ObjectRest, we must cache the result so that we // can perform the ObjectRest destructuring in a different declaration if (element.transformFlags & 16384 /* ContainsObjectRestOrSpread */) { - var temp = ts.createTempVariable(/*recordTempVariable*/ undefined); + var temp = flattenContext.context.factory.createTempVariable(/*recordTempVariable*/ undefined); if (flattenContext.hoistTempVariables) { flattenContext.context.hoistVariableDeclaration(temp); } @@ -77187,11 +80130,11 @@ var ts; continue; } else if (!ts.getRestIndicatorOfBindingOrAssignmentElement(element)) { - var rhsValue = ts.createElementAccess(value, i); + var rhsValue = flattenContext.context.factory.createElementAccessExpression(value, i); flattenBindingOrAssignmentElement(flattenContext, element, rhsValue, /*location*/ element); } else if (i === numElements - 1) { - var rhsValue = ts.createArraySlice(value, i); + var rhsValue = flattenContext.context.factory.createArraySliceCall(value, i); flattenBindingOrAssignmentElement(flattenContext, element, rhsValue, /*location*/ element); } } @@ -77215,7 +80158,7 @@ var ts; */ function createDefaultValueCheck(flattenContext, value, defaultValue, location) { value = ensureIdentifier(flattenContext, value, /*reuseIdentifierExpressions*/ true, location); - return ts.createConditional(ts.createTypeCheck(value, "undefined"), defaultValue, value); + return flattenContext.context.factory.createConditionalExpression(flattenContext.context.factory.createTypeCheck(value, "undefined"), /*questionToken*/ undefined, defaultValue, /*colonToken*/ undefined, value); } /** * Creates either a PropertyAccessExpression or an ElementAccessExpression for the @@ -77230,16 +80173,15 @@ var ts; function createDestructuringPropertyAccess(flattenContext, value, propertyName) { if (ts.isComputedPropertyName(propertyName)) { var argumentExpression = ensureIdentifier(flattenContext, ts.visitNode(propertyName.expression, flattenContext.visitor), /*reuseIdentifierExpressions*/ false, /*location*/ propertyName); - return ts.createElementAccess(value, argumentExpression); + return flattenContext.context.factory.createElementAccessExpression(value, argumentExpression); } else if (ts.isStringOrNumericLiteralLike(propertyName)) { - var argumentExpression = ts.getSynthesizedClone(propertyName); - argumentExpression.text = argumentExpression.text; - return ts.createElementAccess(value, argumentExpression); + var argumentExpression = ts.factory.cloneNode(propertyName); + return flattenContext.context.factory.createElementAccessExpression(value, argumentExpression); } else { - var name = ts.createIdentifier(ts.idText(propertyName)); - return ts.createPropertyAccess(value, name); + var name = flattenContext.context.factory.createIdentifier(ts.idText(propertyName)); + return flattenContext.context.factory.createPropertyAccessExpression(value, name); } } /** @@ -77258,10 +80200,10 @@ var ts; return value; } else { - var temp = ts.createTempVariable(/*recordTempVariable*/ undefined); + var temp = flattenContext.context.factory.createTempVariable(/*recordTempVariable*/ undefined); if (flattenContext.hoistTempVariables) { flattenContext.context.hoistVariableDeclaration(temp); - flattenContext.emitExpression(ts.setTextRange(ts.createAssignment(temp, value), location)); + flattenContext.emitExpression(ts.setTextRange(flattenContext.context.factory.createAssignment(temp, value), location)); } else { flattenContext.emitBindingOrAssignment(temp, value, location, /*original*/ undefined); @@ -77269,59 +80211,26 @@ var ts; return temp; } } - function makeArrayBindingPattern(elements) { + function makeArrayBindingPattern(factory, elements) { ts.Debug.assertEachNode(elements, ts.isArrayBindingElement); - return ts.createArrayBindingPattern(elements); + return factory.createArrayBindingPattern(elements); } - function makeArrayAssignmentPattern(elements) { - return ts.createArrayLiteral(ts.map(elements, ts.convertToArrayAssignmentElement)); + function makeArrayAssignmentPattern(factory, elements) { + return factory.createArrayLiteralExpression(ts.map(elements, factory.converters.convertToArrayAssignmentElement)); } - function makeObjectBindingPattern(elements) { + function makeObjectBindingPattern(factory, elements) { ts.Debug.assertEachNode(elements, ts.isBindingElement); - return ts.createObjectBindingPattern(elements); + return factory.createObjectBindingPattern(elements); } - function makeObjectAssignmentPattern(elements) { - return ts.createObjectLiteral(ts.map(elements, ts.convertToObjectAssignmentElement)); + function makeObjectAssignmentPattern(factory, elements) { + return factory.createObjectLiteralExpression(ts.map(elements, factory.converters.convertToObjectAssignmentElement)); } - function makeBindingElement(name) { - return ts.createBindingElement(/*dotDotDotToken*/ undefined, /*propertyName*/ undefined, name); + function makeBindingElement(factory, name) { + return factory.createBindingElement(/*dotDotDotToken*/ undefined, /*propertyName*/ undefined, name); } function makeAssignmentElement(name) { return name; } - ts.restHelper = { - name: "typescript:rest", - importName: "__rest", - scoped: false, - text: "\n var __rest = (this && this.__rest) || function (s, e) {\n var t = {};\n for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n t[p] = s[p];\n if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {\n if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))\n t[p[i]] = s[p[i]];\n }\n return t;\n };" - }; - /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement - * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);` - */ - function createRestCall(context, value, elements, computedTempVariables, location) { - context.requestEmitHelper(ts.restHelper); - var propertyNames = []; - var computedTempVariableOffset = 0; - for (var i = 0; i < elements.length - 1; i++) { - var propertyName = ts.getPropertyNameOfBindingOrAssignmentElement(elements[i]); - if (propertyName) { - if (ts.isComputedPropertyName(propertyName)) { - var temp = computedTempVariables[computedTempVariableOffset]; - computedTempVariableOffset++; - // typeof _tmp === "symbol" ? _tmp : _tmp + "" - propertyNames.push(ts.createConditional(ts.createTypeCheck(temp, "symbol"), temp, ts.createAdd(temp, ts.createLiteral("")))); - } - else { - propertyNames.push(ts.createLiteral(propertyName)); - } - } - } - return ts.createCall(ts.getUnscopedHelperName("__rest"), - /*typeArguments*/ undefined, [ - value, - ts.setTextRange(ts.createArrayLiteral(propertyNames), location) - ]); - } })(ts || (ts = {})); /*@internal*/ var ts; @@ -77341,8 +80250,9 @@ var ts; var cookedStrings = []; var rawStrings = []; var template = node.template; - if (level === ProcessLevel.LiftRestriction && !ts.hasInvalidEscape(template)) - return node; + if (level === ProcessLevel.LiftRestriction && !ts.hasInvalidEscape(template)) { + return ts.visitEachChild(node, visitor, context); + } if (ts.isNoSubstitutionTemplateLiteral(template)) { cookedStrings.push(createTemplateCooked(template)); rawStrings.push(getRawLiteral(template, currentSourceFile)); @@ -77357,23 +80267,23 @@ var ts; templateArguments.push(ts.visitNode(templateSpan.expression, visitor, ts.isExpression)); } } - var helperCall = createTemplateObjectHelper(context, ts.createArrayLiteral(cookedStrings), ts.createArrayLiteral(rawStrings)); + var helperCall = context.getEmitHelperFactory().createTemplateObjectHelper(ts.factory.createArrayLiteralExpression(cookedStrings), ts.factory.createArrayLiteralExpression(rawStrings)); // Create a variable to cache the template object if we're in a module. // Do not do this in the global scope, as any variable we currently generate could conflict with // variables from outside of the current compilation. In the future, we can revisit this behavior. if (ts.isExternalModule(currentSourceFile)) { - var tempVar = ts.createUniqueName("templateObject"); + var tempVar = ts.factory.createUniqueName("templateObject"); recordTaggedTemplateString(tempVar); - templateArguments[0] = ts.createLogicalOr(tempVar, ts.createAssignment(tempVar, helperCall)); + templateArguments[0] = ts.factory.createLogicalOr(tempVar, ts.factory.createAssignment(tempVar, helperCall)); } else { templateArguments[0] = helperCall; } - return ts.createCall(tag, /*typeArguments*/ undefined, templateArguments); + return ts.factory.createCallExpression(tag, /*typeArguments*/ undefined, templateArguments); } ts.processTaggedTemplateExpression = processTaggedTemplateExpression; function createTemplateCooked(template) { - return template.templateFlags ? ts.createIdentifier("undefined") : ts.createLiteral(template.text); + return template.templateFlags ? ts.factory.createVoidZero() : ts.factory.createStringLiteral(template.text); } /** * Creates an ES5 compatible literal from an ES6 template literal. @@ -77398,23 +80308,8 @@ var ts; // ES6 Spec 11.8.6.1 - Static Semantics of TV's and TRV's // and LineTerminatorSequences are normalized to for both TV and TRV. text = text.replace(/\r\n?/g, "\n"); - return ts.setTextRange(ts.createLiteral(text), node); + return ts.setTextRange(ts.factory.createStringLiteral(text), node); } - function createTemplateObjectHelper(context, cooked, raw) { - context.requestEmitHelper(ts.templateObjectHelper); - return ts.createCall(ts.getUnscopedHelperName("__makeTemplateObject"), - /*typeArguments*/ undefined, [ - cooked, - raw - ]); - } - ts.templateObjectHelper = { - name: "typescript:makeTemplateObject", - importName: "__makeTemplateObject", - scoped: false, - priority: 0, - text: "\n var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {\n if (Object.defineProperty) { Object.defineProperty(cooked, \"raw\", { value: raw }); } else { cooked.raw = raw; }\n return cooked;\n };" - }; })(ts || (ts = {})); /*@internal*/ var ts; @@ -77449,7 +80344,7 @@ var ts; ClassFacts[ClassFacts["IsExported"] = 56] = "IsExported"; })(ClassFacts || (ClassFacts = {})); function transformTypeScript(context) { - var startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration; + var factory = context.factory, emitHelpers = context.getEmitHelperFactory, startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration; var resolver = context.getEmitResolver(); var compilerOptions = context.getCompilerOptions(); var strictNullChecks = ts.getStrictOptionValue(compilerOptions, "strictNullChecks"); @@ -77462,8 +80357,8 @@ var ts; context.onEmitNode = onEmitNode; context.onSubstituteNode = onSubstituteNode; // Enable substitution for property/element access to emit const enum values. - context.enableSubstitution(194 /* PropertyAccessExpression */); - context.enableSubstitution(195 /* ElementAccessExpression */); + context.enableSubstitution(198 /* PropertyAccessExpression */); + context.enableSubstitution(199 /* ElementAccessExpression */); // These variables contain state that changes as we descend into the tree. var currentSourceFile; var currentNamespace; @@ -77489,14 +80384,14 @@ var ts; var applicableSubstitutions; return transformSourceFileOrBundle; function transformSourceFileOrBundle(node) { - if (node.kind === 291 /* Bundle */) { + if (node.kind === 295 /* Bundle */) { return transformBundle(node); } return transformSourceFile(node); } function transformBundle(node) { - return ts.createBundle(node.sourceFiles.map(transformSourceFile), ts.mapDefined(node.prepends, function (prepend) { - if (prepend.kind === 293 /* InputFiles */) { + return factory.createBundle(node.sourceFiles.map(transformSourceFile), ts.mapDefined(node.prepends, function (prepend) { + if (prepend.kind === 297 /* InputFiles */) { return ts.createUnparsedSourceFile(prepend, "js"); } return prepend; @@ -77547,17 +80442,17 @@ var ts; */ function onBeforeVisitNode(node) { switch (node.kind) { - case 290 /* SourceFile */: - case 251 /* CaseBlock */: - case 250 /* ModuleBlock */: - case 223 /* Block */: + case 294 /* SourceFile */: + case 255 /* CaseBlock */: + case 254 /* ModuleBlock */: + case 227 /* Block */: currentLexicalScope = node; currentNameScope = undefined; currentScopeFirstDeclarationsOfName = undefined; break; - case 245 /* ClassDeclaration */: - case 244 /* FunctionDeclaration */: - if (ts.hasModifier(node, 2 /* Ambient */)) { + case 249 /* ClassDeclaration */: + case 248 /* FunctionDeclaration */: + if (ts.hasSyntacticModifier(node, 2 /* Ambient */)) { break; } // Record these declarations provided that they have a name. @@ -77568,7 +80463,7 @@ var ts; // These nodes should always have names unless they are default-exports; // however, class declaration parsing allows for undefined names, so syntactically invalid // programs may also have an undefined name. - ts.Debug.assert(node.kind === 245 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */)); + ts.Debug.assert(node.kind === 249 /* ClassDeclaration */ || ts.hasSyntacticModifier(node, 512 /* Default */)); } if (ts.isClassDeclaration(node)) { // XXX: should probably also cover interfaces and type aliases that can have type variables? @@ -77611,16 +80506,16 @@ var ts; */ function sourceElementVisitorWorker(node) { switch (node.kind) { - case 254 /* ImportDeclaration */: - case 253 /* ImportEqualsDeclaration */: - case 259 /* ExportAssignment */: - case 260 /* ExportDeclaration */: - return visitEllidableStatement(node); + case 258 /* ImportDeclaration */: + case 257 /* ImportEqualsDeclaration */: + case 263 /* ExportAssignment */: + case 264 /* ExportDeclaration */: + return visitElidableStatement(node); default: return visitorWorker(node); } } - function visitEllidableStatement(node) { + function visitElidableStatement(node) { var parsed = ts.getParseTreeNode(node); if (parsed !== node) { // If the node has been transformed by a `before` transformer, perform no ellision on it @@ -77635,13 +80530,13 @@ var ts; return node; } switch (node.kind) { - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: return visitImportDeclaration(node); - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return visitImportEqualsDeclaration(node); - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: return visitExportAssignment(node); - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: return visitExportDeclaration(node); default: ts.Debug.fail("Unhandled ellided statement"); @@ -77661,15 +80556,15 @@ var ts; * @param node The node to visit. */ function namespaceElementVisitorWorker(node) { - if (node.kind === 260 /* ExportDeclaration */ || - node.kind === 254 /* ImportDeclaration */ || - node.kind === 255 /* ImportClause */ || - (node.kind === 253 /* ImportEqualsDeclaration */ && - node.moduleReference.kind === 265 /* ExternalModuleReference */)) { + if (node.kind === 264 /* ExportDeclaration */ || + node.kind === 258 /* ImportDeclaration */ || + node.kind === 259 /* ImportClause */ || + (node.kind === 257 /* ImportEqualsDeclaration */ && + node.moduleReference.kind === 269 /* ExternalModuleReference */)) { // do not emit ES6 imports and exports since they are illegal inside a namespace return undefined; } - else if (node.transformFlags & 1 /* ContainsTypeScript */ || ts.hasModifier(node, 1 /* Export */)) { + else if (node.transformFlags & 1 /* ContainsTypeScript */ || ts.hasSyntacticModifier(node, 1 /* Export */)) { return visitTypeScript(node); } return node; @@ -77689,19 +80584,19 @@ var ts; */ function classElementVisitorWorker(node) { switch (node.kind) { - case 162 /* Constructor */: + case 165 /* Constructor */: return visitConstructor(node); - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: // Property declarations are not TypeScript syntax, but they must be visited // for the decorator transformation. return visitPropertyDeclaration(node); - case 167 /* IndexSignature */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 161 /* MethodDeclaration */: + case 170 /* IndexSignature */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 164 /* MethodDeclaration */: // Fallback to the default visit behavior. return visitorWorker(node); - case 222 /* SemicolonClassElement */: + case 226 /* SemicolonClassElement */: return node; default: return ts.Debug.failBadSyntaxKind(node); @@ -77711,7 +80606,7 @@ var ts; if (ts.modifierToFlag(node.kind) & 2270 /* TypeScriptModifier */) { return undefined; } - else if (currentNamespace && node.kind === 89 /* ExportKeyword */) { + else if (currentNamespace && node.kind === 92 /* ExportKeyword */) { return undefined; } return node; @@ -77722,77 +80617,77 @@ var ts; * @param node The node to visit. */ function visitTypeScript(node) { - if (ts.isStatement(node) && ts.hasModifier(node, 2 /* Ambient */)) { + if (ts.isStatement(node) && ts.hasSyntacticModifier(node, 2 /* Ambient */)) { // TypeScript ambient declarations are elided, but some comments may be preserved. // See the implementation of `getLeadingComments` in comments.ts for more details. - return ts.createNotEmittedStatement(node); + return factory.createNotEmittedStatement(node); } switch (node.kind) { - case 89 /* ExportKeyword */: - case 84 /* DefaultKeyword */: + case 92 /* ExportKeyword */: + case 87 /* DefaultKeyword */: // ES6 export and default modifiers are elided when inside a namespace. return currentNamespace ? undefined : node; - case 119 /* PublicKeyword */: - case 117 /* PrivateKeyword */: - case 118 /* ProtectedKeyword */: - case 122 /* AbstractKeyword */: - case 81 /* ConstKeyword */: - case 130 /* DeclareKeyword */: - case 138 /* ReadonlyKeyword */: + case 122 /* PublicKeyword */: + case 120 /* PrivateKeyword */: + case 121 /* ProtectedKeyword */: + case 125 /* AbstractKeyword */: + case 84 /* ConstKeyword */: + case 133 /* DeclareKeyword */: + case 141 /* ReadonlyKeyword */: // TypeScript accessibility and readonly modifiers are elided // falls through - case 174 /* ArrayType */: - case 175 /* TupleType */: - case 176 /* OptionalType */: - case 177 /* RestType */: - case 173 /* TypeLiteral */: - case 168 /* TypePredicate */: - case 155 /* TypeParameter */: - case 125 /* AnyKeyword */: - case 148 /* UnknownKeyword */: - case 128 /* BooleanKeyword */: - case 143 /* StringKeyword */: - case 140 /* NumberKeyword */: - case 137 /* NeverKeyword */: - case 110 /* VoidKeyword */: - case 144 /* SymbolKeyword */: - case 171 /* ConstructorType */: - case 170 /* FunctionType */: - case 172 /* TypeQuery */: - case 169 /* TypeReference */: - case 178 /* UnionType */: - case 179 /* IntersectionType */: - case 180 /* ConditionalType */: - case 182 /* ParenthesizedType */: - case 183 /* ThisType */: - case 184 /* TypeOperator */: - case 185 /* IndexedAccessType */: - case 186 /* MappedType */: - case 187 /* LiteralType */: + case 177 /* ArrayType */: + case 178 /* TupleType */: + case 179 /* OptionalType */: + case 180 /* RestType */: + case 176 /* TypeLiteral */: + case 171 /* TypePredicate */: + case 158 /* TypeParameter */: + case 128 /* AnyKeyword */: + case 151 /* UnknownKeyword */: + case 131 /* BooleanKeyword */: + case 146 /* StringKeyword */: + case 143 /* NumberKeyword */: + case 140 /* NeverKeyword */: + case 113 /* VoidKeyword */: + case 147 /* SymbolKeyword */: + case 174 /* ConstructorType */: + case 173 /* FunctionType */: + case 175 /* TypeQuery */: + case 172 /* TypeReference */: + case 181 /* UnionType */: + case 182 /* IntersectionType */: + case 183 /* ConditionalType */: + case 185 /* ParenthesizedType */: + case 186 /* ThisType */: + case 187 /* TypeOperator */: + case 188 /* IndexedAccessType */: + case 189 /* MappedType */: + case 190 /* LiteralType */: // TypeScript type nodes are elided. // falls through - case 167 /* IndexSignature */: + case 170 /* IndexSignature */: // TypeScript index signatures are elided. // falls through - case 157 /* Decorator */: + case 160 /* Decorator */: // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration. // falls through - case 247 /* TypeAliasDeclaration */: + case 251 /* TypeAliasDeclaration */: // TypeScript type-only declarations are elided. return undefined; - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: // TypeScript property declarations are elided. However their names are still visited, and can potentially be retained if they could have sideeffects return visitPropertyDeclaration(node); - case 252 /* NamespaceExportDeclaration */: + case 256 /* NamespaceExportDeclaration */: // TypeScript namespace export declarations are elided. return undefined; - case 162 /* Constructor */: + case 165 /* Constructor */: return visitConstructor(node); - case 246 /* InterfaceDeclaration */: + case 250 /* InterfaceDeclaration */: // TypeScript interfaces are elided, but some comments may be preserved. // See the implementation of `getLeadingComments` in comments.ts for more details. - return ts.createNotEmittedStatement(node); - case 245 /* ClassDeclaration */: + return factory.createNotEmittedStatement(node); + case 249 /* ClassDeclaration */: // This may be a class declaration with TypeScript syntax extensions. // // TypeScript class syntax extensions include: @@ -77802,7 +80697,7 @@ var ts; // - index signatures // - method overload signatures return visitClassDeclaration(node); - case 214 /* ClassExpression */: + case 218 /* ClassExpression */: // This may be a class expression with TypeScript syntax extensions. // // TypeScript class syntax extensions include: @@ -77812,35 +80707,35 @@ var ts; // - index signatures // - method overload signatures return visitClassExpression(node); - case 279 /* HeritageClause */: + case 283 /* HeritageClause */: // This may be a heritage clause with TypeScript syntax extensions. // // TypeScript heritage clause extensions include: // - `implements` clause return visitHeritageClause(node); - case 216 /* ExpressionWithTypeArguments */: + case 220 /* ExpressionWithTypeArguments */: // TypeScript supports type arguments on an expression in an `extends` heritage clause. return visitExpressionWithTypeArguments(node); - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: // TypeScript method declarations may have decorators, modifiers // or type annotations. return visitMethodDeclaration(node); - case 163 /* GetAccessor */: + case 166 /* GetAccessor */: // Get Accessors can have TypeScript modifiers, decorators, and type annotations. return visitGetAccessor(node); - case 164 /* SetAccessor */: + case 167 /* SetAccessor */: // Set Accessors can have TypeScript modifiers and type annotations. return visitSetAccessor(node); - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: // Typescript function declarations can have modifiers, decorators, and type annotations. return visitFunctionDeclaration(node); - case 201 /* FunctionExpression */: + case 205 /* FunctionExpression */: // TypeScript function expressions can have modifiers and type annotations. return visitFunctionExpression(node); - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: // TypeScript arrow functions can have modifiers and type annotations. return visitArrowFunction(node); - case 156 /* Parameter */: + case 159 /* Parameter */: // This may be a parameter declaration with TypeScript syntax extensions. // // TypeScript parameter declaration syntax extensions include: @@ -77850,40 +80745,40 @@ var ts; // - type annotations // - this parameters return visitParameter(node); - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: // ParenthesizedExpressions are TypeScript if their expression is a // TypeAssertion or AsExpression return visitParenthesizedExpression(node); - case 199 /* TypeAssertionExpression */: - case 217 /* AsExpression */: + case 203 /* TypeAssertionExpression */: + case 221 /* AsExpression */: // TypeScript type assertions are removed, but their subtrees are preserved. return visitAssertionExpression(node); - case 196 /* CallExpression */: + case 200 /* CallExpression */: return visitCallExpression(node); - case 197 /* NewExpression */: + case 201 /* NewExpression */: return visitNewExpression(node); - case 198 /* TaggedTemplateExpression */: + case 202 /* TaggedTemplateExpression */: return visitTaggedTemplateExpression(node); - case 218 /* NonNullExpression */: + case 222 /* NonNullExpression */: // TypeScript non-null expressions are removed, but their subtrees are preserved. return visitNonNullExpression(node); - case 248 /* EnumDeclaration */: + case 252 /* EnumDeclaration */: // TypeScript enum declarations do not exist in ES6 and must be rewritten. return visitEnumDeclaration(node); - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: // TypeScript namespace exports for variable statements must be transformed. return visitVariableStatement(node); - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return visitVariableDeclaration(node); - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: // TypeScript namespace declarations must be transformed. return visitModuleDeclaration(node); - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: // TypeScript namespace or external module import. return visitImportEqualsDeclaration(node); - case 267 /* JsxSelfClosingElement */: + case 271 /* JsxSelfClosingElement */: return visitJsxSelfClosingElement(node); - case 268 /* JsxOpeningElement */: + case 272 /* JsxOpeningElement */: return visitJsxJsxOpeningElement(node); default: // node contains some other TypeScript syntax @@ -77894,7 +80789,7 @@ var ts; var alwaysStrict = ts.getStrictOptionValue(compilerOptions, "alwaysStrict") && !(ts.isExternalModule(node) && moduleKind >= ts.ModuleKind.ES2015) && !ts.isJsonSourceFile(node); - return ts.updateSourceFileNode(node, ts.visitLexicalEnvironment(node.statements, sourceElementVisitor, context, /*start*/ 0, alwaysStrict)); + return factory.updateSourceFile(node, ts.visitLexicalEnvironment(node.statements, sourceElementVisitor, context, /*start*/ 0, alwaysStrict)); } /** * Tests whether we should emit a __decorate call for a class declaration. @@ -77920,7 +80815,7 @@ var ts; if (ts.some(staticProperties)) facts |= 1 /* HasStaticInitializedProperties */; var extendsClauseElement = ts.getEffectiveBaseTypeNode(node); - if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 100 /* NullKeyword */) + if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 103 /* NullKeyword */) facts |= 64 /* IsDerivedClass */; if (shouldEmitDecorateCallForClass(node)) facts |= 2 /* HasConstructorDecorators */; @@ -77946,7 +80841,7 @@ var ts; || ts.some(node.members, hasTypeScriptClassSyntax); } function visitClassDeclaration(node) { - if (!isClassLikeDeclarationWithTypeScriptSyntax(node) && !(currentNamespace && ts.hasModifier(node, 1 /* Export */))) { + if (!isClassLikeDeclarationWithTypeScriptSyntax(node) && !(currentNamespace && ts.hasSyntacticModifier(node, 1 /* Export */))) { return ts.visitEachChild(node, visitor, context); } var staticProperties = ts.getProperties(node, /*requireInitializer*/ true, /*isStatic*/ true); @@ -77954,7 +80849,7 @@ var ts; if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */) { context.startLexicalEnvironment(); } - var name = node.name || (facts & 5 /* NeedsName */ ? ts.getGeneratedNameForNode(node) : undefined); + var name = node.name || (facts & 5 /* NeedsName */ ? factory.getGeneratedNameForNode(node) : undefined); var classStatement = facts & 2 /* HasConstructorDecorators */ ? createClassDeclarationHeadWithDecorators(node, name) : createClassDeclarationHeadWithoutDecorators(node, name, facts); @@ -77976,22 +80871,23 @@ var ts; // }(); // var closingBraceLocation = ts.createTokenRange(ts.skipTrivia(currentSourceFile.text, node.members.end), 19 /* CloseBraceToken */); - var localName = ts.getInternalName(node); + var localName = factory.getInternalName(node); // The following partially-emitted expression exists purely to align our sourcemap // emit with the original emitter. - var outer = ts.createPartiallyEmittedExpression(localName); - outer.end = closingBraceLocation.end; + var outer = factory.createPartiallyEmittedExpression(localName); + ts.setTextRangeEnd(outer, closingBraceLocation.end); ts.setEmitFlags(outer, 1536 /* NoComments */); - var statement = ts.createReturn(outer); - statement.pos = closingBraceLocation.pos; + var statement = factory.createReturnStatement(outer); + ts.setTextRangePos(statement, closingBraceLocation.pos); ts.setEmitFlags(statement, 1536 /* NoComments */ | 384 /* NoTokenSourceMaps */); statements.push(statement); ts.insertStatementsAfterStandardPrologue(statements, context.endLexicalEnvironment()); - var iife = ts.createImmediatelyInvokedArrowFunction(statements); + var iife = factory.createImmediatelyInvokedArrowFunction(statements); ts.setEmitFlags(iife, 33554432 /* TypeScriptClassWrapper */); - var varStatement = ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ false), + var varStatement = factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList([ + factory.createVariableDeclaration(factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ false), + /*exclamationToken*/ undefined, /*type*/ undefined, iife) ])); ts.setOriginalNode(varStatement, node); @@ -78008,15 +80904,15 @@ var ts; } else if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */ || facts & 2 /* HasConstructorDecorators */) { if (facts & 32 /* IsDefaultExternalExport */) { - statements.push(ts.createExportDefault(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))); + statements.push(factory.createExportDefault(factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))); } else if (facts & 16 /* IsNamedExternalExport */) { - statements.push(ts.createExternalModuleExport(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))); + statements.push(factory.createExternalModuleExport(factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))); } } if (statements.length > 1) { // Add a DeclarationMarker as a marker for the end of the declaration - statements.push(ts.createEndOfDeclarationMarker(node)); + statements.push(factory.createEndOfDeclarationMarker(node)); ts.setEmitFlags(classStatement, ts.getEmitFlags(classStatement) | 4194304 /* HasEndOfDeclarationMarker */); } return ts.singleOrMany(statements); @@ -78036,7 +80932,7 @@ var ts; var modifiers = !(facts & 128 /* UseImmediatelyInvokedFunctionExpression */) ? ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier) : undefined; - var classDeclaration = ts.createClassDeclaration( + var classDeclaration = factory.createClassDeclaration( /*decorators*/ undefined, modifiers, name, /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node)); // To better align with the old emitter, we should not emit a trailing source map @@ -78045,7 +80941,6 @@ var ts; if (facts & 1 /* HasStaticInitializedProperties */) { emitFlags |= 32 /* NoTrailingSourceMap */; } - ts.aggregateTransformFlags(classDeclaration); ts.setTextRange(classDeclaration, node); ts.setOriginalNode(classDeclaration, node); ts.setEmitFlags(classDeclaration, emitFlags); @@ -78143,22 +81038,22 @@ var ts; // var location = ts.moveRangePastDecorators(node); var classAlias = getClassAliasIfNeeded(node); - var declName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); + var declName = factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); // ... = class ${name} ${heritageClauses} { // ${members} // } var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause); var members = transformClassMembers(node); - var classExpression = ts.createClassExpression(/*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members); - ts.aggregateTransformFlags(classExpression); + var classExpression = factory.createClassExpression(/*decorators*/ undefined, /*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members); ts.setOriginalNode(classExpression, node); ts.setTextRange(classExpression, location); // let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference // or decoratedClassAlias if the class contain self-reference. - var statement = ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(declName, - /*type*/ undefined, classAlias ? ts.createAssignment(classAlias, classExpression) : classExpression) + var statement = factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList([ + factory.createVariableDeclaration(declName, + /*exclamationToken*/ undefined, + /*type*/ undefined, classAlias ? factory.createAssignment(classAlias, classExpression) : classExpression) ], 1 /* Let */)); ts.setOriginalNode(statement, node); ts.setTextRange(statement, location); @@ -78169,10 +81064,10 @@ var ts; if (!isClassLikeDeclarationWithTypeScriptSyntax(node)) { return ts.visitEachChild(node, visitor, context); } - var classExpression = ts.createClassExpression( + var classExpression = factory.createClassExpression( + /*decorators*/ undefined, /*modifiers*/ undefined, node.name, /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node)); - ts.aggregateTransformFlags(classExpression); ts.setOriginalNode(classExpression, node); ts.setTextRange(classExpression, node); return classExpression; @@ -78191,17 +81086,17 @@ var ts; for (var _i = 0, parametersWithPropertyAssignments_1 = parametersWithPropertyAssignments; _i < parametersWithPropertyAssignments_1.length; _i++) { var parameter = parametersWithPropertyAssignments_1[_i]; if (ts.isIdentifier(parameter.name)) { - members.push(ts.setOriginalNode(ts.aggregateTransformFlags(ts.createProperty( + members.push(ts.setOriginalNode(factory.createPropertyDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, parameter.name, /*questionOrExclamationToken*/ undefined, /*type*/ undefined, - /*initializer*/ undefined)), parameter)); + /*initializer*/ undefined), parameter)); } } } ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement)); - return ts.setTextRange(ts.createNodeArray(members), /*location*/ node.members); + return ts.setTextRange(factory.createNodeArray(members), /*location*/ node.members); } /** * Gets either the static or instance members of a class that are decorated, or have @@ -78240,7 +81135,7 @@ var ts; */ function isDecoratedClassElement(member, isStatic, parent) { return ts.nodeOrChildIsDecorated(member, parent) - && isStatic === ts.hasModifier(member, 32 /* Static */); + && isStatic === ts.hasSyntacticModifier(member, 32 /* Static */); } /** * Gets an array of arrays of decorators for the parameters of a function-like node. @@ -78292,12 +81187,12 @@ var ts; */ function getAllDecoratorsOfClassElement(node, member) { switch (member.kind) { - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return getAllDecoratorsOfAccessors(node, member); - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: return getAllDecoratorsOfMethod(member); - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: return getAllDecoratorsOfProperty(member); default: return undefined; @@ -78450,15 +81345,16 @@ var ts; var prefix = getClassMemberPrefix(node, member); var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true); var descriptor = languageVersion > 0 /* ES3 */ - ? member.kind === 159 /* PropertyDeclaration */ + ? member.kind === 162 /* PropertyDeclaration */ // We emit `void 0` here to indicate to `__decorate` that it can invoke `Object.defineProperty` directly, but that it // should not invoke `Object.getOwnPropertyDescriptor`. - ? ts.createVoidZero() + ? factory.createVoidZero() // We emit `null` here to indicate to `__decorate` that it can invoke `Object.getOwnPropertyDescriptor` directly. // We have this extra argument here so that we can inject an explicit property descriptor at a later date. - : ts.createNull() + : factory.createNull() : undefined; - var helper = createDecorateHelper(context, decoratorExpressions, prefix, memberName, descriptor, ts.moveRangePastDecorators(member)); + var helper = emitHelpers().createDecorateHelper(decoratorExpressions, prefix, memberName, descriptor); + ts.setTextRange(helper, ts.moveRangePastDecorators(member)); ts.setEmitFlags(helper, 1536 /* NoComments */); return helper; } @@ -78470,7 +81366,7 @@ var ts; function addConstructorDecorationStatement(statements, node) { var expression = generateConstructorDecorationExpression(node); if (expression) { - statements.push(ts.setOriginalNode(ts.createExpressionStatement(expression), node)); + statements.push(ts.setOriginalNode(factory.createExpressionStatement(expression), node)); } } /** @@ -78485,9 +81381,9 @@ var ts; return undefined; } var classAlias = classAliases && classAliases[ts.getOriginalNodeId(node)]; - var localName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); - var decorate = createDecorateHelper(context, decoratorExpressions, localName); - var expression = ts.createAssignment(localName, classAlias ? ts.createAssignment(classAlias, decorate) : decorate); + var localName = factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); + var decorate = emitHelpers().createDecorateHelper(decoratorExpressions, localName); + var expression = factory.createAssignment(localName, classAlias ? factory.createAssignment(classAlias, decorate) : decorate); ts.setEmitFlags(expression, 1536 /* NoComments */); ts.setSourceMapRange(expression, ts.moveRangePastDecorators(node)); return expression; @@ -78512,8 +81408,8 @@ var ts; expressions = []; for (var _i = 0, decorators_1 = decorators; _i < decorators_1.length; _i++) { var decorator = decorators_1[_i]; - var helper = createParamHelper(context, transformDecorator(decorator), parameterOffset, - /*location*/ decorator.expression); + var helper = emitHelpers().createParamHelper(transformDecorator(decorator), parameterOffset); + ts.setTextRange(helper, decorator.expression); ts.setEmitFlags(helper, 1536 /* NoComments */); expressions.push(helper); } @@ -78537,13 +81433,13 @@ var ts; function addOldTypeMetadata(node, container, decoratorExpressions) { if (compilerOptions.emitDecoratorMetadata) { if (shouldAddTypeMetadata(node)) { - decoratorExpressions.push(createMetadataHelper(context, "design:type", serializeTypeOfNode(node))); + decoratorExpressions.push(emitHelpers().createMetadataHelper("design:type", serializeTypeOfNode(node))); } if (shouldAddParamTypesMetadata(node)) { - decoratorExpressions.push(createMetadataHelper(context, "design:paramtypes", serializeParameterTypesOfNode(node, container))); + decoratorExpressions.push(emitHelpers().createMetadataHelper("design:paramtypes", serializeParameterTypesOfNode(node, container))); } if (shouldAddReturnTypeMetadata(node)) { - decoratorExpressions.push(createMetadataHelper(context, "design:returntype", serializeReturnTypeOfNode(node))); + decoratorExpressions.push(emitHelpers().createMetadataHelper("design:returntype", serializeReturnTypeOfNode(node))); } } } @@ -78551,16 +81447,16 @@ var ts; if (compilerOptions.emitDecoratorMetadata) { var properties = void 0; if (shouldAddTypeMetadata(node)) { - (properties || (properties = [])).push(ts.createPropertyAssignment("type", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, ts.createToken(38 /* EqualsGreaterThanToken */), serializeTypeOfNode(node)))); + (properties || (properties = [])).push(factory.createPropertyAssignment("type", factory.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, factory.createToken(38 /* EqualsGreaterThanToken */), serializeTypeOfNode(node)))); } if (shouldAddParamTypesMetadata(node)) { - (properties || (properties = [])).push(ts.createPropertyAssignment("paramTypes", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, ts.createToken(38 /* EqualsGreaterThanToken */), serializeParameterTypesOfNode(node, container)))); + (properties || (properties = [])).push(factory.createPropertyAssignment("paramTypes", factory.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, factory.createToken(38 /* EqualsGreaterThanToken */), serializeParameterTypesOfNode(node, container)))); } if (shouldAddReturnTypeMetadata(node)) { - (properties || (properties = [])).push(ts.createPropertyAssignment("returnType", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, ts.createToken(38 /* EqualsGreaterThanToken */), serializeReturnTypeOfNode(node)))); + (properties || (properties = [])).push(factory.createPropertyAssignment("returnType", factory.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, factory.createToken(38 /* EqualsGreaterThanToken */), serializeReturnTypeOfNode(node)))); } if (properties) { - decoratorExpressions.push(createMetadataHelper(context, "design:typeinfo", ts.createObjectLiteral(properties, /*multiLine*/ true))); + decoratorExpressions.push(emitHelpers().createMetadataHelper("design:typeinfo", factory.createObjectLiteralExpression(properties, /*multiLine*/ true))); } } } @@ -78573,10 +81469,10 @@ var ts; */ function shouldAddTypeMetadata(node) { var kind = node.kind; - return kind === 161 /* MethodDeclaration */ - || kind === 163 /* GetAccessor */ - || kind === 164 /* SetAccessor */ - || kind === 159 /* PropertyDeclaration */; + return kind === 164 /* MethodDeclaration */ + || kind === 166 /* GetAccessor */ + || kind === 167 /* SetAccessor */ + || kind === 162 /* PropertyDeclaration */; } /** * Determines whether to emit the "design:returntype" metadata based on the node's kind. @@ -78586,7 +81482,7 @@ var ts; * @param node The node to test. */ function shouldAddReturnTypeMetadata(node) { - return node.kind === 161 /* MethodDeclaration */; + return node.kind === 164 /* MethodDeclaration */; } /** * Determines whether to emit the "design:paramtypes" metadata based on the node's kind. @@ -78597,12 +81493,12 @@ var ts; */ function shouldAddParamTypesMetadata(node) { switch (node.kind) { - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: return ts.getFirstConstructorWithBody(node) !== undefined; - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return true; } return false; @@ -78619,18 +81515,18 @@ var ts; */ function serializeTypeOfNode(node) { switch (node.kind) { - case 159 /* PropertyDeclaration */: - case 156 /* Parameter */: + case 162 /* PropertyDeclaration */: + case 159 /* Parameter */: return serializeTypeNode(node.type); - case 164 /* SetAccessor */: - case 163 /* GetAccessor */: + case 167 /* SetAccessor */: + case 166 /* GetAccessor */: return serializeTypeNode(getAccessorTypeNode(node)); - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 161 /* MethodDeclaration */: - return ts.createIdentifier("Function"); + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 164 /* MethodDeclaration */: + return factory.createIdentifier("Function"); default: - return ts.createVoidZero(); + return factory.createVoidZero(); } } /** @@ -78661,10 +81557,10 @@ var ts; } } } - return ts.createArrayLiteral(expressions); + return factory.createArrayLiteralExpression(expressions); } function getParametersOfDecoratedDeclaration(node, container) { - if (container && node.kind === 163 /* GetAccessor */) { + if (container && node.kind === 166 /* GetAccessor */) { var setAccessor = ts.getAllAccessorDeclarations(container.members, node).setAccessor; if (setAccessor) { return setAccessor.parameters; @@ -78682,9 +81578,9 @@ var ts; return serializeTypeNode(node.type); } else if (ts.isAsyncFunction(node)) { - return ts.createIdentifier("Promise"); + return factory.createIdentifier("Promise"); } - return ts.createVoidZero(); + return factory.createVoidZero(); } /** * Serializes a type node for use with decorator type metadata. @@ -78706,88 +81602,90 @@ var ts; */ function serializeTypeNode(node) { if (node === undefined) { - return ts.createIdentifier("Object"); + return factory.createIdentifier("Object"); } switch (node.kind) { - case 110 /* VoidKeyword */: - case 146 /* UndefinedKeyword */: - case 100 /* NullKeyword */: - case 137 /* NeverKeyword */: - return ts.createVoidZero(); - case 182 /* ParenthesizedType */: + case 113 /* VoidKeyword */: + case 149 /* UndefinedKeyword */: + case 140 /* NeverKeyword */: + return factory.createVoidZero(); + case 185 /* ParenthesizedType */: return serializeTypeNode(node.type); - case 170 /* FunctionType */: - case 171 /* ConstructorType */: - return ts.createIdentifier("Function"); - case 174 /* ArrayType */: - case 175 /* TupleType */: - return ts.createIdentifier("Array"); - case 168 /* TypePredicate */: - case 128 /* BooleanKeyword */: - return ts.createIdentifier("Boolean"); - case 143 /* StringKeyword */: - return ts.createIdentifier("String"); - case 141 /* ObjectKeyword */: - return ts.createIdentifier("Object"); - case 187 /* LiteralType */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: + return factory.createIdentifier("Function"); + case 177 /* ArrayType */: + case 178 /* TupleType */: + return factory.createIdentifier("Array"); + case 171 /* TypePredicate */: + case 131 /* BooleanKeyword */: + return factory.createIdentifier("Boolean"); + case 146 /* StringKeyword */: + return factory.createIdentifier("String"); + case 144 /* ObjectKeyword */: + return factory.createIdentifier("Object"); + case 190 /* LiteralType */: switch (node.literal.kind) { case 10 /* StringLiteral */: - return ts.createIdentifier("String"); - case 207 /* PrefixUnaryExpression */: + case 14 /* NoSubstitutionTemplateLiteral */: + return factory.createIdentifier("String"); + case 211 /* PrefixUnaryExpression */: case 8 /* NumericLiteral */: - return ts.createIdentifier("Number"); + return factory.createIdentifier("Number"); case 9 /* BigIntLiteral */: return getGlobalBigIntNameWithFallback(); - case 106 /* TrueKeyword */: - case 91 /* FalseKeyword */: - return ts.createIdentifier("Boolean"); + case 109 /* TrueKeyword */: + case 94 /* FalseKeyword */: + return factory.createIdentifier("Boolean"); + case 103 /* NullKeyword */: + return factory.createVoidZero(); default: return ts.Debug.failBadSyntaxKind(node.literal); } - case 140 /* NumberKeyword */: - return ts.createIdentifier("Number"); - case 151 /* BigIntKeyword */: + case 143 /* NumberKeyword */: + return factory.createIdentifier("Number"); + case 154 /* BigIntKeyword */: return getGlobalBigIntNameWithFallback(); - case 144 /* SymbolKeyword */: + case 147 /* SymbolKeyword */: return languageVersion < 2 /* ES2015 */ ? getGlobalSymbolNameWithFallback() - : ts.createIdentifier("Symbol"); - case 169 /* TypeReference */: + : factory.createIdentifier("Symbol"); + case 172 /* TypeReference */: return serializeTypeReferenceNode(node); - case 179 /* IntersectionType */: - case 178 /* UnionType */: + case 182 /* IntersectionType */: + case 181 /* UnionType */: return serializeTypeList(node.types); - case 180 /* ConditionalType */: + case 183 /* ConditionalType */: return serializeTypeList([node.trueType, node.falseType]); - case 184 /* TypeOperator */: - if (node.operator === 138 /* ReadonlyKeyword */) { + case 187 /* TypeOperator */: + if (node.operator === 141 /* ReadonlyKeyword */) { return serializeTypeNode(node.type); } break; - case 172 /* TypeQuery */: - case 185 /* IndexedAccessType */: - case 186 /* MappedType */: - case 173 /* TypeLiteral */: - case 125 /* AnyKeyword */: - case 148 /* UnknownKeyword */: - case 183 /* ThisType */: - case 188 /* ImportType */: + case 175 /* TypeQuery */: + case 188 /* IndexedAccessType */: + case 189 /* MappedType */: + case 176 /* TypeLiteral */: + case 128 /* AnyKeyword */: + case 151 /* UnknownKeyword */: + case 186 /* ThisType */: + case 192 /* ImportType */: break; // handle JSDoc types from an invalid parse - case 295 /* JSDocAllType */: - case 296 /* JSDocUnknownType */: - case 300 /* JSDocFunctionType */: - case 301 /* JSDocVariadicType */: - case 302 /* JSDocNamepathType */: + case 299 /* JSDocAllType */: + case 300 /* JSDocUnknownType */: + case 304 /* JSDocFunctionType */: + case 305 /* JSDocVariadicType */: + case 306 /* JSDocNamepathType */: break; - case 297 /* JSDocNullableType */: - case 298 /* JSDocNonNullableType */: - case 299 /* JSDocOptionalType */: + case 301 /* JSDocNullableType */: + case 302 /* JSDocNonNullableType */: + case 303 /* JSDocOptionalType */: return serializeTypeNode(node.type); default: return ts.Debug.failBadSyntaxKind(node); } - return ts.createIdentifier("Object"); + return factory.createIdentifier("Object"); } function serializeTypeList(types) { // Note when updating logic here also update getEntityNameForDecoratorMetadata @@ -78795,13 +81693,13 @@ var ts; var serializedUnion; for (var _i = 0, types_21 = types; _i < types_21.length; _i++) { var typeNode = types_21[_i]; - while (typeNode.kind === 182 /* ParenthesizedType */) { + while (typeNode.kind === 185 /* ParenthesizedType */) { typeNode = typeNode.type; // Skip parens if need be } - if (typeNode.kind === 137 /* NeverKeyword */) { + if (typeNode.kind === 140 /* NeverKeyword */) { continue; // Always elide `never` from the union/intersection if possible } - if (!strictNullChecks && (typeNode.kind === 100 /* NullKeyword */ || typeNode.kind === 146 /* UndefinedKeyword */)) { + if (!strictNullChecks && (typeNode.kind === 190 /* LiteralType */ && typeNode.literal.kind === 103 /* NullKeyword */ || typeNode.kind === 149 /* UndefinedKeyword */)) { continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks } var serializedIndividual = serializeTypeNode(typeNode); @@ -78816,7 +81714,7 @@ var ts; if (!ts.isIdentifier(serializedUnion) || !ts.isIdentifier(serializedIndividual) || serializedUnion.escapedText !== serializedIndividual.escapedText) { - return ts.createIdentifier("Object"); + return factory.createIdentifier("Object"); } } else { @@ -78825,7 +81723,7 @@ var ts; } } // If we were able to find common type, use it - return serializedUnion || ts.createVoidZero(); // Fallback is only hit if all union constituients are null/undefined/never + return serializedUnion || factory.createVoidZero(); // Fallback is only hit if all union constituients are null/undefined/never } /** * Serializes a TypeReferenceNode to an appropriate JS constructor value for use with @@ -78839,41 +81737,43 @@ var ts; case ts.TypeReferenceSerializationKind.Unknown: // From conditional type type reference that cannot be resolved is Similar to any or unknown if (ts.findAncestor(node, function (n) { return n.parent && ts.isConditionalTypeNode(n.parent) && (n.parent.trueType === n || n.parent.falseType === n); })) { - return ts.createIdentifier("Object"); + return factory.createIdentifier("Object"); } var serialized = serializeEntityNameAsExpressionFallback(node.typeName); - var temp = ts.createTempVariable(hoistVariableDeclaration); - return ts.createConditional(ts.createTypeCheck(ts.createAssignment(temp, serialized), "function"), temp, ts.createIdentifier("Object")); + var temp = factory.createTempVariable(hoistVariableDeclaration); + return factory.createConditionalExpression(factory.createTypeCheck(factory.createAssignment(temp, serialized), "function"), + /*questionToken*/ undefined, temp, + /*colonToken*/ undefined, factory.createIdentifier("Object")); case ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue: return serializeEntityNameAsExpression(node.typeName); case ts.TypeReferenceSerializationKind.VoidNullableOrNeverType: - return ts.createVoidZero(); + return factory.createVoidZero(); case ts.TypeReferenceSerializationKind.BigIntLikeType: return getGlobalBigIntNameWithFallback(); case ts.TypeReferenceSerializationKind.BooleanType: - return ts.createIdentifier("Boolean"); + return factory.createIdentifier("Boolean"); case ts.TypeReferenceSerializationKind.NumberLikeType: - return ts.createIdentifier("Number"); + return factory.createIdentifier("Number"); case ts.TypeReferenceSerializationKind.StringLikeType: - return ts.createIdentifier("String"); + return factory.createIdentifier("String"); case ts.TypeReferenceSerializationKind.ArrayLikeType: - return ts.createIdentifier("Array"); + return factory.createIdentifier("Array"); case ts.TypeReferenceSerializationKind.ESSymbolType: return languageVersion < 2 /* ES2015 */ ? getGlobalSymbolNameWithFallback() - : ts.createIdentifier("Symbol"); + : factory.createIdentifier("Symbol"); case ts.TypeReferenceSerializationKind.TypeWithCallSignature: - return ts.createIdentifier("Function"); + return factory.createIdentifier("Function"); case ts.TypeReferenceSerializationKind.Promise: - return ts.createIdentifier("Promise"); + return factory.createIdentifier("Promise"); case ts.TypeReferenceSerializationKind.ObjectType: - return ts.createIdentifier("Object"); + return factory.createIdentifier("Object"); default: return ts.Debug.assertNever(kind); } } function createCheckedValue(left, right) { - return ts.createLogicalAnd(ts.createStrictInequality(ts.createTypeOf(left), ts.createLiteral("undefined")), right); + return factory.createLogicalAnd(factory.createStrictInequality(factory.createTypeOfExpression(left), factory.createStringLiteral("undefined")), right); } /** * Serializes an entity name which may not exist at runtime, but whose access shouldn't throw @@ -78881,19 +81781,19 @@ var ts; * @param node The entity name to serialize. */ function serializeEntityNameAsExpressionFallback(node) { - if (node.kind === 75 /* Identifier */) { + if (node.kind === 78 /* Identifier */) { // A -> typeof A !== undefined && A var copied = serializeEntityNameAsExpression(node); return createCheckedValue(copied, copied); } - if (node.left.kind === 75 /* Identifier */) { + if (node.left.kind === 78 /* Identifier */) { // A.B -> typeof A !== undefined && A.B return createCheckedValue(serializeEntityNameAsExpression(node.left), serializeEntityNameAsExpression(node)); } // A.B.C -> typeof A !== undefined && (_a = A.B) !== void 0 && _a.C var left = serializeEntityNameAsExpressionFallback(node.left); - var temp = ts.createTempVariable(hoistVariableDeclaration); - return ts.createLogicalAnd(ts.createLogicalAnd(left.left, ts.createStrictInequality(ts.createAssignment(temp, left.right), ts.createVoidZero())), ts.createPropertyAccess(temp, node.right)); + var temp = factory.createTempVariable(hoistVariableDeclaration); + return factory.createLogicalAnd(factory.createLogicalAnd(left.left, factory.createStrictInequality(factory.createAssignment(temp, left.right), factory.createVoidZero())), factory.createPropertyAccessExpression(temp, node.right)); } /** * Serializes an entity name as an expression for decorator type metadata. @@ -78902,15 +81802,14 @@ var ts; */ function serializeEntityNameAsExpression(node) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: // Create a clone of the name with a new parent, and treat it as if it were // a source tree node for the purposes of the checker. - var name = ts.getMutableClone(node); - name.flags &= ~8 /* Synthesized */; + var name = ts.setParent(ts.setTextRange(ts.parseNodeFactory.cloneNode(node), node), node.parent); name.original = undefined; - name.parent = ts.getParseTreeNode(currentLexicalScope); // ensure the parent is set to a parse tree node. + ts.setParent(name, ts.getParseTreeNode(currentLexicalScope)); // ensure the parent is set to a parse tree node. return name; - case 153 /* QualifiedName */: + case 156 /* QualifiedName */: return serializeQualifiedNameAsExpression(node); } } @@ -78922,14 +81821,16 @@ var ts; * qualified name at runtime. */ function serializeQualifiedNameAsExpression(node) { - return ts.createPropertyAccess(serializeEntityNameAsExpression(node.left), node.right); + return factory.createPropertyAccessExpression(serializeEntityNameAsExpression(node.left), node.right); } /** * Gets an expression that points to the global "Symbol" constructor at runtime if it is * available. */ function getGlobalSymbolNameWithFallback() { - return ts.createConditional(ts.createTypeCheck(ts.createIdentifier("Symbol"), "function"), ts.createIdentifier("Symbol"), ts.createIdentifier("Object")); + return factory.createConditionalExpression(factory.createTypeCheck(factory.createIdentifier("Symbol"), "function"), + /*questionToken*/ undefined, factory.createIdentifier("Symbol"), + /*colonToken*/ undefined, factory.createIdentifier("Object")); } /** * Gets an expression that points to the global "BigInt" constructor at runtime if it is @@ -78937,8 +81838,10 @@ var ts; */ function getGlobalBigIntNameWithFallback() { return languageVersion < 99 /* ESNext */ - ? ts.createConditional(ts.createTypeCheck(ts.createIdentifier("BigInt"), "function"), ts.createIdentifier("BigInt"), ts.createIdentifier("Object")) - : ts.createIdentifier("BigInt"); + ? factory.createConditionalExpression(factory.createTypeCheck(factory.createIdentifier("BigInt"), "function"), + /*questionToken*/ undefined, factory.createIdentifier("BigInt"), + /*colonToken*/ undefined, factory.createIdentifier("Object")) + : factory.createIdentifier("BigInt"); } /** * Gets an expression that represents a property name (for decorated properties or enums). @@ -78949,18 +81852,18 @@ var ts; function getExpressionForPropertyName(member, generateNameForComputedPropertyName) { var name = member.name; if (ts.isPrivateIdentifier(name)) { - return ts.createIdentifier(""); + return factory.createIdentifier(""); } else if (ts.isComputedPropertyName(name)) { return generateNameForComputedPropertyName && !ts.isSimpleInlineableExpression(name.expression) - ? ts.getGeneratedNameForNode(name) + ? factory.getGeneratedNameForNode(name) : name.expression; } else if (ts.isIdentifier(name)) { - return ts.createLiteral(ts.idText(name)); + return factory.createStringLiteral(ts.idText(name)); } else { - return ts.getSynthesizedClone(name); + return factory.cloneNode(name); } } /** @@ -78980,9 +81883,9 @@ var ts; var expression = ts.visitNode(name.expression, visitor, ts.isExpression); var innerExpression = ts.skipPartiallyEmittedExpressions(expression); if (!ts.isSimpleInlineableExpression(innerExpression)) { - var generatedName = ts.getGeneratedNameForNode(name); + var generatedName = factory.getGeneratedNameForNode(name); hoistVariableDeclaration(generatedName); - return ts.updateComputedPropertyName(name, ts.createAssignment(generatedName, expression)); + return factory.updateComputedPropertyName(name, factory.createAssignment(generatedName, expression)); } } return ts.visitNode(name, visitor, ts.isPropertyName); @@ -78997,7 +81900,7 @@ var ts; * @param node The HeritageClause to transform. */ function visitHeritageClause(node) { - if (node.token === 113 /* ImplementsKeyword */) { + if (node.token === 116 /* ImplementsKeyword */) { // implements clauses are elided return undefined; } @@ -79012,8 +81915,8 @@ var ts; * @param node The ExpressionWithTypeArguments to transform. */ function visitExpressionWithTypeArguments(node) { - return ts.updateExpressionWithTypeArguments(node, - /*typeArguments*/ undefined, ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression)); + return factory.updateExpressionWithTypeArguments(node, ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression), + /*typeArguments*/ undefined); } /** * Determines whether to emit a function-like declaration. We should not emit the @@ -79028,7 +81931,7 @@ var ts; if (node.flags & 8388608 /* Ambient */) { return undefined; } - var updated = ts.updateProperty(node, + var updated = factory.updatePropertyDeclaration(node, /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), visitPropertyNameOfClassElement(node), /*questionOrExclamationToken*/ undefined, /*type*/ undefined, ts.visitNode(node.initializer, visitor)); @@ -79044,7 +81947,7 @@ var ts; if (!shouldEmitFunctionLikeDeclaration(node)) { return undefined; } - return ts.updateConstructor(node, + return factory.updateConstructorDeclaration(node, /*decorators*/ undefined, /*modifiers*/ undefined, ts.visitParameterList(node.parameters, visitor, context), transformConstructorBody(node.body, node)); } @@ -79057,7 +81960,7 @@ var ts; var statements = []; var indexOfFirstStatement = 0; resumeLexicalEnvironment(); - indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor); + indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(factory, constructor, statements, visitor); // Add parameters with property assignments. Transforms this: // // constructor (public x, public y) { @@ -79074,8 +81977,8 @@ var ts; // Add the existing statements, skipping the initial super call. ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, indexOfFirstStatement)); // End the lexical environment. - statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment()); - var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), body.statements), /*multiLine*/ true); + statements = factory.mergeLexicalEnvironment(statements, endLexicalEnvironment()); + var block = factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), body.statements), /*multiLine*/ true); ts.setTextRange(block, /*location*/ body); ts.setOriginalNode(block, body); return block; @@ -79090,17 +81993,19 @@ var ts; if (!ts.isIdentifier(name)) { return undefined; } - var propertyName = ts.getMutableClone(name); + // TODO(rbuckton): Does this need to be parented? + var propertyName = ts.setParent(ts.setTextRange(factory.cloneNode(name), name), name.parent); ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 48 /* NoSourceMap */); - var localName = ts.getMutableClone(name); + // TODO(rbuckton): Does this need to be parented? + var localName = ts.setParent(ts.setTextRange(factory.cloneNode(name), name), name.parent); ts.setEmitFlags(localName, 1536 /* NoComments */); - return ts.startOnNewLine(ts.removeAllComments(ts.setTextRange(ts.setOriginalNode(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), node), ts.moveRangePos(node, -1)))); + return ts.startOnNewLine(ts.removeAllComments(ts.setTextRange(ts.setOriginalNode(factory.createExpressionStatement(factory.createAssignment(ts.setTextRange(factory.createPropertyAccessExpression(factory.createThis(), propertyName), node.name), localName)), node), ts.moveRangePos(node, -1)))); } function visitMethodDeclaration(node) { if (!shouldEmitFunctionLikeDeclaration(node)) { return undefined; } - var updated = ts.updateMethod(node, + var updated = factory.updateMethodDeclaration(node, /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), /*questionToken*/ undefined, /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), @@ -79120,15 +82025,15 @@ var ts; * @param node The declaration node. */ function shouldEmitAccessorDeclaration(node) { - return !(ts.nodeIsMissing(node.body) && ts.hasModifier(node, 128 /* Abstract */)); + return !(ts.nodeIsMissing(node.body) && ts.hasSyntacticModifier(node, 128 /* Abstract */)); } function visitGetAccessor(node) { if (!shouldEmitAccessorDeclaration(node)) { return undefined; } - var updated = ts.updateGetAccessor(node, + var updated = factory.updateGetAccessorDeclaration(node, /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitParameterList(node.parameters, visitor, context), - /*type*/ undefined, ts.visitFunctionBody(node.body, visitor, context) || ts.createBlock([])); + /*type*/ undefined, ts.visitFunctionBody(node.body, visitor, context) || factory.createBlock([])); if (updated !== node) { // While we emit the source map for the node after skipping decorators and modifiers, // we need to emit the comments for the original range. @@ -79141,8 +82046,8 @@ var ts; if (!shouldEmitAccessorDeclaration(node)) { return undefined; } - var updated = ts.updateSetAccessor(node, - /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitParameterList(node.parameters, visitor, context), ts.visitFunctionBody(node.body, visitor, context) || ts.createBlock([])); + var updated = factory.updateSetAccessorDeclaration(node, + /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitParameterList(node.parameters, visitor, context), ts.visitFunctionBody(node.body, visitor, context) || factory.createBlock([])); if (updated !== node) { // While we emit the source map for the node after skipping decorators and modifiers, // we need to emit the comments for the original range. @@ -79153,12 +82058,12 @@ var ts; } function visitFunctionDeclaration(node) { if (!shouldEmitFunctionLikeDeclaration(node)) { - return ts.createNotEmittedStatement(node); + return factory.createNotEmittedStatement(node); } - var updated = ts.updateFunctionDeclaration(node, + var updated = factory.updateFunctionDeclaration(node, /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), - /*type*/ undefined, ts.visitFunctionBody(node.body, visitor, context) || ts.createBlock([])); + /*type*/ undefined, ts.visitFunctionBody(node.body, visitor, context) || factory.createBlock([])); if (isExportOfNamespace(node)) { var statements = [updated]; addExportMemberAssignment(statements, node); @@ -79168,15 +82073,15 @@ var ts; } function visitFunctionExpression(node) { if (!shouldEmitFunctionLikeDeclaration(node)) { - return ts.createOmittedExpression(); + return factory.createOmittedExpression(); } - var updated = ts.updateFunctionExpression(node, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, + var updated = factory.updateFunctionExpression(node, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), - /*type*/ undefined, ts.visitFunctionBody(node.body, visitor, context) || ts.createBlock([])); + /*type*/ undefined, ts.visitFunctionBody(node.body, visitor, context) || factory.createBlock([])); return updated; } function visitArrowFunction(node) { - var updated = ts.updateArrowFunction(node, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), + var updated = factory.updateArrowFunction(node, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), /*type*/ undefined, node.equalsGreaterThanToken, ts.visitFunctionBody(node.body, visitor, context)); return updated; @@ -79185,7 +82090,7 @@ var ts; if (ts.parameterIsThisKeyword(node)) { return undefined; } - var updated = ts.updateParameter(node, + var updated = factory.updateParameterDeclaration(node, /*decorators*/ undefined, /*modifiers*/ undefined, node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), /*questionToken*/ undefined, @@ -79207,7 +82112,7 @@ var ts; // elide statement if there are no initialized variables. return undefined; } - return ts.setTextRange(ts.createExpressionStatement(ts.inlineExpressions(ts.map(variables, transformInitializedVariable))), node); + return ts.setTextRange(factory.createExpressionStatement(factory.inlineExpressions(ts.map(variables, transformInitializedVariable))), node); } else { return ts.visitEachChild(node, visitor, context); @@ -79220,13 +82125,13 @@ var ts; /*needsValue*/ false, createNamespaceExportExpression); } else { - return ts.setTextRange(ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(name), ts.visitNode(node.initializer, visitor, ts.isExpression)), + return ts.setTextRange(factory.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(name), ts.visitNode(node.initializer, visitor, ts.isExpression)), /*location*/ node); } } function visitVariableDeclaration(node) { - return ts.updateTypeScriptVariableDeclaration(node, ts.visitNode(node.name, visitor, ts.isBindingName), - /*exclaimationToken*/ undefined, + return factory.updateVariableDeclaration(node, ts.visitNode(node.name, visitor, ts.isBindingName), + /*exclamationToken*/ undefined, /*type*/ undefined, ts.visitNode(node.initializer, visitor, ts.isExpression)); } function visitParenthesizedExpression(node) { @@ -79251,38 +82156,38 @@ var ts; // HOWEVER - if there are leading comments on the expression itself, to handle ASI // correctly for return and throw, we must keep the parenthesis if (ts.length(ts.getLeadingCommentRangesOfNode(expression, currentSourceFile))) { - return ts.updateParen(node, expression); + return factory.updateParenthesizedExpression(node, expression); } - return ts.createPartiallyEmittedExpression(expression, node); + return factory.createPartiallyEmittedExpression(expression, node); } return ts.visitEachChild(node, visitor, context); } function visitAssertionExpression(node) { var expression = ts.visitNode(node.expression, visitor, ts.isExpression); - return ts.createPartiallyEmittedExpression(expression, node); + return factory.createPartiallyEmittedExpression(expression, node); } function visitNonNullExpression(node) { var expression = ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression); - return ts.createPartiallyEmittedExpression(expression, node); + return factory.createPartiallyEmittedExpression(expression, node); } function visitCallExpression(node) { - return ts.updateCall(node, ts.visitNode(node.expression, visitor, ts.isExpression), + return factory.updateCallExpression(node, ts.visitNode(node.expression, visitor, ts.isExpression), /*typeArguments*/ undefined, ts.visitNodes(node.arguments, visitor, ts.isExpression)); } function visitNewExpression(node) { - return ts.updateNew(node, ts.visitNode(node.expression, visitor, ts.isExpression), + return factory.updateNewExpression(node, ts.visitNode(node.expression, visitor, ts.isExpression), /*typeArguments*/ undefined, ts.visitNodes(node.arguments, visitor, ts.isExpression)); } function visitTaggedTemplateExpression(node) { - return ts.updateTaggedTemplate(node, ts.visitNode(node.tag, visitor, ts.isExpression), + return factory.updateTaggedTemplateExpression(node, ts.visitNode(node.tag, visitor, ts.isExpression), /*typeArguments*/ undefined, ts.visitNode(node.template, visitor, ts.isExpression)); } function visitJsxSelfClosingElement(node) { - return ts.updateJsxSelfClosingElement(node, ts.visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), + return factory.updateJsxSelfClosingElement(node, ts.visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), /*typeArguments*/ undefined, ts.visitNode(node.attributes, visitor, ts.isJsxAttributes)); } function visitJsxJsxOpeningElement(node) { - return ts.updateJsxOpeningElement(node, ts.visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), + return factory.updateJsxOpeningElement(node, ts.visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), /*typeArguments*/ undefined, ts.visitNode(node.attributes, visitor, ts.isJsxAttributes)); } /** @@ -79304,7 +82209,7 @@ var ts; */ function visitEnumDeclaration(node) { if (!shouldEmitEnumDeclaration(node)) { - return ts.createNotEmittedStatement(node); + return factory.createNotEmittedStatement(node); } var statements = []; // We request to be advised when the printer is about to print this node. This allows @@ -79325,27 +82230,27 @@ var ts; // `containerName` is the expression used inside of the enum for assignments. var containerName = getNamespaceContainerName(node); // `exportName` is the expression used within this node's container for any exported references. - var exportName = ts.hasModifier(node, 1 /* Export */) - ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true) - : ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); + var exportName = ts.hasSyntacticModifier(node, 1 /* Export */) + ? factory.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true) + : factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); // x || (x = {}) // exports.x || (exports.x = {}) - var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral())); + var moduleArg = factory.createLogicalOr(exportName, factory.createAssignment(exportName, factory.createObjectLiteralExpression())); if (hasNamespaceQualifiedExportName(node)) { // `localName` is the expression used within this node's containing scope for any local references. - var localName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); + var localName = factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); // x = (exports.x || (exports.x = {})) - moduleArg = ts.createAssignment(localName, moduleArg); + moduleArg = factory.createAssignment(localName, moduleArg); } // (function (x) { // x[x["y"] = 0] = "y"; // ... // })(x || (x = {})); - var enumStatement = ts.createExpressionStatement(ts.createCall(ts.createFunctionExpression( + var enumStatement = factory.createExpressionStatement(factory.createCallExpression(factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, - /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], + /*typeParameters*/ undefined, [factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], /*type*/ undefined, transformEnumBody(node, containerName)), /*typeArguments*/ undefined, [moduleArg])); ts.setOriginalNode(enumStatement, node); @@ -79359,7 +82264,7 @@ var ts; statements.push(enumStatement); // Add a DeclarationMarker for the enum to preserve trailing comments and mark // the end of the declaration. - statements.push(ts.createEndOfDeclarationMarker(node)); + statements.push(factory.createEndOfDeclarationMarker(node)); return statements; } /** @@ -79376,7 +82281,7 @@ var ts; ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment()); ts.addRange(statements, members); currentNamespaceContainerName = savedCurrentNamespaceLocalName; - return ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), /*location*/ node.members), + return factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), /*location*/ node.members), /*multiLine*/ true); } /** @@ -79390,11 +82295,11 @@ var ts; // old emitter always generate 'expression' part of the name as-is. var name = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ false); var valueExpression = transformEnumMemberDeclarationValue(member); - var innerAssignment = ts.createAssignment(ts.createElementAccess(currentNamespaceContainerName, name), valueExpression); + var innerAssignment = factory.createAssignment(factory.createElementAccessExpression(currentNamespaceContainerName, name), valueExpression); var outerAssignment = valueExpression.kind === 10 /* StringLiteral */ ? innerAssignment : - ts.createAssignment(ts.createElementAccess(currentNamespaceContainerName, innerAssignment), name); - return ts.setTextRange(ts.createExpressionStatement(ts.setTextRange(outerAssignment, member)), member); + factory.createAssignment(factory.createElementAccessExpression(currentNamespaceContainerName, innerAssignment), name); + return ts.setTextRange(factory.createExpressionStatement(ts.setTextRange(outerAssignment, member)), member); } /** * Transforms the value of an enum member. @@ -79404,7 +82309,7 @@ var ts; function transformEnumMemberDeclarationValue(member) { var value = resolver.getConstantValue(member); if (value !== undefined) { - return ts.createLiteral(value); + return typeof value === "string" ? factory.createStringLiteral(value) : factory.createNumericLiteral(value); } else { enableSubstitutionForNonQualifiedEnumMembers(); @@ -79412,7 +82317,7 @@ var ts; return ts.visitNode(member.initializer, visitor, ts.isExpression); } else { - return ts.createVoidZero(); + return factory.createVoidZero(); } } } @@ -79447,7 +82352,7 @@ var ts; */ function recordEmittedDeclarationInScope(node) { if (!currentScopeFirstDeclarationsOfName) { - currentScopeFirstDeclarationsOfName = ts.createUnderscoreEscapedMap(); + currentScopeFirstDeclarationsOfName = new ts.Map(); } var name = declaredNameInScope(node); if (!currentScopeFirstDeclarationsOfName.has(name)) { @@ -79476,14 +82381,14 @@ var ts; // Emit a variable statement for the module. We emit top-level enums as a `var` // declaration to avoid static errors in global scripts scripts due to redeclaration. // enums in any other scope are emitted as a `let` declaration. - var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([ - ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true)) - ], currentLexicalScope.kind === 290 /* SourceFile */ ? 0 /* None */ : 1 /* Let */)); + var statement = factory.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), factory.createVariableDeclarationList([ + factory.createVariableDeclaration(factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true)) + ], currentLexicalScope.kind === 294 /* SourceFile */ ? 0 /* None */ : 1 /* Let */)); ts.setOriginalNode(statement, node); recordEmittedDeclarationInScope(node); if (isFirstEmittedDeclarationInScope(node)) { // Adjust the source map emit to match the old emitter. - if (node.kind === 248 /* EnumDeclaration */) { + if (node.kind === 252 /* EnumDeclaration */) { ts.setSourceMapRange(statement.declarationList, node); } else { @@ -79517,7 +82422,7 @@ var ts; // declaration we do not emit a leading variable declaration. To preserve the // begin/end semantics of the declararation and to properly handle exports // we wrap the leading variable declaration in a `MergeDeclarationMarker`. - var mergeMarker = ts.createMergeDeclarationMarker(statement); + var mergeMarker = factory.createMergeDeclarationMarker(statement); ts.setEmitFlags(mergeMarker, 1536 /* NoComments */ | 4194304 /* HasEndOfDeclarationMarker */); statements.push(mergeMarker); return false; @@ -79532,7 +82437,7 @@ var ts; */ function visitModuleDeclaration(node) { if (!shouldEmitModuleDeclaration(node)) { - return ts.createNotEmittedStatement(node); + return factory.createNotEmittedStatement(node); } ts.Debug.assertNode(node.name, ts.isIdentifier, "A TypeScript namespace should have an Identifier name."); enableSubstitutionForNamespaceExports(); @@ -79555,26 +82460,26 @@ var ts; // `containerName` is the expression used inside of the namespace for exports. var containerName = getNamespaceContainerName(node); // `exportName` is the expression used within this node's container for any exported references. - var exportName = ts.hasModifier(node, 1 /* Export */) - ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true) - : ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); + var exportName = ts.hasSyntacticModifier(node, 1 /* Export */) + ? factory.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true) + : factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); // x || (x = {}) // exports.x || (exports.x = {}) - var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral())); + var moduleArg = factory.createLogicalOr(exportName, factory.createAssignment(exportName, factory.createObjectLiteralExpression())); if (hasNamespaceQualifiedExportName(node)) { // `localName` is the expression used within this node's containing scope for any local references. - var localName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); + var localName = factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true); // x = (exports.x || (exports.x = {})) - moduleArg = ts.createAssignment(localName, moduleArg); + moduleArg = factory.createAssignment(localName, moduleArg); } // (function (x_1) { // x_1.y = ...; // })(x || (x = {})); - var moduleStatement = ts.createExpressionStatement(ts.createCall(ts.createFunctionExpression( + var moduleStatement = factory.createExpressionStatement(factory.createCallExpression(factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, - /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], + /*typeParameters*/ undefined, [factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], /*type*/ undefined, transformModuleBody(node, containerName)), /*typeArguments*/ undefined, [moduleArg])); ts.setOriginalNode(moduleStatement, node); @@ -79588,7 +82493,7 @@ var ts; statements.push(moduleStatement); // Add a DeclarationMarker for the namespace to preserve trailing comments and mark // the end of the declaration. - statements.push(ts.createEndOfDeclarationMarker(node)); + statements.push(factory.createEndOfDeclarationMarker(node)); return statements; } /** @@ -79608,7 +82513,7 @@ var ts; var statementsLocation; var blockLocation; if (node.body) { - if (node.body.kind === 250 /* ModuleBlock */) { + if (node.body.kind === 254 /* ModuleBlock */) { saveStateAndInvoke(node.body, function (body) { return ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement)); }); statementsLocation = node.body.statements; blockLocation = node.body; @@ -79631,7 +82536,7 @@ var ts; currentNamespaceContainerName = savedCurrentNamespaceContainerName; currentNamespace = savedCurrentNamespace; currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName; - var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), + var block = factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), /*location*/ statementsLocation), /*multiLine*/ true); ts.setTextRange(block, blockLocation); @@ -79655,13 +82560,13 @@ var ts; // })(hi = hello.hi || (hello.hi = {})); // })(hello || (hello = {})); // We only want to emit comment on the namespace which contains block body itself, not the containing namespaces. - if (!node.body || node.body.kind !== 250 /* ModuleBlock */) { + if (!node.body || node.body.kind !== 254 /* ModuleBlock */) { ts.setEmitFlags(block, ts.getEmitFlags(block) | 1536 /* NoComments */); } return block; } function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) { - if (moduleDeclaration.body.kind === 249 /* ModuleDeclaration */) { + if (moduleDeclaration.body.kind === 253 /* ModuleDeclaration */) { var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body); return recursiveInnerModule || moduleDeclaration.body; } @@ -79686,7 +82591,7 @@ var ts; return importClause || compilerOptions.importsNotUsedAsValues === 1 /* Preserve */ || compilerOptions.importsNotUsedAsValues === 2 /* Error */ - ? ts.updateImportDeclaration(node, + ? factory.updateImportDeclaration(node, /*decorators*/ undefined, /*modifiers*/ undefined, importClause, node.moduleSpecifier) : undefined; @@ -79703,7 +82608,7 @@ var ts; // Elide the import clause if we elide both its name and its named bindings. var name = resolver.isReferencedAliasDeclaration(node) ? node.name : undefined; var namedBindings = ts.visitNode(node.namedBindings, visitNamedImportBindings, ts.isNamedImportBindings); - return (name || namedBindings) ? ts.updateImportClause(node, name, namedBindings, /*isTypeOnly*/ false) : undefined; + return (name || namedBindings) ? factory.updateImportClause(node, /*isTypeOnly*/ false, name, namedBindings) : undefined; } /** * Visits named import bindings, eliding it if it is not referenced. @@ -79711,14 +82616,14 @@ var ts; * @param node The named import bindings node. */ function visitNamedImportBindings(node) { - if (node.kind === 256 /* NamespaceImport */) { + if (node.kind === 260 /* NamespaceImport */) { // Elide a namespace import if it is not referenced. return resolver.isReferencedAliasDeclaration(node) ? node : undefined; } else { // Elide named imports if all of its import specifiers are elided. var elements = ts.visitNodes(node.elements, visitImportSpecifier, ts.isImportSpecifier); - return ts.some(elements) ? ts.updateNamedImports(node, elements) : undefined; + return ts.some(elements) ? factory.updateNamedImports(node, elements) : undefined; } } /** @@ -79765,9 +82670,9 @@ var ts; // Elide the export declaration if all of its named exports are elided. var exportClause = ts.visitNode(node.exportClause, visitNamedExportBindings, ts.isNamedExportBindings); return exportClause - ? ts.updateExportDeclaration(node, + ? factory.updateExportDeclaration(node, /*decorators*/ undefined, - /*modifiers*/ undefined, exportClause, node.moduleSpecifier, node.isTypeOnly) + /*modifiers*/ undefined, node.isTypeOnly, exportClause, node.moduleSpecifier) : undefined; } /** @@ -79779,10 +82684,10 @@ var ts; function visitNamedExports(node) { // Elide the named exports if all of its export specifiers were elided. var elements = ts.visitNodes(node.elements, visitExportSpecifier, ts.isExportSpecifier); - return ts.some(elements) ? ts.updateNamedExports(node, elements) : undefined; + return ts.some(elements) ? factory.updateNamedExports(node, elements) : undefined; } function visitNamespaceExports(node) { - return ts.updateNamespaceExport(node, ts.visitNode(node.name, visitor, ts.isIdentifier)); + return factory.updateNamespaceExport(node, ts.visitNode(node.name, visitor, ts.isIdentifier)); } function visitNamedExportBindings(node) { return ts.isNamespaceExport(node) ? visitNamespaceExports(node) : visitNamedExports(node); @@ -79819,7 +82724,7 @@ var ts; var isReferenced = resolver.isReferencedAliasDeclaration(node); // If the alias is unreferenced but we want to keep the import, replace with 'import "mod"'. if (!isReferenced && compilerOptions.importsNotUsedAsValues === 1 /* Preserve */) { - return ts.setOriginalNode(ts.setTextRange(ts.createImportDeclaration( + return ts.setOriginalNode(ts.setTextRange(factory.createImportDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, /*importClause*/ undefined, node.moduleReference.expression), node), node); @@ -79829,13 +82734,14 @@ var ts; if (!shouldEmitImportEqualsDeclaration(node)) { return undefined; } - var moduleReference = ts.createExpressionFromEntityName(node.moduleReference); + var moduleReference = ts.createExpressionFromEntityName(factory, node.moduleReference); ts.setEmitFlags(moduleReference, 1536 /* NoComments */ | 2048 /* NoNestedComments */); if (isNamedExternalModuleExport(node) || !isExportOfNamespace(node)) { // export var ${name} = ${moduleReference}; // var ${name} = ${moduleReference}; - return ts.setOriginalNode(ts.setTextRange(ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([ - ts.setOriginalNode(ts.createVariableDeclaration(node.name, + return ts.setOriginalNode(ts.setTextRange(factory.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), factory.createVariableDeclarationList([ + ts.setOriginalNode(factory.createVariableDeclaration(node.name, + /*exclamationToken*/ undefined, /*type*/ undefined, moduleReference), node) ])), node), node); } @@ -79850,7 +82756,7 @@ var ts; * @param node The node to test. */ function isExportOfNamespace(node) { - return currentNamespace !== undefined && ts.hasModifier(node, 1 /* Export */); + return currentNamespace !== undefined && ts.hasSyntacticModifier(node, 1 /* Export */); } /** * Gets a value indicating whether the node is exported from an external module. @@ -79858,7 +82764,7 @@ var ts; * @param node The node to test. */ function isExternalModuleExport(node) { - return currentNamespace === undefined && ts.hasModifier(node, 1 /* Export */); + return currentNamespace === undefined && ts.hasSyntacticModifier(node, 1 /* Export */); } /** * Gets a value indicating whether the node is a named export from an external module. @@ -79867,7 +82773,7 @@ var ts; */ function isNamedExternalModuleExport(node) { return isExternalModuleExport(node) - && !ts.hasModifier(node, 512 /* Default */); + && !ts.hasSyntacticModifier(node, 512 /* Default */); } /** * Gets a value indicating whether the node is the default export of an external module. @@ -79876,35 +82782,35 @@ var ts; */ function isDefaultExternalModuleExport(node) { return isExternalModuleExport(node) - && ts.hasModifier(node, 512 /* Default */); + && ts.hasSyntacticModifier(node, 512 /* Default */); } /** * Creates a statement for the provided expression. This is used in calls to `map`. */ function expressionToStatement(expression) { - return ts.createExpressionStatement(expression); + return factory.createExpressionStatement(expression); } function addExportMemberAssignment(statements, node) { - var expression = ts.createAssignment(ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true), ts.getLocalName(node)); + var expression = factory.createAssignment(factory.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true), factory.getLocalName(node)); ts.setSourceMapRange(expression, ts.createRange(node.name ? node.name.pos : node.pos, node.end)); - var statement = ts.createExpressionStatement(expression); + var statement = factory.createExpressionStatement(expression); ts.setSourceMapRange(statement, ts.createRange(-1, node.end)); statements.push(statement); } function createNamespaceExport(exportName, exportValue, location) { - return ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(ts.getNamespaceMemberName(currentNamespaceContainerName, exportName, /*allowComments*/ false, /*allowSourceMaps*/ true), exportValue)), location); + return ts.setTextRange(factory.createExpressionStatement(factory.createAssignment(factory.getNamespaceMemberName(currentNamespaceContainerName, exportName, /*allowComments*/ false, /*allowSourceMaps*/ true), exportValue)), location); } function createNamespaceExportExpression(exportName, exportValue, location) { - return ts.setTextRange(ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(exportName), exportValue), location); + return ts.setTextRange(factory.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(exportName), exportValue), location); } function getNamespaceMemberNameWithSourceMapsAndWithoutComments(name) { - return ts.getNamespaceMemberName(currentNamespaceContainerName, name, /*allowComments*/ false, /*allowSourceMaps*/ true); + return factory.getNamespaceMemberName(currentNamespaceContainerName, name, /*allowComments*/ false, /*allowSourceMaps*/ true); } /** * Gets the declaration name used inside of a namespace or enum. */ function getNamespaceParameterName(node) { - var name = ts.getGeneratedNameForNode(node); + var name = factory.getGeneratedNameForNode(node); ts.setSourceMapRange(name, node.name); return name; } @@ -79913,7 +82819,7 @@ var ts; * of its declaration. */ function getNamespaceContainerName(node) { - return ts.getGeneratedNameForNode(node); + return factory.getGeneratedNameForNode(node); } /** * Gets a local alias for a class declaration if it is a decorated class with an internal @@ -79923,24 +82829,24 @@ var ts; function getClassAliasIfNeeded(node) { if (resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */) { enableSubstitutionForClassAliases(); - var classAlias = ts.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? ts.idText(node.name) : "default"); + var classAlias = factory.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? ts.idText(node.name) : "default"); classAliases[ts.getOriginalNodeId(node)] = classAlias; hoistVariableDeclaration(classAlias); return classAlias; } } function getClassPrototype(node) { - return ts.createPropertyAccess(ts.getDeclarationName(node), "prototype"); + return factory.createPropertyAccessExpression(factory.getDeclarationName(node), "prototype"); } function getClassMemberPrefix(node, member) { - return ts.hasModifier(member, 32 /* Static */) - ? ts.getDeclarationName(node) + return ts.hasSyntacticModifier(member, 32 /* Static */) + ? factory.getDeclarationName(node) : getClassPrototype(node); } function enableSubstitutionForNonQualifiedEnumMembers() { if ((enabledSubstitutions & 8 /* NonQualifiedEnumMembers */) === 0) { enabledSubstitutions |= 8 /* NonQualifiedEnumMembers */; - context.enableSubstitution(75 /* Identifier */); + context.enableSubstitution(78 /* Identifier */); } } function enableSubstitutionForClassAliases() { @@ -79948,7 +82854,7 @@ var ts; enabledSubstitutions |= 1 /* ClassAliases */; // We need to enable substitutions for identifiers. This allows us to // substitute class names inside of a class declaration. - context.enableSubstitution(75 /* Identifier */); + context.enableSubstitution(78 /* Identifier */); // Keep track of class aliases. classAliases = []; } @@ -79958,17 +82864,17 @@ var ts; enabledSubstitutions |= 2 /* NamespaceExports */; // We need to enable substitutions for identifiers and shorthand property assignments. This allows us to // substitute the names of exported members of a namespace. - context.enableSubstitution(75 /* Identifier */); - context.enableSubstitution(282 /* ShorthandPropertyAssignment */); + context.enableSubstitution(78 /* Identifier */); + context.enableSubstitution(286 /* ShorthandPropertyAssignment */); // We need to be notified when entering and exiting namespaces. - context.enableEmitNotification(249 /* ModuleDeclaration */); + context.enableEmitNotification(253 /* ModuleDeclaration */); } } function isTransformedModuleDeclaration(node) { - return ts.getOriginalNode(node).kind === 249 /* ModuleDeclaration */; + return ts.getOriginalNode(node).kind === 253 /* ModuleDeclaration */; } function isTransformedEnumDeclaration(node) { - return ts.getOriginalNode(node).kind === 248 /* EnumDeclaration */; + return ts.getOriginalNode(node).kind === 252 /* EnumDeclaration */; } /** * Hook for node emit. @@ -80017,21 +82923,21 @@ var ts; // A shorthand property with an assignment initializer is probably part of a // destructuring assignment if (node.objectAssignmentInitializer) { - var initializer = ts.createAssignment(exportedName, node.objectAssignmentInitializer); - return ts.setTextRange(ts.createPropertyAssignment(name, initializer), node); + var initializer = factory.createAssignment(exportedName, node.objectAssignmentInitializer); + return ts.setTextRange(factory.createPropertyAssignment(name, initializer), node); } - return ts.setTextRange(ts.createPropertyAssignment(name, exportedName), node); + return ts.setTextRange(factory.createPropertyAssignment(name, exportedName), node); } } return node; } function substituteExpression(node) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return substituteExpressionIdentifier(node); - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: return substitutePropertyAccessExpression(node); - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: return substituteElementAccessExpression(node); } return node; @@ -80053,7 +82959,7 @@ var ts; if (declaration) { var classAlias = classAliases[declaration.id]; // TODO: GH#18217 if (classAlias) { - var clone_1 = ts.getSynthesizedClone(classAlias); + var clone_1 = factory.cloneNode(classAlias); ts.setSourceMapRange(clone_1, node); ts.setCommentRange(clone_1, node); return clone_1; @@ -80069,11 +82975,11 @@ var ts; // If we are nested within a namespace declaration, we may need to qualifiy // an identifier that is exported from a merged namespace. var container = resolver.getReferencedExportContainer(node, /*prefixLocals*/ false); - if (container && container.kind !== 290 /* SourceFile */) { - var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 249 /* ModuleDeclaration */) || - (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 248 /* EnumDeclaration */); + if (container && container.kind !== 294 /* SourceFile */) { + var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 253 /* ModuleDeclaration */) || + (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 252 /* EnumDeclaration */); if (substitute) { - return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node), + return ts.setTextRange(factory.createPropertyAccessExpression(factory.getGeneratedNameForNode(container), node), /*location*/ node); } } @@ -80091,7 +82997,7 @@ var ts; if (constantValue !== undefined) { // track the constant value on the node for the printer in needsDotDotForPropertyAccess ts.setConstantValue(node, constantValue); - var substitute = ts.createLiteral(constantValue); + var substitute = typeof constantValue === "string" ? factory.createStringLiteral(constantValue) : factory.createNumericLiteral(constantValue); if (!compilerOptions.removeComments) { var originalNode = ts.getOriginalNode(node, ts.isAccessExpression); var propertyName = ts.isPropertyAccessExpression(originalNode) @@ -80111,57 +83017,6 @@ var ts; } } ts.transformTypeScript = transformTypeScript; - function createDecorateHelper(context, decoratorExpressions, target, memberName, descriptor, location) { - var argumentsArray = []; - argumentsArray.push(ts.createArrayLiteral(decoratorExpressions, /*multiLine*/ true)); - argumentsArray.push(target); - if (memberName) { - argumentsArray.push(memberName); - if (descriptor) { - argumentsArray.push(descriptor); - } - } - context.requestEmitHelper(ts.decorateHelper); - return ts.setTextRange(ts.createCall(ts.getUnscopedHelperName("__decorate"), - /*typeArguments*/ undefined, argumentsArray), location); - } - ts.decorateHelper = { - name: "typescript:decorate", - importName: "__decorate", - scoped: false, - priority: 2, - text: "\n var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n return c > 3 && r && Object.defineProperty(target, key, r), r;\n };" - }; - function createMetadataHelper(context, metadataKey, metadataValue) { - context.requestEmitHelper(ts.metadataHelper); - return ts.createCall(ts.getUnscopedHelperName("__metadata"), - /*typeArguments*/ undefined, [ - ts.createLiteral(metadataKey), - metadataValue - ]); - } - ts.metadataHelper = { - name: "typescript:metadata", - importName: "__metadata", - scoped: false, - priority: 3, - text: "\n var __metadata = (this && this.__metadata) || function (k, v) {\n if (typeof Reflect === \"object\" && typeof Reflect.metadata === \"function\") return Reflect.metadata(k, v);\n };" - }; - function createParamHelper(context, expression, parameterOffset, location) { - context.requestEmitHelper(ts.paramHelper); - return ts.setTextRange(ts.createCall(ts.getUnscopedHelperName("__param"), - /*typeArguments*/ undefined, [ - ts.createLiteral(parameterOffset), - expression - ]), location); - } - ts.paramHelper = { - name: "typescript:param", - importName: "__param", - scoped: false, - priority: 4, - text: "\n var __param = (this && this.__param) || function (paramIndex, decorator) {\n return function (target, key) { decorator(target, key, paramIndex); }\n };" - }; })(ts || (ts = {})); /*@internal*/ var ts; @@ -80186,7 +83041,7 @@ var ts; * When --useDefineForClassFields is on, this transforms to ECMAScript semantics, with Object.defineProperty. */ function transformClassFields(context) { - var hoistVariableDeclaration = context.hoistVariableDeclaration, endLexicalEnvironment = context.endLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment; + var factory = context.factory, hoistVariableDeclaration = context.hoistVariableDeclaration, endLexicalEnvironment = context.endLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment; var resolver = context.getEmitResolver(); var compilerOptions = context.getCompilerOptions(); var languageVersion = ts.getEmitScriptTarget(compilerOptions); @@ -80207,7 +83062,7 @@ var ts; var pendingStatements; var privateIdentifierEnvironmentStack = []; var currentPrivateIdentifierEnvironment; - return ts.chainBundle(transformSourceFile); + return ts.chainBundle(context, transformSourceFile); function transformSourceFile(node) { var options = context.getCompilerOptions(); if (node.isDeclarationFile @@ -80222,40 +83077,40 @@ var ts; if (!(node.transformFlags & 4194304 /* ContainsClassFields */)) return node; switch (node.kind) { - case 214 /* ClassExpression */: - case 245 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 249 /* ClassDeclaration */: return visitClassLike(node); - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: return visitPropertyDeclaration(node); - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: return visitVariableStatement(node); - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: return visitComputedPropertyName(node); - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: return visitPropertyAccessExpression(node); - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: return visitPrefixUnaryExpression(node); - case 208 /* PostfixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: return visitPostfixUnaryExpression(node, /*valueIsDiscarded*/ false); - case 196 /* CallExpression */: + case 200 /* CallExpression */: return visitCallExpression(node); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return visitBinaryExpression(node); - case 76 /* PrivateIdentifier */: + case 79 /* PrivateIdentifier */: return visitPrivateIdentifier(node); - case 226 /* ExpressionStatement */: + case 230 /* ExpressionStatement */: return visitExpressionStatement(node); - case 230 /* ForStatement */: + case 234 /* ForStatement */: return visitForStatement(node); - case 198 /* TaggedTemplateExpression */: + case 202 /* TaggedTemplateExpression */: return visitTaggedTemplateExpression(node); } return ts.visitEachChild(node, visitor, context); } function visitorDestructuringTarget(node) { switch (node.kind) { - case 193 /* ObjectLiteralExpression */: - case 192 /* ArrayLiteralExpression */: + case 197 /* ObjectLiteralExpression */: + case 196 /* ArrayLiteralExpression */: return visitAssignmentPattern(node); default: return visitor(node); @@ -80269,7 +83124,7 @@ var ts; if (!shouldTransformPrivateFields) { return node; } - return ts.setOriginalNode(ts.createIdentifier(""), node); + return ts.setOriginalNode(factory.createIdentifier(""), node); } /** * Visits the members of a class that has fields. @@ -80278,20 +83133,20 @@ var ts; */ function classElementVisitor(node) { switch (node.kind) { - case 162 /* Constructor */: + case 165 /* Constructor */: // Constructors for classes using class fields are transformed in // `visitClassDeclaration` or `visitClassExpression`. return undefined; - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 161 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 164 /* MethodDeclaration */: // Visit the name of the member (if it's a computed property name). return ts.visitEachChild(node, classElementVisitor, context); - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: return visitPropertyDeclaration(node); - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: return visitComputedPropertyName(node); - case 222 /* SemicolonClassElement */: + case 226 /* SemicolonClassElement */: return node; default: return visitor(node); @@ -80312,7 +83167,7 @@ var ts; var expressions = pendingExpressions; expressions.push(name.expression); pendingExpressions = []; - node = ts.updateComputedPropertyName(node, ts.inlineExpressions(expressions)); + node = factory.updateComputedPropertyName(node, factory.inlineExpressions(expressions)); } return node; } @@ -80320,7 +83175,7 @@ var ts; ts.Debug.assert(!ts.some(node.decorators)); if (!shouldTransformPrivateFields && ts.isPrivateIdentifier(node.name)) { // Initializer is elided as the field is initialized in transformConstructor. - return ts.updateProperty(node, + return factory.updatePropertyDeclaration(node, /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.name, /*questionOrExclamationToken*/ undefined, /*type*/ undefined, @@ -80331,7 +83186,7 @@ var ts; // the property name to the temporary variable. var expr = getPropertyNameExpressionIfNeeded(node.name, !!node.initializer || !!context.getCompilerOptions().useDefineForClassFields); if (expr && !ts.isSimpleInlineableExpression(expr)) { - (pendingExpressions || (pendingExpressions = [])).push(expr); + getPendingExpressions().push(expr); } return undefined; } @@ -80339,7 +83194,7 @@ var ts; receiver = ts.visitNode(receiver, visitor, ts.isExpression); switch (info.placement) { case 0 /* InstanceField */: - return createClassPrivateFieldGetHelper(context, ts.nodeIsSynthesized(receiver) ? receiver : ts.getSynthesizedClone(receiver), info.weakMapName); + return context.getEmitHelperFactory().createClassPrivateFieldGetHelper(ts.nodeIsSynthesized(receiver) ? receiver : factory.cloneNode(receiver), info.weakMapName); default: return ts.Debug.fail("Unexpected private identifier placement"); } } @@ -80361,8 +83216,8 @@ var ts; if (operator && (info = accessPrivateIdentifier(node.operand.name))) { var receiver = ts.visitNode(node.operand.expression, visitor, ts.isExpression); var _a = createCopiableReceiverExpr(receiver), readExpression = _a.readExpression, initializeExpression = _a.initializeExpression; - var existingValue = ts.createPrefix(39 /* PlusToken */, createPrivateIdentifierAccess(info, readExpression)); - return ts.setOriginalNode(createPrivateIdentifierAssignment(info, initializeExpression || readExpression, ts.createBinary(existingValue, operator, ts.createLiteral(1)), 62 /* EqualsToken */), node); + var existingValue = factory.createPrefixUnaryExpression(39 /* PlusToken */, createPrivateIdentifierAccess(info, readExpression)); + return ts.setOriginalNode(createPrivateIdentifierAssignment(info, initializeExpression || readExpression, factory.createBinaryExpression(existingValue, operator, factory.createNumericLiteral(1)), 62 /* EqualsToken */), node); } } return ts.visitEachChild(node, visitor, context); @@ -80376,11 +83231,11 @@ var ts; if (operator && (info = accessPrivateIdentifier(node.operand.name))) { var receiver = ts.visitNode(node.operand.expression, visitor, ts.isExpression); var _a = createCopiableReceiverExpr(receiver), readExpression = _a.readExpression, initializeExpression = _a.initializeExpression; - var existingValue = ts.createPrefix(39 /* PlusToken */, createPrivateIdentifierAccess(info, readExpression)); + var existingValue = factory.createPrefixUnaryExpression(39 /* PlusToken */, createPrivateIdentifierAccess(info, readExpression)); // Create a temporary variable to store the value returned by the expression. - var returnValue = valueIsDiscarded ? undefined : ts.createTempVariable(hoistVariableDeclaration); - return ts.setOriginalNode(ts.inlineExpressions(ts.compact([ - createPrivateIdentifierAssignment(info, initializeExpression || readExpression, ts.createBinary(returnValue ? ts.createAssignment(returnValue, existingValue) : existingValue, operator, ts.createLiteral(1)), 62 /* EqualsToken */), + var returnValue = valueIsDiscarded ? undefined : factory.createTempVariable(hoistVariableDeclaration); + return ts.setOriginalNode(factory.inlineExpressions(ts.compact([ + createPrivateIdentifierAssignment(info, initializeExpression || readExpression, factory.createBinaryExpression(returnValue ? factory.createAssignment(returnValue, existingValue) : existingValue, operator, factory.createNumericLiteral(1)), 62 /* EqualsToken */), returnValue ])), node); } @@ -80389,30 +83244,30 @@ var ts; } function visitForStatement(node) { if (node.incrementor && ts.isPostfixUnaryExpression(node.incrementor)) { - return ts.updateFor(node, ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), visitPostfixUnaryExpression(node.incrementor, /*valueIsDiscarded*/ true), ts.visitNode(node.statement, visitor, ts.isStatement)); + return factory.updateForStatement(node, ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), visitPostfixUnaryExpression(node.incrementor, /*valueIsDiscarded*/ true), ts.visitNode(node.statement, visitor, ts.isStatement)); } return ts.visitEachChild(node, visitor, context); } function visitExpressionStatement(node) { if (ts.isPostfixUnaryExpression(node.expression)) { - return ts.updateExpressionStatement(node, visitPostfixUnaryExpression(node.expression, /*valueIsDiscarded*/ true)); + return factory.updateExpressionStatement(node, visitPostfixUnaryExpression(node.expression, /*valueIsDiscarded*/ true)); } return ts.visitEachChild(node, visitor, context); } function createCopiableReceiverExpr(receiver) { - var clone = ts.nodeIsSynthesized(receiver) ? receiver : ts.getSynthesizedClone(receiver); + var clone = ts.nodeIsSynthesized(receiver) ? receiver : factory.cloneNode(receiver); if (ts.isSimpleInlineableExpression(receiver)) { return { readExpression: clone, initializeExpression: undefined }; } - var readExpression = ts.createTempVariable(hoistVariableDeclaration); - var initializeExpression = ts.createAssignment(readExpression, clone); + var readExpression = factory.createTempVariable(hoistVariableDeclaration); + var initializeExpression = factory.createAssignment(readExpression, clone); return { readExpression: readExpression, initializeExpression: initializeExpression }; } function visitCallExpression(node) { if (shouldTransformPrivateFields && ts.isPrivateIdentifierPropertyAccessExpression(node.expression)) { // Transform call expressions of private names to properly bind the `this` parameter. - var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration, languageVersion), thisArg = _a.thisArg, target = _a.target; - return ts.updateCall(node, ts.createPropertyAccess(ts.visitNode(target, visitor), "call"), + var _a = factory.createCallBinding(node.expression, hoistVariableDeclaration, languageVersion), thisArg = _a.thisArg, target = _a.target; + return factory.updateCallExpression(node, factory.createPropertyAccessExpression(ts.visitNode(target, visitor), "call"), /*typeArguments*/ undefined, __spreadArrays([ts.visitNode(thisArg, visitor, ts.isExpression)], ts.visitNodes(node.arguments, visitor, ts.isExpression))); } return ts.visitEachChild(node, visitor, context); @@ -80420,9 +83275,10 @@ var ts; function visitTaggedTemplateExpression(node) { if (shouldTransformPrivateFields && ts.isPrivateIdentifierPropertyAccessExpression(node.tag)) { // Bind the `this` correctly for tagged template literals when the tag is a private identifier property access. - var _a = ts.createCallBinding(node.tag, hoistVariableDeclaration, languageVersion), thisArg = _a.thisArg, target = _a.target; - return ts.updateTaggedTemplate(node, ts.createCall(ts.createPropertyAccess(ts.visitNode(target, visitor), "bind"), - /*typeArguments*/ undefined, [ts.visitNode(thisArg, visitor, ts.isExpression)]), ts.visitNode(node.template, visitor, ts.isTemplateLiteral)); + var _a = factory.createCallBinding(node.tag, hoistVariableDeclaration, languageVersion), thisArg = _a.thisArg, target = _a.target; + return factory.updateTaggedTemplateExpression(node, factory.createCallExpression(factory.createPropertyAccessExpression(ts.visitNode(target, visitor), "bind"), + /*typeArguments*/ undefined, [ts.visitNode(thisArg, visitor, ts.isExpression)]), + /*typeArguments*/ undefined, ts.visitNode(node.template, visitor, ts.isTemplateLiteral)); } return ts.visitEachChild(node, visitor, context); } @@ -80431,9 +83287,9 @@ var ts; if (ts.isDestructuringAssignment(node)) { var savedPendingExpressions = pendingExpressions; pendingExpressions = undefined; - node = ts.updateBinary(node, ts.visitNode(node.left, visitorDestructuringTarget), ts.visitNode(node.right, visitor), node.operatorToken); + node = factory.updateBinaryExpression(node, ts.visitNode(node.left, visitorDestructuringTarget), node.operatorToken, ts.visitNode(node.right, visitor)); var expr = ts.some(pendingExpressions) ? - ts.inlineExpressions(ts.compact(__spreadArrays(pendingExpressions, [node]))) : + factory.inlineExpressions(ts.compact(__spreadArrays(pendingExpressions, [node]))) : node; pendingExpressions = savedPendingExpressions; return expr; @@ -80460,10 +83316,10 @@ var ts; right = ts.visitNode(right, visitor, ts.isExpression); if (ts.isCompoundAssignment(operator)) { var _a = createCopiableReceiverExpr(receiver), readExpression = _a.readExpression, initializeExpression = _a.initializeExpression; - return createClassPrivateFieldSetHelper(context, initializeExpression || readExpression, info.weakMapName, ts.createBinary(createClassPrivateFieldGetHelper(context, readExpression, info.weakMapName), ts.getNonAssignmentOperatorForCompoundAssignment(operator), right)); + return context.getEmitHelperFactory().createClassPrivateFieldSetHelper(initializeExpression || readExpression, info.weakMapName, factory.createBinaryExpression(context.getEmitHelperFactory().createClassPrivateFieldGetHelper(readExpression, info.weakMapName), ts.getNonAssignmentOperatorForCompoundAssignment(operator), right)); } else { - return createClassPrivateFieldSetHelper(context, receiver, info.weakMapName, right); + return context.getEmitHelperFactory().createClassPrivateFieldSetHelper(receiver, info.weakMapName, right); } } /** @@ -80492,15 +83348,15 @@ var ts; return ts.visitEachChild(node, visitor, context); } var extendsClauseElement = ts.getEffectiveBaseTypeNode(node); - var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 100 /* NullKeyword */); + var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 103 /* NullKeyword */); var statements = [ - ts.updateClassDeclaration(node, + factory.updateClassDeclaration(node, /*decorators*/ undefined, node.modifiers, node.name, /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass)) ]; // Write any pending expressions from elided or moved computed property names if (ts.some(pendingExpressions)) { - statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions))); + statements.push(factory.createExpressionStatement(factory.inlineExpressions(pendingExpressions))); } // Emit static property assignment. Because classDeclaration is lexically evaluated, // it is safe to emit static property assignment after classDeclaration @@ -80509,7 +83365,7 @@ var ts; // a lexical declaration such as a LexicalDeclaration or a ClassDeclaration. var staticProperties = ts.getProperties(node, /*requireInitializer*/ true, /*isStatic*/ true); if (ts.some(staticProperties)) { - addPropertyStatements(statements, staticProperties, ts.getInternalName(node)); + addPropertyStatements(statements, staticProperties, factory.getInternalName(node)); } return statements; } @@ -80527,41 +83383,41 @@ var ts; var isDecoratedClassDeclaration = ts.isClassDeclaration(ts.getOriginalNode(node)); var staticProperties = ts.getProperties(node, /*requireInitializer*/ true, /*isStatic*/ true); var extendsClauseElement = ts.getEffectiveBaseTypeNode(node); - var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 100 /* NullKeyword */); - var classExpression = ts.updateClassExpression(node, node.modifiers, node.name, + var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 103 /* NullKeyword */); + var classExpression = factory.updateClassExpression(node, ts.visitNodes(node.decorators, visitor, ts.isDecorator), node.modifiers, node.name, /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass)); if (ts.some(staticProperties) || ts.some(pendingExpressions)) { if (isDecoratedClassDeclaration) { ts.Debug.assertIsDefined(pendingStatements, "Decorated classes transformed by TypeScript are expected to be within a variable declaration."); // Write any pending expressions from elided or moved computed property names if (pendingStatements && pendingExpressions && ts.some(pendingExpressions)) { - pendingStatements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions))); + pendingStatements.push(factory.createExpressionStatement(factory.inlineExpressions(pendingExpressions))); } if (pendingStatements && ts.some(staticProperties)) { - addPropertyStatements(pendingStatements, staticProperties, ts.getInternalName(node)); + addPropertyStatements(pendingStatements, staticProperties, factory.getInternalName(node)); } return classExpression; } else { var expressions = []; var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */; - var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference); + var temp = factory.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference); if (isClassWithConstructorReference) { // record an alias as the class name is not in scope for statics. enableSubstitutionForClassAliases(); - var alias = ts.getSynthesizedClone(temp); + var alias = factory.cloneNode(temp); alias.autoGenerateFlags &= ~8 /* ReservedInNestedScopes */; classAliases[ts.getOriginalNodeId(node)] = alias; } // To preserve the behavior of the old emitter, we explicitly indent // the body of a class with static initializers. ts.setEmitFlags(classExpression, 65536 /* Indented */ | ts.getEmitFlags(classExpression)); - expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression))); + expressions.push(ts.startOnNewLine(factory.createAssignment(temp, classExpression))); // Add any pending expressions leftover from elided or relocated computed property names ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine)); ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp)); expressions.push(ts.startOnNewLine(temp)); - return ts.inlineExpressions(expressions); + return factory.inlineExpressions(expressions); } } return classExpression; @@ -80582,7 +83438,7 @@ var ts; members.push(constructor); } ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement)); - return ts.setTextRange(ts.createNodeArray(members), /*location*/ node.members); + return ts.setTextRange(factory.createNodeArray(members), /*location*/ node.members); } function isPropertyDeclarationThatRequiresConstructorStatement(member) { if (!ts.isPropertyDeclaration(member) || ts.hasStaticModifier(member)) { @@ -80606,7 +83462,7 @@ var ts; if (!body) { return undefined; } - return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor( + return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(factory.createConstructorDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, parameters !== null && parameters !== void 0 ? parameters : [], body), constructor || node), constructor)); } @@ -80628,11 +83484,11 @@ var ts; // // super(...arguments); // - statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), - /*typeArguments*/ undefined, [ts.createSpread(ts.createIdentifier("arguments"))]))); + statements.push(factory.createExpressionStatement(factory.createCallExpression(factory.createSuper(), + /*typeArguments*/ undefined, [factory.createSpreadElement(factory.createIdentifier("arguments"))]))); } if (constructor) { - indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor); + indexOfFirstStatement = ts.addPrologueDirectivesAndInitialSuperCall(factory, constructor, statements, visitor); } // Add the property initializers. Transforms this: // @@ -80656,13 +83512,13 @@ var ts; indexOfFirstStatement = afterParameterProperties; } } - addPropertyStatements(statements, properties, ts.createThis()); + addPropertyStatements(statements, properties, factory.createThis()); // Add existing statements, skipping the initial super call. if (constructor) { ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement)); } - statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment()); - return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), + statements = factory.mergeLexicalEnvironment(statements, endLexicalEnvironment()); + return ts.setTextRange(factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), /*location*/ constructor ? constructor.body.statements : node.members), /*multiLine*/ true), /*location*/ constructor ? constructor.body : undefined); @@ -80674,13 +83530,13 @@ var ts; * @param receiver The receiver on which each property should be assigned. */ function addPropertyStatements(statements, properties, receiver) { - for (var _i = 0, properties_8 = properties; _i < properties_8.length; _i++) { - var property = properties_8[_i]; + for (var _i = 0, properties_7 = properties; _i < properties_7.length; _i++) { + var property = properties_7[_i]; var expression = transformProperty(property, receiver); if (!expression) { continue; } - var statement = ts.createExpressionStatement(expression); + var statement = factory.createExpressionStatement(expression); ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property)); ts.setCommentRange(statement, property); ts.setOriginalNode(statement, property); @@ -80695,8 +83551,8 @@ var ts; */ function generateInitializedPropertyExpressions(properties, receiver) { var expressions = []; - for (var _i = 0, properties_9 = properties; _i < properties_9.length; _i++) { - var property = properties_9[_i]; + for (var _i = 0, properties_8 = properties; _i < properties_8.length; _i++) { + var property = properties_8[_i]; var expression = transformProperty(property, receiver); if (!expression) { continue; @@ -80716,10 +83572,11 @@ var ts; * @param receiver The object receiving the property assignment. */ function transformProperty(property, receiver) { + var _a; // We generate a name here in order to reuse the value cached by the relocated computed name expression (which uses the same generated name) var emitAssignment = !context.getCompilerOptions().useDefineForClassFields; var propertyName = ts.isComputedPropertyName(property.name) && !ts.isSimpleInlineableExpression(property.name.expression) - ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name)) + ? factory.updateComputedPropertyName(property.name, factory.getGeneratedNameForNode(property.name)) : property.name; if (shouldTransformPrivateFields && ts.isPrivateIdentifier(propertyName)) { var privateIdentifierInfo = accessPrivateIdentifier(propertyName); @@ -80741,19 +83598,18 @@ var ts; return undefined; } var propertyOriginalNode = ts.getOriginalNode(property); - var initializer = property.initializer || emitAssignment ? ts.visitNode(property.initializer, visitor, ts.isExpression) - : ts.isParameterPropertyDeclaration(propertyOriginalNode, propertyOriginalNode.parent) && ts.isIdentifier(propertyName) ? propertyName - : ts.createVoidZero(); + var initializer = property.initializer || emitAssignment ? (_a = ts.visitNode(property.initializer, visitor, ts.isExpression)) !== null && _a !== void 0 ? _a : factory.createVoidZero() : ts.isParameterPropertyDeclaration(propertyOriginalNode, propertyOriginalNode.parent) && ts.isIdentifier(propertyName) ? propertyName + : factory.createVoidZero(); if (emitAssignment || ts.isPrivateIdentifier(propertyName)) { - var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName); - return ts.createAssignment(memberAccess, initializer); + var memberAccess = ts.createMemberAccessForPropertyName(factory, receiver, propertyName, /*location*/ propertyName); + return factory.createAssignment(memberAccess, initializer); } else { var name = ts.isComputedPropertyName(propertyName) ? propertyName.expression - : ts.isIdentifier(propertyName) ? ts.createStringLiteral(ts.unescapeLeadingUnderscores(propertyName.escapedText)) + : ts.isIdentifier(propertyName) ? factory.createStringLiteral(ts.unescapeLeadingUnderscores(propertyName.escapedText)) : propertyName; - var descriptor = ts.createPropertyDescriptor({ value: initializer, configurable: true, writable: true, enumerable: true }); - return ts.createObjectDefinePropertyCall(receiver, name, descriptor); + var descriptor = factory.createPropertyDescriptor({ value: initializer, configurable: true, writable: true, enumerable: true }); + return factory.createObjectDefinePropertyCall(receiver, name, descriptor); } } function enableSubstitutionForClassAliases() { @@ -80761,7 +83617,7 @@ var ts; enabledSubstitutions |= 1 /* ClassAliases */; // We need to enable substitutions for identifiers. This allows us to // substitute class names inside of a class declaration. - context.enableSubstitution(75 /* Identifier */); + context.enableSubstitution(78 /* Identifier */); // Keep track of class aliases. classAliases = []; } @@ -80781,7 +83637,7 @@ var ts; } function substituteExpression(node) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return substituteExpressionIdentifier(node); } return node; @@ -80801,7 +83657,7 @@ var ts; if (declaration) { var classAlias = classAliases[declaration.id]; // TODO: GH#18217 if (classAlias) { - var clone_2 = ts.getSynthesizedClone(classAlias); + var clone_2 = factory.cloneNode(classAlias); ts.setSourceMapRange(clone_2, node); ts.setCommentRange(clone_2, node); return clone_2; @@ -80823,9 +83679,9 @@ var ts; var inlinable = ts.isSimpleInlineableExpression(innerExpression); var alreadyTransformed = ts.isAssignmentExpression(innerExpression) && ts.isGeneratedIdentifier(innerExpression.left); if (!alreadyTransformed && !inlinable && shouldHoist) { - var generatedName = ts.getGeneratedNameForNode(name); + var generatedName = factory.getGeneratedNameForNode(name); hoistVariableDeclaration(generatedName); - return ts.createAssignment(generatedName, expression); + return factory.createAssignment(generatedName, expression); } return (inlinable || ts.isIdentifier(innerExpression)) ? undefined : expression; } @@ -80837,14 +83693,18 @@ var ts; function endPrivateIdentifierEnvironment() { currentPrivateIdentifierEnvironment = privateIdentifierEnvironmentStack.pop(); } + function getPrivateIdentifierEnvironment() { + return currentPrivateIdentifierEnvironment || (currentPrivateIdentifierEnvironment = new ts.Map()); + } + function getPendingExpressions() { + return pendingExpressions || (pendingExpressions = []); + } function addPrivateIdentifierToEnvironment(name) { var text = ts.getTextOfPropertyName(name); - var weakMapName = ts.createOptimisticUniqueName("_" + text.substring(1)); - weakMapName.autoGenerateFlags |= 8 /* ReservedInNestedScopes */; + var weakMapName = factory.createUniqueName("_" + text.substring(1), 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */); hoistVariableDeclaration(weakMapName); - (currentPrivateIdentifierEnvironment || (currentPrivateIdentifierEnvironment = ts.createUnderscoreEscapedMap())) - .set(name.escapedText, { placement: 0 /* InstanceField */, weakMapName: weakMapName }); - (pendingExpressions || (pendingExpressions = [])).push(ts.createAssignment(weakMapName, ts.createNew(ts.createIdentifier("WeakMap"), + getPrivateIdentifierEnvironment().set(name.escapedText, { placement: 0 /* InstanceField */, weakMapName: weakMapName }); + getPendingExpressions().push(factory.createAssignment(weakMapName, factory.createNewExpression(factory.createIdentifier("WeakMap"), /*typeArguments*/ undefined, []))); } function accessPrivateIdentifier(name) { @@ -80867,7 +83727,7 @@ var ts; return undefined; } function wrapPrivateIdentifierForDestructuringTarget(node) { - var parameter = ts.getGeneratedNameForNode(node); + var parameter = factory.getGeneratedNameForNode(node); var info = accessPrivateIdentifier(node.name); if (!info) { return ts.visitEachChild(node, visitor, context); @@ -80876,22 +83736,21 @@ var ts; // We cannot copy `this` or `super` into the function because they will be bound // differently inside the function. if (ts.isThisProperty(node) || ts.isSuperProperty(node) || !ts.isSimpleCopiableExpression(node.expression)) { - receiver = ts.createTempVariable(hoistVariableDeclaration); - receiver.autoGenerateFlags |= 8 /* ReservedInNestedScopes */; - (pendingExpressions || (pendingExpressions = [])).push(ts.createBinary(receiver, 62 /* EqualsToken */, node.expression)); + receiver = factory.createTempVariable(hoistVariableDeclaration, /*reservedInNestedScopes*/ true); + getPendingExpressions().push(factory.createBinaryExpression(receiver, 62 /* EqualsToken */, node.expression)); } - return ts.createPropertyAccess( + return factory.createPropertyAccessExpression( // Explicit parens required because of v8 regression (https://bugs.chromium.org/p/v8/issues/detail?id=9560) - ts.createParen(ts.createObjectLiteral([ - ts.createSetAccessor( + factory.createParenthesizedExpression(factory.createObjectLiteralExpression([ + factory.createSetAccessorDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, "value", [ts.createParameter( + /*modifiers*/ undefined, "value", [factory.createParameterDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameter, /*questionToken*/ undefined, /*type*/ undefined, - /*initializer*/ undefined)], ts.createBlock([ts.createExpressionStatement(createPrivateIdentifierAssignment(info, receiver, parameter, 62 /* EqualsToken */))])) + /*initializer*/ undefined)], factory.createBlock([factory.createExpressionStatement(createPrivateIdentifierAssignment(info, receiver, parameter, 62 /* EqualsToken */))])) ])), "value"); } function visitArrayAssignmentTarget(node) { @@ -80899,10 +83758,10 @@ var ts; if (target && ts.isPrivateIdentifierPropertyAccessExpression(target)) { var wrapped = wrapPrivateIdentifierForDestructuringTarget(target); if (ts.isAssignmentExpression(node)) { - return ts.updateBinary(node, wrapped, ts.visitNode(node.right, visitor, ts.isExpression), node.operatorToken); + return factory.updateBinaryExpression(node, wrapped, node.operatorToken, ts.visitNode(node.right, visitor, ts.isExpression)); } else if (ts.isSpreadElement(node)) { - return ts.updateSpread(node, wrapped); + return factory.updateSpreadElement(node, wrapped); } else { return wrapped; @@ -80916,9 +83775,9 @@ var ts; if (target && ts.isPrivateIdentifierPropertyAccessExpression(target)) { var initializer = ts.getInitializerOfBindingOrAssignmentElement(node); var wrapped = wrapPrivateIdentifierForDestructuringTarget(target); - return ts.updatePropertyAssignment(node, ts.visitNode(node.name, visitor), initializer ? ts.createAssignment(wrapped, ts.visitNode(initializer, visitor)) : wrapped); + return factory.updatePropertyAssignment(node, ts.visitNode(node.name, visitor), initializer ? factory.createAssignment(wrapped, ts.visitNode(initializer, visitor)) : wrapped); } - return ts.updatePropertyAssignment(node, ts.visitNode(node.name, visitor), ts.visitNode(node.initializer, visitorDestructuringTarget)); + return factory.updatePropertyAssignment(node, ts.visitNode(node.name, visitor), ts.visitNode(node.initializer, visitorDestructuringTarget)); } return ts.visitNode(node, visitor); } @@ -80931,7 +83790,7 @@ var ts; // // Transformation: // [ { set value(x) { this.#myProp = x; } }.value ] = [ "hello" ]; - return ts.updateArrayLiteral(node, ts.visitNodes(node.elements, visitArrayAssignmentTarget, ts.isExpression)); + return factory.updateArrayLiteralExpression(node, ts.visitNodes(node.elements, visitArrayAssignmentTarget, ts.isExpression)); } else { // Transforms private names in destructuring assignment object bindings. @@ -80941,32 +83800,14 @@ var ts; // // Transformation: // ({ stringProperty: { set value(x) { this.#myProp = x; } }.value }) = { stringProperty: "hello" }; - return ts.updateObjectLiteral(node, ts.visitNodes(node.properties, visitObjectAssignmentTarget, ts.isObjectLiteralElementLike)); + return factory.updateObjectLiteralExpression(node, ts.visitNodes(node.properties, visitObjectAssignmentTarget, ts.isObjectLiteralElementLike)); } } } ts.transformClassFields = transformClassFields; function createPrivateInstanceFieldInitializer(receiver, initializer, weakMapName) { - return ts.createCall(ts.createPropertyAccess(weakMapName, "set"), - /*typeArguments*/ undefined, [receiver, initializer || ts.createVoidZero()]); - } - ts.classPrivateFieldGetHelper = { - name: "typescript:classPrivateFieldGet", - scoped: false, - text: "\n var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, privateMap) {\n if (!privateMap.has(receiver)) {\n throw new TypeError(\"attempted to get private field on non-instance\");\n }\n return privateMap.get(receiver);\n };" - }; - function createClassPrivateFieldGetHelper(context, receiver, privateField) { - context.requestEmitHelper(ts.classPrivateFieldGetHelper); - return ts.createCall(ts.getUnscopedHelperName("__classPrivateFieldGet"), /* typeArguments */ undefined, [receiver, privateField]); - } - ts.classPrivateFieldSetHelper = { - name: "typescript:classPrivateFieldSet", - scoped: false, - text: "\n var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, privateMap, value) {\n if (!privateMap.has(receiver)) {\n throw new TypeError(\"attempted to set private field on non-instance\");\n }\n privateMap.set(receiver, value);\n return value;\n };" - }; - function createClassPrivateFieldSetHelper(context, receiver, privateField, value) { - context.requestEmitHelper(ts.classPrivateFieldSetHelper); - return ts.createCall(ts.getUnscopedHelperName("__classPrivateFieldSet"), /* typeArguments */ undefined, [receiver, privateField, value]); + return ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(weakMapName, "set"), + /*typeArguments*/ undefined, [receiver, initializer || ts.factory.createVoidZero()]); } })(ts || (ts = {})); /*@internal*/ @@ -80983,7 +83824,7 @@ var ts; ContextFlags[ContextFlags["HasLexicalThis"] = 2] = "HasLexicalThis"; })(ContextFlags || (ContextFlags = {})); function transformES2017(context) { - var resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration; + var factory = context.factory, emitHelpers = context.getEmitHelperFactory, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration; var resolver = context.getEmitResolver(); var compilerOptions = context.getCompilerOptions(); var languageVersion = ts.getEmitScriptTarget(compilerOptions); @@ -81013,7 +83854,7 @@ var ts; // Set new transformation hooks. context.onEmitNode = onEmitNode; context.onSubstituteNode = onSubstituteNode; - return ts.chainBundle(transformSourceFile); + return ts.chainBundle(context, transformSourceFile); function transformSourceFile(node) { if (node.isDeclarationFile) { return node; @@ -81054,34 +83895,34 @@ var ts; return node; } switch (node.kind) { - case 126 /* AsyncKeyword */: + case 129 /* AsyncKeyword */: // ES2017 async modifier should be elided for targets < ES2017 return undefined; - case 206 /* AwaitExpression */: + case 210 /* AwaitExpression */: return visitAwaitExpression(node); - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: return doWithContext(1 /* NonTopLevel */ | 2 /* HasLexicalThis */, visitMethodDeclaration, node); - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: return doWithContext(1 /* NonTopLevel */ | 2 /* HasLexicalThis */, visitFunctionDeclaration, node); - case 201 /* FunctionExpression */: + case 205 /* FunctionExpression */: return doWithContext(1 /* NonTopLevel */ | 2 /* HasLexicalThis */, visitFunctionExpression, node); - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: return doWithContext(1 /* NonTopLevel */, visitArrowFunction, node); - case 194 /* PropertyAccessExpression */: - if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 102 /* SuperKeyword */) { - capturedSuperProperties.set(node.name.escapedText, true); + case 198 /* PropertyAccessExpression */: + if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 105 /* SuperKeyword */) { + capturedSuperProperties.add(node.name.escapedText); } return ts.visitEachChild(node, visitor, context); - case 195 /* ElementAccessExpression */: - if (capturedSuperProperties && node.expression.kind === 102 /* SuperKeyword */) { + case 199 /* ElementAccessExpression */: + if (capturedSuperProperties && node.expression.kind === 105 /* SuperKeyword */) { hasSuperElementAccess = true; } return ts.visitEachChild(node, visitor, context); - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 162 /* Constructor */: - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 165 /* Constructor */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: return doWithContext(1 /* NonTopLevel */ | 2 /* HasLexicalThis */, visitDefault, node); default: return ts.visitEachChild(node, visitor, context); @@ -81090,27 +83931,27 @@ var ts; function asyncBodyVisitor(node) { if (ts.isNodeWithPossibleHoistedDeclaration(node)) { switch (node.kind) { - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: return visitVariableStatementInAsyncBody(node); - case 230 /* ForStatement */: + case 234 /* ForStatement */: return visitForStatementInAsyncBody(node); - case 231 /* ForInStatement */: + case 235 /* ForInStatement */: return visitForInStatementInAsyncBody(node); - case 232 /* ForOfStatement */: + case 236 /* ForOfStatement */: return visitForOfStatementInAsyncBody(node); - case 280 /* CatchClause */: + case 284 /* CatchClause */: return visitCatchClauseInAsyncBody(node); - case 223 /* Block */: - case 237 /* SwitchStatement */: - case 251 /* CaseBlock */: - case 277 /* CaseClause */: - case 278 /* DefaultClause */: - case 240 /* TryStatement */: - case 228 /* DoStatement */: - case 229 /* WhileStatement */: - case 227 /* IfStatement */: - case 236 /* WithStatement */: - case 238 /* LabeledStatement */: + case 227 /* Block */: + case 241 /* SwitchStatement */: + case 255 /* CaseBlock */: + case 281 /* CaseClause */: + case 282 /* DefaultClause */: + case 244 /* TryStatement */: + case 232 /* DoStatement */: + case 233 /* WhileStatement */: + case 231 /* IfStatement */: + case 240 /* WithStatement */: + case 242 /* LabeledStatement */: return ts.visitEachChild(node, asyncBodyVisitor, context); default: return ts.Debug.assertNever(node, "Unhandled node."); @@ -81119,14 +83960,14 @@ var ts; return visitor(node); } function visitCatchClauseInAsyncBody(node) { - var catchClauseNames = ts.createUnderscoreEscapedMap(); + var catchClauseNames = new ts.Set(); recordDeclarationName(node.variableDeclaration, catchClauseNames); // TODO: GH#18217 // names declared in a catch variable are block scoped var catchClauseUnshadowedNames; catchClauseNames.forEach(function (_, escapedName) { if (enclosingFunctionParameterNames.has(escapedName)) { if (!catchClauseUnshadowedNames) { - catchClauseUnshadowedNames = ts.cloneMap(enclosingFunctionParameterNames); + catchClauseUnshadowedNames = new ts.Set(enclosingFunctionParameterNames); } catchClauseUnshadowedNames.delete(escapedName); } @@ -81145,25 +83986,25 @@ var ts; function visitVariableStatementInAsyncBody(node) { if (isVariableDeclarationListWithCollidingName(node.declarationList)) { var expression = visitVariableDeclarationListWithCollidingNames(node.declarationList, /*hasReceiver*/ false); - return expression ? ts.createExpressionStatement(expression) : undefined; + return expression ? factory.createExpressionStatement(expression) : undefined; } return ts.visitEachChild(node, visitor, context); } function visitForInStatementInAsyncBody(node) { - return ts.updateForIn(node, isVariableDeclarationListWithCollidingName(node.initializer) + return factory.updateForInStatement(node, isVariableDeclarationListWithCollidingName(node.initializer) ? visitVariableDeclarationListWithCollidingNames(node.initializer, /*hasReceiver*/ true) - : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), ts.visitNode(node.statement, asyncBodyVisitor, ts.isStatement, ts.liftToBlock)); + : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), ts.visitNode(node.statement, asyncBodyVisitor, ts.isStatement, factory.liftToBlock)); } function visitForOfStatementInAsyncBody(node) { - return ts.updateForOf(node, ts.visitNode(node.awaitModifier, visitor, ts.isToken), isVariableDeclarationListWithCollidingName(node.initializer) + return factory.updateForOfStatement(node, ts.visitNode(node.awaitModifier, visitor, ts.isToken), isVariableDeclarationListWithCollidingName(node.initializer) ? visitVariableDeclarationListWithCollidingNames(node.initializer, /*hasReceiver*/ true) - : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), ts.visitNode(node.statement, asyncBodyVisitor, ts.isStatement, ts.liftToBlock)); + : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), ts.visitNode(node.statement, asyncBodyVisitor, ts.isStatement, factory.liftToBlock)); } function visitForStatementInAsyncBody(node) { var initializer = node.initializer; // TODO: GH#18217 - return ts.updateFor(node, isVariableDeclarationListWithCollidingName(initializer) + return factory.updateForStatement(node, isVariableDeclarationListWithCollidingName(initializer) ? visitVariableDeclarationListWithCollidingNames(initializer, /*hasReceiver*/ false) - : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitor, ts.isExpression), ts.visitNode(node.statement, asyncBodyVisitor, ts.isStatement, ts.liftToBlock)); + : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitor, ts.isExpression), ts.visitNode(node.statement, asyncBodyVisitor, ts.isStatement, factory.liftToBlock)); } /** * Visits an AwaitExpression node. @@ -81177,7 +84018,7 @@ var ts; if (inTopLevelContext()) { return ts.visitEachChild(node, visitor, context); } - return ts.setOriginalNode(ts.setTextRange(ts.createYield( + return ts.setOriginalNode(ts.setTextRange(factory.createYieldExpression( /*asteriskToken*/ undefined, ts.visitNode(node.expression, visitor, ts.isExpression)), node), node); } /** @@ -81189,7 +84030,7 @@ var ts; * @param node The node to visit. */ function visitMethodDeclaration(node) { - return ts.updateMethod(node, + return factory.updateMethodDeclaration(node, /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, /*questionToken*/ undefined, /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), @@ -81206,7 +84047,7 @@ var ts; * @param node The node to visit. */ function visitFunctionDeclaration(node) { - return ts.updateFunctionDeclaration(node, + return factory.updateFunctionDeclaration(node, /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), /*type*/ undefined, ts.getFunctionFlags(node) & 2 /* Async */ @@ -81222,7 +84063,7 @@ var ts; * @param node The node to visit. */ function visitFunctionExpression(node) { - return ts.updateFunctionExpression(node, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, + return factory.updateFunctionExpression(node, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), /*type*/ undefined, ts.getFunctionFlags(node) & 2 /* Async */ ? transformAsyncFunctionBody(node) @@ -81237,7 +84078,7 @@ var ts; * @param node The node to visit. */ function visitArrowFunction(node) { - return ts.updateArrowFunction(node, ts.visitNodes(node.modifiers, visitor, ts.isModifier), + return factory.updateArrowFunction(node, ts.visitNodes(node.modifiers, visitor, ts.isModifier), /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), /*type*/ undefined, node.equalsGreaterThanToken, ts.getFunctionFlags(node) & 2 /* Async */ ? transformAsyncFunctionBody(node) @@ -81246,7 +84087,7 @@ var ts; function recordDeclarationName(_a, names) { var name = _a.name; if (ts.isIdentifier(name)) { - names.set(name.escapedText, true); + names.add(name.escapedText); } else { for (var _i = 0, _b = name.elements; _i < _b.length; _i++) { @@ -81268,11 +84109,11 @@ var ts; var variables = ts.getInitializedVariables(node); if (variables.length === 0) { if (hasReceiver) { - return ts.visitNode(ts.convertToAssignmentElementTarget(node.declarations[0].name), visitor, ts.isExpression); + return ts.visitNode(factory.converters.convertToAssignmentElementTarget(node.declarations[0].name), visitor, ts.isExpression); } return undefined; } - return ts.inlineExpressions(ts.map(variables, transformInitializedVariable)); + return factory.inlineExpressions(ts.map(variables, transformInitializedVariable)); } function hoistVariableDeclarationList(node) { ts.forEach(node.declarations, hoistVariable); @@ -81292,7 +84133,7 @@ var ts; } } function transformInitializedVariable(node) { - var converted = ts.setSourceMapRange(ts.createAssignment(ts.convertToAssignmentElementTarget(node.name), node.initializer), node); + var converted = ts.setSourceMapRange(factory.createAssignment(factory.converters.convertToAssignmentElementTarget(node.name), node.initializer), node); return ts.visitNode(converted, visitor, ts.isExpression); } function collidesWithParameterName(_a) { @@ -81315,7 +84156,7 @@ var ts; var original = ts.getOriginalNode(node, ts.isFunctionLike); var nodeType = original.type; var promiseConstructor = languageVersion < 2 /* ES2015 */ ? getPromiseConstructor(nodeType) : undefined; - var isArrowFunction = node.kind === 202 /* ArrowFunction */; + var isArrowFunction = node.kind === 206 /* ArrowFunction */; var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192 /* CaptureArguments */) !== 0; // An async function is emit as an outer function that calls an inner // generator function. To preserve lexical bindings, we pass the current @@ -81323,7 +84164,7 @@ var ts; // passed to `__awaiter` is executed inside of the callback to the // promise constructor. var savedEnclosingFunctionParameterNames = enclosingFunctionParameterNames; - enclosingFunctionParameterNames = ts.createUnderscoreEscapedMap(); + enclosingFunctionParameterNames = new ts.Set(); for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) { var parameter = _a[_i]; recordDeclarationName(parameter, enclosingFunctionParameterNames); @@ -81331,27 +84172,27 @@ var ts; var savedCapturedSuperProperties = capturedSuperProperties; var savedHasSuperElementAccess = hasSuperElementAccess; if (!isArrowFunction) { - capturedSuperProperties = ts.createUnderscoreEscapedMap(); + capturedSuperProperties = new ts.Set(); hasSuperElementAccess = false; } var result; if (!isArrowFunction) { var statements = []; - var statementOffset = ts.addPrologue(statements, node.body.statements, /*ensureUseStrict*/ false, visitor); - statements.push(ts.createReturn(createAwaiterHelper(context, inHasLexicalThisContext(), hasLexicalArguments, promiseConstructor, transformAsyncFunctionBodyWorker(node.body, statementOffset)))); + var statementOffset = factory.copyPrologue(node.body.statements, statements, /*ensureUseStrict*/ false, visitor); + statements.push(factory.createReturnStatement(emitHelpers().createAwaiterHelper(inHasLexicalThisContext(), hasLexicalArguments, promiseConstructor, transformAsyncFunctionBodyWorker(node.body, statementOffset)))); ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment()); // Minor optimization, emit `_super` helper to capture `super` access in an arrow. // This step isn't needed if we eventually transform this to ES5. var emitSuperHelpers = languageVersion >= 2 /* ES2015 */ && resolver.getNodeCheckFlags(node) & (4096 /* AsyncMethodWithSuperBinding */ | 2048 /* AsyncMethodWithSuper */); if (emitSuperHelpers) { enableSubstitutionForAsyncMethodsWithSuper(); - if (ts.hasEntries(capturedSuperProperties)) { - var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties); + if (capturedSuperProperties.size) { + var variableStatement = createSuperAccessVariableStatement(factory, resolver, node, capturedSuperProperties); substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true; ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]); } } - var block = ts.createBlock(statements, /*multiLine*/ true); + var block = factory.createBlock(statements, /*multiLine*/ true); ts.setTextRange(block, node.body); if (emitSuperHelpers && hasSuperElementAccess) { // Emit helpers for super element access expressions (`super[x]`). @@ -81365,11 +84206,11 @@ var ts; result = block; } else { - var expression = createAwaiterHelper(context, inHasLexicalThisContext(), hasLexicalArguments, promiseConstructor, transformAsyncFunctionBodyWorker(node.body)); + var expression = emitHelpers().createAwaiterHelper(inHasLexicalThisContext(), hasLexicalArguments, promiseConstructor, transformAsyncFunctionBodyWorker(node.body)); var declarations = endLexicalEnvironment(); if (ts.some(declarations)) { - var block = ts.convertToFunctionBody(expression); - result = ts.updateBlock(block, ts.setTextRange(ts.createNodeArray(ts.concatenate(declarations, block.statements)), block.statements)); + var block = factory.converters.convertToFunctionBlock(expression); + result = factory.updateBlock(block, ts.setTextRange(factory.createNodeArray(ts.concatenate(declarations, block.statements)), block.statements)); } else { result = expression; @@ -81384,10 +84225,10 @@ var ts; } function transformAsyncFunctionBodyWorker(body, start) { if (ts.isBlock(body)) { - return ts.updateBlock(body, ts.visitNodes(body.statements, asyncBodyVisitor, ts.isStatement, start)); + return factory.updateBlock(body, ts.visitNodes(body.statements, asyncBodyVisitor, ts.isStatement, start)); } else { - return ts.convertToFunctionBody(ts.visitNode(body, asyncBodyVisitor, ts.isConciseBody)); + return factory.converters.convertToFunctionBlock(ts.visitNode(body, asyncBodyVisitor, ts.isConciseBody)); } } function getPromiseConstructor(type) { @@ -81406,17 +84247,17 @@ var ts; enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */; // We need to enable substitutions for call, property access, and element access // if we need to rewrite super calls. - context.enableSubstitution(196 /* CallExpression */); - context.enableSubstitution(194 /* PropertyAccessExpression */); - context.enableSubstitution(195 /* ElementAccessExpression */); + context.enableSubstitution(200 /* CallExpression */); + context.enableSubstitution(198 /* PropertyAccessExpression */); + context.enableSubstitution(199 /* ElementAccessExpression */); // We need to be notified when entering and exiting declarations that bind super. - context.enableEmitNotification(245 /* ClassDeclaration */); - context.enableEmitNotification(161 /* MethodDeclaration */); - context.enableEmitNotification(163 /* GetAccessor */); - context.enableEmitNotification(164 /* SetAccessor */); - context.enableEmitNotification(162 /* Constructor */); + context.enableEmitNotification(249 /* ClassDeclaration */); + context.enableEmitNotification(164 /* MethodDeclaration */); + context.enableEmitNotification(166 /* GetAccessor */); + context.enableEmitNotification(167 /* SetAccessor */); + context.enableEmitNotification(165 /* Constructor */); // We need to be notified when entering the generated accessor arrow functions. - context.enableEmitNotification(225 /* VariableStatement */); + context.enableEmitNotification(229 /* VariableStatement */); } } /** @@ -81464,23 +84305,23 @@ var ts; } function substituteExpression(node) { switch (node.kind) { - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: return substitutePropertyAccessExpression(node); - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: return substituteElementAccessExpression(node); - case 196 /* CallExpression */: + case 200 /* CallExpression */: return substituteCallExpression(node); } return node; } function substitutePropertyAccessExpression(node) { - if (node.expression.kind === 102 /* SuperKeyword */) { - return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node); + if (node.expression.kind === 105 /* SuperKeyword */) { + return ts.setTextRange(factory.createPropertyAccessExpression(factory.createUniqueName("_super", 16 /* Optimistic */ | 32 /* FileLevel */), node.name), node); } return node; } function substituteElementAccessExpression(node) { - if (node.expression.kind === 102 /* SuperKeyword */) { + if (node.expression.kind === 105 /* SuperKeyword */) { return createSuperElementAccessInAsyncMethod(node.argumentExpression, node); } return node; @@ -81491,35 +84332,35 @@ var ts; var argumentExpression = ts.isPropertyAccessExpression(expression) ? substitutePropertyAccessExpression(expression) : substituteElementAccessExpression(expression); - return ts.createCall(ts.createPropertyAccess(argumentExpression, "call"), + return factory.createCallExpression(factory.createPropertyAccessExpression(argumentExpression, "call"), /*typeArguments*/ undefined, __spreadArrays([ - ts.createThis() + factory.createThis() ], node.arguments)); } return node; } function isSuperContainer(node) { var kind = node.kind; - return kind === 245 /* ClassDeclaration */ - || kind === 162 /* Constructor */ - || kind === 161 /* MethodDeclaration */ - || kind === 163 /* GetAccessor */ - || kind === 164 /* SetAccessor */; + return kind === 249 /* ClassDeclaration */ + || kind === 165 /* Constructor */ + || kind === 164 /* MethodDeclaration */ + || kind === 166 /* GetAccessor */ + || kind === 167 /* SetAccessor */; } function createSuperElementAccessInAsyncMethod(argumentExpression, location) { if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) { - return ts.setTextRange(ts.createPropertyAccess(ts.createCall(ts.createFileLevelUniqueName("_superIndex"), + return ts.setTextRange(factory.createPropertyAccessExpression(factory.createCallExpression(factory.createUniqueName("_superIndex", 16 /* Optimistic */ | 32 /* FileLevel */), /*typeArguments*/ undefined, [argumentExpression]), "value"), location); } else { - return ts.setTextRange(ts.createCall(ts.createFileLevelUniqueName("_superIndex"), + return ts.setTextRange(factory.createCallExpression(factory.createUniqueName("_superIndex", 16 /* Optimistic */ | 32 /* FileLevel */), /*typeArguments*/ undefined, [argumentExpression]), location); } } } ts.transformES2017 = transformES2017; /** Creates a variable named `_super` with accessor properties for the given property names. */ - function createSuperAccessVariableStatement(resolver, node, names) { + function createSuperAccessVariableStatement(factory, resolver, node, names) { // Create a variable declaration with a getter/setter (if binding) definition for each name: // const _super = Object.create(null, { x: { get: () => super.x, set: (v) => super.x = v }, ... }); var hasBinding = (resolver.getNodeCheckFlags(node) & 4096 /* AsyncMethodWithSuperBinding */) !== 0; @@ -81527,18 +84368,18 @@ var ts; names.forEach(function (_, key) { var name = ts.unescapeLeadingUnderscores(key); var getterAndSetter = []; - getterAndSetter.push(ts.createPropertyAssignment("get", ts.createArrowFunction( + getterAndSetter.push(factory.createPropertyAssignment("get", factory.createArrowFunction( /* modifiers */ undefined, /* typeParameters */ undefined, /* parameters */ [], /* type */ undefined, - /* equalsGreaterThanToken */ undefined, ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */)))); + /* equalsGreaterThanToken */ undefined, ts.setEmitFlags(factory.createPropertyAccessExpression(ts.setEmitFlags(factory.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */)))); if (hasBinding) { - getterAndSetter.push(ts.createPropertyAssignment("set", ts.createArrowFunction( + getterAndSetter.push(factory.createPropertyAssignment("set", factory.createArrowFunction( /* modifiers */ undefined, /* typeParameters */ undefined, /* parameters */ [ - ts.createParameter( + factory.createParameterDeclaration( /* decorators */ undefined, /* modifiers */ undefined, /* dotDotDotToken */ undefined, "v", @@ -81547,56 +84388,22 @@ var ts; /* initializer */ undefined) ], /* type */ undefined, - /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */), ts.createIdentifier("v"))))); + /* equalsGreaterThanToken */ undefined, factory.createAssignment(ts.setEmitFlags(factory.createPropertyAccessExpression(ts.setEmitFlags(factory.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */), factory.createIdentifier("v"))))); } - accessors.push(ts.createPropertyAssignment(name, ts.createObjectLiteral(getterAndSetter))); + accessors.push(factory.createPropertyAssignment(name, factory.createObjectLiteralExpression(getterAndSetter))); }); - return ts.createVariableStatement( - /* modifiers */ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(ts.createFileLevelUniqueName("_super"), - /* type */ undefined, ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "create"), + return factory.createVariableStatement( + /* modifiers */ undefined, factory.createVariableDeclarationList([ + factory.createVariableDeclaration(factory.createUniqueName("_super", 16 /* Optimistic */ | 32 /* FileLevel */), + /*exclamationToken*/ undefined, + /* type */ undefined, factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Object"), "create"), /* typeArguments */ undefined, [ - ts.createNull(), - ts.createObjectLiteral(accessors, /* multiline */ true) + factory.createNull(), + factory.createObjectLiteralExpression(accessors, /* multiline */ true) ])) ], 2 /* Const */)); } ts.createSuperAccessVariableStatement = createSuperAccessVariableStatement; - ts.awaiterHelper = { - name: "typescript:awaiter", - importName: "__awaiter", - scoped: false, - priority: 5, - text: "\n var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n return new (P || (P = Promise))(function (resolve, reject) {\n function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n step((generator = generator.apply(thisArg, _arguments || [])).next());\n });\n };" - }; - function createAwaiterHelper(context, hasLexicalThis, hasLexicalArguments, promiseConstructor, body) { - context.requestEmitHelper(ts.awaiterHelper); - var generatorFunc = ts.createFunctionExpression( - /*modifiers*/ undefined, ts.createToken(41 /* AsteriskToken */), - /*name*/ undefined, - /*typeParameters*/ undefined, - /*parameters*/ [], - /*type*/ undefined, body); - // Mark this node as originally an async function - (generatorFunc.emitNode || (generatorFunc.emitNode = {})).flags |= 262144 /* AsyncFunctionBody */ | 524288 /* ReuseTempVariableScope */; - return ts.createCall(ts.getUnscopedHelperName("__awaiter"), - /*typeArguments*/ undefined, [ - hasLexicalThis ? ts.createThis() : ts.createVoidZero(), - hasLexicalArguments ? ts.createIdentifier("arguments") : ts.createVoidZero(), - promiseConstructor ? ts.createExpressionFromEntityName(promiseConstructor) : ts.createVoidZero(), - generatorFunc - ]); - } - ts.asyncSuperHelper = { - name: "typescript:async-super", - scoped: true, - text: ts.helperString(__makeTemplateObject(["\n const ", " = name => super[name];"], ["\n const ", " = name => super[name];"]), "_superIndex") - }; - ts.advancedAsyncSuperHelper = { - name: "typescript:advanced-async-super", - scoped: true, - text: ts.helperString(__makeTemplateObject(["\n const ", " = (function (geti, seti) {\n const cache = Object.create(null);\n return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });\n })(name => super[name], (name, value) => super[name] = value);"], ["\n const ", " = (function (geti, seti) {\n const cache = Object.create(null);\n return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });\n })(name => super[name], (name, value) => super[name] = value);"]), "_superIndex") - }; })(ts || (ts = {})); /*@internal*/ var ts; @@ -81631,7 +84438,7 @@ var ts; HierarchyFacts[HierarchyFacts["IterationStatementExcludes"] = 0] = "IterationStatementExcludes"; })(HierarchyFacts || (HierarchyFacts = {})); function transformES2018(context) { - var resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration; + var factory = context.factory, emitHelpers = context.getEmitHelperFactory, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration; var resolver = context.getEmitResolver(); var compilerOptions = context.getCompilerOptions(); var languageVersion = ts.getEmitScriptTarget(compilerOptions); @@ -81652,7 +84459,7 @@ var ts; var hasSuperElementAccess; /** A set of node IDs for generated super accessors. */ var substitutedSuperAccessors = []; - return ts.chainBundle(transformSourceFile); + return ts.chainBundle(context, transformSourceFile); function affectsSubtree(excludeFacts, includeFacts) { return hierarchyFacts !== (hierarchyFacts & ~excludeFacts | includeFacts); } @@ -81675,7 +84482,7 @@ var ts; hierarchyFacts = ancestorFacts; } function recordTaggedTemplateString(temp) { - taggedTemplateStringDeclarations = ts.append(taggedTemplateStringDeclarations, ts.createVariableDeclaration(temp)); + taggedTemplateStringDeclarations = ts.append(taggedTemplateStringDeclarations, factory.createVariableDeclaration(temp)); } function transformSourceFile(node) { if (node.isDeclarationFile) { @@ -81695,7 +84502,7 @@ var ts; return visitorWorker(node, /*noDestructuringValue*/ true); } function visitorNoAsyncModifier(node) { - if (node.kind === 126 /* AsyncKeyword */) { + if (node.kind === 129 /* AsyncKeyword */) { return undefined; } return node; @@ -81717,68 +84524,68 @@ var ts; return node; } switch (node.kind) { - case 206 /* AwaitExpression */: + case 210 /* AwaitExpression */: return visitAwaitExpression(node); - case 212 /* YieldExpression */: + case 216 /* YieldExpression */: return visitYieldExpression(node); - case 235 /* ReturnStatement */: + case 239 /* ReturnStatement */: return visitReturnStatement(node); - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: return visitLabeledStatement(node); - case 193 /* ObjectLiteralExpression */: + case 197 /* ObjectLiteralExpression */: return visitObjectLiteralExpression(node); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return visitBinaryExpression(node, noDestructuringValue); - case 280 /* CatchClause */: + case 284 /* CatchClause */: return visitCatchClause(node); - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: return visitVariableStatement(node); - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return visitVariableDeclaration(node); - case 228 /* DoStatement */: - case 229 /* WhileStatement */: - case 231 /* ForInStatement */: + case 232 /* DoStatement */: + case 233 /* WhileStatement */: + case 235 /* ForInStatement */: return doWithHierarchyFacts(visitDefault, node, 0 /* IterationStatementExcludes */, 2 /* IterationStatementIncludes */); - case 232 /* ForOfStatement */: + case 236 /* ForOfStatement */: return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined); - case 230 /* ForStatement */: + case 234 /* ForStatement */: return doWithHierarchyFacts(visitForStatement, node, 0 /* IterationStatementExcludes */, 2 /* IterationStatementIncludes */); - case 205 /* VoidExpression */: + case 209 /* VoidExpression */: return visitVoidExpression(node); - case 162 /* Constructor */: + case 165 /* Constructor */: return doWithHierarchyFacts(visitConstructorDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */); - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: return doWithHierarchyFacts(visitMethodDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */); - case 163 /* GetAccessor */: + case 166 /* GetAccessor */: return doWithHierarchyFacts(visitGetAccessorDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */); - case 164 /* SetAccessor */: + case 167 /* SetAccessor */: return doWithHierarchyFacts(visitSetAccessorDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */); - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: return doWithHierarchyFacts(visitFunctionDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */); - case 201 /* FunctionExpression */: + case 205 /* FunctionExpression */: return doWithHierarchyFacts(visitFunctionExpression, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */); - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: return doWithHierarchyFacts(visitArrowFunction, node, 2 /* ArrowFunctionExcludes */, 0 /* ArrowFunctionIncludes */); - case 156 /* Parameter */: + case 159 /* Parameter */: return visitParameter(node); - case 226 /* ExpressionStatement */: + case 230 /* ExpressionStatement */: return visitExpressionStatement(node); - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return visitParenthesizedExpression(node, noDestructuringValue); - case 198 /* TaggedTemplateExpression */: + case 202 /* TaggedTemplateExpression */: return visitTaggedTemplateExpression(node); - case 194 /* PropertyAccessExpression */: - if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 102 /* SuperKeyword */) { - capturedSuperProperties.set(node.name.escapedText, true); + case 198 /* PropertyAccessExpression */: + if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 105 /* SuperKeyword */) { + capturedSuperProperties.add(node.name.escapedText); } return ts.visitEachChild(node, visitor, context); - case 195 /* ElementAccessExpression */: - if (capturedSuperProperties && node.expression.kind === 102 /* SuperKeyword */) { + case 199 /* ElementAccessExpression */: + if (capturedSuperProperties && node.expression.kind === 105 /* SuperKeyword */) { hasSuperElementAccess = true; } return ts.visitEachChild(node, visitor, context); - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: return doWithHierarchyFacts(visitDefault, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */); default: return ts.visitEachChild(node, visitor, context); @@ -81786,7 +84593,7 @@ var ts; } function visitAwaitExpression(node) { if (enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */) { - return ts.setOriginalNode(ts.setTextRange(ts.createYield(createAwaitHelper(context, ts.visitNode(node.expression, visitor, ts.isExpression))), + return ts.setOriginalNode(ts.setTextRange(factory.createYieldExpression(/*asteriskToken*/ undefined, emitHelpers().createAwaitHelper(ts.visitNode(node.expression, visitor, ts.isExpression))), /*location*/ node), node); } return ts.visitEachChild(node, visitor, context); @@ -81794,28 +84601,30 @@ var ts; function visitYieldExpression(node) { if (enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */) { if (node.asteriskToken) { - var expression = ts.visitNode(node.expression, visitor, ts.isExpression); - return ts.setOriginalNode(ts.setTextRange(ts.createYield(createAwaitHelper(context, ts.updateYield(node, node.asteriskToken, createAsyncDelegatorHelper(context, createAsyncValuesHelper(context, expression, expression), expression)))), node), node); + var expression = ts.visitNode(ts.Debug.assertDefined(node.expression), visitor, ts.isExpression); + return ts.setOriginalNode(ts.setTextRange(factory.createYieldExpression( + /*asteriskToken*/ undefined, emitHelpers().createAwaitHelper(factory.updateYieldExpression(node, node.asteriskToken, ts.setTextRange(emitHelpers().createAsyncDelegatorHelper(ts.setTextRange(emitHelpers().createAsyncValuesHelper(expression), expression)), expression)))), node), node); } - return ts.setOriginalNode(ts.setTextRange(ts.createYield(createDownlevelAwait(node.expression + return ts.setOriginalNode(ts.setTextRange(factory.createYieldExpression( + /*asteriskToken*/ undefined, createDownlevelAwait(node.expression ? ts.visitNode(node.expression, visitor, ts.isExpression) - : ts.createVoidZero())), node), node); + : factory.createVoidZero())), node), node); } return ts.visitEachChild(node, visitor, context); } function visitReturnStatement(node) { if (enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */) { - return ts.updateReturn(node, createDownlevelAwait(node.expression ? ts.visitNode(node.expression, visitor, ts.isExpression) : ts.createVoidZero())); + return factory.updateReturnStatement(node, createDownlevelAwait(node.expression ? ts.visitNode(node.expression, visitor, ts.isExpression) : factory.createVoidZero())); } return ts.visitEachChild(node, visitor, context); } function visitLabeledStatement(node) { if (enclosingFunctionFlags & 2 /* Async */) { var statement = ts.unwrapInnermostStatementOfLabel(node); - if (statement.kind === 232 /* ForOfStatement */ && statement.awaitModifier) { + if (statement.kind === 236 /* ForOfStatement */ && statement.awaitModifier) { return visitForOfStatement(statement, node); } - return ts.restoreEnclosingLabel(ts.visitNode(statement, visitor, ts.isStatement, ts.liftToBlock), node); + return factory.restoreEnclosingLabel(ts.visitNode(statement, visitor, ts.isStatement, factory.liftToBlock), node); } return ts.visitEachChild(node, visitor, context); } @@ -81824,22 +84633,22 @@ var ts; var objects = []; for (var _i = 0, elements_4 = elements; _i < elements_4.length; _i++) { var e = elements_4[_i]; - if (e.kind === 283 /* SpreadAssignment */) { + if (e.kind === 287 /* SpreadAssignment */) { if (chunkObject) { - objects.push(ts.createObjectLiteral(chunkObject)); + objects.push(factory.createObjectLiteralExpression(chunkObject)); chunkObject = undefined; } var target = e.expression; objects.push(ts.visitNode(target, visitor, ts.isExpression)); } else { - chunkObject = ts.append(chunkObject, e.kind === 281 /* PropertyAssignment */ - ? ts.createPropertyAssignment(e.name, ts.visitNode(e.initializer, visitor, ts.isExpression)) + chunkObject = ts.append(chunkObject, e.kind === 285 /* PropertyAssignment */ + ? factory.createPropertyAssignment(e.name, ts.visitNode(e.initializer, visitor, ts.isExpression)) : ts.visitNode(e, visitor, ts.isObjectLiteralElementLike)); } } if (chunkObject) { - objects.push(ts.createObjectLiteral(chunkObject)); + objects.push(factory.createObjectLiteralExpression(chunkObject)); } return objects; } @@ -81867,18 +84676,18 @@ var ts; // If we translate the above to `__assign({}, k, l)`, the `l` will evaluate before `k` is spread and we // end up with `{ a: 1, b: 2, c: 3 }` var objects = chunkObjectLiteralElements(node.properties); - if (objects.length && objects[0].kind !== 193 /* ObjectLiteralExpression */) { - objects.unshift(ts.createObjectLiteral()); + if (objects.length && objects[0].kind !== 197 /* ObjectLiteralExpression */) { + objects.unshift(factory.createObjectLiteralExpression()); } var expression = objects[0]; if (objects.length > 1) { for (var i = 1; i < objects.length; i++) { - expression = createAssignHelper(context, [expression, objects[i]]); + expression = emitHelpers().createAssignHelper([expression, objects[i]]); } return expression; } else { - return createAssignHelper(context, objects); + return emitHelpers().createAssignHelper(objects); } } return ts.visitEachChild(node, visitor, context); @@ -81896,9 +84705,9 @@ var ts; exportedVariableStatement = false; var visited = ts.visitEachChild(node, visitor, context); var statement = ts.concatenate(visited.statements, taggedTemplateStringDeclarations && [ - ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList(taggedTemplateStringDeclarations)) + factory.createVariableStatement(/*modifiers*/ undefined, factory.createVariableDeclarationList(taggedTemplateStringDeclarations)) ]); - var result = ts.updateSourceFileNode(visited, ts.setTextRange(ts.createNodeArray(statement), node.statements)); + var result = factory.updateSourceFile(visited, ts.setTextRange(factory.createNodeArray(statement), node.statements)); exitSubtree(ancestorFacts); return result; } @@ -81915,7 +84724,7 @@ var ts; return ts.flattenDestructuringAssignment(node, visitor, context, 1 /* ObjectRest */, !noDestructuringValue); } else if (node.operatorToken.kind === 27 /* CommaToken */) { - return ts.updateBinary(node, ts.visitNode(node.left, visitorNoDestructuringValue, ts.isExpression), ts.visitNode(node.right, noDestructuringValue ? visitorNoDestructuringValue : visitor, ts.isExpression)); + return factory.updateBinaryExpression(node, ts.visitNode(node.left, visitorNoDestructuringValue, ts.isExpression), node.operatorToken, ts.visitNode(node.right, noDestructuringValue ? visitorNoDestructuringValue : visitor, ts.isExpression)); } return ts.visitEachChild(node, visitor, context); } @@ -81923,21 +84732,21 @@ var ts; if (node.variableDeclaration && ts.isBindingPattern(node.variableDeclaration.name) && node.variableDeclaration.name.transformFlags & 16384 /* ContainsObjectRestOrSpread */) { - var name = ts.getGeneratedNameForNode(node.variableDeclaration.name); - var updatedDecl = ts.updateVariableDeclaration(node.variableDeclaration, node.variableDeclaration.name, /*type*/ undefined, name); + var name = factory.getGeneratedNameForNode(node.variableDeclaration.name); + var updatedDecl = factory.updateVariableDeclaration(node.variableDeclaration, node.variableDeclaration.name, /*exclamationToken*/ undefined, /*type*/ undefined, name); var visitedBindings = ts.flattenDestructuringBinding(updatedDecl, visitor, context, 1 /* ObjectRest */); var block = ts.visitNode(node.block, visitor, ts.isBlock); if (ts.some(visitedBindings)) { - block = ts.updateBlock(block, __spreadArrays([ - ts.createVariableStatement(/*modifiers*/ undefined, visitedBindings) + block = factory.updateBlock(block, __spreadArrays([ + factory.createVariableStatement(/*modifiers*/ undefined, visitedBindings) ], block.statements)); } - return ts.updateCatchClause(node, ts.updateVariableDeclaration(node.variableDeclaration, name, /*type*/ undefined, /*initializer*/ undefined), block); + return factory.updateCatchClause(node, factory.updateVariableDeclaration(node.variableDeclaration, name, /*exclamationToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined), block); } return ts.visitEachChild(node, visitor, context); } function visitVariableStatement(node) { - if (ts.hasModifier(node, 1 /* Export */)) { + if (ts.hasSyntacticModifier(node, 1 /* Export */)) { var savedExportedVariableStatement = exportedVariableStatement; exportedVariableStatement = true; var visited = ts.visitEachChild(node, visitor, context); @@ -81970,7 +84779,7 @@ var ts; return ts.visitEachChild(node, visitor, context); } function visitForStatement(node) { - return ts.updateFor(node, ts.visitNode(node.initializer, visitorNoDestructuringValue, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitor, ts.isExpression), ts.visitNode(node.statement, visitor, ts.isStatement)); + return factory.updateForStatement(node, ts.visitNode(node.initializer, visitorNoDestructuringValue, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitor, ts.isExpression), ts.visitNode(node.statement, visitor, ts.isStatement)); } function visitVoidExpression(node) { return ts.visitEachChild(node, visitorNoDestructuringValue, context); @@ -81987,7 +84796,7 @@ var ts; } var result = node.awaitModifier ? transformForAwaitOfStatement(node, outermostLabeledStatement, ancestorFacts) : - ts.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement); + factory.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement); exitSubtree(ancestorFacts); return result; } @@ -81996,8 +84805,8 @@ var ts; if (ts.isVariableDeclarationList(initializerWithoutParens) || ts.isAssignmentPattern(initializerWithoutParens)) { var bodyLocation = void 0; var statementsLocation = void 0; - var temp = ts.createTempVariable(/*recordTempVariable*/ undefined); - var statements = [ts.createForOfBindingStatement(initializerWithoutParens, temp)]; + var temp = factory.createTempVariable(/*recordTempVariable*/ undefined); + var statements = [ts.createForOfBindingStatement(factory, initializerWithoutParens, temp)]; if (ts.isBlock(node.statement)) { ts.addRange(statements, node.statement.statements); bodyLocation = node.statement; @@ -82008,15 +84817,15 @@ var ts; bodyLocation = node.statement; statementsLocation = node.statement; } - return ts.updateForOf(node, node.awaitModifier, ts.setTextRange(ts.createVariableDeclarationList([ - ts.setTextRange(ts.createVariableDeclaration(temp), node.initializer) - ], 1 /* Let */), node.initializer), node.expression, ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), statementsLocation), + return factory.updateForOfStatement(node, node.awaitModifier, ts.setTextRange(factory.createVariableDeclarationList([ + ts.setTextRange(factory.createVariableDeclaration(temp), node.initializer) + ], 1 /* Let */), node.initializer), node.expression, ts.setTextRange(factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), statementsLocation), /*multiLine*/ true), bodyLocation)); } return node; } function convertForOfStatementHead(node, boundValue) { - var binding = ts.createForOfBindingStatement(node.initializer, boundValue); + var binding = ts.createForOfBindingStatement(factory, node.initializer, boundValue); var bodyLocation; var statementsLocation; var statements = [ts.visitNode(binding, visitor, ts.isStatement)]; @@ -82029,55 +84838,55 @@ var ts; else { statements.push(statement); } - return ts.setEmitFlags(ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), statementsLocation), + return ts.setEmitFlags(ts.setTextRange(factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), statementsLocation), /*multiLine*/ true), bodyLocation), 48 /* NoSourceMap */ | 384 /* NoTokenSourceMaps */); } function createDownlevelAwait(expression) { return enclosingFunctionFlags & 1 /* Generator */ - ? ts.createYield(/*asteriskToken*/ undefined, createAwaitHelper(context, expression)) - : ts.createAwait(expression); + ? factory.createYieldExpression(/*asteriskToken*/ undefined, emitHelpers().createAwaitHelper(expression)) + : factory.createAwaitExpression(expression); } function transformForAwaitOfStatement(node, outermostLabeledStatement, ancestorFacts) { var expression = ts.visitNode(node.expression, visitor, ts.isExpression); - var iterator = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(expression) : ts.createTempVariable(/*recordTempVariable*/ undefined); - var result = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(iterator) : ts.createTempVariable(/*recordTempVariable*/ undefined); - var errorRecord = ts.createUniqueName("e"); - var catchVariable = ts.getGeneratedNameForNode(errorRecord); - var returnMethod = ts.createTempVariable(/*recordTempVariable*/ undefined); - var callValues = createAsyncValuesHelper(context, expression, /*location*/ node.expression); - var callNext = ts.createCall(ts.createPropertyAccess(iterator, "next"), /*typeArguments*/ undefined, []); - var getDone = ts.createPropertyAccess(result, "done"); - var getValue = ts.createPropertyAccess(result, "value"); - var callReturn = ts.createFunctionCall(returnMethod, iterator, []); + var iterator = ts.isIdentifier(expression) ? factory.getGeneratedNameForNode(expression) : factory.createTempVariable(/*recordTempVariable*/ undefined); + var result = ts.isIdentifier(expression) ? factory.getGeneratedNameForNode(iterator) : factory.createTempVariable(/*recordTempVariable*/ undefined); + var errorRecord = factory.createUniqueName("e"); + var catchVariable = factory.getGeneratedNameForNode(errorRecord); + var returnMethod = factory.createTempVariable(/*recordTempVariable*/ undefined); + var callValues = ts.setTextRange(emitHelpers().createAsyncValuesHelper(expression), node.expression); + var callNext = factory.createCallExpression(factory.createPropertyAccessExpression(iterator, "next"), /*typeArguments*/ undefined, []); + var getDone = factory.createPropertyAccessExpression(result, "done"); + var getValue = factory.createPropertyAccessExpression(result, "value"); + var callReturn = factory.createFunctionCallCall(returnMethod, iterator, []); hoistVariableDeclaration(errorRecord); hoistVariableDeclaration(returnMethod); // if we are enclosed in an outer loop ensure we reset 'errorRecord' per each iteration var initializer = ancestorFacts & 2 /* IterationContainer */ ? - ts.inlineExpressions([ts.createAssignment(errorRecord, ts.createVoidZero()), callValues]) : + factory.inlineExpressions([factory.createAssignment(errorRecord, factory.createVoidZero()), callValues]) : callValues; - var forStatement = ts.setEmitFlags(ts.setTextRange(ts.createFor( - /*initializer*/ ts.setEmitFlags(ts.setTextRange(ts.createVariableDeclarationList([ - ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, initializer), node.expression), - ts.createVariableDeclaration(result) + var forStatement = ts.setEmitFlags(ts.setTextRange(factory.createForStatement( + /*initializer*/ ts.setEmitFlags(ts.setTextRange(factory.createVariableDeclarationList([ + ts.setTextRange(factory.createVariableDeclaration(iterator, /*exclamationToken*/ undefined, /*type*/ undefined, initializer), node.expression), + factory.createVariableDeclaration(result) ]), node.expression), 2097152 /* NoHoisting */), - /*condition*/ ts.createComma(ts.createAssignment(result, createDownlevelAwait(callNext)), ts.createLogicalNot(getDone)), + /*condition*/ factory.createComma(factory.createAssignment(result, createDownlevelAwait(callNext)), factory.createLogicalNot(getDone)), /*incrementor*/ undefined, /*statement*/ convertForOfStatementHead(node, getValue)), /*location*/ node), 256 /* NoTokenTrailingSourceMaps */); - return ts.createTry(ts.createBlock([ - ts.restoreEnclosingLabel(forStatement, outermostLabeledStatement) - ]), ts.createCatchClause(ts.createVariableDeclaration(catchVariable), ts.setEmitFlags(ts.createBlock([ - ts.createExpressionStatement(ts.createAssignment(errorRecord, ts.createObjectLiteral([ - ts.createPropertyAssignment("error", catchVariable) + return factory.createTryStatement(factory.createBlock([ + factory.restoreEnclosingLabel(forStatement, outermostLabeledStatement) + ]), factory.createCatchClause(factory.createVariableDeclaration(catchVariable), ts.setEmitFlags(factory.createBlock([ + factory.createExpressionStatement(factory.createAssignment(errorRecord, factory.createObjectLiteralExpression([ + factory.createPropertyAssignment("error", catchVariable) ]))) - ]), 1 /* SingleLine */)), ts.createBlock([ - ts.createTry( - /*tryBlock*/ ts.createBlock([ - ts.setEmitFlags(ts.createIf(ts.createLogicalAnd(ts.createLogicalAnd(result, ts.createLogicalNot(getDone)), ts.createAssignment(returnMethod, ts.createPropertyAccess(iterator, "return"))), ts.createExpressionStatement(createDownlevelAwait(callReturn))), 1 /* SingleLine */) + ]), 1 /* SingleLine */)), factory.createBlock([ + factory.createTryStatement( + /*tryBlock*/ factory.createBlock([ + ts.setEmitFlags(factory.createIfStatement(factory.createLogicalAnd(factory.createLogicalAnd(result, factory.createLogicalNot(getDone)), factory.createAssignment(returnMethod, factory.createPropertyAccessExpression(iterator, "return"))), factory.createExpressionStatement(createDownlevelAwait(callReturn))), 1 /* SingleLine */) ]), /*catchClause*/ undefined, - /*finallyBlock*/ ts.setEmitFlags(ts.createBlock([ - ts.setEmitFlags(ts.createIf(errorRecord, ts.createThrow(ts.createPropertyAccess(errorRecord, "error"))), 1 /* SingleLine */) + /*finallyBlock*/ ts.setEmitFlags(factory.createBlock([ + ts.setEmitFlags(factory.createIfStatement(errorRecord, factory.createThrowStatement(factory.createPropertyAccessExpression(errorRecord, "error"))), 1 /* SingleLine */) ]), 1 /* SingleLine */)) ])); } @@ -82085,9 +84894,9 @@ var ts; if (node.transformFlags & 16384 /* ContainsObjectRestOrSpread */) { // Binding patterns are converted into a generated name and are // evaluated inside the function body. - return ts.updateParameter(node, + return factory.updateParameterDeclaration(node, /*decorators*/ undefined, - /*modifiers*/ undefined, node.dotDotDotToken, ts.getGeneratedNameForNode(node), + /*modifiers*/ undefined, node.dotDotDotToken, factory.getGeneratedNameForNode(node), /*questionToken*/ undefined, /*type*/ undefined, ts.visitNode(node.initializer, visitor, ts.isExpression)); } @@ -82096,7 +84905,7 @@ var ts; function visitConstructorDeclaration(node) { var savedEnclosingFunctionFlags = enclosingFunctionFlags; enclosingFunctionFlags = 0 /* Normal */; - var updated = ts.updateConstructor(node, + var updated = factory.updateConstructorDeclaration(node, /*decorators*/ undefined, node.modifiers, ts.visitParameterList(node.parameters, visitor, context), transformFunctionBody(node)); enclosingFunctionFlags = savedEnclosingFunctionFlags; return updated; @@ -82104,7 +84913,7 @@ var ts; function visitGetAccessorDeclaration(node) { var savedEnclosingFunctionFlags = enclosingFunctionFlags; enclosingFunctionFlags = 0 /* Normal */; - var updated = ts.updateGetAccessor(node, + var updated = factory.updateGetAccessorDeclaration(node, /*decorators*/ undefined, node.modifiers, ts.visitNode(node.name, visitor, ts.isPropertyName), ts.visitParameterList(node.parameters, visitor, context), /*type*/ undefined, transformFunctionBody(node)); enclosingFunctionFlags = savedEnclosingFunctionFlags; @@ -82113,7 +84922,7 @@ var ts; function visitSetAccessorDeclaration(node) { var savedEnclosingFunctionFlags = enclosingFunctionFlags; enclosingFunctionFlags = 0 /* Normal */; - var updated = ts.updateSetAccessor(node, + var updated = factory.updateSetAccessorDeclaration(node, /*decorators*/ undefined, node.modifiers, ts.visitNode(node.name, visitor, ts.isPropertyName), ts.visitParameterList(node.parameters, visitor, context), transformFunctionBody(node)); enclosingFunctionFlags = savedEnclosingFunctionFlags; return updated; @@ -82121,7 +84930,7 @@ var ts; function visitMethodDeclaration(node) { var savedEnclosingFunctionFlags = enclosingFunctionFlags; enclosingFunctionFlags = ts.getFunctionFlags(node); - var updated = ts.updateMethod(node, + var updated = factory.updateMethodDeclaration(node, /*decorators*/ undefined, enclosingFunctionFlags & 1 /* Generator */ ? ts.visitNodes(node.modifiers, visitorNoAsyncModifier, ts.isModifier) : node.modifiers, enclosingFunctionFlags & 2 /* Async */ @@ -82137,7 +84946,7 @@ var ts; function visitFunctionDeclaration(node) { var savedEnclosingFunctionFlags = enclosingFunctionFlags; enclosingFunctionFlags = ts.getFunctionFlags(node); - var updated = ts.updateFunctionDeclaration(node, + var updated = factory.updateFunctionDeclaration(node, /*decorators*/ undefined, enclosingFunctionFlags & 1 /* Generator */ ? ts.visitNodes(node.modifiers, visitorNoAsyncModifier, ts.isModifier) : node.modifiers, enclosingFunctionFlags & 2 /* Async */ @@ -82153,7 +84962,7 @@ var ts; function visitArrowFunction(node) { var savedEnclosingFunctionFlags = enclosingFunctionFlags; enclosingFunctionFlags = ts.getFunctionFlags(node); - var updated = ts.updateArrowFunction(node, node.modifiers, + var updated = factory.updateArrowFunction(node, node.modifiers, /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), /*type*/ undefined, node.equalsGreaterThanToken, transformFunctionBody(node)); enclosingFunctionFlags = savedEnclosingFunctionFlags; @@ -82162,7 +84971,7 @@ var ts; function visitFunctionExpression(node) { var savedEnclosingFunctionFlags = enclosingFunctionFlags; enclosingFunctionFlags = ts.getFunctionFlags(node); - var updated = ts.updateFunctionExpression(node, enclosingFunctionFlags & 1 /* Generator */ + var updated = factory.updateFunctionExpression(node, enclosingFunctionFlags & 1 /* Generator */ ? ts.visitNodes(node.modifiers, visitorNoAsyncModifier, ts.isModifier) : node.modifiers, enclosingFunctionFlags & 2 /* Async */ ? undefined @@ -82177,29 +84986,29 @@ var ts; function transformAsyncGeneratorFunctionBody(node) { resumeLexicalEnvironment(); var statements = []; - var statementOffset = ts.addPrologue(statements, node.body.statements, /*ensureUseStrict*/ false, visitor); + var statementOffset = factory.copyPrologue(node.body.statements, statements, /*ensureUseStrict*/ false, visitor); appendObjectRestAssignmentsIfNeeded(statements, node); var savedCapturedSuperProperties = capturedSuperProperties; var savedHasSuperElementAccess = hasSuperElementAccess; - capturedSuperProperties = ts.createUnderscoreEscapedMap(); + capturedSuperProperties = new ts.Set(); hasSuperElementAccess = false; - var returnStatement = ts.createReturn(createAsyncGeneratorHelper(context, ts.createFunctionExpression( - /*modifiers*/ undefined, ts.createToken(41 /* AsteriskToken */), node.name && ts.getGeneratedNameForNode(node.name), + var returnStatement = factory.createReturnStatement(emitHelpers().createAsyncGeneratorHelper(factory.createFunctionExpression( + /*modifiers*/ undefined, factory.createToken(41 /* AsteriskToken */), node.name && factory.getGeneratedNameForNode(node.name), /*typeParameters*/ undefined, /*parameters*/ [], - /*type*/ undefined, ts.updateBlock(node.body, ts.visitLexicalEnvironment(node.body.statements, visitor, context, statementOffset))), !!(hierarchyFacts & 1 /* HasLexicalThis */))); + /*type*/ undefined, factory.updateBlock(node.body, ts.visitLexicalEnvironment(node.body.statements, visitor, context, statementOffset))), !!(hierarchyFacts & 1 /* HasLexicalThis */))); // Minor optimization, emit `_super` helper to capture `super` access in an arrow. // This step isn't needed if we eventually transform this to ES5. var emitSuperHelpers = languageVersion >= 2 /* ES2015 */ && resolver.getNodeCheckFlags(node) & (4096 /* AsyncMethodWithSuperBinding */ | 2048 /* AsyncMethodWithSuper */); if (emitSuperHelpers) { enableSubstitutionForAsyncMethodsWithSuper(); - var variableStatement = ts.createSuperAccessVariableStatement(resolver, node, capturedSuperProperties); + var variableStatement = ts.createSuperAccessVariableStatement(factory, resolver, node, capturedSuperProperties); substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true; ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]); } statements.push(returnStatement); ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment()); - var block = ts.updateBlock(node.body, statements); + var block = factory.updateBlock(node.body, statements); if (emitSuperHelpers && hasSuperElementAccess) { if (resolver.getNodeCheckFlags(node) & 4096 /* AsyncMethodWithSuperBinding */) { ts.addEmitHelper(block, ts.advancedAsyncSuperHelper); @@ -82213,20 +85022,21 @@ var ts; return block; } function transformFunctionBody(node) { + var _a; resumeLexicalEnvironment(); var statementOffset = 0; var statements = []; - var body = ts.visitNode(node.body, visitor, ts.isConciseBody); + var body = (_a = ts.visitNode(node.body, visitor, ts.isConciseBody)) !== null && _a !== void 0 ? _a : factory.createBlock([]); if (ts.isBlock(body)) { - statementOffset = ts.addPrologue(statements, body.statements, /*ensureUseStrict*/ false, visitor); + statementOffset = factory.copyPrologue(body.statements, statements, /*ensureUseStrict*/ false, visitor); } ts.addRange(statements, appendObjectRestAssignmentsIfNeeded(/*statements*/ undefined, node)); var leadingStatements = endLexicalEnvironment(); if (statementOffset > 0 || ts.some(statements) || ts.some(leadingStatements)) { - var block = ts.convertToFunctionBody(body, /*multiLine*/ true); + var block = factory.converters.convertToFunctionBlock(body, /*multiLine*/ true); ts.insertStatementsAfterStandardPrologue(statements, leadingStatements); ts.addRange(statements, block.statements.slice(statementOffset)); - return ts.updateBlock(block, ts.setTextRange(ts.createNodeArray(statements), block.statements)); + return factory.updateBlock(block, ts.setTextRange(factory.createNodeArray(statements), block.statements)); } return body; } @@ -82234,13 +85044,13 @@ var ts; for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) { var parameter = _a[_i]; if (parameter.transformFlags & 16384 /* ContainsObjectRestOrSpread */) { - var temp = ts.getGeneratedNameForNode(parameter); + var temp = factory.getGeneratedNameForNode(parameter); var declarations = ts.flattenDestructuringBinding(parameter, visitor, context, 1 /* ObjectRest */, temp, /*doNotRecordTempVariablesInLine*/ false, /*skipInitializer*/ true); if (ts.some(declarations)) { - var statement = ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList(declarations)); + var statement = factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList(declarations)); ts.setEmitFlags(statement, 1048576 /* CustomPrologue */); statements = ts.append(statements, statement); } @@ -82253,17 +85063,17 @@ var ts; enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */; // We need to enable substitutions for call, property access, and element access // if we need to rewrite super calls. - context.enableSubstitution(196 /* CallExpression */); - context.enableSubstitution(194 /* PropertyAccessExpression */); - context.enableSubstitution(195 /* ElementAccessExpression */); + context.enableSubstitution(200 /* CallExpression */); + context.enableSubstitution(198 /* PropertyAccessExpression */); + context.enableSubstitution(199 /* ElementAccessExpression */); // We need to be notified when entering and exiting declarations that bind super. - context.enableEmitNotification(245 /* ClassDeclaration */); - context.enableEmitNotification(161 /* MethodDeclaration */); - context.enableEmitNotification(163 /* GetAccessor */); - context.enableEmitNotification(164 /* SetAccessor */); - context.enableEmitNotification(162 /* Constructor */); + context.enableEmitNotification(249 /* ClassDeclaration */); + context.enableEmitNotification(164 /* MethodDeclaration */); + context.enableEmitNotification(166 /* GetAccessor */); + context.enableEmitNotification(167 /* SetAccessor */); + context.enableEmitNotification(165 /* Constructor */); // We need to be notified when entering the generated accessor arrow functions. - context.enableEmitNotification(225 /* VariableStatement */); + context.enableEmitNotification(229 /* VariableStatement */); } } /** @@ -82311,23 +85121,23 @@ var ts; } function substituteExpression(node) { switch (node.kind) { - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: return substitutePropertyAccessExpression(node); - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: return substituteElementAccessExpression(node); - case 196 /* CallExpression */: + case 200 /* CallExpression */: return substituteCallExpression(node); } return node; } function substitutePropertyAccessExpression(node) { - if (node.expression.kind === 102 /* SuperKeyword */) { - return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node); + if (node.expression.kind === 105 /* SuperKeyword */) { + return ts.setTextRange(factory.createPropertyAccessExpression(factory.createUniqueName("_super", 16 /* Optimistic */ | 32 /* FileLevel */), node.name), node); } return node; } function substituteElementAccessExpression(node) { - if (node.expression.kind === 102 /* SuperKeyword */) { + if (node.expression.kind === 105 /* SuperKeyword */) { return createSuperElementAccessInAsyncMethod(node.argumentExpression, node); } return node; @@ -82338,106 +85148,40 @@ var ts; var argumentExpression = ts.isPropertyAccessExpression(expression) ? substitutePropertyAccessExpression(expression) : substituteElementAccessExpression(expression); - return ts.createCall(ts.createPropertyAccess(argumentExpression, "call"), + return factory.createCallExpression(factory.createPropertyAccessExpression(argumentExpression, "call"), /*typeArguments*/ undefined, __spreadArrays([ - ts.createThis() + factory.createThis() ], node.arguments)); } return node; } function isSuperContainer(node) { var kind = node.kind; - return kind === 245 /* ClassDeclaration */ - || kind === 162 /* Constructor */ - || kind === 161 /* MethodDeclaration */ - || kind === 163 /* GetAccessor */ - || kind === 164 /* SetAccessor */; + return kind === 249 /* ClassDeclaration */ + || kind === 165 /* Constructor */ + || kind === 164 /* MethodDeclaration */ + || kind === 166 /* GetAccessor */ + || kind === 167 /* SetAccessor */; } function createSuperElementAccessInAsyncMethod(argumentExpression, location) { if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) { - return ts.setTextRange(ts.createPropertyAccess(ts.createCall(ts.createIdentifier("_superIndex"), + return ts.setTextRange(factory.createPropertyAccessExpression(factory.createCallExpression(factory.createIdentifier("_superIndex"), /*typeArguments*/ undefined, [argumentExpression]), "value"), location); } else { - return ts.setTextRange(ts.createCall(ts.createIdentifier("_superIndex"), + return ts.setTextRange(factory.createCallExpression(factory.createIdentifier("_superIndex"), /*typeArguments*/ undefined, [argumentExpression]), location); } } } ts.transformES2018 = transformES2018; - ts.assignHelper = { - name: "typescript:assign", - importName: "__assign", - scoped: false, - priority: 1, - text: "\n var __assign = (this && this.__assign) || function () {\n __assign = Object.assign || function(t) {\n for (var s, i = 1, n = arguments.length; i < n; i++) {\n s = arguments[i];\n for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))\n t[p] = s[p];\n }\n return t;\n };\n return __assign.apply(this, arguments);\n };" - }; - function createAssignHelper(context, attributesSegments) { - if (context.getCompilerOptions().target >= 2 /* ES2015 */) { - return ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "assign"), /*typeArguments*/ undefined, attributesSegments); - } - context.requestEmitHelper(ts.assignHelper); - return ts.createCall(ts.getUnscopedHelperName("__assign"), - /*typeArguments*/ undefined, attributesSegments); - } - ts.createAssignHelper = createAssignHelper; - ts.awaitHelper = { - name: "typescript:await", - importName: "__await", - scoped: false, - text: "\n var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }" - }; - function createAwaitHelper(context, expression) { - context.requestEmitHelper(ts.awaitHelper); - return ts.createCall(ts.getUnscopedHelperName("__await"), /*typeArguments*/ undefined, [expression]); - } - ts.asyncGeneratorHelper = { - name: "typescript:asyncGenerator", - importName: "__asyncGenerator", - scoped: false, - dependencies: [ts.awaitHelper], - text: "\n var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {\n if (!Symbol.asyncIterator) throw new TypeError(\"Symbol.asyncIterator is not defined.\");\n var g = generator.apply(thisArg, _arguments || []), i, q = [];\n return i = {}, verb(\"next\"), verb(\"throw\"), verb(\"return\"), i[Symbol.asyncIterator] = function () { return this; }, i;\n function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }\n function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }\n function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }\n function fulfill(value) { resume(\"next\", value); }\n function reject(value) { resume(\"throw\", value); }\n function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }\n };" - }; - function createAsyncGeneratorHelper(context, generatorFunc, hasLexicalThis) { - context.requestEmitHelper(ts.asyncGeneratorHelper); - // Mark this node as originally an async function - (generatorFunc.emitNode || (generatorFunc.emitNode = {})).flags |= 262144 /* AsyncFunctionBody */ | 524288 /* ReuseTempVariableScope */; - return ts.createCall(ts.getUnscopedHelperName("__asyncGenerator"), - /*typeArguments*/ undefined, [ - hasLexicalThis ? ts.createThis() : ts.createVoidZero(), - ts.createIdentifier("arguments"), - generatorFunc - ]); - } - ts.asyncDelegator = { - name: "typescript:asyncDelegator", - importName: "__asyncDelegator", - scoped: false, - dependencies: [ts.awaitHelper], - text: "\n var __asyncDelegator = (this && this.__asyncDelegator) || function (o) {\n var i, p;\n return i = {}, verb(\"next\"), verb(\"throw\", function (e) { throw e; }), verb(\"return\"), i[Symbol.iterator] = function () { return this; }, i;\n function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === \"return\" } : f ? f(v) : v; } : f; }\n };" - }; - function createAsyncDelegatorHelper(context, expression, location) { - context.requestEmitHelper(ts.asyncDelegator); - return ts.setTextRange(ts.createCall(ts.getUnscopedHelperName("__asyncDelegator"), - /*typeArguments*/ undefined, [expression]), location); - } - ts.asyncValues = { - name: "typescript:asyncValues", - importName: "__asyncValues", - scoped: false, - text: "\n var __asyncValues = (this && this.__asyncValues) || function (o) {\n if (!Symbol.asyncIterator) throw new TypeError(\"Symbol.asyncIterator is not defined.\");\n var m = o[Symbol.asyncIterator], i;\n return m ? m.call(o) : (o = typeof __values === \"function\" ? __values(o) : o[Symbol.iterator](), i = {}, verb(\"next\"), verb(\"throw\"), verb(\"return\"), i[Symbol.asyncIterator] = function () { return this; }, i);\n function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }\n function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }\n };" - }; - function createAsyncValuesHelper(context, expression, location) { - context.requestEmitHelper(ts.asyncValues); - return ts.setTextRange(ts.createCall(ts.getUnscopedHelperName("__asyncValues"), - /*typeArguments*/ undefined, [expression]), location); - } })(ts || (ts = {})); /*@internal*/ var ts; (function (ts) { function transformES2019(context) { - return ts.chainBundle(transformSourceFile); + var factory = context.factory; + return ts.chainBundle(context, transformSourceFile); function transformSourceFile(node) { if (node.isDeclarationFile) { return node; @@ -82449,7 +85193,7 @@ var ts; return node; } switch (node.kind) { - case 280 /* CatchClause */: + case 284 /* CatchClause */: return visitCatchClause(node); default: return ts.visitEachChild(node, visitor, context); @@ -82457,7 +85201,7 @@ var ts; } function visitCatchClause(node) { if (!node.variableDeclaration) { - return ts.updateCatchClause(node, ts.createVariableDeclaration(ts.createTempVariable(/*recordTempVariable*/ undefined)), ts.visitNode(node.block, visitor, ts.isBlock)); + return factory.updateCatchClause(node, factory.createVariableDeclaration(factory.createTempVariable(/*recordTempVariable*/ undefined)), ts.visitNode(node.block, visitor, ts.isBlock)); } return ts.visitEachChild(node, visitor, context); } @@ -82468,8 +85212,8 @@ var ts; var ts; (function (ts) { function transformES2020(context) { - var hoistVariableDeclaration = context.hoistVariableDeclaration; - return ts.chainBundle(transformSourceFile); + var factory = context.factory, hoistVariableDeclaration = context.hoistVariableDeclaration; + return ts.chainBundle(context, transformSourceFile); function transformSourceFile(node) { if (node.isDeclarationFile) { return node; @@ -82481,21 +85225,21 @@ var ts; return node; } switch (node.kind) { - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: - case 196 /* CallExpression */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: + case 200 /* CallExpression */: if (node.flags & 32 /* OptionalChain */) { var updated = visitOptionalExpression(node, /*captureThisArg*/ false, /*isDelete*/ false); ts.Debug.assertNotNode(updated, ts.isSyntheticReference); return updated; } return ts.visitEachChild(node, visitor, context); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: if (node.operatorToken.kind === 60 /* QuestionQuestionToken */) { return transformNullishCoalescingExpression(node); } return ts.visitEachChild(node, visitor, context); - case 203 /* DeleteExpression */: + case 207 /* DeleteExpression */: return visitDeleteExpression(node); default: return ts.visitEachChild(node, visitor, context); @@ -82516,9 +85260,9 @@ var ts; if (ts.isSyntheticReference(expression)) { // `(a.b)` -> { expression `((_a = a).b)`, thisArg: `_a` } // `(a[b])` -> { expression `((_a = a)[b])`, thisArg: `_a` } - return ts.createSyntheticReferenceExpression(ts.updateParen(node, expression.expression), expression.thisArg); + return factory.createSyntheticReferenceExpression(factory.updateParenthesizedExpression(node, expression.expression), expression.thisArg); } - return ts.updateParen(node, expression); + return factory.updateParenthesizedExpression(node, expression); } function visitNonOptionalPropertyOrElementAccessExpression(node, captureThisArg, isDelete) { if (ts.isOptionalChain(node)) { @@ -82529,19 +85273,19 @@ var ts; ts.Debug.assertNotNode(expression, ts.isSyntheticReference); var thisArg; if (captureThisArg) { - if (shouldCaptureInTempVariable(expression)) { - thisArg = ts.createTempVariable(hoistVariableDeclaration); - expression = ts.createAssignment(thisArg, expression); + if (!ts.isSimpleCopiableExpression(expression)) { + thisArg = factory.createTempVariable(hoistVariableDeclaration); + expression = factory.createAssignment(thisArg, expression); // if (inParameterInitializer) tempVariableInParameter = true; } else { thisArg = expression; } } - expression = node.kind === 194 /* PropertyAccessExpression */ - ? ts.updatePropertyAccess(node, expression, ts.visitNode(node.name, visitor, ts.isIdentifier)) - : ts.updateElementAccess(node, expression, ts.visitNode(node.argumentExpression, visitor, ts.isExpression)); - return thisArg ? ts.createSyntheticReferenceExpression(expression, thisArg) : expression; + expression = node.kind === 198 /* PropertyAccessExpression */ + ? factory.updatePropertyAccessExpression(node, expression, ts.visitNode(node.name, visitor, ts.isIdentifier)) + : factory.updateElementAccessExpression(node, expression, ts.visitNode(node.argumentExpression, visitor, ts.isExpression)); + return thisArg ? factory.createSyntheticReferenceExpression(expression, thisArg) : expression; } function visitNonOptionalCallExpression(node, captureThisArg) { if (ts.isOptionalChain(node)) { @@ -82552,10 +85296,10 @@ var ts; } function visitNonOptionalExpression(node, captureThisArg, isDelete) { switch (node.kind) { - case 200 /* ParenthesizedExpression */: return visitNonOptionalParenthesizedExpression(node, captureThisArg, isDelete); - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: return visitNonOptionalPropertyOrElementAccessExpression(node, captureThisArg, isDelete); - case 196 /* CallExpression */: return visitNonOptionalCallExpression(node, captureThisArg); + case 204 /* ParenthesizedExpression */: return visitNonOptionalParenthesizedExpression(node, captureThisArg, isDelete); + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: return visitNonOptionalPropertyOrElementAccessExpression(node, captureThisArg, isDelete); + case 200 /* CallExpression */: return visitNonOptionalCallExpression(node, captureThisArg); default: return ts.visitNode(node, visitor, ts.isExpression); } } @@ -82565,9 +85309,9 @@ var ts; var leftThisArg = ts.isSyntheticReference(left) ? left.thisArg : undefined; var leftExpression = ts.isSyntheticReference(left) ? left.expression : left; var capturedLeft = leftExpression; - if (shouldCaptureInTempVariable(leftExpression)) { - capturedLeft = ts.createTempVariable(hoistVariableDeclaration); - leftExpression = ts.createAssignment(capturedLeft, leftExpression); + if (!ts.isSimpleCopiableExpression(leftExpression)) { + capturedLeft = factory.createTempVariable(hoistVariableDeclaration); + leftExpression = factory.createAssignment(capturedLeft, leftExpression); // if (inParameterInitializer) tempVariableInParameter = true; } var rightExpression = capturedLeft; @@ -82575,28 +85319,28 @@ var ts; for (var i = 0; i < chain.length; i++) { var segment = chain[i]; switch (segment.kind) { - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: if (i === chain.length - 1 && captureThisArg) { - if (shouldCaptureInTempVariable(rightExpression)) { - thisArg = ts.createTempVariable(hoistVariableDeclaration); - rightExpression = ts.createAssignment(thisArg, rightExpression); + if (!ts.isSimpleCopiableExpression(rightExpression)) { + thisArg = factory.createTempVariable(hoistVariableDeclaration); + rightExpression = factory.createAssignment(thisArg, rightExpression); // if (inParameterInitializer) tempVariableInParameter = true; } else { thisArg = rightExpression; } } - rightExpression = segment.kind === 194 /* PropertyAccessExpression */ - ? ts.createPropertyAccess(rightExpression, ts.visitNode(segment.name, visitor, ts.isIdentifier)) - : ts.createElementAccess(rightExpression, ts.visitNode(segment.argumentExpression, visitor, ts.isExpression)); + rightExpression = segment.kind === 198 /* PropertyAccessExpression */ + ? factory.createPropertyAccessExpression(rightExpression, ts.visitNode(segment.name, visitor, ts.isIdentifier)) + : factory.createElementAccessExpression(rightExpression, ts.visitNode(segment.argumentExpression, visitor, ts.isExpression)); break; - case 196 /* CallExpression */: + case 200 /* CallExpression */: if (i === 0 && leftThisArg) { - rightExpression = ts.createFunctionCall(rightExpression, leftThisArg.kind === 102 /* SuperKeyword */ ? ts.createThis() : leftThisArg, ts.visitNodes(segment.arguments, visitor, ts.isExpression)); + rightExpression = factory.createFunctionCallCall(rightExpression, leftThisArg.kind === 105 /* SuperKeyword */ ? factory.createThis() : leftThisArg, ts.visitNodes(segment.arguments, visitor, ts.isExpression)); } else { - rightExpression = ts.createCall(rightExpression, + rightExpression = factory.createCallExpression(rightExpression, /*typeArguments*/ undefined, ts.visitNodes(segment.arguments, visitor, ts.isExpression)); } break; @@ -82604,34 +85348,29 @@ var ts; ts.setOriginalNode(rightExpression, segment); } var target = isDelete - ? ts.createConditional(createNotNullCondition(leftExpression, capturedLeft, /*invert*/ true), ts.createTrue(), ts.createDelete(rightExpression)) - : ts.createConditional(createNotNullCondition(leftExpression, capturedLeft, /*invert*/ true), ts.createVoidZero(), rightExpression); - return thisArg ? ts.createSyntheticReferenceExpression(target, thisArg) : target; + ? factory.createConditionalExpression(createNotNullCondition(leftExpression, capturedLeft, /*invert*/ true), /*questionToken*/ undefined, factory.createTrue(), /*colonToken*/ undefined, factory.createDeleteExpression(rightExpression)) + : factory.createConditionalExpression(createNotNullCondition(leftExpression, capturedLeft, /*invert*/ true), /*questionToken*/ undefined, factory.createVoidZero(), /*colonToken*/ undefined, rightExpression); + return thisArg ? factory.createSyntheticReferenceExpression(target, thisArg) : target; } function createNotNullCondition(left, right, invert) { - return ts.createBinary(ts.createBinary(left, ts.createToken(invert ? 36 /* EqualsEqualsEqualsToken */ : 37 /* ExclamationEqualsEqualsToken */), ts.createNull()), ts.createToken(invert ? 56 /* BarBarToken */ : 55 /* AmpersandAmpersandToken */), ts.createBinary(right, ts.createToken(invert ? 36 /* EqualsEqualsEqualsToken */ : 37 /* ExclamationEqualsEqualsToken */), ts.createVoidZero())); + return factory.createBinaryExpression(factory.createBinaryExpression(left, factory.createToken(invert ? 36 /* EqualsEqualsEqualsToken */ : 37 /* ExclamationEqualsEqualsToken */), factory.createNull()), factory.createToken(invert ? 56 /* BarBarToken */ : 55 /* AmpersandAmpersandToken */), factory.createBinaryExpression(right, factory.createToken(invert ? 36 /* EqualsEqualsEqualsToken */ : 37 /* ExclamationEqualsEqualsToken */), factory.createVoidZero())); } function transformNullishCoalescingExpression(node) { var left = ts.visitNode(node.left, visitor, ts.isExpression); var right = left; - if (shouldCaptureInTempVariable(left)) { - right = ts.createTempVariable(hoistVariableDeclaration); - left = ts.createAssignment(right, left); + if (!ts.isSimpleCopiableExpression(left)) { + right = factory.createTempVariable(hoistVariableDeclaration); + left = factory.createAssignment(right, left); // if (inParameterInitializer) tempVariableInParameter = true; } - return ts.createConditional(createNotNullCondition(left, right), right, ts.visitNode(node.right, visitor, ts.isExpression)); - } - function shouldCaptureInTempVariable(expression) { - // don't capture identifiers and `this` in a temporary variable - // `super` cannot be captured as it's no real variable - return !ts.isIdentifier(expression) && - expression.kind !== 104 /* ThisKeyword */ && - expression.kind !== 102 /* SuperKeyword */; + return factory.createConditionalExpression(createNotNullCondition(left, right), + /*questionToken*/ undefined, right, + /*colonToken*/ undefined, ts.visitNode(node.right, visitor, ts.isExpression)); } function visitDeleteExpression(node) { return ts.isOptionalChain(ts.skipParentheses(node.expression)) ? ts.setOriginalNode(visitNonOptionalExpression(node.expression, /*captureThisArg*/ false, /*isDelete*/ true), node) - : ts.updateDelete(node, ts.visitNode(node.expression, visitor, ts.isExpression)); + : factory.updateDeleteExpression(node, ts.visitNode(node.expression, visitor, ts.isExpression)); } } ts.transformES2020 = transformES2020; @@ -82640,7 +85379,8 @@ var ts; var ts; (function (ts) { function transformESNext(context) { - return ts.chainBundle(transformSourceFile); + var hoistVariableDeclaration = context.hoistVariableDeclaration, factory = context.factory; + return ts.chainBundle(context, transformSourceFile); function transformSourceFile(node) { if (node.isDeclarationFile) { return node; @@ -82652,10 +85392,41 @@ var ts; return node; } switch (node.kind) { + case 213 /* BinaryExpression */: + var binaryExpression = node; + if (ts.isLogicalOrCoalescingAssignmentExpression(binaryExpression)) { + return transformLogicalAssignment(binaryExpression); + } + // falls through default: return ts.visitEachChild(node, visitor, context); } } + function transformLogicalAssignment(binaryExpression) { + var operator = binaryExpression.operatorToken; + var nonAssignmentOperator = ts.getNonAssignmentOperatorForCompoundAssignment(operator.kind); + var left = ts.skipParentheses(ts.visitNode(binaryExpression.left, visitor, ts.isLeftHandSideExpression)); + var assignmentTarget = left; + var right = ts.skipParentheses(ts.visitNode(binaryExpression.right, visitor, ts.isExpression)); + if (ts.isAccessExpression(left)) { + var propertyAccessTargetSimpleCopiable = ts.isSimpleCopiableExpression(left.expression); + var propertyAccessTarget = propertyAccessTargetSimpleCopiable ? left.expression : + factory.createTempVariable(hoistVariableDeclaration); + var propertyAccessTargetAssignment = propertyAccessTargetSimpleCopiable ? left.expression : factory.createAssignment(propertyAccessTarget, left.expression); + if (ts.isPropertyAccessExpression(left)) { + assignmentTarget = factory.createPropertyAccessExpression(propertyAccessTarget, left.name); + left = factory.createPropertyAccessExpression(propertyAccessTargetAssignment, left.name); + } + else { + var elementAccessArgumentSimpleCopiable = ts.isSimpleCopiableExpression(left.argumentExpression); + var elementAccessArgument = elementAccessArgumentSimpleCopiable ? left.argumentExpression : + factory.createTempVariable(hoistVariableDeclaration); + assignmentTarget = factory.createElementAccessExpression(propertyAccessTarget, elementAccessArgument); + left = factory.createElementAccessExpression(propertyAccessTargetAssignment, elementAccessArgumentSimpleCopiable ? left.argumentExpression : factory.createAssignment(elementAccessArgument, left.argumentExpression)); + } + } + return factory.createBinaryExpression(left, nonAssignmentOperator, factory.createParenthesizedExpression(factory.createAssignment(assignmentTarget, right))); + } } ts.transformESNext = transformESNext; })(ts || (ts = {})); @@ -82663,9 +85434,10 @@ var ts; var ts; (function (ts) { function transformJsx(context) { + var factory = context.factory, emitHelpers = context.getEmitHelperFactory; var compilerOptions = context.getCompilerOptions(); var currentSourceFile; - return ts.chainBundle(transformSourceFile); + return ts.chainBundle(context, transformSourceFile); /** * Transform JSX-specific syntax in a SourceFile. * @@ -82690,13 +85462,13 @@ var ts; } function visitorWorker(node) { switch (node.kind) { - case 266 /* JsxElement */: + case 270 /* JsxElement */: return visitJsxElement(node, /*isChild*/ false); - case 267 /* JsxSelfClosingElement */: + case 271 /* JsxSelfClosingElement */: return visitJsxSelfClosingElement(node, /*isChild*/ false); - case 270 /* JsxFragment */: + case 274 /* JsxFragment */: return visitJsxFragment(node, /*isChild*/ false); - case 276 /* JsxExpression */: + case 280 /* JsxExpression */: return visitJsxExpression(node); default: return ts.visitEachChild(node, visitor, context); @@ -82706,13 +85478,13 @@ var ts; switch (node.kind) { case 11 /* JsxText */: return visitJsxText(node); - case 276 /* JsxExpression */: + case 280 /* JsxExpression */: return visitJsxExpression(node); - case 266 /* JsxElement */: + case 270 /* JsxElement */: return visitJsxElement(node, /*isChild*/ true); - case 267 /* JsxSelfClosingElement */: + case 271 /* JsxSelfClosingElement */: return visitJsxSelfClosingElement(node, /*isChild*/ true); - case 270 /* JsxFragment */: + case 274 /* JsxFragment */: return visitJsxFragment(node, /*isChild*/ true); default: return ts.Debug.failBadSyntaxKind(node); @@ -82732,28 +85504,28 @@ var ts; var objectProperties; var attrs = node.attributes.properties; if (attrs.length === 0) { + objectProperties = factory.createNull(); // When there are no attributes, React wants "null" - objectProperties = ts.createNull(); } else { // Map spans of JsxAttribute nodes into object literals and spans // of JsxSpreadAttribute nodes into expressions. var segments = ts.flatten(ts.spanMap(attrs, ts.isJsxSpreadAttribute, function (attrs, isSpread) { return isSpread ? ts.map(attrs, transformJsxSpreadAttributeToExpression) - : ts.createObjectLiteral(ts.map(attrs, transformJsxAttributeToObjectLiteralElement)); })); + : factory.createObjectLiteralExpression(ts.map(attrs, transformJsxAttributeToObjectLiteralElement)); })); if (ts.isJsxSpreadAttribute(attrs[0])) { // We must always emit at least one object literal before a spread - // argument. - segments.unshift(ts.createObjectLiteral()); + // argument.factory.createObjectLiteral + segments.unshift(factory.createObjectLiteralExpression()); } // Either emit one big object literal (no spread attribs), or // a call to the __assign helper. objectProperties = ts.singleOrUndefined(segments); if (!objectProperties) { - objectProperties = ts.createAssignHelper(context, segments); + objectProperties = emitHelpers().createAssignHelper(segments); } } - var element = ts.createExpressionForJsxElement(context.getEmitResolver().getJsxFactoryEntity(currentSourceFile), compilerOptions.reactNamespace, // TODO: GH#18217 + var element = ts.createExpressionForJsxElement(factory, context.getEmitResolver().getJsxFactoryEntity(currentSourceFile), compilerOptions.reactNamespace, // TODO: GH#18217 tagName, objectProperties, ts.mapDefined(children, transformJsxChildToExpression), node, location); if (isChild) { ts.startOnNewLine(element); @@ -82761,7 +85533,7 @@ var ts; return element; } function visitJsxOpeningFragment(node, children, isChild, location) { - var element = ts.createExpressionForJsxFragment(context.getEmitResolver().getJsxFactoryEntity(currentSourceFile), compilerOptions.reactNamespace, // TODO: GH#18217 + var element = ts.createExpressionForJsxFragment(factory, context.getEmitResolver().getJsxFactoryEntity(currentSourceFile), context.getEmitResolver().getJsxFragmentFactoryEntity(currentSourceFile), compilerOptions.reactNamespace, // TODO: GH#18217 ts.mapDefined(children, transformJsxChildToExpression), node, location); if (isChild) { ts.startOnNewLine(element); @@ -82774,24 +85546,24 @@ var ts; function transformJsxAttributeToObjectLiteralElement(node) { var name = getAttributeName(node); var expression = transformJsxAttributeInitializer(node.initializer); - return ts.createPropertyAssignment(name, expression); + return factory.createPropertyAssignment(name, expression); } function transformJsxAttributeInitializer(node) { if (node === undefined) { - return ts.createTrue(); + return factory.createTrue(); } else if (node.kind === 10 /* StringLiteral */) { // Always recreate the literal to escape any escape sequences or newlines which may be in the original jsx string and which // Need to be escaped to be handled correctly in a normal string - var literal = ts.createLiteral(tryDecodeEntities(node.text) || node.text); - literal.singleQuote = node.singleQuote !== undefined ? node.singleQuote : !ts.isStringDoubleQuoted(node, currentSourceFile); + var singleQuote = node.singleQuote !== undefined ? node.singleQuote : !ts.isStringDoubleQuoted(node, currentSourceFile); + var literal = factory.createStringLiteral(tryDecodeEntities(node.text) || node.text, singleQuote); return ts.setTextRange(literal, node); } - else if (node.kind === 276 /* JsxExpression */) { + else if (node.kind === 280 /* JsxExpression */) { if (node.expression === undefined) { - return ts.createTrue(); + return factory.createTrue(); } - return visitJsxExpression(node); + return ts.visitNode(node.expression, visitor, ts.isExpression); } else { return ts.Debug.failBadSyntaxKind(node); @@ -82799,7 +85571,7 @@ var ts; } function visitJsxText(node) { var fixed = fixupWhitespaceAndDecodeEntities(node.text); - return fixed === undefined ? undefined : ts.createLiteral(fixed); + return fixed === undefined ? undefined : factory.createStringLiteral(fixed); } /** * JSX trims whitespace at the end and beginning of lines, except that the @@ -82881,16 +85653,16 @@ var ts; return decoded === text ? undefined : decoded; } function getTagName(node) { - if (node.kind === 266 /* JsxElement */) { + if (node.kind === 270 /* JsxElement */) { return getTagName(node.openingElement); } else { var name = node.tagName; if (ts.isIdentifier(name) && ts.isIntrinsicJsxName(name.escapedText)) { - return ts.createLiteral(ts.idText(name)); + return factory.createStringLiteral(ts.idText(name)); } else { - return ts.createExpressionFromEntityName(name); + return ts.createExpressionFromEntityName(factory, name); } } } @@ -82906,7 +85678,7 @@ var ts; return name; } else { - return ts.createLiteral(text); + return factory.createStringLiteral(text); } } function visitJsxExpression(node) { @@ -82914,7 +85686,7 @@ var ts; } } ts.transformJsx = transformJsx; - var entities = ts.createMapFromTemplate({ + var entities = new ts.Map(ts.getEntries({ quot: 0x0022, amp: 0x0026, apos: 0x0027, @@ -83168,14 +85940,14 @@ var ts; clubs: 0x2663, hearts: 0x2665, diams: 0x2666 - }); + })); })(ts || (ts = {})); /*@internal*/ var ts; (function (ts) { function transformES2016(context) { - var hoistVariableDeclaration = context.hoistVariableDeclaration; - return ts.chainBundle(transformSourceFile); + var factory = context.factory, hoistVariableDeclaration = context.hoistVariableDeclaration; + return ts.chainBundle(context, transformSourceFile); function transformSourceFile(node) { if (node.isDeclarationFile) { return node; @@ -83187,7 +85959,7 @@ var ts; return node; } switch (node.kind) { - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return visitBinaryExpression(node); default: return ts.visitEachChild(node, visitor, context); @@ -83210,29 +85982,29 @@ var ts; var right = ts.visitNode(node.right, visitor, ts.isExpression); if (ts.isElementAccessExpression(left)) { // Transforms `a[x] **= b` into `(_a = a)[_x = x] = Math.pow(_a[_x], b)` - var expressionTemp = ts.createTempVariable(hoistVariableDeclaration); - var argumentExpressionTemp = ts.createTempVariable(hoistVariableDeclaration); - target = ts.setTextRange(ts.createElementAccess(ts.setTextRange(ts.createAssignment(expressionTemp, left.expression), left.expression), ts.setTextRange(ts.createAssignment(argumentExpressionTemp, left.argumentExpression), left.argumentExpression)), left); - value = ts.setTextRange(ts.createElementAccess(expressionTemp, argumentExpressionTemp), left); + var expressionTemp = factory.createTempVariable(hoistVariableDeclaration); + var argumentExpressionTemp = factory.createTempVariable(hoistVariableDeclaration); + target = ts.setTextRange(factory.createElementAccessExpression(ts.setTextRange(factory.createAssignment(expressionTemp, left.expression), left.expression), ts.setTextRange(factory.createAssignment(argumentExpressionTemp, left.argumentExpression), left.argumentExpression)), left); + value = ts.setTextRange(factory.createElementAccessExpression(expressionTemp, argumentExpressionTemp), left); } else if (ts.isPropertyAccessExpression(left)) { // Transforms `a.x **= b` into `(_a = a).x = Math.pow(_a.x, b)` - var expressionTemp = ts.createTempVariable(hoistVariableDeclaration); - target = ts.setTextRange(ts.createPropertyAccess(ts.setTextRange(ts.createAssignment(expressionTemp, left.expression), left.expression), left.name), left); - value = ts.setTextRange(ts.createPropertyAccess(expressionTemp, left.name), left); + var expressionTemp = factory.createTempVariable(hoistVariableDeclaration); + target = ts.setTextRange(factory.createPropertyAccessExpression(ts.setTextRange(factory.createAssignment(expressionTemp, left.expression), left.expression), left.name), left); + value = ts.setTextRange(factory.createPropertyAccessExpression(expressionTemp, left.name), left); } else { // Transforms `a **= b` into `a = Math.pow(a, b)` target = left; value = left; } - return ts.setTextRange(ts.createAssignment(target, ts.createMathPow(value, right, /*location*/ node)), node); + return ts.setTextRange(factory.createAssignment(target, ts.setTextRange(factory.createGlobalMethodCall("Math", "pow", [value, right]), node)), node); } function visitExponentiationExpression(node) { // Transforms `a ** b` into `Math.pow(a, b)` var left = ts.visitNode(node.left, visitor, ts.isExpression); var right = ts.visitNode(node.right, visitor, ts.isExpression); - return ts.createMathPow(left, right, /*location*/ node); + return ts.setTextRange(factory.createGlobalMethodCall("Math", "pow", [left, right]), node); } } ts.transformES2016 = transformES2016; @@ -83339,7 +86111,7 @@ var ts; HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 49152] = "FunctionSubtreeExcludes"; })(HierarchyFacts || (HierarchyFacts = {})); function transformES2015(context) { - var startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration; + var factory = context.factory, emitHelpers = context.getEmitHelperFactory, startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration; var compilerOptions = context.getCompilerOptions(); var resolver = context.getEmitResolver(); var previousOnSubstituteNode = context.onSubstituteNode; @@ -83351,7 +86123,7 @@ var ts; var hierarchyFacts; var taggedTemplateStringDeclarations; function recordTaggedTemplateString(temp) { - taggedTemplateStringDeclarations = ts.append(taggedTemplateStringDeclarations, ts.createVariableDeclaration(temp)); + taggedTemplateStringDeclarations = ts.append(taggedTemplateStringDeclarations, factory.createVariableDeclaration(temp)); } /** * Used to track if we are emitting body of the converted loop @@ -83363,7 +86135,7 @@ var ts; * be reset. */ var enabledSubstitutions; - return ts.chainBundle(transformSourceFile); + return ts.chainBundle(context, transformSourceFile); function transformSourceFile(node) { if (node.isDeclarationFile) { return node; @@ -83400,13 +86172,28 @@ var ts; } function isReturnVoidStatementInConstructorWithCapturedSuper(node) { return (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */) !== 0 - && node.kind === 235 /* ReturnStatement */ + && node.kind === 239 /* ReturnStatement */ && !node.expression; } + function isOrMayContainReturnCompletion(node) { + return node.transformFlags & 1048576 /* ContainsHoistedDeclarationOrCompletion */ + && (ts.isReturnStatement(node) + || ts.isIfStatement(node) + || ts.isWithStatement(node) + || ts.isSwitchStatement(node) + || ts.isCaseBlock(node) + || ts.isCaseClause(node) + || ts.isDefaultClause(node) + || ts.isTryStatement(node) + || ts.isCatchClause(node) + || ts.isLabeledStatement(node) + || ts.isIterationStatement(node, /*lookInLabeledStatements*/ false) + || ts.isBlock(node)); + } function shouldVisitNode(node) { return (node.transformFlags & 256 /* ContainsES2015 */) !== 0 || convertedLoopState !== undefined - || (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 223 /* Block */))) + || (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */ && isOrMayContainReturnCompletion(node)) || (ts.isIterationStatement(node, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatement(node)) || (ts.getEmitFlags(node) & 33554432 /* TypeScriptClassWrapper */) !== 0; } @@ -83419,72 +86206,72 @@ var ts; } } function callExpressionVisitor(node) { - if (node.kind === 102 /* SuperKeyword */) { + if (node.kind === 105 /* SuperKeyword */) { return visitSuperKeyword(/*isExpressionOfCall*/ true); } return visitor(node); } function visitJavaScript(node) { switch (node.kind) { - case 120 /* StaticKeyword */: + case 123 /* StaticKeyword */: return undefined; // elide static keyword - case 245 /* ClassDeclaration */: + case 249 /* ClassDeclaration */: return visitClassDeclaration(node); - case 214 /* ClassExpression */: + case 218 /* ClassExpression */: return visitClassExpression(node); - case 156 /* Parameter */: + case 159 /* Parameter */: return visitParameter(node); - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: return visitFunctionDeclaration(node); - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: return visitArrowFunction(node); - case 201 /* FunctionExpression */: + case 205 /* FunctionExpression */: return visitFunctionExpression(node); - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return visitVariableDeclaration(node); - case 75 /* Identifier */: + case 78 /* Identifier */: return visitIdentifier(node); - case 243 /* VariableDeclarationList */: + case 247 /* VariableDeclarationList */: return visitVariableDeclarationList(node); - case 237 /* SwitchStatement */: + case 241 /* SwitchStatement */: return visitSwitchStatement(node); - case 251 /* CaseBlock */: + case 255 /* CaseBlock */: return visitCaseBlock(node); - case 223 /* Block */: + case 227 /* Block */: return visitBlock(node, /*isFunctionBody*/ false); - case 234 /* BreakStatement */: - case 233 /* ContinueStatement */: + case 238 /* BreakStatement */: + case 237 /* ContinueStatement */: return visitBreakOrContinueStatement(node); - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: return visitLabeledStatement(node); - case 228 /* DoStatement */: - case 229 /* WhileStatement */: + case 232 /* DoStatement */: + case 233 /* WhileStatement */: return visitDoOrWhileStatement(node, /*outermostLabeledStatement*/ undefined); - case 230 /* ForStatement */: + case 234 /* ForStatement */: return visitForStatement(node, /*outermostLabeledStatement*/ undefined); - case 231 /* ForInStatement */: + case 235 /* ForInStatement */: return visitForInStatement(node, /*outermostLabeledStatement*/ undefined); - case 232 /* ForOfStatement */: + case 236 /* ForOfStatement */: return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined); - case 226 /* ExpressionStatement */: + case 230 /* ExpressionStatement */: return visitExpressionStatement(node); - case 193 /* ObjectLiteralExpression */: + case 197 /* ObjectLiteralExpression */: return visitObjectLiteralExpression(node); - case 280 /* CatchClause */: + case 284 /* CatchClause */: return visitCatchClause(node); - case 282 /* ShorthandPropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: return visitShorthandPropertyAssignment(node); - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: return visitComputedPropertyName(node); - case 192 /* ArrayLiteralExpression */: + case 196 /* ArrayLiteralExpression */: return visitArrayLiteralExpression(node); - case 196 /* CallExpression */: + case 200 /* CallExpression */: return visitCallExpression(node); - case 197 /* NewExpression */: + case 201 /* NewExpression */: return visitNewExpression(node); - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return visitParenthesizedExpression(node, /*needsDestructuringValue*/ true); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return visitBinaryExpression(node, /*needsDestructuringValue*/ true); case 14 /* NoSubstitutionTemplateLiteral */: case 15 /* TemplateHead */: @@ -83495,28 +86282,28 @@ var ts; return visitStringLiteral(node); case 8 /* NumericLiteral */: return visitNumericLiteral(node); - case 198 /* TaggedTemplateExpression */: + case 202 /* TaggedTemplateExpression */: return visitTaggedTemplateExpression(node); - case 211 /* TemplateExpression */: + case 215 /* TemplateExpression */: return visitTemplateExpression(node); - case 212 /* YieldExpression */: + case 216 /* YieldExpression */: return visitYieldExpression(node); - case 213 /* SpreadElement */: + case 217 /* SpreadElement */: return visitSpreadElement(node); - case 102 /* SuperKeyword */: + case 105 /* SuperKeyword */: return visitSuperKeyword(/*isExpressionOfCall*/ false); - case 104 /* ThisKeyword */: + case 107 /* ThisKeyword */: return visitThisKeyword(node); - case 219 /* MetaProperty */: + case 223 /* MetaProperty */: return visitMetaProperty(node); - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: return visitMethodDeclaration(node); - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return visitAccessorDeclaration(node); - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: return visitVariableStatement(node); - case 235 /* ReturnStatement */: + case 239 /* ReturnStatement */: return visitReturnStatement(node); default: return ts.visitEachChild(node, visitor, context); @@ -83527,16 +86314,15 @@ var ts; var prologue = []; var statements = []; startLexicalEnvironment(); - var statementOffset = ts.addStandardPrologue(prologue, node.statements, /*ensureUseStrict*/ false); - statementOffset = ts.addCustomPrologue(prologue, node.statements, statementOffset, visitor); + var statementOffset = factory.copyPrologue(node.statements, prologue, /*ensureUseStrict*/ false, visitor); ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset)); if (taggedTemplateStringDeclarations) { - statements.push(ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList(taggedTemplateStringDeclarations))); + statements.push(factory.createVariableStatement(/*modifiers*/ undefined, factory.createVariableDeclarationList(taggedTemplateStringDeclarations))); } - ts.mergeLexicalEnvironment(prologue, endLexicalEnvironment()); + factory.mergeLexicalEnvironment(prologue, endLexicalEnvironment()); insertCaptureThisForNodeIfNeeded(prologue, node); exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */); - return ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray(ts.concatenate(prologue, statements)), node.statements)); + return factory.updateSourceFile(node, ts.setTextRange(factory.createNodeArray(ts.concatenate(prologue, statements)), node.statements)); } function visitSwitchStatement(node) { if (convertedLoopState !== undefined) { @@ -83556,7 +86342,7 @@ var ts; return updated; } function returnCapturedThis(node) { - return ts.setOriginalNode(ts.createReturn(ts.createFileLevelUniqueName("_this")), node); + return ts.setOriginalNode(factory.createReturnStatement(factory.createUniqueName("_this", 16 /* Optimistic */ | 32 /* FileLevel */)), node); } function visitReturnStatement(node) { if (convertedLoopState) { @@ -83564,10 +86350,10 @@ var ts; if (isReturnVoidStatementInConstructorWithCapturedSuper(node)) { node = returnCapturedThis(node); } - return ts.createReturn(ts.createObjectLiteral([ - ts.createPropertyAssignment(ts.createIdentifier("value"), node.expression + return factory.createReturnStatement(factory.createObjectLiteralExpression([ + factory.createPropertyAssignment(factory.createIdentifier("value"), node.expression ? ts.visitNode(node.expression, visitor, ts.isExpression) - : ts.createVoidZero()) + : factory.createVoidZero()) ])); } else if (isReturnVoidStatementInConstructorWithCapturedSuper(node)) { @@ -83585,7 +86371,7 @@ var ts; convertedLoopState.containsLexicalThis = true; return node; } - return convertedLoopState.thisName || (convertedLoopState.thisName = ts.createUniqueName("this")); + return convertedLoopState.thisName || (convertedLoopState.thisName = factory.createUniqueName("this")); } return node; } @@ -83593,13 +86379,10 @@ var ts; if (!convertedLoopState) { return node; } - if (ts.isGeneratedIdentifier(node)) { - return node; + if (resolver.isArgumentsLocalBinding(node)) { + return convertedLoopState.argumentsName || (convertedLoopState.argumentsName = factory.createUniqueName("arguments")); } - if (node.escapedText !== "arguments" || !resolver.isArgumentsLocalBinding(node)) { - return node; - } - return convertedLoopState.argumentsName || (convertedLoopState.argumentsName = ts.createUniqueName("arguments")); + return node; } function visitBreakOrContinueStatement(node) { if (convertedLoopState) { @@ -83607,14 +86390,14 @@ var ts; // it is possible if either // - break/continue is labeled and label is located inside the converted loop // - break/continue is non-labeled and located in non-converted loop/switch statement - var jump = node.kind === 234 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */; + var jump = node.kind === 238 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */; var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels.get(ts.idText(node.label))) || (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump)); if (!canUseBreakOrContinue) { var labelMarker = void 0; var label = node.label; if (!label) { - if (node.kind === 234 /* BreakStatement */) { + if (node.kind === 238 /* BreakStatement */) { convertedLoopState.nonLocalJumps |= 2 /* Break */; labelMarker = "break"; } @@ -83625,7 +86408,7 @@ var ts; } } else { - if (node.kind === 234 /* BreakStatement */) { + if (node.kind === 238 /* BreakStatement */) { labelMarker = "break-" + label.escapedText; setLabeledJump(convertedLoopState, /*isBreak*/ true, ts.idText(label), labelMarker); } @@ -83634,7 +86417,7 @@ var ts; setLabeledJump(convertedLoopState, /*isBreak*/ false, ts.idText(label), labelMarker); } } - var returnExpression = ts.createLiteral(labelMarker); + var returnExpression = factory.createStringLiteral(labelMarker); if (convertedLoopState.loopOutParameters.length) { var outParams = convertedLoopState.loopOutParameters; var expr = void 0; @@ -83644,12 +86427,12 @@ var ts; expr = copyExpr; } else { - expr = ts.createBinary(expr, 27 /* CommaToken */, copyExpr); + expr = factory.createBinaryExpression(expr, 27 /* CommaToken */, copyExpr); } } - returnExpression = ts.createBinary(expr, 27 /* CommaToken */, returnExpression); + returnExpression = factory.createBinaryExpression(expr, 27 /* CommaToken */, returnExpression); } - return ts.createReturn(returnExpression); + return factory.createReturnStatement(returnExpression); } } return ts.visitEachChild(node, visitor, context); @@ -83669,27 +86452,28 @@ var ts; // } // return C; // }()); - var variable = ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ true), + var variable = factory.createVariableDeclaration(factory.getLocalName(node, /*allowComments*/ true), + /*exclamationToken*/ undefined, /*type*/ undefined, transformClassLikeDeclarationToExpression(node)); ts.setOriginalNode(variable, node); var statements = []; - var statement = ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([variable])); + var statement = factory.createVariableStatement(/*modifiers*/ undefined, factory.createVariableDeclarationList([variable])); ts.setOriginalNode(statement, node); ts.setTextRange(statement, node); ts.startOnNewLine(statement); statements.push(statement); // Add an `export default` statement for default exports (for `--target es5 --module es6`) - if (ts.hasModifier(node, 1 /* Export */)) { - var exportStatement = ts.hasModifier(node, 512 /* Default */) - ? ts.createExportDefault(ts.getLocalName(node)) - : ts.createExternalModuleExport(ts.getLocalName(node)); + if (ts.hasSyntacticModifier(node, 1 /* Export */)) { + var exportStatement = ts.hasSyntacticModifier(node, 512 /* Default */) + ? factory.createExportDefault(factory.getLocalName(node)) + : factory.createExternalModuleExport(factory.getLocalName(node)); ts.setOriginalNode(exportStatement, statement); statements.push(exportStatement); } var emitFlags = ts.getEmitFlags(node); if ((emitFlags & 4194304 /* HasEndOfDeclarationMarker */) === 0) { // Add a DeclarationMarker as a marker for the end of the declaration - statements.push(ts.createEndOfDeclarationMarker(node)); + statements.push(factory.createEndOfDeclarationMarker(node)); ts.setEmitFlags(statement, emitFlags | 4194304 /* HasEndOfDeclarationMarker */); } return ts.singleOrMany(statements); @@ -83743,11 +86527,11 @@ var ts; enableSubstitutionsForBlockScopedBindings(); } var extendsClauseElement = ts.getClassExtendsHeritageElement(node); - var classFunction = ts.createFunctionExpression( + var classFunction = factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, - /*typeParameters*/ undefined, extendsClauseElement ? [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, ts.createFileLevelUniqueName("_super"))] : [], + /*typeParameters*/ undefined, extendsClauseElement ? [factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, factory.createUniqueName("_super", 16 /* Optimistic */ | 32 /* FileLevel */))] : [], /*type*/ undefined, transformClassBody(node, extendsClauseElement)); // To preserve the behavior of the old emitter, we explicitly indent // the body of the function here if it was requested in an earlier @@ -83755,13 +86539,13 @@ var ts; ts.setEmitFlags(classFunction, (ts.getEmitFlags(node) & 65536 /* Indented */) | 524288 /* ReuseTempVariableScope */); // "inner" and "outer" below are added purely to preserve source map locations from // the old emitter - var inner = ts.createPartiallyEmittedExpression(classFunction); - inner.end = node.end; + var inner = factory.createPartiallyEmittedExpression(classFunction); + ts.setTextRangeEnd(inner, node.end); ts.setEmitFlags(inner, 1536 /* NoComments */); - var outer = ts.createPartiallyEmittedExpression(inner); - outer.end = ts.skipTrivia(currentText, node.pos); + var outer = factory.createPartiallyEmittedExpression(inner); + ts.setTextRangeEnd(outer, ts.skipTrivia(currentText, node.pos)); ts.setEmitFlags(outer, 1536 /* NoComments */); - var result = ts.createParen(ts.createCall(outer, + var result = factory.createParenthesizedExpression(factory.createCallExpression(outer, /*typeArguments*/ undefined, extendsClauseElement ? [ts.visitNode(extendsClauseElement.expression, visitor, ts.isExpression)] : [])); @@ -83782,18 +86566,18 @@ var ts; addClassMembers(statements, node); // Create a synthetic text range for the return statement. var closingBraceLocation = ts.createTokenRange(ts.skipTrivia(currentText, node.members.end), 19 /* CloseBraceToken */); - var localName = ts.getInternalName(node); + var localName = factory.getInternalName(node); // The following partially-emitted expression exists purely to align our sourcemap // emit with the original emitter. - var outer = ts.createPartiallyEmittedExpression(localName); - outer.end = closingBraceLocation.end; + var outer = factory.createPartiallyEmittedExpression(localName); + ts.setTextRangeEnd(outer, closingBraceLocation.end); ts.setEmitFlags(outer, 1536 /* NoComments */); - var statement = ts.createReturn(outer); - statement.pos = closingBraceLocation.pos; + var statement = factory.createReturnStatement(outer); + ts.setTextRangePos(statement, closingBraceLocation.pos); ts.setEmitFlags(statement, 1536 /* NoComments */ | 384 /* NoTokenSourceMaps */); statements.push(statement); ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment()); - var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), /*location*/ node.members), /*multiLine*/ true); + var block = factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), /*location*/ node.members), /*multiLine*/ true); ts.setEmitFlags(block, 1536 /* NoComments */); return block; } @@ -83806,7 +86590,7 @@ var ts; */ function addExtendsHelperIfNeeded(statements, node, extendsClauseElement) { if (extendsClauseElement) { - statements.push(ts.setTextRange(ts.createExpressionStatement(createExtendsHelper(context, ts.getInternalName(node))), + statements.push(ts.setTextRange(factory.createExpressionStatement(emitHelpers().createExtendsHelper(factory.getInternalName(node))), /*location*/ extendsClauseElement)); } } @@ -83823,10 +86607,10 @@ var ts; var ancestorFacts = enterSubtree(16278 /* ConstructorExcludes */, 73 /* ConstructorIncludes */); var constructor = ts.getFirstConstructorWithBody(node); var hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined); - var constructorFunction = ts.createFunctionDeclaration( + var constructorFunction = factory.createFunctionDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, - /*asteriskToken*/ undefined, ts.getInternalName(node), + /*asteriskToken*/ undefined, factory.getInternalName(node), /*typeParameters*/ undefined, transformConstructorParameters(constructor, hasSynthesizedSuper), /*type*/ undefined, transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper)); ts.setTextRange(constructorFunction, constructor || node); @@ -83859,14 +86643,14 @@ var ts; // If that's the case we can just immediately return the result of a 'super()' call. var statements = []; resumeLexicalEnvironment(); - ts.mergeLexicalEnvironment(statements, endLexicalEnvironment()); + factory.mergeLexicalEnvironment(statements, endLexicalEnvironment()); if (isDerivedClass) { // return _super !== null && _super.apply(this, arguments) || this; - statements.push(ts.createReturn(createDefaultSuperCallOrThis())); + statements.push(factory.createReturnStatement(createDefaultSuperCallOrThis())); } - var statementsArray = ts.createNodeArray(statements); + var statementsArray = factory.createNodeArray(statements); ts.setTextRange(statementsArray, node.members); - var block = ts.createBlock(statementsArray, /*multiLine*/ true); + var block = factory.createBlock(statementsArray, /*multiLine*/ true); ts.setTextRange(block, node); ts.setEmitFlags(block, 1536 /* NoComments */); return block; @@ -83883,7 +86667,7 @@ var ts; function transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper) { // determine whether the class is known syntactically to be a derived class (e.g. a // class that extends a value that is not syntactically known to be `null`). - var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 100 /* NullKeyword */; + var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 103 /* NullKeyword */; // When the subclass does not have a constructor, we synthesize a *default* constructor using the following // representation: // @@ -83910,11 +86694,11 @@ var ts; // The assumption is that no prior step in the pipeline has added any prologue directives. var statementOffset = 0; if (!hasSynthesizedSuper) - statementOffset = ts.addStandardPrologue(prologue, constructor.body.statements, /*ensureUseStrict*/ false); + statementOffset = factory.copyStandardPrologue(constructor.body.statements, prologue, /*ensureUseStrict*/ false); addDefaultValueAssignmentsIfNeeded(statements, constructor); addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper); if (!hasSynthesizedSuper) - statementOffset = ts.addCustomPrologue(statements, constructor.body.statements, statementOffset, visitor); + statementOffset = factory.copyCustomPrologue(constructor.body.statements, statements, statementOffset, visitor); // If the first statement is a call to `super()`, visit the statement directly var superCallExpression; if (hasSynthesizedSuper) { @@ -83932,7 +86716,7 @@ var ts; } // visit the remaining statements ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, /*start*/ statementOffset)); - ts.mergeLexicalEnvironment(prologue, endLexicalEnvironment()); + factory.mergeLexicalEnvironment(prologue, endLexicalEnvironment()); insertCaptureNewTargetIfNeeded(prologue, constructor, /*copyOnWrite*/ false); if (isDerivedClass) { if (superCallExpression && statementOffset === constructor.body.statements.length && !(constructor.body.transformFlags & 4096 /* ContainsLexicalThis */)) { @@ -83956,7 +86740,7 @@ var ts; // })(Base); // ``` var superCall = ts.cast(ts.cast(superCallExpression, ts.isBinaryExpression).left, ts.isCallExpression); - var returnStatement = ts.createReturn(superCallExpression); + var returnStatement = factory.createReturnStatement(superCallExpression); ts.setCommentRange(returnStatement, ts.getCommentRange(superCall)); ts.setEmitFlags(superCall, 1536 /* NoComments */); statements.push(returnStatement); @@ -83987,7 +86771,7 @@ var ts; // `super()` at the top of the list of `statements` (after any pre-existing custom prologues). insertCaptureThisForNode(statements, constructor, superCallExpression || createActualThis()); if (!isSufficientlyCoveredByReturnStatements(constructor.body)) { - statements.push(ts.createReturn(ts.createFileLevelUniqueName("_this"))); + statements.push(factory.createReturnStatement(factory.createUniqueName("_this", 16 /* Optimistic */ | 32 /* FileLevel */))); } } } @@ -84008,7 +86792,7 @@ var ts; // ``` insertCaptureThisForNodeIfNeeded(prologue, constructor); } - var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(ts.concatenate(prologue, statements)), + var block = factory.createBlock(ts.setTextRange(factory.createNodeArray(ts.concatenate(prologue, statements)), /*location*/ constructor.body.statements), /*multiLine*/ true); ts.setTextRange(block, constructor.body); @@ -84021,11 +86805,11 @@ var ts; */ function isSufficientlyCoveredByReturnStatements(statement) { // A return statement is considered covered. - if (statement.kind === 235 /* ReturnStatement */) { + if (statement.kind === 239 /* ReturnStatement */) { return true; } // An if-statement with two covered branches is covered. - else if (statement.kind === 227 /* IfStatement */) { + else if (statement.kind === 231 /* IfStatement */) { var ifStatement = statement; if (ifStatement.elseStatement) { return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) && @@ -84033,7 +86817,7 @@ var ts; } } // A block is covered if it has a last statement which is covered. - else if (statement.kind === 223 /* Block */) { + else if (statement.kind === 227 /* Block */) { var lastStatement = ts.lastOrUndefined(statement.statements); if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) { return true; @@ -84042,10 +86826,10 @@ var ts; return false; } function createActualThis() { - return ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */); + return ts.setEmitFlags(factory.createThis(), 4 /* NoSubstitution */); } function createDefaultSuperCallOrThis() { - return ts.createLogicalOr(ts.createLogicalAnd(ts.createStrictInequality(ts.createFileLevelUniqueName("_super"), ts.createNull()), ts.createFunctionApply(ts.createFileLevelUniqueName("_super"), createActualThis(), ts.createIdentifier("arguments"))), createActualThis()); + return factory.createLogicalOr(factory.createLogicalAnd(factory.createStrictInequality(factory.createUniqueName("_super", 16 /* Optimistic */ | 32 /* FileLevel */), factory.createNull()), factory.createFunctionApplyCall(factory.createUniqueName("_super", 16 /* Optimistic */ | 32 /* FileLevel */), createActualThis(), factory.createIdentifier("arguments"))), createActualThis()); } /** * Visits a parameter declaration. @@ -84060,10 +86844,10 @@ var ts; else if (ts.isBindingPattern(node.name)) { // Binding patterns are converted into a generated name and are // evaluated inside the function body. - return ts.setOriginalNode(ts.setTextRange(ts.createParameter( + return ts.setOriginalNode(ts.setTextRange(factory.createParameterDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, - /*dotDotDotToken*/ undefined, ts.getGeneratedNameForNode(node), + /*dotDotDotToken*/ undefined, factory.getGeneratedNameForNode(node), /*questionToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined), @@ -84072,7 +86856,7 @@ var ts; } else if (node.initializer) { // Initializers are elided - return ts.setOriginalNode(ts.setTextRange(ts.createParameter( + return ts.setOriginalNode(ts.setTextRange(factory.createParameterDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, node.name, @@ -84133,12 +86917,12 @@ var ts; // we usually don't want to emit a var declaration; however, in the presence // of an initializer, we must emit that expression to preserve side effects. if (name.elements.length > 0) { - ts.insertStatementAfterCustomPrologue(statements, ts.setEmitFlags(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, ts.getGeneratedNameForNode(parameter)))), 1048576 /* CustomPrologue */)); + ts.insertStatementAfterCustomPrologue(statements, ts.setEmitFlags(factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, factory.getGeneratedNameForNode(parameter)))), 1048576 /* CustomPrologue */)); return true; } else if (initializer) { - ts.insertStatementAfterCustomPrologue(statements, ts.setEmitFlags(ts.createExpressionStatement(ts.createAssignment(ts.getGeneratedNameForNode(parameter), ts.visitNode(initializer, visitor, ts.isExpression))), 1048576 /* CustomPrologue */)); + ts.insertStatementAfterCustomPrologue(statements, ts.setEmitFlags(factory.createExpressionStatement(factory.createAssignment(factory.getGeneratedNameForNode(parameter), ts.visitNode(initializer, visitor, ts.isExpression))), 1048576 /* CustomPrologue */)); return true; } return false; @@ -84153,8 +86937,10 @@ var ts; */ function insertDefaultValueAssignmentForInitializer(statements, parameter, name, initializer) { initializer = ts.visitNode(initializer, visitor, ts.isExpression); - var statement = ts.createIf(ts.createTypeCheck(ts.getSynthesizedClone(name), "undefined"), ts.setEmitFlags(ts.setTextRange(ts.createBlock([ - ts.createExpressionStatement(ts.setEmitFlags(ts.setTextRange(ts.createAssignment(ts.setEmitFlags(ts.getMutableClone(name), 48 /* NoSourceMap */), ts.setEmitFlags(initializer, 48 /* NoSourceMap */ | ts.getEmitFlags(initializer) | 1536 /* NoComments */)), parameter), 1536 /* NoComments */)) + var statement = factory.createIfStatement(factory.createTypeCheck(factory.cloneNode(name), "undefined"), ts.setEmitFlags(ts.setTextRange(factory.createBlock([ + factory.createExpressionStatement(ts.setEmitFlags(ts.setTextRange(factory.createAssignment( + // TODO(rbuckton): Does this need to be parented? + ts.setEmitFlags(ts.setParent(ts.setTextRange(factory.cloneNode(name), name), name.parent), 48 /* NoSourceMap */), ts.setEmitFlags(initializer, 48 /* NoSourceMap */ | ts.getEmitFlags(initializer) | 1536 /* NoComments */)), parameter), 1536 /* NoComments */)) ]), parameter), 1 /* SingleLine */ | 32 /* NoTrailingSourceMap */ | 384 /* NoTokenSourceMaps */ | 1536 /* NoComments */)); ts.startOnNewLine(statement); ts.setTextRange(statement, parameter); @@ -84188,37 +86974,39 @@ var ts; return false; } // `declarationName` is the name of the local declaration for the parameter. - var declarationName = parameter.name.kind === 75 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined); + // TODO(rbuckton): Does this need to be parented? + var declarationName = parameter.name.kind === 78 /* Identifier */ ? ts.setParent(ts.setTextRange(factory.cloneNode(parameter.name), parameter.name), parameter.name.parent) : factory.createTempVariable(/*recordTempVariable*/ undefined); ts.setEmitFlags(declarationName, 48 /* NoSourceMap */); // `expressionName` is the name of the parameter used in expressions. - var expressionName = parameter.name.kind === 75 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName; + var expressionName = parameter.name.kind === 78 /* Identifier */ ? factory.cloneNode(parameter.name) : declarationName; var restIndex = node.parameters.length - 1; - var temp = ts.createLoopVariable(); + var temp = factory.createLoopVariable(); // var param = []; - prologueStatements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(declarationName, - /*type*/ undefined, ts.createArrayLiteral([])) + prologueStatements.push(ts.setEmitFlags(ts.setTextRange(factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList([ + factory.createVariableDeclaration(declarationName, + /*exclamationToken*/ undefined, + /*type*/ undefined, factory.createArrayLiteralExpression([])) ])), /*location*/ parameter), 1048576 /* CustomPrologue */)); // for (var _i = restIndex; _i < arguments.length; _i++) { // param[_i - restIndex] = arguments[_i]; // } - var forStatement = ts.createFor(ts.setTextRange(ts.createVariableDeclarationList([ - ts.createVariableDeclaration(temp, /*type*/ undefined, ts.createLiteral(restIndex)) - ]), parameter), ts.setTextRange(ts.createLessThan(temp, ts.createPropertyAccess(ts.createIdentifier("arguments"), "length")), parameter), ts.setTextRange(ts.createPostfixIncrement(temp), parameter), ts.createBlock([ - ts.startOnNewLine(ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(ts.createElementAccess(expressionName, restIndex === 0 + var forStatement = factory.createForStatement(ts.setTextRange(factory.createVariableDeclarationList([ + factory.createVariableDeclaration(temp, /*exclamationToken*/ undefined, /*type*/ undefined, factory.createNumericLiteral(restIndex)) + ]), parameter), ts.setTextRange(factory.createLessThan(temp, factory.createPropertyAccessExpression(factory.createIdentifier("arguments"), "length")), parameter), ts.setTextRange(factory.createPostfixIncrement(temp), parameter), factory.createBlock([ + ts.startOnNewLine(ts.setTextRange(factory.createExpressionStatement(factory.createAssignment(factory.createElementAccessExpression(expressionName, restIndex === 0 ? temp - : ts.createSubtract(temp, ts.createLiteral(restIndex))), ts.createElementAccess(ts.createIdentifier("arguments"), temp))), + : factory.createSubtract(temp, factory.createNumericLiteral(restIndex))), factory.createElementAccessExpression(factory.createIdentifier("arguments"), temp))), /*location*/ parameter)) ])); ts.setEmitFlags(forStatement, 1048576 /* CustomPrologue */); ts.startOnNewLine(forStatement); prologueStatements.push(forStatement); - if (parameter.name.kind !== 75 /* Identifier */) { + if (parameter.name.kind !== 78 /* Identifier */) { // do the actual destructuring of the rest parameter if necessary - prologueStatements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, expressionName))), parameter), 1048576 /* CustomPrologue */)); + prologueStatements.push(ts.setEmitFlags(ts.setTextRange(factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, expressionName))), parameter), 1048576 /* CustomPrologue */)); } ts.insertStatementsAfterCustomPrologue(statements, prologueStatements); return true; @@ -84231,17 +87019,18 @@ var ts; * @param node A node. */ function insertCaptureThisForNodeIfNeeded(statements, node) { - if (hierarchyFacts & 32768 /* CapturedLexicalThis */ && node.kind !== 202 /* ArrowFunction */) { - insertCaptureThisForNode(statements, node, ts.createThis()); + if (hierarchyFacts & 32768 /* CapturedLexicalThis */ && node.kind !== 206 /* ArrowFunction */) { + insertCaptureThisForNode(statements, node, factory.createThis()); return true; } return false; } function insertCaptureThisForNode(statements, node, initializer) { enableSubstitutionsForCapturedThis(); - var captureThisStatement = ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(ts.createFileLevelUniqueName("_this"), + var captureThisStatement = factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList([ + factory.createVariableDeclaration(factory.createUniqueName("_this", 16 /* Optimistic */ | 32 /* FileLevel */), + /*exclamationToken*/ undefined, /*type*/ undefined, initializer) ])); ts.setEmitFlags(captureThisStatement, 1536 /* NoComments */ | 1048576 /* CustomPrologue */); @@ -84252,32 +87041,35 @@ var ts; if (hierarchyFacts & 16384 /* NewTarget */) { var newTarget = void 0; switch (node.kind) { - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: return statements; - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: // Methods and accessors cannot be constructors, so 'new.target' will // always return 'undefined'. - newTarget = ts.createVoidZero(); + newTarget = factory.createVoidZero(); break; - case 162 /* Constructor */: + case 165 /* Constructor */: // Class constructors can only be called with `new`, so `this.constructor` // should be relatively safe to use. - newTarget = ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"); + newTarget = factory.createPropertyAccessExpression(ts.setEmitFlags(factory.createThis(), 4 /* NoSubstitution */), "constructor"); break; - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: // Functions can be called or constructed, and may have a `this` due to // being a member or when calling an imported function via `other_1.f()`. - newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 98 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero()); + newTarget = factory.createConditionalExpression(factory.createLogicalAnd(ts.setEmitFlags(factory.createThis(), 4 /* NoSubstitution */), factory.createBinaryExpression(ts.setEmitFlags(factory.createThis(), 4 /* NoSubstitution */), 101 /* InstanceOfKeyword */, factory.getLocalName(node))), + /*questionToken*/ undefined, factory.createPropertyAccessExpression(ts.setEmitFlags(factory.createThis(), 4 /* NoSubstitution */), "constructor"), + /*colonToken*/ undefined, factory.createVoidZero()); break; default: return ts.Debug.failBadSyntaxKind(node); } - var captureNewTargetStatement = ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(ts.createFileLevelUniqueName("_newTarget"), + var captureNewTargetStatement = factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList([ + factory.createVariableDeclaration(factory.createUniqueName("_newTarget", 16 /* Optimistic */ | 32 /* FileLevel */), + /*exclamationToken*/ undefined, /*type*/ undefined, newTarget) ])); ts.setEmitFlags(captureNewTargetStatement, 1536 /* NoComments */ | 1048576 /* CustomPrologue */); @@ -84299,20 +87091,20 @@ var ts; for (var _i = 0, _a = node.members; _i < _a.length; _i++) { var member = _a[_i]; switch (member.kind) { - case 222 /* SemicolonClassElement */: + case 226 /* SemicolonClassElement */: statements.push(transformSemicolonClassElementToStatement(member)); break; - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member, node)); break; - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: var accessors = ts.getAllAccessorDeclarations(node.members, member); if (member === accessors.firstAccessor) { statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors, node)); } break; - case 162 /* Constructor */: + case 165 /* Constructor */: // Constructors are handled in visitClassExpression/visitClassDeclaration break; default: @@ -84327,7 +87119,7 @@ var ts; * @param member The SemicolonClassElement node. */ function transformSemicolonClassElementToStatement(member) { - return ts.setTextRange(ts.createEmptyStatement(), member); + return ts.setTextRange(factory.createEmptyStatement(), member); } /** * Transforms a MethodDeclaration into a statement for a class body function. @@ -84343,17 +87135,17 @@ var ts; var e; if (!ts.isPrivateIdentifier(propertyName) && context.getCompilerOptions().useDefineForClassFields) { var name = ts.isComputedPropertyName(propertyName) ? propertyName.expression - : ts.isIdentifier(propertyName) ? ts.createStringLiteral(ts.unescapeLeadingUnderscores(propertyName.escapedText)) + : ts.isIdentifier(propertyName) ? factory.createStringLiteral(ts.unescapeLeadingUnderscores(propertyName.escapedText)) : propertyName; - e = ts.createObjectDefinePropertyCall(receiver, name, ts.createPropertyDescriptor({ value: memberFunction, enumerable: false, writable: true, configurable: true })); + e = factory.createObjectDefinePropertyCall(receiver, name, factory.createPropertyDescriptor({ value: memberFunction, enumerable: false, writable: true, configurable: true })); } else { - var memberName = ts.createMemberAccessForPropertyName(receiver, propertyName, /*location*/ member.name); - e = ts.createAssignment(memberName, memberFunction); + var memberName = ts.createMemberAccessForPropertyName(factory, receiver, propertyName, /*location*/ member.name); + e = factory.createAssignment(memberName, memberFunction); } ts.setEmitFlags(memberFunction, 1536 /* NoComments */); ts.setSourceMapRange(memberFunction, sourceMapRange); - var statement = ts.setTextRange(ts.createExpressionStatement(e), /*location*/ member); + var statement = ts.setTextRange(factory.createExpressionStatement(e), /*location*/ member); ts.setOriginalNode(statement, member); ts.setCommentRange(statement, commentRange); // The location for the statement is used to emit comments only. @@ -84369,7 +87161,7 @@ var ts; * @param accessors The set of related get/set accessors. */ function transformAccessorsToStatement(receiver, accessors, container) { - var statement = ts.createExpressionStatement(transformAccessorsToExpression(receiver, accessors, container, /*startsOnNewLine*/ false)); + var statement = factory.createExpressionStatement(transformAccessorsToExpression(receiver, accessors, container, /*startsOnNewLine*/ false)); // The location for the statement is used to emit source maps only. // No comments should be emitted for this statement to align with the // old emitter. @@ -84387,14 +87179,15 @@ var ts; var firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor; // To align with source maps in the old emitter, the receiver and property name // arguments are both mapped contiguously to the accessor name. - var target = ts.getMutableClone(receiver); + // TODO(rbuckton): Does this need to be parented? + var target = ts.setParent(ts.setTextRange(factory.cloneNode(receiver), receiver), receiver.parent); ts.setEmitFlags(target, 1536 /* NoComments */ | 32 /* NoTrailingSourceMap */); ts.setSourceMapRange(target, firstAccessor.name); var visitedAccessorName = ts.visitNode(firstAccessor.name, visitor, ts.isPropertyName); if (ts.isPrivateIdentifier(visitedAccessorName)) { return ts.Debug.failBadSyntaxKind(visitedAccessorName, "Encountered unhandled private identifier while transforming ES2015."); } - var propertyName = ts.createExpressionForPropertyName(visitedAccessorName); + var propertyName = ts.createExpressionForPropertyName(factory, visitedAccessorName); ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 16 /* NoLeadingSourceMap */); ts.setSourceMapRange(propertyName, firstAccessor.name); var properties = []; @@ -84402,7 +87195,7 @@ var ts; var getterFunction = transformFunctionLikeToExpression(getAccessor, /*location*/ undefined, /*name*/ undefined, container); ts.setSourceMapRange(getterFunction, ts.getSourceMapRange(getAccessor)); ts.setEmitFlags(getterFunction, 512 /* NoLeadingComments */); - var getter = ts.createPropertyAssignment("get", getterFunction); + var getter = factory.createPropertyAssignment("get", getterFunction); ts.setCommentRange(getter, ts.getCommentRange(getAccessor)); properties.push(getter); } @@ -84410,16 +87203,16 @@ var ts; var setterFunction = transformFunctionLikeToExpression(setAccessor, /*location*/ undefined, /*name*/ undefined, container); ts.setSourceMapRange(setterFunction, ts.getSourceMapRange(setAccessor)); ts.setEmitFlags(setterFunction, 512 /* NoLeadingComments */); - var setter = ts.createPropertyAssignment("set", setterFunction); + var setter = factory.createPropertyAssignment("set", setterFunction); ts.setCommentRange(setter, ts.getCommentRange(setAccessor)); properties.push(setter); } - properties.push(ts.createPropertyAssignment("enumerable", getAccessor || setAccessor ? ts.createFalse() : ts.createTrue()), ts.createPropertyAssignment("configurable", ts.createTrue())); - var call = ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), + properties.push(factory.createPropertyAssignment("enumerable", getAccessor || setAccessor ? factory.createFalse() : factory.createTrue()), factory.createPropertyAssignment("configurable", factory.createTrue())); + var call = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Object"), "defineProperty"), /*typeArguments*/ undefined, [ target, propertyName, - ts.createObjectLiteral(properties, /*multiLine*/ true) + factory.createObjectLiteralExpression(properties, /*multiLine*/ true) ]); if (startsOnNewLine) { ts.startOnNewLine(call); @@ -84438,7 +87231,7 @@ var ts; var savedConvertedLoopState = convertedLoopState; convertedLoopState = undefined; var ancestorFacts = enterSubtree(15232 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */); - var func = ts.createFunctionExpression( + var func = factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, @@ -84469,11 +87262,11 @@ var ts; var parameters = ts.visitParameterList(node.parameters, visitor, context); var body = transformFunctionBody(node); var name = hierarchyFacts & 16384 /* NewTarget */ - ? ts.getLocalName(node) + ? factory.getLocalName(node) : node.name; exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */); convertedLoopState = savedConvertedLoopState; - return ts.updateFunctionExpression(node, + return factory.updateFunctionExpression(node, /*modifiers*/ undefined, node.asteriskToken, name, /*typeParameters*/ undefined, parameters, /*type*/ undefined, body); @@ -84490,11 +87283,11 @@ var ts; var parameters = ts.visitParameterList(node.parameters, visitor, context); var body = transformFunctionBody(node); var name = hierarchyFacts & 16384 /* NewTarget */ - ? ts.getLocalName(node) + ? factory.getLocalName(node) : node.name; exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */); convertedLoopState = savedConvertedLoopState; - return ts.updateFunctionDeclaration(node, + return factory.updateFunctionDeclaration(node, /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, name, /*typeParameters*/ undefined, parameters, /*type*/ undefined, body); @@ -84509,17 +87302,17 @@ var ts; function transformFunctionLikeToExpression(node, location, name, container) { var savedConvertedLoopState = convertedLoopState; convertedLoopState = undefined; - var ancestorFacts = container && ts.isClassLike(container) && !ts.hasModifier(node, 32 /* Static */) + var ancestorFacts = container && ts.isClassLike(container) && !ts.hasSyntacticModifier(node, 32 /* Static */) ? enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */) : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */); var parameters = ts.visitParameterList(node.parameters, visitor, context); var body = transformFunctionBody(node); - if (hierarchyFacts & 16384 /* NewTarget */ && !name && (node.kind === 244 /* FunctionDeclaration */ || node.kind === 201 /* FunctionExpression */)) { - name = ts.getGeneratedNameForNode(node); + if (hierarchyFacts & 16384 /* NewTarget */ && !name && (node.kind === 248 /* FunctionDeclaration */ || node.kind === 205 /* FunctionExpression */)) { + name = factory.getGeneratedNameForNode(node); } exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */); convertedLoopState = savedConvertedLoopState; - return ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression( + return ts.setOriginalNode(ts.setTextRange(factory.createFunctionExpression( /*modifiers*/ undefined, node.asteriskToken, name, /*typeParameters*/ undefined, parameters, /*type*/ undefined, body), location), @@ -84543,15 +87336,15 @@ var ts; if (ts.isBlock(body)) { // ensureUseStrict is false because no new prologue-directive should be added. // addStandardPrologue will put already-existing directives at the beginning of the target statement-array - statementOffset = ts.addStandardPrologue(prologue, body.statements, /*ensureUseStrict*/ false); - statementOffset = ts.addCustomPrologue(statements, body.statements, statementOffset, visitor, ts.isHoistedFunction); - statementOffset = ts.addCustomPrologue(statements, body.statements, statementOffset, visitor, ts.isHoistedVariableStatement); + statementOffset = factory.copyStandardPrologue(body.statements, prologue, /*ensureUseStrict*/ false); + statementOffset = factory.copyCustomPrologue(body.statements, statements, statementOffset, visitor, ts.isHoistedFunction); + statementOffset = factory.copyCustomPrologue(body.statements, statements, statementOffset, visitor, ts.isHoistedVariableStatement); } multiLine = addDefaultValueAssignmentsIfNeeded(statements, node) || multiLine; multiLine = addRestParameterIfNeeded(statements, node, /*inConstructorWithSynthesizedSuper*/ false) || multiLine; if (ts.isBlock(body)) { // addCustomPrologue puts already-existing directives at the beginning of the target statement-array - statementOffset = ts.addCustomPrologue(statements, body.statements, statementOffset, visitor); + statementOffset = factory.copyCustomPrologue(body.statements, statements, statementOffset, visitor); statementsLocation = body.statements; ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, statementOffset)); // If the original body was a multi-line block, this must be a multi-line block. @@ -84560,7 +87353,7 @@ var ts; } } else { - ts.Debug.assert(node.kind === 202 /* ArrowFunction */); + ts.Debug.assert(node.kind === 206 /* ArrowFunction */); // To align with the old emitter, we use a synthetic end position on the location // for the statement list we synthesize when we down-level an arrow function with // an expression function body. This prevents both comments and source maps from @@ -84576,7 +87369,7 @@ var ts; } } var expression = ts.visitNode(body, visitor, ts.isExpression); - var returnStatement = ts.createReturn(expression); + var returnStatement = factory.createReturnStatement(expression); ts.setTextRange(returnStatement, body); ts.moveSyntheticComments(returnStatement, body); ts.setEmitFlags(returnStatement, 384 /* NoTokenSourceMaps */ | 32 /* NoTrailingSourceMap */ | 1024 /* NoTrailingComments */); @@ -84585,7 +87378,7 @@ var ts; // source map location for the close brace. closeBraceLocation = body; } - ts.mergeLexicalEnvironment(prologue, endLexicalEnvironment()); + factory.mergeLexicalEnvironment(prologue, endLexicalEnvironment()); insertCaptureNewTargetIfNeeded(prologue, node, /*copyOnWrite*/ false); insertCaptureThisForNodeIfNeeded(prologue, node); // If we added any final generated statements, this must be a multi-line block @@ -84597,7 +87390,7 @@ var ts; // no changes were made, preserve the tree return body; } - var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), statementsLocation), multiLine); + var block = factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), statementsLocation), multiLine); ts.setTextRange(block, node.body); if (!multiLine && singleLine) { ts.setEmitFlags(block, 1 /* SingleLine */); @@ -84628,10 +87421,10 @@ var ts; function visitExpressionStatement(node) { // If we are here it is most likely because our expression is a destructuring assignment. switch (node.expression.kind) { - case 200 /* ParenthesizedExpression */: - return ts.updateExpressionStatement(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false)); - case 209 /* BinaryExpression */: - return ts.updateExpressionStatement(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false)); + case 204 /* ParenthesizedExpression */: + return factory.updateExpressionStatement(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false)); + case 213 /* BinaryExpression */: + return factory.updateExpressionStatement(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false)); } return ts.visitEachChild(node, visitor, context); } @@ -84649,10 +87442,10 @@ var ts; // expression. If we are in a state where we do not need the destructuring value, // we pass that information along to the children that care about it. switch (node.expression.kind) { - case 200 /* ParenthesizedExpression */: - return ts.updateParen(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false)); - case 209 /* BinaryExpression */: - return ts.updateParen(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false)); + case 204 /* ParenthesizedExpression */: + return factory.updateParenthesizedExpression(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false)); + case 213 /* BinaryExpression */: + return factory.updateParenthesizedExpression(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false)); } } return ts.visitEachChild(node, visitor, context); @@ -84677,7 +87470,7 @@ var ts; && !!(ts.getEmitFlags(node.declarationList.declarations[0].initializer) & 33554432 /* TypeScriptClassWrapper */); } function visitVariableStatement(node) { - var ancestorFacts = enterSubtree(0 /* None */, ts.hasModifier(node, 1 /* Export */) ? 32 /* ExportedVariableStatement */ : 0 /* None */); + var ancestorFacts = enterSubtree(0 /* None */, ts.hasSyntacticModifier(node, 1 /* Export */) ? 32 /* ExportedVariableStatement */ : 0 /* None */); var updated; if (convertedLoopState && (node.declarationList.flags & 3 /* BlockScoped */) === 0 && !isVariableStatementOfTypeScriptClassWrapper(node)) { // we are inside a converted loop - hoist variable declarations @@ -84691,14 +87484,14 @@ var ts; assignment = ts.flattenDestructuringAssignment(decl, visitor, context, 0 /* All */); } else { - assignment = ts.createBinary(decl.name, 62 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression)); + assignment = factory.createBinaryExpression(decl.name, 62 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression)); ts.setTextRange(assignment, decl); } assignments = ts.append(assignments, assignment); } } if (assignments) { - updated = ts.setTextRange(ts.createExpressionStatement(ts.inlineExpressions(assignments)), node); + updated = ts.setTextRange(factory.createExpressionStatement(factory.inlineExpressions(assignments)), node); } else { // none of declarations has initializer - the entire variable statement can be deleted @@ -84724,7 +87517,7 @@ var ts; var declarations = ts.flatMap(node.declarations, node.flags & 1 /* Let */ ? visitVariableDeclarationInLetDeclarationList : visitVariableDeclaration); - var declarationList = ts.createVariableDeclarationList(declarations); + var declarationList = factory.createVariableDeclarationList(declarations); ts.setOriginalNode(declarationList, node); ts.setTextRange(declarationList, node); ts.setCommentRange(declarationList, node); @@ -84824,9 +87617,7 @@ var ts; return visitVariableDeclaration(node); } if (!node.initializer && shouldEmitExplicitInitializerForLetDeclaration(node)) { - var clone_3 = ts.getMutableClone(node); - clone_3.initializer = ts.createVoidZero(); - return clone_3; + return factory.updateVariableDeclaration(node, node.name, /*exclamationToken*/ undefined, /*type*/ undefined, factory.createVoidZero()); } return ts.visitEachChild(node, visitor, context); } @@ -84856,23 +87647,23 @@ var ts; } function visitLabeledStatement(node) { if (convertedLoopState && !convertedLoopState.labels) { - convertedLoopState.labels = ts.createMap(); + convertedLoopState.labels = new ts.Map(); } var statement = ts.unwrapInnermostStatementOfLabel(node, convertedLoopState && recordLabel); return ts.isIterationStatement(statement, /*lookInLabeledStatements*/ false) ? visitIterationStatement(statement, /*outermostLabeledStatement*/ node) - : ts.restoreEnclosingLabel(ts.visitNode(statement, visitor, ts.isStatement, ts.liftToBlock), node, convertedLoopState && resetLabel); + : factory.restoreEnclosingLabel(ts.visitNode(statement, visitor, ts.isStatement, factory.liftToBlock), node, convertedLoopState && resetLabel); } function visitIterationStatement(node, outermostLabeledStatement) { switch (node.kind) { - case 228 /* DoStatement */: - case 229 /* WhileStatement */: + case 232 /* DoStatement */: + case 233 /* WhileStatement */: return visitDoOrWhileStatement(node, outermostLabeledStatement); - case 230 /* ForStatement */: + case 234 /* ForStatement */: return visitForStatement(node, outermostLabeledStatement); - case 231 /* ForInStatement */: + case 235 /* ForInStatement */: return visitForInStatement(node, outermostLabeledStatement); - case 232 /* ForOfStatement */: + case 236 /* ForOfStatement */: return visitForOfStatement(node, outermostLabeledStatement); } } @@ -84906,20 +87697,21 @@ var ts; // This works whether the declaration is a var, let, or const. // It will use rhsIterationValue _a[_i] as the initializer. var declarations = ts.flattenDestructuringBinding(firstOriginalDeclaration, visitor, context, 0 /* All */, boundValue); - var declarationList = ts.setTextRange(ts.createVariableDeclarationList(declarations), node.initializer); + var declarationList = ts.setTextRange(factory.createVariableDeclarationList(declarations), node.initializer); ts.setOriginalNode(declarationList, node.initializer); // Adjust the source map range for the first declaration to align with the old // emitter. ts.setSourceMapRange(declarationList, ts.createRange(declarations[0].pos, ts.last(declarations).end)); - statements.push(ts.createVariableStatement( + statements.push(factory.createVariableStatement( /*modifiers*/ undefined, declarationList)); } else { // The following call does not include the initializer, so we have // to emit it separately. - statements.push(ts.setTextRange(ts.createVariableStatement( - /*modifiers*/ undefined, ts.setOriginalNode(ts.setTextRange(ts.createVariableDeclarationList([ - ts.createVariableDeclaration(firstOriginalDeclaration ? firstOriginalDeclaration.name : ts.createTempVariable(/*recordTempVariable*/ undefined), + statements.push(ts.setTextRange(factory.createVariableStatement( + /*modifiers*/ undefined, ts.setOriginalNode(ts.setTextRange(factory.createVariableDeclarationList([ + factory.createVariableDeclaration(firstOriginalDeclaration ? firstOriginalDeclaration.name : factory.createTempVariable(/*recordTempVariable*/ undefined), + /*exclamationToken*/ undefined, /*type*/ undefined, boundValue) ]), ts.moveRangePos(initializer, -1)), initializer)), ts.moveRangeEnd(initializer, -1))); } @@ -84927,23 +87719,22 @@ var ts; else { // Initializer is an expression. Emit the expression in the body, so that it's // evaluated on every iteration. - var assignment = ts.createAssignment(initializer, boundValue); + var assignment = factory.createAssignment(initializer, boundValue); if (ts.isDestructuringAssignment(assignment)) { - ts.aggregateTransformFlags(assignment); - statements.push(ts.createExpressionStatement(visitBinaryExpression(assignment, /*needsDestructuringValue*/ false))); + statements.push(factory.createExpressionStatement(visitBinaryExpression(assignment, /*needsDestructuringValue*/ false))); } else { - assignment.end = initializer.end; - statements.push(ts.setTextRange(ts.createExpressionStatement(ts.visitNode(assignment, visitor, ts.isExpression)), ts.moveRangeEnd(initializer, -1))); + ts.setTextRangeEnd(assignment, initializer.end); + statements.push(ts.setTextRange(factory.createExpressionStatement(ts.visitNode(assignment, visitor, ts.isExpression)), ts.moveRangeEnd(initializer, -1))); } } if (convertedLoopBodyStatements) { return createSyntheticBlockForConvertedStatements(ts.addRange(statements, convertedLoopBodyStatements)); } else { - var statement = ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock); + var statement = ts.visitNode(node.statement, visitor, ts.isStatement, factory.liftToBlock); if (ts.isBlock(statement)) { - return ts.updateBlock(statement, ts.setTextRange(ts.createNodeArray(ts.concatenate(statements, statement.statements)), statement.statements)); + return factory.updateBlock(statement, ts.setTextRange(factory.createNodeArray(ts.concatenate(statements, statement.statements)), statement.statements)); } else { statements.push(statement); @@ -84952,7 +87743,7 @@ var ts; } } function createSyntheticBlockForConvertedStatements(statements) { - return ts.setEmitFlags(ts.createBlock(ts.createNodeArray(statements), + return ts.setEmitFlags(factory.createBlock(factory.createNodeArray(statements), /*multiLine*/ true), 48 /* NoSourceMap */ | 384 /* NoTokenSourceMaps */); } function convertForOfStatementForArray(node, outermostLabeledStatement, convertedLoopBodyStatements) { @@ -84982,62 +87773,62 @@ var ts; // for (let v of arr) { } // // we don't want to emit a temporary variable for the RHS, just use it directly. - var counter = ts.createLoopVariable(); - var rhsReference = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(expression) : ts.createTempVariable(/*recordTempVariable*/ undefined); + var counter = factory.createLoopVariable(); + var rhsReference = ts.isIdentifier(expression) ? factory.getGeneratedNameForNode(expression) : factory.createTempVariable(/*recordTempVariable*/ undefined); // The old emitter does not emit source maps for the expression ts.setEmitFlags(expression, 48 /* NoSourceMap */ | ts.getEmitFlags(expression)); - var forStatement = ts.setTextRange(ts.createFor( - /*initializer*/ ts.setEmitFlags(ts.setTextRange(ts.createVariableDeclarationList([ - ts.setTextRange(ts.createVariableDeclaration(counter, /*type*/ undefined, ts.createLiteral(0)), ts.moveRangePos(node.expression, -1)), - ts.setTextRange(ts.createVariableDeclaration(rhsReference, /*type*/ undefined, expression), node.expression) + var forStatement = ts.setTextRange(factory.createForStatement( + /*initializer*/ ts.setEmitFlags(ts.setTextRange(factory.createVariableDeclarationList([ + ts.setTextRange(factory.createVariableDeclaration(counter, /*exclamationToken*/ undefined, /*type*/ undefined, factory.createNumericLiteral(0)), ts.moveRangePos(node.expression, -1)), + ts.setTextRange(factory.createVariableDeclaration(rhsReference, /*exclamationToken*/ undefined, /*type*/ undefined, expression), node.expression) ]), node.expression), 2097152 /* NoHoisting */), - /*condition*/ ts.setTextRange(ts.createLessThan(counter, ts.createPropertyAccess(rhsReference, "length")), node.expression), - /*incrementor*/ ts.setTextRange(ts.createPostfixIncrement(counter), node.expression), - /*statement*/ convertForOfStatementHead(node, ts.createElementAccess(rhsReference, counter), convertedLoopBodyStatements)), + /*condition*/ ts.setTextRange(factory.createLessThan(counter, factory.createPropertyAccessExpression(rhsReference, "length")), node.expression), + /*incrementor*/ ts.setTextRange(factory.createPostfixIncrement(counter), node.expression), + /*statement*/ convertForOfStatementHead(node, factory.createElementAccessExpression(rhsReference, counter), convertedLoopBodyStatements)), /*location*/ node); // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter. ts.setEmitFlags(forStatement, 256 /* NoTokenTrailingSourceMaps */); ts.setTextRange(forStatement, node); - return ts.restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel); + return factory.restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel); } function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements, ancestorFacts) { var expression = ts.visitNode(node.expression, visitor, ts.isExpression); - var iterator = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(expression) : ts.createTempVariable(/*recordTempVariable*/ undefined); - var result = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(iterator) : ts.createTempVariable(/*recordTempVariable*/ undefined); - var errorRecord = ts.createUniqueName("e"); - var catchVariable = ts.getGeneratedNameForNode(errorRecord); - var returnMethod = ts.createTempVariable(/*recordTempVariable*/ undefined); - var values = ts.createValuesHelper(context, expression, node.expression); - var next = ts.createCall(ts.createPropertyAccess(iterator, "next"), /*typeArguments*/ undefined, []); + var iterator = ts.isIdentifier(expression) ? factory.getGeneratedNameForNode(expression) : factory.createTempVariable(/*recordTempVariable*/ undefined); + var result = ts.isIdentifier(expression) ? factory.getGeneratedNameForNode(iterator) : factory.createTempVariable(/*recordTempVariable*/ undefined); + var errorRecord = factory.createUniqueName("e"); + var catchVariable = factory.getGeneratedNameForNode(errorRecord); + var returnMethod = factory.createTempVariable(/*recordTempVariable*/ undefined); + var values = ts.setTextRange(emitHelpers().createValuesHelper(expression), node.expression); + var next = factory.createCallExpression(factory.createPropertyAccessExpression(iterator, "next"), /*typeArguments*/ undefined, []); hoistVariableDeclaration(errorRecord); hoistVariableDeclaration(returnMethod); // if we are enclosed in an outer loop ensure we reset 'errorRecord' per each iteration var initializer = ancestorFacts & 1024 /* IterationContainer */ - ? ts.inlineExpressions([ts.createAssignment(errorRecord, ts.createVoidZero()), values]) + ? factory.inlineExpressions([factory.createAssignment(errorRecord, factory.createVoidZero()), values]) : values; - var forStatement = ts.setEmitFlags(ts.setTextRange(ts.createFor( - /*initializer*/ ts.setEmitFlags(ts.setTextRange(ts.createVariableDeclarationList([ - ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, initializer), node.expression), - ts.createVariableDeclaration(result, /*type*/ undefined, next) + var forStatement = ts.setEmitFlags(ts.setTextRange(factory.createForStatement( + /*initializer*/ ts.setEmitFlags(ts.setTextRange(factory.createVariableDeclarationList([ + ts.setTextRange(factory.createVariableDeclaration(iterator, /*exclamationToken*/ undefined, /*type*/ undefined, initializer), node.expression), + factory.createVariableDeclaration(result, /*exclamationToken*/ undefined, /*type*/ undefined, next) ]), node.expression), 2097152 /* NoHoisting */), - /*condition*/ ts.createLogicalNot(ts.createPropertyAccess(result, "done")), - /*incrementor*/ ts.createAssignment(result, next), - /*statement*/ convertForOfStatementHead(node, ts.createPropertyAccess(result, "value"), convertedLoopBodyStatements)), + /*condition*/ factory.createLogicalNot(factory.createPropertyAccessExpression(result, "done")), + /*incrementor*/ factory.createAssignment(result, next), + /*statement*/ convertForOfStatementHead(node, factory.createPropertyAccessExpression(result, "value"), convertedLoopBodyStatements)), /*location*/ node), 256 /* NoTokenTrailingSourceMaps */); - return ts.createTry(ts.createBlock([ - ts.restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel) - ]), ts.createCatchClause(ts.createVariableDeclaration(catchVariable), ts.setEmitFlags(ts.createBlock([ - ts.createExpressionStatement(ts.createAssignment(errorRecord, ts.createObjectLiteral([ - ts.createPropertyAssignment("error", catchVariable) + return factory.createTryStatement(factory.createBlock([ + factory.restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel) + ]), factory.createCatchClause(factory.createVariableDeclaration(catchVariable), ts.setEmitFlags(factory.createBlock([ + factory.createExpressionStatement(factory.createAssignment(errorRecord, factory.createObjectLiteralExpression([ + factory.createPropertyAssignment("error", catchVariable) ]))) - ]), 1 /* SingleLine */)), ts.createBlock([ - ts.createTry( - /*tryBlock*/ ts.createBlock([ - ts.setEmitFlags(ts.createIf(ts.createLogicalAnd(ts.createLogicalAnd(result, ts.createLogicalNot(ts.createPropertyAccess(result, "done"))), ts.createAssignment(returnMethod, ts.createPropertyAccess(iterator, "return"))), ts.createExpressionStatement(ts.createFunctionCall(returnMethod, iterator, []))), 1 /* SingleLine */), + ]), 1 /* SingleLine */)), factory.createBlock([ + factory.createTryStatement( + /*tryBlock*/ factory.createBlock([ + ts.setEmitFlags(factory.createIfStatement(factory.createLogicalAnd(factory.createLogicalAnd(result, factory.createLogicalNot(factory.createPropertyAccessExpression(result, "done"))), factory.createAssignment(returnMethod, factory.createPropertyAccessExpression(iterator, "return"))), factory.createExpressionStatement(factory.createFunctionCallCall(returnMethod, iterator, []))), 1 /* SingleLine */), ]), /*catchClause*/ undefined, - /*finallyBlock*/ ts.setEmitFlags(ts.createBlock([ - ts.setEmitFlags(ts.createIf(errorRecord, ts.createThrow(ts.createPropertyAccess(errorRecord, "error"))), 1 /* SingleLine */) + /*finallyBlock*/ ts.setEmitFlags(factory.createBlock([ + ts.setEmitFlags(factory.createIfStatement(errorRecord, factory.createThrowStatement(factory.createPropertyAccessExpression(errorRecord, "error"))), 1 /* SingleLine */) ]), 1 /* SingleLine */)) ])); } @@ -85047,45 +87838,37 @@ var ts; * @param node An ObjectLiteralExpression node. */ function visitObjectLiteralExpression(node) { - // We are here because a ComputedPropertyName was used somewhere in the expression. var properties = node.properties; - var numProperties = properties.length; // Find the first computed property. // Everything until that point can be emitted as part of the initial object literal. - var numInitialProperties = numProperties; - var numInitialPropertiesWithoutYield = numProperties; - for (var i = 0; i < numProperties; i++) { + var numInitialProperties = -1, hasComputed = false; + for (var i = 0; i < properties.length; i++) { var property = properties[i]; - if ((property.transformFlags & 262144 /* ContainsYield */ && hierarchyFacts & 4 /* AsyncFunctionBody */) - && i < numInitialPropertiesWithoutYield) { - numInitialPropertiesWithoutYield = i; - } - if (property.name.kind === 154 /* ComputedPropertyName */) { + if ((property.transformFlags & 262144 /* ContainsYield */ && + hierarchyFacts & 4 /* AsyncFunctionBody */) + || (hasComputed = ts.Debug.checkDefined(property.name).kind === 157 /* ComputedPropertyName */)) { numInitialProperties = i; break; } } - if (numInitialProperties !== numProperties) { - if (numInitialPropertiesWithoutYield < numInitialProperties) { - numInitialProperties = numInitialPropertiesWithoutYield; - } - // For computed properties, we need to create a unique handle to the object - // literal so we can modify it without risking internal assignments tainting the object. - var temp = ts.createTempVariable(hoistVariableDeclaration); - // Write out the first non-computed properties, then emit the rest through indexing on the temp variable. - var expressions = []; - var assignment = ts.createAssignment(temp, ts.setEmitFlags(ts.createObjectLiteral(ts.visitNodes(properties, visitor, ts.isObjectLiteralElementLike, 0, numInitialProperties), node.multiLine), 65536 /* Indented */)); - if (node.multiLine) { - ts.startOnNewLine(assignment); - } - expressions.push(assignment); - addObjectLiteralMembers(expressions, node, temp, numInitialProperties); - // We need to clone the temporary identifier so that we can write it on a - // new line - expressions.push(node.multiLine ? ts.startOnNewLine(ts.getMutableClone(temp)) : temp); - return ts.inlineExpressions(expressions); + if (numInitialProperties < 0) { + return ts.visitEachChild(node, visitor, context); } - return ts.visitEachChild(node, visitor, context); + // For computed properties, we need to create a unique handle to the object + // literal so we can modify it without risking internal assignments tainting the object. + var temp = factory.createTempVariable(hoistVariableDeclaration); + // Write out the first non-computed properties, then emit the rest through indexing on the temp variable. + var expressions = []; + var assignment = factory.createAssignment(temp, ts.setEmitFlags(factory.createObjectLiteralExpression(ts.visitNodes(properties, visitor, ts.isObjectLiteralElementLike, 0, numInitialProperties), node.multiLine), hasComputed ? 65536 /* Indented */ : 0)); + if (node.multiLine) { + ts.startOnNewLine(assignment); + } + expressions.push(assignment); + addObjectLiteralMembers(expressions, node, temp, numInitialProperties); + // We need to clone the temporary identifier so that we can write it on a + // new line + expressions.push(node.multiLine ? ts.startOnNewLine(ts.setParent(ts.setTextRange(factory.cloneNode(temp), temp), temp.parent)) : temp); + return factory.inlineExpressions(expressions); } function shouldConvertPartOfIterationStatement(node) { return (resolver.getNodeCheckFlags(node) & 131072 /* ContainsCapturedBlockScopeBinding */) !== 0; @@ -85115,7 +87898,7 @@ var ts; } visit(node.name); function visit(node) { - if (node.kind === 75 /* Identifier */) { + if (node.kind === 78 /* Identifier */) { state.hoistedLocalVariables.push(node); } else { @@ -85139,7 +87922,7 @@ var ts; } var result = convert ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined, ancestorFacts) - : ts.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement, convertedLoopState && resetLabel); + : factory.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement, convertedLoopState && resetLabel); if (convertedLoopState) { convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps; } @@ -85166,55 +87949,53 @@ var ts; loop = convert(node, outermostLabeledStatement, bodyFunction.part, ancestorFacts); } else { - var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, /*multiLine*/ true)); - ts.aggregateTransformFlags(clone_4); - loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel); + var clone_3 = convertIterationStatementCore(node, initializerFunction, factory.createBlock(bodyFunction.part, /*multiLine*/ true)); + loop = factory.restoreEnclosingLabel(clone_3, outermostLabeledStatement, convertedLoopState && resetLabel); } } else { - var clone_5 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock)); - ts.aggregateTransformFlags(clone_5); - loop = ts.restoreEnclosingLabel(clone_5, outermostLabeledStatement, convertedLoopState && resetLabel); + var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, factory.liftToBlock)); + loop = factory.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel); } statements.push(loop); return statements; } function convertIterationStatementCore(node, initializerFunction, convertedLoopBody) { switch (node.kind) { - case 230 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody); - case 231 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody); - case 232 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody); - case 228 /* DoStatement */: return convertDoStatement(node, convertedLoopBody); - case 229 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody); + case 234 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody); + case 235 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody); + case 236 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody); + case 232 /* DoStatement */: return convertDoStatement(node, convertedLoopBody); + case 233 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody); default: return ts.Debug.failBadSyntaxKind(node, "IterationStatement expected"); } } function convertForStatement(node, initializerFunction, convertedLoopBody) { var shouldConvertCondition = node.condition && shouldConvertPartOfIterationStatement(node.condition); var shouldConvertIncrementor = shouldConvertCondition || node.incrementor && shouldConvertPartOfIterationStatement(node.incrementor); - return ts.updateFor(node, ts.visitNode(initializerFunction ? initializerFunction.part : node.initializer, visitor, ts.isForInitializer), ts.visitNode(shouldConvertCondition ? undefined : node.condition, visitor, ts.isExpression), ts.visitNode(shouldConvertIncrementor ? undefined : node.incrementor, visitor, ts.isExpression), convertedLoopBody); + return factory.updateForStatement(node, ts.visitNode(initializerFunction ? initializerFunction.part : node.initializer, visitor, ts.isForInitializer), ts.visitNode(shouldConvertCondition ? undefined : node.condition, visitor, ts.isExpression), ts.visitNode(shouldConvertIncrementor ? undefined : node.incrementor, visitor, ts.isExpression), convertedLoopBody); } function convertForOfStatement(node, convertedLoopBody) { - return ts.updateForOf(node, + return factory.updateForOfStatement(node, /*awaitModifier*/ undefined, ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), convertedLoopBody); } function convertForInStatement(node, convertedLoopBody) { - return ts.updateForIn(node, ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), convertedLoopBody); + return factory.updateForInStatement(node, ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), convertedLoopBody); } function convertDoStatement(node, convertedLoopBody) { - return ts.updateDo(node, convertedLoopBody, ts.visitNode(node.expression, visitor, ts.isExpression)); + return factory.updateDoStatement(node, convertedLoopBody, ts.visitNode(node.expression, visitor, ts.isExpression)); } function convertWhileStatement(node, convertedLoopBody) { - return ts.updateWhile(node, ts.visitNode(node.expression, visitor, ts.isExpression), convertedLoopBody); + return factory.updateWhileStatement(node, ts.visitNode(node.expression, visitor, ts.isExpression), convertedLoopBody); } function createConvertedLoopState(node) { var loopInitializer; switch (node.kind) { - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: var initializer = node.initializer; - if (initializer && initializer.kind === 243 /* VariableDeclarationList */) { + if (initializer && initializer.kind === 247 /* VariableDeclarationList */) { loopInitializer = initializer; } break; @@ -85263,8 +88044,9 @@ var ts; } else { // this is top level converted loop and we need to create an alias for 'arguments' object - (extraVariableDeclarations || (extraVariableDeclarations = [])).push(ts.createVariableDeclaration(state.argumentsName, - /*type*/ undefined, ts.createIdentifier("arguments"))); + (extraVariableDeclarations || (extraVariableDeclarations = [])).push(factory.createVariableDeclaration(state.argumentsName, + /*exclamationToken*/ undefined, + /*type*/ undefined, factory.createIdentifier("arguments"))); } } if (state.thisName) { @@ -85278,8 +88060,9 @@ var ts; // NOTE: // if converted loops were all nested in arrow function then we'll always emit '_this' so convertedLoopState.thisName will not be set. // If it is set this means that all nested loops are not nested in arrow function and it is safe to capture 'this'. - (extraVariableDeclarations || (extraVariableDeclarations = [])).push(ts.createVariableDeclaration(state.thisName, - /*type*/ undefined, ts.createIdentifier("this"))); + (extraVariableDeclarations || (extraVariableDeclarations = [])).push(factory.createVariableDeclaration(state.thisName, + /*exclamationToken*/ undefined, + /*type*/ undefined, factory.createIdentifier("this"))); } } if (state.hoistedLocalVariables) { @@ -85295,7 +88078,7 @@ var ts; // hoist collected variable declarations for (var _i = 0, _a = state.hoistedLocalVariables; _i < _a.length; _i++) { var identifier = _a[_i]; - extraVariableDeclarations.push(ts.createVariableDeclaration(identifier)); + extraVariableDeclarations.push(factory.createVariableDeclaration(identifier)); } } } @@ -85306,23 +88089,23 @@ var ts; } for (var _b = 0, _c = state.loopOutParameters; _b < _c.length; _b++) { var outParam = _c[_b]; - extraVariableDeclarations.push(ts.createVariableDeclaration(outParam.outParamName)); + extraVariableDeclarations.push(factory.createVariableDeclaration(outParam.outParamName)); } } if (state.conditionVariable) { if (!extraVariableDeclarations) { extraVariableDeclarations = []; } - extraVariableDeclarations.push(ts.createVariableDeclaration(state.conditionVariable, /*type*/ undefined, ts.createFalse())); + extraVariableDeclarations.push(factory.createVariableDeclaration(state.conditionVariable, /*exclamationToken*/ undefined, /*type*/ undefined, factory.createFalse())); } // create variable statement to hold all introduced variable declarations if (extraVariableDeclarations) { - statements.push(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList(extraVariableDeclarations))); + statements.push(factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList(extraVariableDeclarations))); } } function createOutVariable(p) { - return ts.createVariableDeclaration(p.originalName, /*type*/ undefined, p.outParamName); + return factory.createVariableDeclaration(p.originalName, /*exclamationToken*/ undefined, /*type*/ undefined, p.outParamName); } /** * Creates a `_loop_init` function for a `ForStatement` with a block-scoped initializer @@ -85331,7 +88114,7 @@ var ts; * [13.7.4.8 RS: ForBodyEvaluation](https://tc39.github.io/ecma262/#sec-forbodyevaluation). */ function createFunctionForInitializerOfForStatement(node, currentState) { - var functionName = ts.createUniqueName("_loop_init"); + var functionName = factory.createUniqueName("_loop_init"); var containsYield = (node.initializer.transformFlags & 262144 /* ContainsYield */) !== 0; var emitFlags = 0 /* None */; if (currentState.containsLexicalThis) @@ -85339,7 +88122,7 @@ var ts; if (containsYield && hierarchyFacts & 4 /* AsyncFunctionBody */) emitFlags |= 262144 /* AsyncFunctionBody */; var statements = []; - statements.push(ts.createVariableStatement(/*modifiers*/ undefined, node.initializer)); + statements.push(factory.createVariableStatement(/*modifiers*/ undefined, node.initializer)); copyOutParameters(currentState.loopOutParameters, 2 /* Initializer */, 1 /* ToOutParameter */, statements); // This transforms the following ES2015 syntax: // @@ -85361,17 +88144,18 @@ var ts; // // Which prevents mutations to `i` in the per-iteration environment of the body // from affecting the initial value for `i` outside of the per-iteration environment. - var functionDeclaration = ts.createVariableStatement( - /*modifiers*/ undefined, ts.setEmitFlags(ts.createVariableDeclarationList([ - ts.createVariableDeclaration(functionName, - /*type*/ undefined, ts.setEmitFlags(ts.createFunctionExpression( - /*modifiers*/ undefined, containsYield ? ts.createToken(41 /* AsteriskToken */) : undefined, + var functionDeclaration = factory.createVariableStatement( + /*modifiers*/ undefined, ts.setEmitFlags(factory.createVariableDeclarationList([ + factory.createVariableDeclaration(functionName, + /*exclamationToken*/ undefined, + /*type*/ undefined, ts.setEmitFlags(factory.createFunctionExpression( + /*modifiers*/ undefined, containsYield ? factory.createToken(41 /* AsteriskToken */) : undefined, /*name*/ undefined, /*typeParameters*/ undefined, /*parameters*/ undefined, - /*type*/ undefined, ts.visitNode(ts.createBlock(statements, /*multiLine*/ true), visitor, ts.isBlock)), emitFlags)) + /*type*/ undefined, ts.visitNode(factory.createBlock(statements, /*multiLine*/ true), visitor, ts.isBlock)), emitFlags)) ]), 2097152 /* NoHoisting */)); - var part = ts.createVariableDeclarationList(ts.map(currentState.loopOutParameters, createOutVariable)); + var part = factory.createVariableDeclarationList(ts.map(currentState.loopOutParameters, createOutVariable)); return { functionName: functionName, containsYield: containsYield, functionDeclaration: functionDeclaration, part: part }; } /** @@ -85381,9 +88165,9 @@ var ts; * [13.7.4.8 RS: ForBodyEvaluation](https://tc39.github.io/ecma262/#sec-forbodyevaluation). */ function createFunctionForBodyOfIterationStatement(node, currentState, outerState) { - var functionName = ts.createUniqueName("_loop"); + var functionName = factory.createUniqueName("_loop"); startLexicalEnvironment(); - var statement = ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock); + var statement = ts.visitNode(node.statement, visitor, ts.isStatement, factory.liftToBlock); var lexicalEnvironment = endLexicalEnvironment(); var statements = []; if (shouldConvertConditionOfForStatement(node) || shouldConvertIncrementorOfForStatement(node)) { @@ -85424,10 +88208,15 @@ var ts; // environment that is carried over to the next iteration of the loop. As a result, // we must indicate whether this is the first evaluation of the loop body so that // we only evaluate the incrementor on subsequent evaluations. - currentState.conditionVariable = ts.createUniqueName("inc"); - statements.push(ts.createIf(currentState.conditionVariable, ts.createStatement(ts.visitNode(node.incrementor, visitor, ts.isExpression)), ts.createStatement(ts.createAssignment(currentState.conditionVariable, ts.createTrue())))); + currentState.conditionVariable = factory.createUniqueName("inc"); + if (node.incrementor) { + statements.push(factory.createIfStatement(currentState.conditionVariable, factory.createExpressionStatement(ts.visitNode(node.incrementor, visitor, ts.isExpression)), factory.createExpressionStatement(factory.createAssignment(currentState.conditionVariable, factory.createTrue())))); + } + else { + statements.push(factory.createIfStatement(factory.createLogicalNot(currentState.conditionVariable), factory.createExpressionStatement(factory.createAssignment(currentState.conditionVariable, factory.createTrue())))); + } if (shouldConvertConditionOfForStatement(node)) { - statements.push(ts.createIf(ts.createPrefix(53 /* ExclamationToken */, ts.visitNode(node.condition, visitor, ts.isExpression)), ts.visitNode(ts.createBreak(), visitor, ts.isStatement))); + statements.push(factory.createIfStatement(factory.createPrefixUnaryExpression(53 /* ExclamationToken */, ts.visitNode(node.condition, visitor, ts.isExpression)), ts.visitNode(factory.createBreakStatement(), visitor, ts.isStatement))); } } if (ts.isBlock(statement)) { @@ -85438,7 +88227,7 @@ var ts; } copyOutParameters(currentState.loopOutParameters, 1 /* Body */, 1 /* ToOutParameter */, statements); ts.insertStatementsAfterStandardPrologue(statements, lexicalEnvironment); - var loopBody = ts.createBlock(statements, /*multiLine*/ true); + var loopBody = factory.createBlock(statements, /*multiLine*/ true); if (ts.isBlock(statement)) ts.setOriginalNode(loopBody, statement); var containsYield = (node.statement.transformFlags & 262144 /* ContainsYield */) !== 0; @@ -85461,11 +88250,12 @@ var ts; // for (var i = 0; i < 2; i++) { // _loop_1(i); // } - var functionDeclaration = ts.createVariableStatement( - /*modifiers*/ undefined, ts.setEmitFlags(ts.createVariableDeclarationList([ - ts.createVariableDeclaration(functionName, - /*type*/ undefined, ts.setEmitFlags(ts.createFunctionExpression( - /*modifiers*/ undefined, containsYield ? ts.createToken(41 /* AsteriskToken */) : undefined, + var functionDeclaration = factory.createVariableStatement( + /*modifiers*/ undefined, ts.setEmitFlags(factory.createVariableDeclarationList([ + factory.createVariableDeclaration(functionName, + /*exclamationToken*/ undefined, + /*type*/ undefined, ts.setEmitFlags(factory.createFunctionExpression( + /*modifiers*/ undefined, containsYield ? factory.createToken(41 /* AsteriskToken */) : undefined, /*name*/ undefined, /*typeParameters*/ undefined, currentState.loopParameters, /*type*/ undefined, loopBody), emitFlags)) @@ -85476,22 +88266,22 @@ var ts; function copyOutParameter(outParam, copyDirection) { var source = copyDirection === 0 /* ToOriginal */ ? outParam.outParamName : outParam.originalName; var target = copyDirection === 0 /* ToOriginal */ ? outParam.originalName : outParam.outParamName; - return ts.createBinary(target, 62 /* EqualsToken */, source); + return factory.createBinaryExpression(target, 62 /* EqualsToken */, source); } function copyOutParameters(outParams, partFlags, copyDirection, statements) { for (var _i = 0, outParams_1 = outParams; _i < outParams_1.length; _i++) { var outParam = outParams_1[_i]; if (outParam.flags & partFlags) { - statements.push(ts.createExpressionStatement(copyOutParameter(outParam, copyDirection))); + statements.push(factory.createExpressionStatement(copyOutParameter(outParam, copyDirection))); } } } function generateCallToConvertedLoopInitializer(initFunctionExpressionName, containsYield) { - var call = ts.createCall(initFunctionExpressionName, /*typeArguments*/ undefined, []); + var call = factory.createCallExpression(initFunctionExpressionName, /*typeArguments*/ undefined, []); var callResult = containsYield - ? ts.createYield(ts.createToken(41 /* AsteriskToken */), ts.setEmitFlags(call, 8388608 /* Iterator */)) + ? factory.createYieldExpression(factory.createToken(41 /* AsteriskToken */), ts.setEmitFlags(call, 8388608 /* Iterator */)) : call; - return ts.createStatement(callResult); + return factory.createExpressionStatement(callResult); } function generateCallToConvertedLoop(loopFunctionExpressionName, state, outerState, containsYield) { var statements = []; @@ -85501,39 +88291,39 @@ var ts; var isSimpleLoop = !(state.nonLocalJumps & ~4 /* Continue */) && !state.labeledNonLocalBreaks && !state.labeledNonLocalContinues; - var call = ts.createCall(loopFunctionExpressionName, /*typeArguments*/ undefined, ts.map(state.loopParameters, function (p) { return p.name; })); + var call = factory.createCallExpression(loopFunctionExpressionName, /*typeArguments*/ undefined, ts.map(state.loopParameters, function (p) { return p.name; })); var callResult = containsYield - ? ts.createYield(ts.createToken(41 /* AsteriskToken */), ts.setEmitFlags(call, 8388608 /* Iterator */)) + ? factory.createYieldExpression(factory.createToken(41 /* AsteriskToken */), ts.setEmitFlags(call, 8388608 /* Iterator */)) : call; if (isSimpleLoop) { - statements.push(ts.createExpressionStatement(callResult)); + statements.push(factory.createExpressionStatement(callResult)); copyOutParameters(state.loopOutParameters, 1 /* Body */, 0 /* ToOriginal */, statements); } else { - var loopResultName = ts.createUniqueName("state"); - var stateVariable = ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(loopResultName, /*type*/ undefined, callResult)])); + var loopResultName = factory.createUniqueName("state"); + var stateVariable = factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList([factory.createVariableDeclaration(loopResultName, /*exclamationToken*/ undefined, /*type*/ undefined, callResult)])); statements.push(stateVariable); copyOutParameters(state.loopOutParameters, 1 /* Body */, 0 /* ToOriginal */, statements); if (state.nonLocalJumps & 8 /* Return */) { var returnStatement = void 0; if (outerState) { outerState.nonLocalJumps |= 8 /* Return */; - returnStatement = ts.createReturn(loopResultName); + returnStatement = factory.createReturnStatement(loopResultName); } else { - returnStatement = ts.createReturn(ts.createPropertyAccess(loopResultName, "value")); + returnStatement = factory.createReturnStatement(factory.createPropertyAccessExpression(loopResultName, "value")); } - statements.push(ts.createIf(ts.createBinary(ts.createTypeOf(loopResultName), 36 /* EqualsEqualsEqualsToken */, ts.createLiteral("object")), returnStatement)); + statements.push(factory.createIfStatement(factory.createTypeCheck(loopResultName, "object"), returnStatement)); } if (state.nonLocalJumps & 2 /* Break */) { - statements.push(ts.createIf(ts.createBinary(loopResultName, 36 /* EqualsEqualsEqualsToken */, ts.createLiteral("break")), ts.createBreak())); + statements.push(factory.createIfStatement(factory.createStrictEquality(loopResultName, factory.createStringLiteral("break")), factory.createBreakStatement())); } if (state.labeledNonLocalBreaks || state.labeledNonLocalContinues) { var caseClauses = []; processLabeledJumps(state.labeledNonLocalBreaks, /*isBreak*/ true, loopResultName, outerState, caseClauses); processLabeledJumps(state.labeledNonLocalContinues, /*isBreak*/ false, loopResultName, outerState, caseClauses); - statements.push(ts.createSwitch(loopResultName, ts.createCaseBlock(caseClauses))); + statements.push(factory.createSwitchStatement(loopResultName, factory.createCaseBlock(caseClauses))); } } return statements; @@ -85541,13 +88331,13 @@ var ts; function setLabeledJump(state, isBreak, labelText, labelMarker) { if (isBreak) { if (!state.labeledNonLocalBreaks) { - state.labeledNonLocalBreaks = ts.createMap(); + state.labeledNonLocalBreaks = new ts.Map(); } state.labeledNonLocalBreaks.set(labelText, labelMarker); } else { if (!state.labeledNonLocalContinues) { - state.labeledNonLocalContinues = ts.createMap(); + state.labeledNonLocalContinues = new ts.Map(); } state.labeledNonLocalContinues.set(labelText, labelMarker); } @@ -85562,14 +88352,14 @@ var ts; // then emit labeled break\continue // otherwise propagate pair 'label -> marker' to outer converted loop and emit 'return labelMarker' so outer loop can later decide what to do if (!outerLoop || (outerLoop.labels && outerLoop.labels.get(labelText))) { - var label = ts.createIdentifier(labelText); - statements.push(isBreak ? ts.createBreak(label) : ts.createContinue(label)); + var label = factory.createIdentifier(labelText); + statements.push(isBreak ? factory.createBreakStatement(label) : factory.createContinueStatement(label)); } else { setLabeledJump(outerLoop, isBreak, labelText, labelMarker); - statements.push(ts.createReturn(loopResultName)); + statements.push(factory.createReturnStatement(loopResultName)); } - caseClauses.push(ts.createCaseClause(ts.createLiteral(labelMarker), statements)); + caseClauses.push(factory.createCaseClause(factory.createStringLiteral(labelMarker), statements)); }); } function processLoopVariableDeclaration(container, decl, loopParameters, loopOutParameters, hasCapturedBindingsInForInitializer) { @@ -85583,10 +88373,10 @@ var ts; } } else { - loopParameters.push(ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name)); + loopParameters.push(factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name)); var checkFlags = resolver.getNodeCheckFlags(decl); if (checkFlags & 4194304 /* NeedsLoopOutParameter */ || hasCapturedBindingsInForInitializer) { - var outParamName = ts.createUniqueName("out_" + ts.idText(name)); + var outParamName = factory.createUniqueName("out_" + ts.idText(name)); var flags = 0; if (checkFlags & 4194304 /* NeedsLoopOutParameter */) { flags |= 1 /* Body */; @@ -85613,20 +88403,20 @@ var ts; for (var i = start; i < numProperties; i++) { var property = properties[i]; switch (property.kind) { - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: var accessors = ts.getAllAccessorDeclarations(node.properties, property); if (property === accessors.firstAccessor) { expressions.push(transformAccessorsToExpression(receiver, accessors, node, !!node.multiLine)); } break; - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node, node.multiLine)); break; - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine)); break; - case 282 /* ShorthandPropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine)); break; default: @@ -85643,7 +88433,7 @@ var ts; * @param receiver The receiver for the assignment. */ function transformPropertyAssignmentToExpression(property, receiver, startsOnNewLine) { - var expression = ts.createAssignment(ts.createMemberAccessForPropertyName(receiver, ts.visitNode(property.name, visitor, ts.isPropertyName)), ts.visitNode(property.initializer, visitor, ts.isExpression)); + var expression = factory.createAssignment(ts.createMemberAccessForPropertyName(factory, receiver, ts.visitNode(property.name, visitor, ts.isPropertyName)), ts.visitNode(property.initializer, visitor, ts.isExpression)); ts.setTextRange(expression, property); if (startsOnNewLine) { ts.startOnNewLine(expression); @@ -85658,7 +88448,7 @@ var ts; * @param receiver The receiver for the assignment. */ function transformShorthandPropertyAssignmentToExpression(property, receiver, startsOnNewLine) { - var expression = ts.createAssignment(ts.createMemberAccessForPropertyName(receiver, ts.visitNode(property.name, visitor, ts.isPropertyName)), ts.getSynthesizedClone(property.name)); + var expression = factory.createAssignment(ts.createMemberAccessForPropertyName(factory, receiver, ts.visitNode(property.name, visitor, ts.isPropertyName)), factory.cloneNode(property.name)); ts.setTextRange(expression, property); if (startsOnNewLine) { ts.startOnNewLine(expression); @@ -85673,7 +88463,7 @@ var ts; * @param receiver The receiver for the assignment. */ function transformObjectLiteralMethodDeclarationToExpression(method, receiver, container, startsOnNewLine) { - var expression = ts.createAssignment(ts.createMemberAccessForPropertyName(receiver, ts.visitNode(method.name, visitor, ts.isPropertyName)), transformFunctionLikeToExpression(method, /*location*/ method, /*name*/ undefined, container)); + var expression = factory.createAssignment(ts.createMemberAccessForPropertyName(factory, receiver, ts.visitNode(method.name, visitor, ts.isPropertyName)), transformFunctionLikeToExpression(method, /*location*/ method, /*name*/ undefined, container)); ts.setTextRange(expression, method); if (startsOnNewLine) { ts.startOnNewLine(expression); @@ -85685,14 +88475,14 @@ var ts; var updated; ts.Debug.assert(!!node.variableDeclaration, "Catch clause variable should always be present when downleveling ES2015."); if (ts.isBindingPattern(node.variableDeclaration.name)) { - var temp = ts.createTempVariable(/*recordTempVariable*/ undefined); - var newVariableDeclaration = ts.createVariableDeclaration(temp); + var temp = factory.createTempVariable(/*recordTempVariable*/ undefined); + var newVariableDeclaration = factory.createVariableDeclaration(temp); ts.setTextRange(newVariableDeclaration, node.variableDeclaration); var vars = ts.flattenDestructuringBinding(node.variableDeclaration, visitor, context, 0 /* All */, temp); - var list = ts.createVariableDeclarationList(vars); + var list = factory.createVariableDeclarationList(vars); ts.setTextRange(list, node.variableDeclaration); - var destructure = ts.createVariableStatement(/*modifiers*/ undefined, list); - updated = ts.updateCatchClause(node, newVariableDeclaration, addStatementToStartOfBlock(node.block, destructure)); + var destructure = factory.createVariableStatement(/*modifiers*/ undefined, list); + updated = factory.updateCatchClause(node, newVariableDeclaration, addStatementToStartOfBlock(node.block, destructure)); } else { updated = ts.visitEachChild(node, visitor, context); @@ -85702,7 +88492,7 @@ var ts; } function addStatementToStartOfBlock(block, statement) { var transformedStatements = ts.visitNodes(block.statements, visitor, ts.isStatement); - return ts.updateBlock(block, __spreadArrays([statement], transformedStatements)); + return factory.updateBlock(block, __spreadArrays([statement], transformedStatements)); } /** * Visits a MethodDeclaration of an ObjectLiteralExpression and transforms it into a @@ -85717,7 +88507,7 @@ var ts; ts.Debug.assert(!ts.isComputedPropertyName(node.name)); var functionExpression = transformFunctionLikeToExpression(node, /*location*/ ts.moveRangePos(node, -1), /*name*/ undefined, /*container*/ undefined); ts.setEmitFlags(functionExpression, 512 /* NoLeadingComments */ | ts.getEmitFlags(functionExpression)); - return ts.setTextRange(ts.createPropertyAssignment(node.name, functionExpression), + return ts.setTextRange(factory.createPropertyAssignment(node.name, functionExpression), /*location*/ node); } /** @@ -85733,11 +88523,11 @@ var ts; var updated; var parameters = ts.visitParameterList(node.parameters, visitor, context); var body = transformFunctionBody(node); - if (node.kind === 163 /* GetAccessor */) { - updated = ts.updateGetAccessor(node, node.decorators, node.modifiers, node.name, parameters, node.type, body); + if (node.kind === 166 /* GetAccessor */) { + updated = factory.updateGetAccessorDeclaration(node, node.decorators, node.modifiers, node.name, parameters, node.type, body); } else { - updated = ts.updateSetAccessor(node, node.decorators, node.modifiers, node.name, parameters, body); + updated = factory.updateSetAccessorDeclaration(node, node.decorators, node.modifiers, node.name, parameters, body); } exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */); convertedLoopState = savedConvertedLoopState; @@ -85749,7 +88539,7 @@ var ts; * @param node A ShorthandPropertyAssignment node. */ function visitShorthandPropertyAssignment(node) { - return ts.setTextRange(ts.createPropertyAssignment(node.name, ts.getSynthesizedClone(node.name)), + return ts.setTextRange(factory.createPropertyAssignment(node.name, visitIdentifier(factory.cloneNode(node.name))), /*location*/ node); } function visitComputedPropertyName(node) { @@ -85786,12 +88576,12 @@ var ts; return visitTypeScriptClassWrapper(node); } var expression = ts.skipOuterExpressions(node.expression); - if (expression.kind === 102 /* SuperKeyword */ || + if (expression.kind === 105 /* SuperKeyword */ || ts.isSuperProperty(expression) || ts.some(node.arguments, ts.isSpreadElement)) { return visitCallExpressionWithPotentialCapturedThisAssignment(node, /*assignToCapturedThis*/ true); } - return ts.updateCall(node, ts.visitNode(node.expression, callExpressionVisitor, ts.isExpression), + return factory.updateCallExpression(node, ts.visitNode(node.expression, callExpressionVisitor, ts.isExpression), /*typeArguments*/ undefined, ts.visitNodes(node.arguments, visitor, ts.isExpression)); } function visitTypeScriptClassWrapper(node) { @@ -85878,7 +88668,7 @@ var ts; statements.push(funcStatements[classBodyStart]); classBodyStart++; // Add the class alias following the declaration. - statements.push(ts.createExpressionStatement(ts.createAssignment(aliasAssignment.left, ts.cast(variable.name, ts.isIdentifier)))); + statements.push(factory.createExpressionStatement(factory.createAssignment(aliasAssignment.left, ts.cast(variable.name, ts.isIdentifier)))); } // Find the trailing 'return' statement (4) while (!ts.isReturnStatement(ts.elementAt(funcStatements, classBodyEnd))) { @@ -85899,12 +88689,12 @@ var ts; ts.addRange(statements, classStatements, /*start*/ 1); // Recreate any outer parentheses or partially-emitted expressions to preserve source map // and comment locations. - return ts.recreateOuterExpressions(node.expression, ts.recreateOuterExpressions(variable.initializer, ts.recreateOuterExpressions(aliasAssignment && aliasAssignment.right, ts.updateCall(call, ts.recreateOuterExpressions(call.expression, ts.updateFunctionExpression(func, + return factory.restoreOuterExpressions(node.expression, factory.restoreOuterExpressions(variable.initializer, factory.restoreOuterExpressions(aliasAssignment && aliasAssignment.right, factory.updateCallExpression(call, factory.restoreOuterExpressions(call.expression, factory.updateFunctionExpression(func, /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, /*typeParameters*/ undefined, func.parameters, - /*type*/ undefined, ts.updateBlock(func.body, statements))), + /*type*/ undefined, factory.updateBlock(func.body, statements))), /*typeArguments*/ undefined, call.arguments)))); } function visitImmediateSuperCallInBody(node) { @@ -85914,10 +88704,10 @@ var ts; // We are here either because SuperKeyword was used somewhere in the expression, or // because we contain a SpreadElementExpression. if (node.transformFlags & 8192 /* ContainsRestOrSpread */ || - node.expression.kind === 102 /* SuperKeyword */ || + node.expression.kind === 105 /* SuperKeyword */ || ts.isSuperProperty(ts.skipOuterExpressions(node.expression))) { - var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg; - if (node.expression.kind === 102 /* SuperKeyword */) { + var _a = factory.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg; + if (node.expression.kind === 105 /* SuperKeyword */) { ts.setEmitFlags(thisArg, 4 /* NoSubstitution */); } var resultingCall = void 0; @@ -85935,7 +88725,7 @@ var ts; // _super.apply(this, a.concat([b])) // _super.m.apply(this, a.concat([b])) // _super.prototype.m.apply(this, a.concat([b])) - resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 102 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false)); + resultingCall = factory.createFunctionApplyCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 105 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false)); } else { // [source] @@ -85947,13 +88737,12 @@ var ts; // _super.call(this, a) // _super.m.call(this, a) // _super.prototype.m.call(this, a) - resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 102 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), - /*location*/ node); + resultingCall = ts.setTextRange(factory.createFunctionCallCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 105 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression)), node); } - if (node.expression.kind === 102 /* SuperKeyword */) { - var initializer = ts.createLogicalOr(resultingCall, createActualThis()); + if (node.expression.kind === 105 /* SuperKeyword */) { + var initializer = factory.createLogicalOr(resultingCall, createActualThis()); resultingCall = assignToCapturedThis - ? ts.createAssignment(ts.createFileLevelUniqueName("_this"), initializer) + ? factory.createAssignment(factory.createUniqueName("_this", 16 /* Optimistic */ | 32 /* FileLevel */), initializer) : initializer; } return ts.setOriginalNode(resultingCall, node); @@ -85973,8 +88762,8 @@ var ts; // // [output] // new ((_a = C).bind.apply(_a, [void 0].concat(a)))() - var _a = ts.createCallBinding(ts.createPropertyAccess(node.expression, "bind"), hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg; - return ts.createNew(ts.createFunctionApply(ts.visitNode(target, visitor, ts.isExpression), thisArg, transformAndSpreadElements(ts.createNodeArray(__spreadArrays([ts.createVoidZero()], node.arguments)), /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false)), + var _a = factory.createCallBinding(factory.createPropertyAccessExpression(node.expression, "bind"), hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg; + return factory.createNewExpression(factory.createFunctionApplyCall(ts.visitNode(target, visitor, ts.isExpression), thisArg, transformAndSpreadElements(factory.createNodeArray(__spreadArrays([factory.createVoidZero()], node.arguments)), /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false)), /*typeArguments*/ undefined, []); } return ts.visitEachChild(node, visitor, context); @@ -86008,7 +88797,7 @@ var ts; return segments[0]; } } - return ts.createSpreadHelper(context, segments); + return emitHelpers().createSpreadHelper(segments); } else { if (segments.length === 1) { @@ -86019,7 +88808,7 @@ var ts; return segments[0]; } } - return ts.createSpreadArraysHelper(context, segments); + return emitHelpers().createSpreadArraysHelper(segments); } } function isPackedElement(node) { @@ -86043,7 +88832,7 @@ var ts; return ts.map(chunk, visitExpressionOfSpread); } function visitSpanOfNonSpreads(chunk, multiLine, hasTrailingComma) { - return ts.createArrayLiteral(ts.visitNodes(ts.createNodeArray(chunk, hasTrailingComma), visitor, ts.isExpression), multiLine); + return factory.createArrayLiteralExpression(ts.visitNodes(factory.createNodeArray(chunk, hasTrailingComma), visitor, ts.isExpression), multiLine); } function visitSpreadElement(node) { return ts.visitNode(node.expression, visitor, ts.isExpression); @@ -86062,7 +88851,7 @@ var ts; * @param node A template literal. */ function visitTemplateLiteral(node) { - return ts.setTextRange(ts.createLiteral(node.text), node); + return ts.setTextRange(factory.createStringLiteral(node.text), node); } /** * Visits a string literal with an extended unicode escape. @@ -86071,7 +88860,7 @@ var ts; */ function visitStringLiteral(node) { if (node.hasExtendedUnicodeEscape) { - return ts.setTextRange(ts.createLiteral(node.text), node); + return ts.setTextRange(factory.createStringLiteral(node.text), node); } return node; } @@ -86082,7 +88871,7 @@ var ts; */ function visitNumericLiteral(node) { if (node.numericLiteralFlags & 384 /* BinaryOrOctalSpecifier */) { - return ts.setTextRange(ts.createNumericLiteral(node.text), node); + return ts.setTextRange(factory.createNumericLiteral(node.text), node); } return node; } @@ -86112,10 +88901,9 @@ var ts; // ("abc" + 1) << (2 + "") // rather than // "abc" + (1 << 2) + "" - var expression = ts.reduceLeft(expressions, ts.createAdd); + var expression = ts.reduceLeft(expressions, factory.createAdd); if (ts.nodeIsSynthesized(expression)) { - expression.pos = node.pos; - expression.end = node.end; + ts.setTextRange(expression, node); } return expression; } @@ -86153,7 +88941,7 @@ var ts; if (!shouldAddTemplateHead(node)) { return; } - expressions.push(ts.createLiteral(node.head.text)); + expressions.push(factory.createStringLiteral(node.head.text)); } /** * Visits and adds the template spans of a TemplateExpression to an array of expressions. @@ -86170,7 +88958,7 @@ var ts; // with the head will force the result up to this point to be a string. // Emitting a '+ ""' has no semantic effect for middles and tails. if (span.literal.text.length !== 0) { - expressions.push(ts.createLiteral(span.literal.text)); + expressions.push(factory.createStringLiteral(span.literal.text)); } } } @@ -86178,13 +88966,15 @@ var ts; * Visits the `super` keyword */ function visitSuperKeyword(isExpressionOfCall) { - return hierarchyFacts & 8 /* NonStaticClassElement */ && !isExpressionOfCall ? ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), "prototype") : - ts.createFileLevelUniqueName("_super"); + return hierarchyFacts & 8 /* NonStaticClassElement */ + && !isExpressionOfCall + ? factory.createPropertyAccessExpression(factory.createUniqueName("_super", 16 /* Optimistic */ | 32 /* FileLevel */), "prototype") + : factory.createUniqueName("_super", 16 /* Optimistic */ | 32 /* FileLevel */); } function visitMetaProperty(node) { - if (node.keywordToken === 99 /* NewKeyword */ && node.name.escapedText === "target") { + if (node.keywordToken === 102 /* NewKeyword */ && node.name.escapedText === "target") { hierarchyFacts |= 16384 /* NewTarget */; - return ts.createFileLevelUniqueName("_newTarget"); + return factory.createUniqueName("_newTarget", 16 /* Optimistic */ | 32 /* FileLevel */); } return node; } @@ -86214,7 +89004,7 @@ var ts; function enableSubstitutionsForBlockScopedBindings() { if ((enabledSubstitutions & 2 /* BlockScopedBindings */) === 0) { enabledSubstitutions |= 2 /* BlockScopedBindings */; - context.enableSubstitution(75 /* Identifier */); + context.enableSubstitution(78 /* Identifier */); } } /** @@ -86224,14 +89014,14 @@ var ts; function enableSubstitutionsForCapturedThis() { if ((enabledSubstitutions & 1 /* CapturedThis */) === 0) { enabledSubstitutions |= 1 /* CapturedThis */; - context.enableSubstitution(104 /* ThisKeyword */); - context.enableEmitNotification(162 /* Constructor */); - context.enableEmitNotification(161 /* MethodDeclaration */); - context.enableEmitNotification(163 /* GetAccessor */); - context.enableEmitNotification(164 /* SetAccessor */); - context.enableEmitNotification(202 /* ArrowFunction */); - context.enableEmitNotification(201 /* FunctionExpression */); - context.enableEmitNotification(244 /* FunctionDeclaration */); + context.enableSubstitution(107 /* ThisKeyword */); + context.enableEmitNotification(165 /* Constructor */); + context.enableEmitNotification(164 /* MethodDeclaration */); + context.enableEmitNotification(166 /* GetAccessor */); + context.enableEmitNotification(167 /* SetAccessor */); + context.enableEmitNotification(206 /* ArrowFunction */); + context.enableEmitNotification(205 /* FunctionExpression */); + context.enableEmitNotification(248 /* FunctionDeclaration */); } } /** @@ -86259,7 +89049,7 @@ var ts; if (enabledSubstitutions & 2 /* BlockScopedBindings */ && !ts.isInternalName(node)) { var original = ts.getParseTreeNode(node, ts.isIdentifier); if (original && isNameOfDeclarationWithCollidingName(original)) { - return ts.setTextRange(ts.getGeneratedNameForNode(original), node); + return ts.setTextRange(factory.getGeneratedNameForNode(original), node); } } return node; @@ -86272,10 +89062,10 @@ var ts; */ function isNameOfDeclarationWithCollidingName(node) { switch (node.parent.kind) { - case 191 /* BindingElement */: - case 245 /* ClassDeclaration */: - case 248 /* EnumDeclaration */: - case 242 /* VariableDeclaration */: + case 195 /* BindingElement */: + case 249 /* ClassDeclaration */: + case 252 /* EnumDeclaration */: + case 246 /* VariableDeclaration */: return node.parent.name === node && resolver.isDeclarationWithCollidingName(node.parent); } @@ -86288,9 +89078,9 @@ var ts; */ function substituteExpression(node) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return substituteExpressionIdentifier(node); - case 104 /* ThisKeyword */: + case 107 /* ThisKeyword */: return substituteThisKeyword(node); } return node; @@ -86304,7 +89094,7 @@ var ts; if (enabledSubstitutions & 2 /* BlockScopedBindings */ && !ts.isInternalName(node)) { var declaration = resolver.getReferencedDeclarationWithCollidingName(node); if (declaration && !(ts.isClassLike(declaration) && isPartOfClassBody(declaration, node))) { - return ts.setTextRange(ts.getGeneratedNameForNode(ts.getNameOfDeclaration(declaration)), node); + return ts.setTextRange(factory.getGeneratedNameForNode(ts.getNameOfDeclaration(declaration)), node); } } return node; @@ -86340,14 +89130,14 @@ var ts; function substituteThisKeyword(node) { if (enabledSubstitutions & 1 /* CapturedThis */ && hierarchyFacts & 16 /* CapturesThis */) { - return ts.setTextRange(ts.createFileLevelUniqueName("_this"), node); + return ts.setTextRange(factory.createUniqueName("_this", 16 /* Optimistic */ | 32 /* FileLevel */), node); } return node; } function getClassMemberPrefix(node, member) { - return ts.hasModifier(member, 32 /* Static */) - ? ts.getInternalName(node) - : ts.createPropertyAccess(ts.getInternalName(node), "prototype"); + return ts.hasSyntacticModifier(member, 32 /* Static */) + ? factory.getInternalName(node) + : factory.createPropertyAccessExpression(factory.getInternalName(node), "prototype"); } function hasSynthesizedDefaultSuperCall(constructor, hasExtendsClause) { if (!constructor || !hasExtendsClause) { @@ -86357,19 +89147,19 @@ var ts; return false; } var statement = ts.firstOrUndefined(constructor.body.statements); - if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 226 /* ExpressionStatement */) { + if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 230 /* ExpressionStatement */) { return false; } var statementExpression = statement.expression; - if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 196 /* CallExpression */) { + if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 200 /* CallExpression */) { return false; } var callTarget = statementExpression.expression; - if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 102 /* SuperKeyword */) { + if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 105 /* SuperKeyword */) { return false; } var callArgument = ts.singleOrUndefined(statementExpression.arguments); - if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 213 /* SpreadElement */) { + if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 217 /* SpreadElement */) { return false; } var expression = callArgument.expression; @@ -86377,21 +89167,6 @@ var ts; } } ts.transformES2015 = transformES2015; - function createExtendsHelper(context, name) { - context.requestEmitHelper(ts.extendsHelper); - return ts.createCall(ts.getUnscopedHelperName("__extends"), - /*typeArguments*/ undefined, [ - name, - ts.createFileLevelUniqueName("_super") - ]); - } - ts.extendsHelper = { - name: "typescript:extends", - importName: "__extends", - scoped: false, - priority: 0, - text: "\n var __extends = (this && this.__extends) || (function () {\n var extendStatics = function (d, b) {\n extendStatics = Object.setPrototypeOf ||\n ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||\n function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };\n return extendStatics(d, b);\n };\n\n return function (d, b) {\n extendStatics(d, b);\n function __() { this.constructor = d; }\n d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n };\n })();" - }; })(ts || (ts = {})); /*@internal*/ var ts; @@ -86402,6 +89177,7 @@ var ts; * @param context Context and state information for the transformation. */ function transformES5(context) { + var factory = context.factory; var compilerOptions = context.getCompilerOptions(); // enable emit notification only if using --jsx preserve or react-native var previousOnEmitNode; @@ -86409,16 +89185,16 @@ var ts; if (compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */) { previousOnEmitNode = context.onEmitNode; context.onEmitNode = onEmitNode; - context.enableEmitNotification(268 /* JsxOpeningElement */); - context.enableEmitNotification(269 /* JsxClosingElement */); - context.enableEmitNotification(267 /* JsxSelfClosingElement */); + context.enableEmitNotification(272 /* JsxOpeningElement */); + context.enableEmitNotification(273 /* JsxClosingElement */); + context.enableEmitNotification(271 /* JsxSelfClosingElement */); noSubstitution = []; } var previousOnSubstituteNode = context.onSubstituteNode; context.onSubstituteNode = onSubstituteNode; - context.enableSubstitution(194 /* PropertyAccessExpression */); - context.enableSubstitution(281 /* PropertyAssignment */); - return ts.chainBundle(transformSourceFile); + context.enableSubstitution(198 /* PropertyAccessExpression */); + context.enableSubstitution(285 /* PropertyAssignment */); + return ts.chainBundle(context, transformSourceFile); /** * Transforms an ES5 source file to ES3. * @@ -86436,9 +89212,9 @@ var ts; */ function onEmitNode(hint, node, emitCallback) { switch (node.kind) { - case 268 /* JsxOpeningElement */: - case 269 /* JsxClosingElement */: - case 267 /* JsxSelfClosingElement */: + case 272 /* JsxOpeningElement */: + case 273 /* JsxClosingElement */: + case 271 /* JsxSelfClosingElement */: var tagName = node.tagName; noSubstitution[ts.getOriginalNodeId(tagName)] = true; break; @@ -86475,7 +89251,7 @@ var ts; } var literalName = trySubstituteReservedName(node.name); if (literalName) { - return ts.setTextRange(ts.createElementAccess(node.expression, literalName), node); + return ts.setTextRange(factory.createElementAccessExpression(node.expression, literalName), node); } return node; } @@ -86487,7 +89263,7 @@ var ts; function substitutePropertyAssignment(node) { var literalName = ts.isIdentifier(node.name) && trySubstituteReservedName(node.name); if (literalName) { - return ts.updatePropertyAssignment(node, literalName, node.initializer); + return factory.updatePropertyAssignment(node, literalName, node.initializer); } return node; } @@ -86498,8 +89274,8 @@ var ts; */ function trySubstituteReservedName(name) { var token = name.originalKeywordKind || (ts.nodeIsSynthesized(name) ? ts.stringToToken(ts.idText(name)) : undefined); - if (token !== undefined && token >= 77 /* FirstReservedWord */ && token <= 112 /* LastReservedWord */) { - return ts.setTextRange(ts.createLiteral(name), name); + if (token !== undefined && token >= 80 /* FirstReservedWord */ && token <= 115 /* LastReservedWord */) { + return ts.setTextRange(factory.createStringLiteralFromNode(name), name); } return undefined; } @@ -86687,7 +89463,7 @@ var ts; } } function transformGenerators(context) { - var resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistFunctionDeclaration = context.hoistFunctionDeclaration, hoistVariableDeclaration = context.hoistVariableDeclaration; + var factory = context.factory, emitHelpers = context.getEmitHelperFactory, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistFunctionDeclaration = context.hoistFunctionDeclaration, hoistVariableDeclaration = context.hoistVariableDeclaration; var compilerOptions = context.getCompilerOptions(); var languageVersion = ts.getEmitScriptTarget(compilerOptions); var resolver = context.getEmitResolver(); @@ -86734,7 +89510,7 @@ var ts; var exceptionBlockStack; // A stack of containing exception blocks. var currentExceptionBlock; // The current exception block. var withBlockStack; // A stack containing `with` blocks. - return ts.chainBundle(transformSourceFile); + return ts.chainBundle(context, transformSourceFile); function transformSourceFile(node) { if (node.isDeclarationFile || (node.transformFlags & 512 /* ContainsGenerator */) === 0) { return node; @@ -86773,13 +89549,13 @@ var ts; */ function visitJavaScriptInStatementContainingYield(node) { switch (node.kind) { - case 228 /* DoStatement */: + case 232 /* DoStatement */: return visitDoStatement(node); - case 229 /* WhileStatement */: + case 233 /* WhileStatement */: return visitWhileStatement(node); - case 237 /* SwitchStatement */: + case 241 /* SwitchStatement */: return visitSwitchStatement(node); - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: return visitLabeledStatement(node); default: return visitJavaScriptInGeneratorFunctionBody(node); @@ -86792,24 +89568,24 @@ var ts; */ function visitJavaScriptInGeneratorFunctionBody(node) { switch (node.kind) { - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: return visitFunctionDeclaration(node); - case 201 /* FunctionExpression */: + case 205 /* FunctionExpression */: return visitFunctionExpression(node); - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return visitAccessorDeclaration(node); - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: return visitVariableStatement(node); - case 230 /* ForStatement */: + case 234 /* ForStatement */: return visitForStatement(node); - case 231 /* ForInStatement */: + case 235 /* ForInStatement */: return visitForInStatement(node); - case 234 /* BreakStatement */: + case 238 /* BreakStatement */: return visitBreakStatement(node); - case 233 /* ContinueStatement */: + case 237 /* ContinueStatement */: return visitContinueStatement(node); - case 235 /* ReturnStatement */: + case 239 /* ReturnStatement */: return visitReturnStatement(node); default: if (node.transformFlags & 262144 /* ContainsYield */) { @@ -86830,21 +89606,21 @@ var ts; */ function visitJavaScriptContainingYield(node) { switch (node.kind) { - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return visitBinaryExpression(node); - case 210 /* ConditionalExpression */: + case 214 /* ConditionalExpression */: return visitConditionalExpression(node); - case 212 /* YieldExpression */: + case 216 /* YieldExpression */: return visitYieldExpression(node); - case 192 /* ArrayLiteralExpression */: + case 196 /* ArrayLiteralExpression */: return visitArrayLiteralExpression(node); - case 193 /* ObjectLiteralExpression */: + case 197 /* ObjectLiteralExpression */: return visitObjectLiteralExpression(node); - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: return visitElementAccessExpression(node); - case 196 /* CallExpression */: + case 200 /* CallExpression */: return visitCallExpression(node); - case 197 /* NewExpression */: + case 201 /* NewExpression */: return visitNewExpression(node); default: return ts.visitEachChild(node, visitor, context); @@ -86857,9 +89633,9 @@ var ts; */ function visitGenerator(node) { switch (node.kind) { - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: return visitFunctionDeclaration(node); - case 201 /* FunctionExpression */: + case 205 /* FunctionExpression */: return visitFunctionExpression(node); default: return ts.Debug.failBadSyntaxKind(node); @@ -86877,7 +89653,7 @@ var ts; function visitFunctionDeclaration(node) { // Currently, we only support generators that were originally async functions. if (node.asteriskToken) { - node = ts.setOriginalNode(ts.setTextRange(ts.createFunctionDeclaration( + node = ts.setOriginalNode(ts.setTextRange(factory.createFunctionDeclaration( /*decorators*/ undefined, node.modifiers, /*asteriskToken*/ undefined, node.name, /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), @@ -86915,7 +89691,7 @@ var ts; function visitFunctionExpression(node) { // Currently, we only support generators that were originally async functions. if (node.asteriskToken) { - node = ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression( + node = ts.setOriginalNode(ts.setTextRange(factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, node.name, /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), @@ -86985,14 +89761,14 @@ var ts; operations = undefined; operationArguments = undefined; operationLocations = undefined; - state = ts.createTempVariable(/*recordTempVariable*/ undefined); + state = factory.createTempVariable(/*recordTempVariable*/ undefined); // Build the generator resumeLexicalEnvironment(); - var statementOffset = ts.addPrologue(statements, body.statements, /*ensureUseStrict*/ false, visitor); + var statementOffset = factory.copyPrologue(body.statements, statements, /*ensureUseStrict*/ false, visitor); transformAndEmitStatements(body.statements, statementOffset); var buildResult = build(); ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment()); - statements.push(ts.createReturn(buildResult)); + statements.push(factory.createReturnStatement(buildResult)); // Restore previous generator state inGeneratorFunctionBody = savedInGeneratorFunctionBody; inStatementContainingYield = savedInStatementContainingYield; @@ -87007,7 +89783,7 @@ var ts; operationArguments = savedOperationArguments; operationLocations = savedOperationLocations; state = savedState; - return ts.setTextRange(ts.createBlock(statements, body.multiLine), body); + return ts.setTextRange(factory.createBlock(statements, body.multiLine), body); } /** * Visits a variable statement. @@ -87035,7 +89811,7 @@ var ts; if (variables.length === 0) { return undefined; } - return ts.setSourceMapRange(ts.createExpressionStatement(ts.inlineExpressions(ts.map(variables, transformInitializedVariable))), node); + return ts.setSourceMapRange(factory.createExpressionStatement(factory.inlineExpressions(ts.map(variables, transformInitializedVariable))), node); } } /** @@ -87067,7 +89843,7 @@ var ts; if (containsYield(right)) { var target = void 0; switch (left.kind) { - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: // [source] // a.b = yield; // @@ -87077,9 +89853,9 @@ var ts; // .yield resumeLabel // .mark resumeLabel // _a.b = %sent%; - target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name); + target = factory.updatePropertyAccessExpression(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name); break; - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: // [source] // a[b] = yield; // @@ -87090,7 +89866,7 @@ var ts; // .yield resumeLabel // .mark resumeLabel // _a[_b] = %sent%; - target = ts.updateElementAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), cacheExpression(ts.visitNode(left.argumentExpression, visitor, ts.isExpression))); + target = factory.updateElementAccessExpression(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), cacheExpression(ts.visitNode(left.argumentExpression, visitor, ts.isExpression))); break; default: target = ts.visitNode(left, visitor, ts.isExpression); @@ -87098,10 +89874,10 @@ var ts; } var operator = node.operatorToken.kind; if (ts.isCompoundAssignment(operator)) { - return ts.setTextRange(ts.createAssignment(target, ts.setTextRange(ts.createBinary(cacheExpression(target), ts.getNonAssignmentOperatorForCompoundAssignment(operator), ts.visitNode(right, visitor, ts.isExpression)), node)), node); + return ts.setTextRange(factory.createAssignment(target, ts.setTextRange(factory.createBinaryExpression(cacheExpression(target), ts.getNonAssignmentOperatorForCompoundAssignment(operator), ts.visitNode(right, visitor, ts.isExpression)), node)), node); } else { - return ts.updateBinary(node, target, ts.visitNode(right, visitor, ts.isExpression)); + return factory.updateBinaryExpression(node, target, node.operatorToken, ts.visitNode(right, visitor, ts.isExpression)); } } return ts.visitEachChild(node, visitor, context); @@ -87122,10 +89898,7 @@ var ts; // _a = a(); // .yield resumeLabel // _a + %sent% + c() - var clone_6 = ts.getMutableClone(node); - clone_6.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression)); - clone_6.right = ts.visitNode(node.right, visitor, ts.isExpression); - return clone_6; + return factory.updateBinaryExpression(node, cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression)), node.operatorToken, ts.visitNode(node.right, visitor, ts.isExpression)); } return ts.visitEachChild(node, visitor, context); } @@ -87195,7 +89968,7 @@ var ts; var pendingExpressions = []; visit(node.left); visit(node.right); - return ts.inlineExpressions(pendingExpressions); + return factory.inlineExpressions(pendingExpressions); function visit(node) { if (ts.isBinaryExpression(node) && node.operatorToken.kind === 27 /* CommaToken */) { visit(node.left); @@ -87203,7 +89976,7 @@ var ts; } else { if (containsYield(node) && pendingExpressions.length > 0) { - emitWorker(1 /* Statement */, [ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions))]); + emitWorker(1 /* Statement */, [factory.createExpressionStatement(factory.inlineExpressions(pendingExpressions))]); pendingExpressions = []; } pendingExpressions.push(ts.visitNode(node, visitor, ts.isExpression)); @@ -87263,8 +90036,9 @@ var ts; var resumeLabel = defineLabel(); var expression = ts.visitNode(node.expression, visitor, ts.isExpression); if (node.asteriskToken) { + // NOTE: `expression` must be defined for `yield*`. var iterator = (ts.getEmitFlags(node.expression) & 8388608 /* Iterator */) === 0 - ? ts.createValuesHelper(context, expression, /*location*/ node) + ? ts.setTextRange(emitHelpers().createValuesHelper(expression), node) : expression; emitYieldStar(iterator, /*location*/ node); } @@ -87304,14 +90078,14 @@ var ts; if (numInitialElements > 0) { temp = declareLocal(); var initialElements = ts.visitNodes(elements, visitor, ts.isExpression, 0, numInitialElements); - emitAssignment(temp, ts.createArrayLiteral(leadingElement + emitAssignment(temp, factory.createArrayLiteralExpression(leadingElement ? __spreadArrays([leadingElement], initialElements) : initialElements)); leadingElement = undefined; } var expressions = ts.reduceLeft(elements, reduceElement, [], numInitialElements); return temp - ? ts.createArrayConcat(temp, [ts.createArrayLiteral(expressions, multiLine)]) - : ts.setTextRange(ts.createArrayLiteral(leadingElement ? __spreadArrays([leadingElement], expressions) : expressions, multiLine), location); + ? factory.createArrayConcatCall(temp, [factory.createArrayLiteralExpression(expressions, multiLine)]) + : ts.setTextRange(factory.createArrayLiteralExpression(leadingElement ? __spreadArrays([leadingElement], expressions) : expressions, multiLine), location); function reduceElement(expressions, element) { if (containsYield(element) && expressions.length > 0) { var hasAssignedTemp = temp !== undefined; @@ -87319,8 +90093,8 @@ var ts; temp = declareLocal(); } emitAssignment(temp, hasAssignedTemp - ? ts.createArrayConcat(temp, [ts.createArrayLiteral(expressions, multiLine)]) - : ts.createArrayLiteral(leadingElement ? __spreadArrays([leadingElement], expressions) : expressions, multiLine)); + ? factory.createArrayConcatCall(temp, [factory.createArrayLiteralExpression(expressions, multiLine)]) + : factory.createArrayLiteralExpression(leadingElement ? __spreadArrays([leadingElement], expressions) : expressions, multiLine)); leadingElement = undefined; expressions = []; } @@ -87350,16 +90124,17 @@ var ts; var multiLine = node.multiLine; var numInitialProperties = countInitialNodesWithoutYield(properties); var temp = declareLocal(); - emitAssignment(temp, ts.createObjectLiteral(ts.visitNodes(properties, visitor, ts.isObjectLiteralElementLike, 0, numInitialProperties), multiLine)); + emitAssignment(temp, factory.createObjectLiteralExpression(ts.visitNodes(properties, visitor, ts.isObjectLiteralElementLike, 0, numInitialProperties), multiLine)); var expressions = ts.reduceLeft(properties, reduceProperty, [], numInitialProperties); - expressions.push(multiLine ? ts.startOnNewLine(ts.getMutableClone(temp)) : temp); - return ts.inlineExpressions(expressions); + // TODO(rbuckton): Does this need to be parented? + expressions.push(multiLine ? ts.startOnNewLine(ts.setParent(ts.setTextRange(factory.cloneNode(temp), temp), temp.parent)) : temp); + return factory.inlineExpressions(expressions); function reduceProperty(expressions, property) { if (containsYield(property) && expressions.length > 0) { - emitStatement(ts.createExpressionStatement(ts.inlineExpressions(expressions))); + emitStatement(factory.createExpressionStatement(factory.inlineExpressions(expressions))); expressions = []; } - var expression = ts.createExpressionForObjectLiteralElementLike(node, property, temp); + var expression = ts.createExpressionForObjectLiteralElementLike(factory, node, property, temp); var visited = ts.visitNode(expression, visitor, ts.isExpression); if (visited) { if (multiLine) { @@ -87386,10 +90161,7 @@ var ts; // .yield resumeLabel // .mark resumeLabel // a = _a[%sent%] - var clone_7 = ts.getMutableClone(node); - clone_7.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression)); - clone_7.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression); - return clone_7; + return factory.updateElementAccessExpression(node, cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression)), ts.visitNode(node.argumentExpression, visitor, ts.isExpression)); } return ts.visitEachChild(node, visitor, context); } @@ -87405,9 +90177,8 @@ var ts; // .yield resumeLabel // .mark resumeLabel // _b.apply(_a, _c.concat([%sent%, 2])); - var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration, languageVersion, /*cacheIdentifiers*/ true), target = _a.target, thisArg = _a.thisArg; - return ts.setOriginalNode(ts.createFunctionApply(cacheExpression(ts.visitNode(target, visitor, ts.isLeftHandSideExpression)), thisArg, visitElements(node.arguments), - /*location*/ node), node); + var _a = factory.createCallBinding(node.expression, hoistVariableDeclaration, languageVersion, /*cacheIdentifiers*/ true), target = _a.target, thisArg = _a.thisArg; + return ts.setOriginalNode(ts.setTextRange(factory.createFunctionApplyCall(cacheExpression(ts.visitNode(target, visitor, ts.isLeftHandSideExpression)), thisArg, visitElements(node.arguments)), node), node); } return ts.visitEachChild(node, visitor, context); } @@ -87423,9 +90194,9 @@ var ts; // .yield resumeLabel // .mark resumeLabel // new (_b.apply(_a, _c.concat([%sent%, 2]))); - var _a = ts.createCallBinding(ts.createPropertyAccess(node.expression, "bind"), hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg; - return ts.setOriginalNode(ts.setTextRange(ts.createNew(ts.createFunctionApply(cacheExpression(ts.visitNode(target, visitor, ts.isExpression)), thisArg, visitElements(node.arguments, - /*leadingElement*/ ts.createVoidZero())), + var _a = factory.createCallBinding(factory.createPropertyAccessExpression(node.expression, "bind"), hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg; + return ts.setOriginalNode(ts.setTextRange(factory.createNewExpression(factory.createFunctionApplyCall(cacheExpression(ts.visitNode(target, visitor, ts.isExpression)), thisArg, visitElements(node.arguments, + /*leadingElement*/ factory.createVoidZero())), /*typeArguments*/ undefined, []), node), node); } return ts.visitEachChild(node, visitor, context); @@ -87455,35 +90226,35 @@ var ts; } function transformAndEmitStatementWorker(node) { switch (node.kind) { - case 223 /* Block */: + case 227 /* Block */: return transformAndEmitBlock(node); - case 226 /* ExpressionStatement */: + case 230 /* ExpressionStatement */: return transformAndEmitExpressionStatement(node); - case 227 /* IfStatement */: + case 231 /* IfStatement */: return transformAndEmitIfStatement(node); - case 228 /* DoStatement */: + case 232 /* DoStatement */: return transformAndEmitDoStatement(node); - case 229 /* WhileStatement */: + case 233 /* WhileStatement */: return transformAndEmitWhileStatement(node); - case 230 /* ForStatement */: + case 234 /* ForStatement */: return transformAndEmitForStatement(node); - case 231 /* ForInStatement */: + case 235 /* ForInStatement */: return transformAndEmitForInStatement(node); - case 233 /* ContinueStatement */: + case 237 /* ContinueStatement */: return transformAndEmitContinueStatement(node); - case 234 /* BreakStatement */: + case 238 /* BreakStatement */: return transformAndEmitBreakStatement(node); - case 235 /* ReturnStatement */: + case 239 /* ReturnStatement */: return transformAndEmitReturnStatement(node); - case 236 /* WithStatement */: + case 240 /* WithStatement */: return transformAndEmitWithStatement(node); - case 237 /* SwitchStatement */: + case 241 /* SwitchStatement */: return transformAndEmitSwitchStatement(node); - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: return transformAndEmitLabeledStatement(node); - case 239 /* ThrowStatement */: + case 243 /* ThrowStatement */: return transformAndEmitThrowStatement(node); - case 240 /* TryStatement */: + case 244 /* TryStatement */: return transformAndEmitTryStatement(node); default: return emitStatement(ts.visitNode(node, visitor, ts.isStatement)); @@ -87503,7 +90274,7 @@ var ts; function transformAndEmitVariableDeclarationList(node) { for (var _i = 0, _a = node.declarations; _i < _a.length; _i++) { var variable = _a[_i]; - var name = ts.getSynthesizedClone(variable.name); + var name = factory.cloneNode(variable.name); ts.setCommentRange(name, variable.name); hoistVariableDeclaration(name); } @@ -87520,7 +90291,7 @@ var ts; pendingExpressions.push(transformInitializedVariable(variable)); } if (pendingExpressions.length) { - emitStatement(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions))); + emitStatement(factory.createExpressionStatement(factory.inlineExpressions(pendingExpressions))); variablesWritten += pendingExpressions.length; pendingExpressions = []; } @@ -87528,7 +90299,7 @@ var ts; return undefined; } function transformInitializedVariable(node) { - return ts.setSourceMapRange(ts.createAssignment(ts.setSourceMapRange(ts.getSynthesizedClone(node.name), node.name), ts.visitNode(node.initializer, visitor, ts.isExpression)), node); + return ts.setSourceMapRange(factory.createAssignment(ts.setSourceMapRange(factory.cloneNode(node.name), node.name), ts.visitNode(node.initializer, visitor, ts.isExpression)), node); } function transformAndEmitIfStatement(node) { if (containsYield(node)) { @@ -87671,7 +90442,7 @@ var ts; transformAndEmitVariableDeclarationList(initializer); } else { - emitStatement(ts.setTextRange(ts.createExpressionStatement(ts.visitNode(initializer, visitor, ts.isExpression)), initializer)); + emitStatement(ts.setTextRange(factory.createExpressionStatement(ts.visitNode(initializer, visitor, ts.isExpression)), initializer)); } } markLabel(conditionLabel); @@ -87681,7 +90452,7 @@ var ts; transformAndEmitEmbeddedStatement(node.statement); markLabel(incrementLabel); if (node.incrementor) { - emitStatement(ts.setTextRange(ts.createExpressionStatement(ts.visitNode(node.incrementor, visitor, ts.isExpression)), node.incrementor)); + emitStatement(ts.setTextRange(factory.createExpressionStatement(ts.visitNode(node.incrementor, visitor, ts.isExpression)), node.incrementor)); } emitBreak(conditionLabel); endLoopBlock(); @@ -87701,9 +90472,9 @@ var ts; hoistVariableDeclaration(variable.name); } var variables = ts.getInitializedVariables(initializer); - node = ts.updateFor(node, variables.length > 0 - ? ts.inlineExpressions(ts.map(variables, transformInitializedVariable)) - : undefined, ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitor, ts.isExpression), ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock)); + node = factory.updateForStatement(node, variables.length > 0 + ? factory.inlineExpressions(ts.map(variables, transformInitializedVariable)) + : undefined, ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitor, ts.isExpression), ts.visitNode(node.statement, visitor, ts.isStatement, factory.liftToBlock)); } else { node = ts.visitEachChild(node, visitor, context); @@ -87738,34 +90509,34 @@ var ts; // .mark endLoopLabel var keysArray = declareLocal(); // _a var key = declareLocal(); // _b - var keysIndex = ts.createLoopVariable(); // _i + var keysIndex = factory.createLoopVariable(); // _i var initializer = node.initializer; hoistVariableDeclaration(keysIndex); - emitAssignment(keysArray, ts.createArrayLiteral()); - emitStatement(ts.createForIn(key, ts.visitNode(node.expression, visitor, ts.isExpression), ts.createExpressionStatement(ts.createCall(ts.createPropertyAccess(keysArray, "push"), + emitAssignment(keysArray, factory.createArrayLiteralExpression()); + emitStatement(factory.createForInStatement(key, ts.visitNode(node.expression, visitor, ts.isExpression), factory.createExpressionStatement(factory.createCallExpression(factory.createPropertyAccessExpression(keysArray, "push"), /*typeArguments*/ undefined, [key])))); - emitAssignment(keysIndex, ts.createLiteral(0)); + emitAssignment(keysIndex, factory.createNumericLiteral(0)); var conditionLabel = defineLabel(); var incrementLabel = defineLabel(); var endLabel = beginLoopBlock(incrementLabel); markLabel(conditionLabel); - emitBreakWhenFalse(endLabel, ts.createLessThan(keysIndex, ts.createPropertyAccess(keysArray, "length"))); + emitBreakWhenFalse(endLabel, factory.createLessThan(keysIndex, factory.createPropertyAccessExpression(keysArray, "length"))); var variable = void 0; if (ts.isVariableDeclarationList(initializer)) { for (var _i = 0, _a = initializer.declarations; _i < _a.length; _i++) { var variable_1 = _a[_i]; hoistVariableDeclaration(variable_1.name); } - variable = ts.getSynthesizedClone(initializer.declarations[0].name); + variable = factory.cloneNode(initializer.declarations[0].name); } else { variable = ts.visitNode(initializer, visitor, ts.isExpression); ts.Debug.assert(ts.isLeftHandSideExpression(variable)); } - emitAssignment(variable, ts.createElementAccess(keysArray, keysIndex)); + emitAssignment(variable, factory.createElementAccessExpression(keysArray, keysIndex)); transformAndEmitEmbeddedStatement(node.statement); markLabel(incrementLabel); - emitStatement(ts.createExpressionStatement(ts.createPostfixIncrement(keysIndex))); + emitStatement(factory.createExpressionStatement(factory.createPostfixIncrement(keysIndex))); emitBreak(conditionLabel); endLoopBlock(); } @@ -87795,7 +90566,7 @@ var ts; var variable = _a[_i]; hoistVariableDeclaration(variable.name); } - node = ts.updateForIn(node, initializer.declarations[0].name, ts.visitNode(node.expression, visitor, ts.isExpression), ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock)); + node = factory.updateForInStatement(node, initializer.declarations[0].name, ts.visitNode(node.expression, visitor, ts.isExpression), ts.visitNode(node.statement, visitor, ts.isStatement, factory.liftToBlock)); } else { node = ts.visitEachChild(node, visitor, context); @@ -87913,7 +90684,7 @@ var ts; for (var i = 0; i < numClauses; i++) { var clause = caseBlock.clauses[i]; clauseLabels.push(defineLabel()); - if (clause.kind === 278 /* DefaultClause */ && defaultClauseIndex === -1) { + if (clause.kind === 282 /* DefaultClause */ && defaultClauseIndex === -1) { defaultClauseIndex = i; } } @@ -87926,11 +90697,11 @@ var ts; var defaultClausesSkipped = 0; for (var i = clausesWritten; i < numClauses; i++) { var clause = caseBlock.clauses[i]; - if (clause.kind === 277 /* CaseClause */) { + if (clause.kind === 281 /* CaseClause */) { if (containsYield(clause.expression) && pendingClauses.length > 0) { break; } - pendingClauses.push(ts.createCaseClause(ts.visitNode(clause.expression, visitor, ts.isExpression), [ + pendingClauses.push(factory.createCaseClause(ts.visitNode(clause.expression, visitor, ts.isExpression), [ createInlineBreak(clauseLabels[i], /*location*/ clause.expression) ])); } @@ -87939,7 +90710,7 @@ var ts; } } if (pendingClauses.length) { - emitStatement(ts.createSwitch(expression, ts.createCaseBlock(pendingClauses))); + emitStatement(factory.createSwitchStatement(expression, factory.createCaseBlock(pendingClauses))); clausesWritten += pendingClauses.length; pendingClauses = []; } @@ -88005,7 +90776,9 @@ var ts; return node; } function transformAndEmitThrowStatement(node) { - emitThrow(ts.visitNode(node.expression, visitor, ts.isExpression), + var _a; + // TODO(rbuckton): `expression` should be required on `throw`. + emitThrow(ts.visitNode((_a = node.expression) !== null && _a !== void 0 ? _a : factory.createVoidZero(), visitor, ts.isExpression), /*location*/ node); } function transformAndEmitTryStatement(node) { @@ -88088,10 +90861,11 @@ var ts; if (declaration) { var name = renamedCatchVariableDeclarations[ts.getOriginalNodeId(declaration)]; if (name) { - var clone_8 = ts.getMutableClone(name); - ts.setSourceMapRange(clone_8, node); - ts.setCommentRange(clone_8, node); - return clone_8; + // TODO(rbuckton): Does this need to be parented? + var clone_5 = ts.setParent(ts.setTextRange(factory.cloneNode(name), name), name.parent); + ts.setSourceMapRange(clone_5, node); + ts.setCommentRange(clone_5, node); + return clone_5; } } } @@ -88102,14 +90876,14 @@ var ts; if (ts.isGeneratedIdentifier(node) || ts.getEmitFlags(node) & 4096 /* HelperName */) { return node; } - var temp = ts.createTempVariable(hoistVariableDeclaration); + var temp = factory.createTempVariable(hoistVariableDeclaration); emitAssignment(temp, node, /*location*/ node); return temp; } function declareLocal(name) { var temp = name - ? ts.createUniqueName(name) - : ts.createTempVariable(/*recordTempVariable*/ undefined); + ? factory.createUniqueName(name) + : factory.createTempVariable(/*recordTempVariable*/ undefined); hoistVariableDeclaration(temp); return temp; } @@ -88235,9 +91009,9 @@ var ts; var text = ts.idText(variable.name); name = declareLocal(text); if (!renamedCatchVariables) { - renamedCatchVariables = ts.createMap(); + renamedCatchVariables = new ts.Map(); renamedCatchVariableDeclarations = []; - context.enableSubstitution(75 /* Identifier */); + context.enableSubstitution(78 /* Identifier */); } renamedCatchVariables.set(text, true); renamedCatchVariableDeclarations[ts.getOriginalNodeId(variable)] = name; @@ -88251,7 +91025,7 @@ var ts; exception.state = 1 /* Catch */; exception.catchVariable = name; exception.catchLabel = catchLabel; - emitAssignment(name, ts.createCall(ts.createPropertyAccess(state, "sent"), /*typeArguments*/ undefined, [])); + emitAssignment(name, factory.createCallExpression(factory.createPropertyAccessExpression(state, "sent"), /*typeArguments*/ undefined, [])); emitNop(); } /** @@ -88494,7 +91268,7 @@ var ts; if (labelExpressions === undefined) { labelExpressions = []; } - var expression = ts.createLiteral(-1); + var expression = factory.createNumericLiteral(-1); if (labelExpressions[label] === undefined) { labelExpressions[label] = [expression]; } @@ -88503,13 +91277,13 @@ var ts; } return expression; } - return ts.createOmittedExpression(); + return factory.createOmittedExpression(); } /** * Creates a numeric literal for the provided instruction. */ function createInstruction(instruction) { - var literal = ts.createLiteral(instruction); + var literal = factory.createNumericLiteral(instruction); ts.addSyntheticTrailingComment(literal, 3 /* MultiLineCommentTrivia */, getInstructionName(instruction)); return literal; } @@ -88521,7 +91295,7 @@ var ts; */ function createInlineBreak(label, location) { ts.Debug.assertLessThan(0, label, "Invalid label"); - return ts.setTextRange(ts.createReturn(ts.createArrayLiteral([ + return ts.setTextRange(factory.createReturnStatement(factory.createArrayLiteralExpression([ createInstruction(3 /* Break */), createLabel(label) ])), location); @@ -88533,7 +91307,7 @@ var ts; * @param location An optional source map location for the statement. */ function createInlineReturn(expression, location) { - return ts.setTextRange(ts.createReturn(ts.createArrayLiteral(expression + return ts.setTextRange(factory.createReturnStatement(factory.createArrayLiteralExpression(expression ? [createInstruction(2 /* Return */), expression] : [createInstruction(2 /* Return */)])), location); } @@ -88541,7 +91315,7 @@ var ts; * Creates an expression that can be used to resume from a Yield operation. */ function createGeneratorResume(location) { - return ts.setTextRange(ts.createCall(ts.createPropertyAccess(state, "sent"), + return ts.setTextRange(factory.createCallExpression(factory.createPropertyAccessExpression(state, "sent"), /*typeArguments*/ undefined, []), location); } /** @@ -88682,12 +91456,12 @@ var ts; currentExceptionBlock = undefined; withBlockStack = undefined; var buildResult = buildStatements(); - return createGeneratorHelper(context, ts.setEmitFlags(ts.createFunctionExpression( + return emitHelpers().createGeneratorHelper(ts.setEmitFlags(factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, - /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, state)], - /*type*/ undefined, ts.createBlock(buildResult, + /*typeParameters*/ undefined, [factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, state)], + /*type*/ undefined, factory.createBlock(buildResult, /*multiLine*/ buildResult.length > 0)), 524288 /* ReuseTempVariableScope */)); } /** @@ -88704,8 +91478,8 @@ var ts; flushFinalLabel(0); } if (clauses) { - var labelExpression = ts.createPropertyAccess(state, "label"); - var switchStatement = ts.createSwitch(labelExpression, ts.createCaseBlock(clauses)); + var labelExpression = factory.createPropertyAccessExpression(state, "label"); + var switchStatement = factory.createSwitchStatement(labelExpression, factory.createCaseBlock(clauses)); return [ts.startOnNewLine(switchStatement)]; } if (statements) { @@ -88780,7 +91554,7 @@ var ts; // surround the statements in generated `with` blocks to create the same environment. for (var i = withBlockStack.length - 1; i >= 0; i--) { var withBlock = withBlockStack[i]; - statements = [ts.createWith(withBlock.expression, ts.createBlock(statements))]; + statements = [factory.createWithStatement(withBlock.expression, factory.createBlock(statements))]; } } if (currentExceptionBlock) { @@ -88788,9 +91562,9 @@ var ts; // indicate entry into a protected region by pushing the label numbers // for each block in the protected region. var startLabel = currentExceptionBlock.startLabel, catchLabel = currentExceptionBlock.catchLabel, finallyLabel = currentExceptionBlock.finallyLabel, endLabel = currentExceptionBlock.endLabel; - statements.unshift(ts.createExpressionStatement(ts.createCall(ts.createPropertyAccess(ts.createPropertyAccess(state, "trys"), "push"), + statements.unshift(factory.createExpressionStatement(factory.createCallExpression(factory.createPropertyAccessExpression(factory.createPropertyAccessExpression(state, "trys"), "push"), /*typeArguments*/ undefined, [ - ts.createArrayLiteral([ + factory.createArrayLiteralExpression([ createLabel(startLabel), createLabel(catchLabel), createLabel(finallyLabel), @@ -88802,10 +91576,10 @@ var ts; if (markLabelEnd) { // The case clause for the last label falls through to this label, so we // add an assignment statement to reflect the change in labels. - statements.push(ts.createExpressionStatement(ts.createAssignment(ts.createPropertyAccess(state, "label"), ts.createLiteral(labelNumber + 1)))); + statements.push(factory.createExpressionStatement(factory.createAssignment(factory.createPropertyAccessExpression(state, "label"), factory.createNumericLiteral(labelNumber + 1)))); } } - clauses.push(ts.createCaseClause(ts.createLiteral(labelNumber), statements || [])); + clauses.push(factory.createCaseClause(factory.createNumericLiteral(labelNumber), statements || [])); statements = undefined; } /** @@ -88960,7 +91734,7 @@ var ts; * @param operationLocation The source map location for the operation. */ function writeAssign(left, right, operationLocation) { - writeStatement(ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(left, right)), operationLocation)); + writeStatement(ts.setTextRange(factory.createExpressionStatement(factory.createAssignment(left, right)), operationLocation)); } /** * Writes a Throw operation to the current label's statement list. @@ -88971,7 +91745,7 @@ var ts; function writeThrow(expression, operationLocation) { lastOperationWasAbrupt = true; lastOperationWasCompletion = true; - writeStatement(ts.setTextRange(ts.createThrow(expression), operationLocation)); + writeStatement(ts.setTextRange(factory.createThrowStatement(expression), operationLocation)); } /** * Writes a Return operation to the current label's statement list. @@ -88982,7 +91756,7 @@ var ts; function writeReturn(expression, operationLocation) { lastOperationWasAbrupt = true; lastOperationWasCompletion = true; - writeStatement(ts.setEmitFlags(ts.setTextRange(ts.createReturn(ts.createArrayLiteral(expression + writeStatement(ts.setEmitFlags(ts.setTextRange(factory.createReturnStatement(factory.createArrayLiteralExpression(expression ? [createInstruction(2 /* Return */), expression] : [createInstruction(2 /* Return */)])), operationLocation), 384 /* NoTokenSourceMaps */)); } @@ -88994,7 +91768,7 @@ var ts; */ function writeBreak(label, operationLocation) { lastOperationWasAbrupt = true; - writeStatement(ts.setEmitFlags(ts.setTextRange(ts.createReturn(ts.createArrayLiteral([ + writeStatement(ts.setEmitFlags(ts.setTextRange(factory.createReturnStatement(factory.createArrayLiteralExpression([ createInstruction(3 /* Break */), createLabel(label) ])), operationLocation), 384 /* NoTokenSourceMaps */)); @@ -89007,7 +91781,7 @@ var ts; * @param operationLocation The source map location for the operation. */ function writeBreakWhenTrue(label, condition, operationLocation) { - writeStatement(ts.setEmitFlags(ts.createIf(condition, ts.setEmitFlags(ts.setTextRange(ts.createReturn(ts.createArrayLiteral([ + writeStatement(ts.setEmitFlags(factory.createIfStatement(condition, ts.setEmitFlags(ts.setTextRange(factory.createReturnStatement(factory.createArrayLiteralExpression([ createInstruction(3 /* Break */), createLabel(label) ])), operationLocation), 384 /* NoTokenSourceMaps */)), 1 /* SingleLine */)); @@ -89020,7 +91794,7 @@ var ts; * @param operationLocation The source map location for the operation. */ function writeBreakWhenFalse(label, condition, operationLocation) { - writeStatement(ts.setEmitFlags(ts.createIf(ts.createLogicalNot(condition), ts.setEmitFlags(ts.setTextRange(ts.createReturn(ts.createArrayLiteral([ + writeStatement(ts.setEmitFlags(factory.createIfStatement(factory.createLogicalNot(condition), ts.setEmitFlags(ts.setTextRange(factory.createReturnStatement(factory.createArrayLiteralExpression([ createInstruction(3 /* Break */), createLabel(label) ])), operationLocation), 384 /* NoTokenSourceMaps */)), 1 /* SingleLine */)); @@ -89033,7 +91807,7 @@ var ts; */ function writeYield(expression, operationLocation) { lastOperationWasAbrupt = true; - writeStatement(ts.setEmitFlags(ts.setTextRange(ts.createReturn(ts.createArrayLiteral(expression + writeStatement(ts.setEmitFlags(ts.setTextRange(factory.createReturnStatement(factory.createArrayLiteralExpression(expression ? [createInstruction(4 /* Yield */), expression] : [createInstruction(4 /* Yield */)])), operationLocation), 384 /* NoTokenSourceMaps */)); } @@ -89045,7 +91819,7 @@ var ts; */ function writeYieldStar(expression, operationLocation) { lastOperationWasAbrupt = true; - writeStatement(ts.setEmitFlags(ts.setTextRange(ts.createReturn(ts.createArrayLiteral([ + writeStatement(ts.setEmitFlags(ts.setTextRange(factory.createReturnStatement(factory.createArrayLiteralExpression([ createInstruction(5 /* YieldStar */), expression ])), operationLocation), 384 /* NoTokenSourceMaps */)); @@ -89055,83 +91829,12 @@ var ts; */ function writeEndfinally() { lastOperationWasAbrupt = true; - writeStatement(ts.createReturn(ts.createArrayLiteral([ + writeStatement(factory.createReturnStatement(factory.createArrayLiteralExpression([ createInstruction(7 /* Endfinally */) ]))); } } ts.transformGenerators = transformGenerators; - function createGeneratorHelper(context, body) { - context.requestEmitHelper(ts.generatorHelper); - return ts.createCall(ts.getUnscopedHelperName("__generator"), - /*typeArguments*/ undefined, [ts.createThis(), body]); - } - // The __generator helper is used by down-level transformations to emulate the runtime - // semantics of an ES2015 generator function. When called, this helper returns an - // object that implements the Iterator protocol, in that it has `next`, `return`, and - // `throw` methods that step through the generator when invoked. - // - // parameters: - // @param thisArg The value to use as the `this` binding for the transformed generator body. - // @param body A function that acts as the transformed generator body. - // - // variables: - // _ Persistent state for the generator that is shared between the helper and the - // generator body. The state object has the following members: - // sent() - A method that returns or throws the current completion value. - // label - The next point at which to resume evaluation of the generator body. - // trys - A stack of protected regions (try/catch/finally blocks). - // ops - A stack of pending instructions when inside of a finally block. - // f A value indicating whether the generator is executing. - // y An iterator to delegate for a yield*. - // t A temporary variable that holds one of the following values (note that these - // cases do not overlap): - // - The completion value when resuming from a `yield` or `yield*`. - // - The error value for a catch block. - // - The current protected region (array of try/catch/finally/end labels). - // - The verb (`next`, `throw`, or `return` method) to delegate to the expression - // of a `yield*`. - // - The result of evaluating the verb delegated to the expression of a `yield*`. - // - // functions: - // verb(n) Creates a bound callback to the `step` function for opcode `n`. - // step(op) Evaluates opcodes in a generator body until execution is suspended or - // completed. - // - // The __generator helper understands a limited set of instructions: - // 0: next(value?) - Start or resume the generator with the specified value. - // 1: throw(error) - Resume the generator with an exception. If the generator is - // suspended inside of one or more protected regions, evaluates - // any intervening finally blocks between the current label and - // the nearest catch block or function boundary. If uncaught, the - // exception is thrown to the caller. - // 2: return(value?) - Resume the generator as if with a return. If the generator is - // suspended inside of one or more protected regions, evaluates any - // intervening finally blocks. - // 3: break(label) - Jump to the specified label. If the label is outside of the - // current protected region, evaluates any intervening finally - // blocks. - // 4: yield(value?) - Yield execution to the caller with an optional value. When - // resumed, the generator will continue at the next label. - // 5: yield*(value) - Delegates evaluation to the supplied iterator. When - // delegation completes, the generator will continue at the next - // label. - // 6: catch(error) - Handles an exception thrown from within the generator body. If - // the current label is inside of one or more protected regions, - // evaluates any intervening finally blocks between the current - // label and the nearest catch block or function boundary. If - // uncaught, the exception is thrown to the caller. - // 7: endfinally - Ends a finally block, resuming the last instruction prior to - // entering a finally block. - // - // For examples of how these are used, see the comments in ./transformers/generators.ts - ts.generatorHelper = { - name: "typescript:generator", - importName: "__generator", - scoped: false, - priority: 6, - text: "\n var __generator = (this && this.__generator) || function (thisArg, body) {\n var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;\n return g = { next: verb(0), \"throw\": verb(1), \"return\": verb(2) }, typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\n function verb(n) { return function (v) { return step([n, v]); }; }\n function step(op) {\n if (f) throw new TypeError(\"Generator is already executing.\");\n while (_) try {\n if (f = 1, y && (t = op[0] & 2 ? y[\"return\"] : op[0] ? y[\"throw\"] || ((t = y[\"return\"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;\n if (y = 0, t) op = [op[0] & 2, t.value];\n switch (op[0]) {\n case 0: case 1: t = op; break;\n case 4: _.label++; return { value: op[1], done: false };\n case 5: _.label++; y = op[1]; op = [0]; continue;\n case 7: op = _.ops.pop(); _.trys.pop(); continue;\n default:\n if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\n if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\n if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\n if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\n if (t[2]) _.ops.pop();\n _.trys.pop(); continue;\n }\n op = body.call(thisArg, _);\n } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\n if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\n }\n };" - }; })(ts || (ts = {})); /*@internal*/ var ts; @@ -89144,7 +91847,7 @@ var ts; default: return transformCommonJSModule; } } - var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration; + var factory = context.factory, emitHelpers = context.getEmitHelperFactory, startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration; var compilerOptions = context.getCompilerOptions(); var resolver = context.getEmitResolver(); var host = context.getEmitHost(); @@ -89154,19 +91857,19 @@ var ts; var previousOnEmitNode = context.onEmitNode; context.onSubstituteNode = onSubstituteNode; context.onEmitNode = onEmitNode; - context.enableSubstitution(75 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols. - context.enableSubstitution(209 /* BinaryExpression */); // Substitutes assignments to exported symbols. - context.enableSubstitution(207 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols. - context.enableSubstitution(208 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols. - context.enableSubstitution(282 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols. - context.enableEmitNotification(290 /* SourceFile */); // Restore state when substituting nodes in a file. + context.enableSubstitution(78 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols. + context.enableSubstitution(213 /* BinaryExpression */); // Substitutes assignments to exported symbols. + context.enableSubstitution(211 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols. + context.enableSubstitution(212 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols. + context.enableSubstitution(286 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols. + context.enableEmitNotification(294 /* SourceFile */); // Restore state when substituting nodes in a file. var moduleInfoMap = []; // The ExternalModuleInfo for each file. var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found. var currentSourceFile; // The current file. var currentModuleInfo; // The ExternalModuleInfo for the current file. var noSubstitution; // Set of nodes for which substitution rules should be ignored. var needUMDDynamicImportHelper; - return ts.chainBundle(transformSourceFile); + return ts.chainBundle(context, transformSourceFile); /** * Transforms the module aspects of a SourceFile. * @@ -89176,11 +91879,11 @@ var ts; if (node.isDeclarationFile || !(ts.isEffectiveExternalModule(node, compilerOptions) || node.transformFlags & 2097152 /* ContainsDynamicImport */ || - (ts.isJsonSourceFile(node) && ts.hasJsonModuleEmitEnabled(compilerOptions) && (compilerOptions.out || compilerOptions.outFile)))) { + (ts.isJsonSourceFile(node) && ts.hasJsonModuleEmitEnabled(compilerOptions) && ts.outFile(compilerOptions)))) { return node; } currentSourceFile = node; - currentModuleInfo = ts.collectExternalModuleInfo(node, resolver, compilerOptions); + currentModuleInfo = ts.collectExternalModuleInfo(context, node, resolver, compilerOptions); moduleInfoMap[ts.getOriginalNodeId(node)] = currentModuleInfo; // Perform the transformation. var transformModule = getTransformModuleDelegate(moduleKind); @@ -89188,7 +91891,7 @@ var ts; currentSourceFile = undefined; currentModuleInfo = undefined; needUMDDynamicImportHelper = false; - return ts.aggregateTransformFlags(updated); + return updated; } function shouldEmitUnderscoreUnderscoreESModule() { if (!currentModuleInfo.exportEquals && ts.isExternalModule(currentSourceFile)) { @@ -89205,18 +91908,18 @@ var ts; startLexicalEnvironment(); var statements = []; var ensureUseStrict = ts.getStrictOptionValue(compilerOptions, "alwaysStrict") || (!compilerOptions.noImplicitUseStrict && ts.isExternalModule(currentSourceFile)); - var statementOffset = ts.addPrologue(statements, node.statements, ensureUseStrict && !ts.isJsonSourceFile(node), sourceElementVisitor); + var statementOffset = factory.copyPrologue(node.statements, statements, ensureUseStrict && !ts.isJsonSourceFile(node), sourceElementVisitor); if (shouldEmitUnderscoreUnderscoreESModule()) { ts.append(statements, createUnderscoreUnderscoreESModule()); } if (ts.length(currentModuleInfo.exportedNames)) { - ts.append(statements, ts.createExpressionStatement(ts.reduceLeft(currentModuleInfo.exportedNames, function (prev, nextId) { return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(ts.idText(nextId))), prev); }, ts.createVoidZero()))); + ts.append(statements, factory.createExpressionStatement(ts.reduceLeft(currentModuleInfo.exportedNames, function (prev, nextId) { return factory.createAssignment(factory.createPropertyAccessExpression(factory.createIdentifier("exports"), factory.createIdentifier(ts.idText(nextId))), prev); }, factory.createVoidZero()))); } ts.append(statements, ts.visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, ts.isStatement)); ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset)); addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false); ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment()); - var updated = ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray(statements), node.statements)); + var updated = factory.updateSourceFile(node, ts.setTextRange(factory.createNodeArray(statements), node.statements)); ts.addEmitHelpers(updated, context.readEmitHelpers()); return updated; } @@ -89226,8 +91929,8 @@ var ts; * @param node The SourceFile node. */ function transformAMDModule(node) { - var define = ts.createIdentifier("define"); - var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions); + var define = factory.createIdentifier("define"); + var moduleName = ts.tryGetModuleNameFromFile(factory, node, host, compilerOptions); var jsonSourceFile = ts.isJsonSourceFile(node) && node; // An AMD define function has the following shape: // @@ -89252,29 +91955,29 @@ var ts; var _a = collectAsynchronousDependencies(node, /*includeNonAmdDependencies*/ true), aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames, importAliasNames = _a.importAliasNames; // Create an updated SourceFile: // - // define(moduleName?, ["module1", "module2"], function ... - var updated = ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray([ - ts.createExpressionStatement(ts.createCall(define, + // define(mofactory.updateSourceFile", "module2"], function ... + var updated = factory.updateSourceFile(node, ts.setTextRange(factory.createNodeArray([ + factory.createExpressionStatement(factory.createCallExpression(define, /*typeArguments*/ undefined, __spreadArrays((moduleName ? [moduleName] : []), [ // Add the dependency array argument: // // ["require", "exports", module1", "module2", ...] - ts.createArrayLiteral(jsonSourceFile ? ts.emptyArray : __spreadArrays([ - ts.createLiteral("require"), - ts.createLiteral("exports") + factory.createArrayLiteralExpression(jsonSourceFile ? ts.emptyArray : __spreadArrays([ + factory.createStringLiteral("require"), + factory.createStringLiteral("exports") ], aliasedModuleNames, unaliasedModuleNames)), // Add the module body function argument: // // function (require, exports, module1, module2) ... jsonSourceFile ? - jsonSourceFile.statements.length ? jsonSourceFile.statements[0].expression : ts.createObjectLiteral() : - ts.createFunctionExpression( + jsonSourceFile.statements.length ? jsonSourceFile.statements[0].expression : factory.createObjectLiteralExpression() : + factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, /*typeParameters*/ undefined, __spreadArrays([ - ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "require"), - ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "exports") + factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "require"), + factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "exports") ], importAliasNames), /*type*/ undefined, transformAsynchronousModuleBody(node)) ]))) @@ -89290,32 +91993,33 @@ var ts; */ function transformUMDModule(node) { var _a = collectAsynchronousDependencies(node, /*includeNonAmdDependencies*/ false), aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames, importAliasNames = _a.importAliasNames; - var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions); - var umdHeader = ts.createFunctionExpression( + var moduleName = ts.tryGetModuleNameFromFile(factory, node, host, compilerOptions); + var umdHeader = factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, - /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "factory")], - /*type*/ undefined, ts.setTextRange(ts.createBlock([ - ts.createIf(ts.createLogicalAnd(ts.createTypeCheck(ts.createIdentifier("module"), "object"), ts.createTypeCheck(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), "object")), ts.createBlock([ - ts.createVariableStatement( + /*typeParameters*/ undefined, [factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "factory")], + /*type*/ undefined, ts.setTextRange(factory.createBlock([ + factory.createIfStatement(factory.createLogicalAnd(factory.createTypeCheck(factory.createIdentifier("module"), "object"), factory.createTypeCheck(factory.createPropertyAccessExpression(factory.createIdentifier("module"), "exports"), "object")), factory.createBlock([ + factory.createVariableStatement( /*modifiers*/ undefined, [ - ts.createVariableDeclaration("v", - /*type*/ undefined, ts.createCall(ts.createIdentifier("factory"), + factory.createVariableDeclaration("v", + /*exclamationToken*/ undefined, + /*type*/ undefined, factory.createCallExpression(factory.createIdentifier("factory"), /*typeArguments*/ undefined, [ - ts.createIdentifier("require"), - ts.createIdentifier("exports") + factory.createIdentifier("require"), + factory.createIdentifier("exports") ])) ]), - ts.setEmitFlags(ts.createIf(ts.createStrictInequality(ts.createIdentifier("v"), ts.createIdentifier("undefined")), ts.createExpressionStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), ts.createIdentifier("v")))), 1 /* SingleLine */) - ]), ts.createIf(ts.createLogicalAnd(ts.createTypeCheck(ts.createIdentifier("define"), "function"), ts.createPropertyAccess(ts.createIdentifier("define"), "amd")), ts.createBlock([ - ts.createExpressionStatement(ts.createCall(ts.createIdentifier("define"), + ts.setEmitFlags(factory.createIfStatement(factory.createStrictInequality(factory.createIdentifier("v"), factory.createIdentifier("undefined")), factory.createExpressionStatement(factory.createAssignment(factory.createPropertyAccessExpression(factory.createIdentifier("module"), "exports"), factory.createIdentifier("v")))), 1 /* SingleLine */) + ]), factory.createIfStatement(factory.createLogicalAnd(factory.createTypeCheck(factory.createIdentifier("define"), "function"), factory.createPropertyAccessExpression(factory.createIdentifier("define"), "amd")), factory.createBlock([ + factory.createExpressionStatement(factory.createCallExpression(factory.createIdentifier("define"), /*typeArguments*/ undefined, __spreadArrays((moduleName ? [moduleName] : []), [ - ts.createArrayLiteral(__spreadArrays([ - ts.createLiteral("require"), - ts.createLiteral("exports") + factory.createArrayLiteralExpression(__spreadArrays([ + factory.createStringLiteral("require"), + factory.createStringLiteral("exports") ], aliasedModuleNames, unaliasedModuleNames)), - ts.createIdentifier("factory") + factory.createIdentifier("factory") ]))) ]))) ], @@ -89332,19 +92036,19 @@ var ts; // define(["require", "exports"], factory); // } // })(function ...) - var updated = ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray([ - ts.createExpressionStatement(ts.createCall(umdHeader, + var updated = factory.updateSourceFile(node, ts.setTextRange(factory.createNodeArray([ + factory.createExpressionStatement(factory.createCallExpression(umdHeader, /*typeArguments*/ undefined, [ // Add the module body function argument: // // function (require, exports) ... - ts.createFunctionExpression( + factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, /*typeParameters*/ undefined, __spreadArrays([ - ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "require"), - ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "exports") + factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "require"), + factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "exports") ], importAliasNames), /*type*/ undefined, transformAsynchronousModuleBody(node)) ])) @@ -89372,19 +92076,19 @@ var ts; for (var _i = 0, _a = node.amdDependencies; _i < _a.length; _i++) { var amdDependency = _a[_i]; if (amdDependency.name) { - aliasedModuleNames.push(ts.createLiteral(amdDependency.path)); - importAliasNames.push(ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, amdDependency.name)); + aliasedModuleNames.push(factory.createStringLiteral(amdDependency.path)); + importAliasNames.push(factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, amdDependency.name)); } else { - unaliasedModuleNames.push(ts.createLiteral(amdDependency.path)); + unaliasedModuleNames.push(factory.createStringLiteral(amdDependency.path)); } } for (var _b = 0, _c = currentModuleInfo.externalImports; _b < _c.length; _b++) { var importNode = _c[_b]; // Find the name of the external module - var externalModuleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions); + var externalModuleName = ts.getExternalModuleNameLiteral(factory, importNode, currentSourceFile, host, resolver, compilerOptions); // Find the name of the module alias, if there is one - var importAliasName = ts.getLocalNameForExternalImport(importNode, currentSourceFile); + var importAliasName = ts.getLocalNameForExternalImport(factory, importNode, currentSourceFile); // It is possible that externalModuleName is undefined if it is not string literal. // This can happen in the invalid import syntax. // E.g : "import * from alias from 'someLib';" @@ -89394,7 +92098,7 @@ var ts; // This is so that when printer will not substitute the identifier ts.setEmitFlags(importAliasName, 4 /* NoSubstitution */); aliasedModuleNames.push(externalModuleName); - importAliasNames.push(ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, importAliasName)); + importAliasNames.push(factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, importAliasName)); } else { unaliasedModuleNames.push(externalModuleName); @@ -89404,15 +92108,15 @@ var ts; return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames }; } function getAMDImportExpressionForImport(node) { - if (ts.isImportEqualsDeclaration(node) || ts.isExportDeclaration(node) || !ts.getExternalModuleNameLiteral(node, currentSourceFile, host, resolver, compilerOptions)) { + if (ts.isImportEqualsDeclaration(node) || ts.isExportDeclaration(node) || !ts.getExternalModuleNameLiteral(factory, node, currentSourceFile, host, resolver, compilerOptions)) { return undefined; } - var name = ts.getLocalNameForExternalImport(node, currentSourceFile); // TODO: GH#18217 + var name = ts.getLocalNameForExternalImport(factory, node, currentSourceFile); // TODO: GH#18217 var expr = getHelperExpressionForImport(node, name); if (expr === name) { return undefined; } - return ts.createExpressionStatement(ts.createAssignment(name, expr)); + return factory.createExpressionStatement(factory.createAssignment(name, expr)); } /** * Transforms a SourceFile into an AMD or UMD module body. @@ -89422,12 +92126,12 @@ var ts; function transformAsynchronousModuleBody(node) { startLexicalEnvironment(); var statements = []; - var statementOffset = ts.addPrologue(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor); + var statementOffset = factory.copyPrologue(node.statements, statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor); if (shouldEmitUnderscoreUnderscoreESModule()) { ts.append(statements, createUnderscoreUnderscoreESModule()); } if (ts.length(currentModuleInfo.exportedNames)) { - ts.append(statements, ts.createExpressionStatement(ts.reduceLeft(currentModuleInfo.exportedNames, function (prev, nextId) { return ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(ts.idText(nextId))), prev); }, ts.createVoidZero()))); + ts.append(statements, factory.createExpressionStatement(ts.reduceLeft(currentModuleInfo.exportedNames, function (prev, nextId) { return factory.createAssignment(factory.createPropertyAccessExpression(factory.createIdentifier("exports"), factory.createIdentifier(ts.idText(nextId))), prev); }, factory.createVoidZero()))); } // Visit each statement of the module body. ts.append(statements, ts.visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, ts.isStatement)); @@ -89440,7 +92144,7 @@ var ts; // End the lexical environment for the module body // and merge any new lexical declarations. ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment()); - var body = ts.createBlock(statements, /*multiLine*/ true); + var body = factory.createBlock(statements, /*multiLine*/ true); if (needUMDDynamicImportHelper) { ts.addEmitHelper(body, dynamicImportUMDHelper); } @@ -89459,13 +92163,13 @@ var ts; var expressionResult = ts.visitNode(currentModuleInfo.exportEquals.expression, moduleExpressionElementVisitor); if (expressionResult) { if (emitAsReturn) { - var statement = ts.createReturn(expressionResult); + var statement = factory.createReturnStatement(expressionResult); ts.setTextRange(statement, currentModuleInfo.exportEquals); ts.setEmitFlags(statement, 384 /* NoTokenSourceMaps */ | 1536 /* NoComments */); statements.push(statement); } else { - var statement = ts.createExpressionStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), expressionResult)); + var statement = factory.createExpressionStatement(factory.createAssignment(factory.createPropertyAccessExpression(factory.createIdentifier("module"), "exports"), expressionResult)); ts.setTextRange(statement, currentModuleInfo.exportEquals); ts.setEmitFlags(statement, 1536 /* NoComments */); statements.push(statement); @@ -89483,23 +92187,23 @@ var ts; */ function sourceElementVisitor(node) { switch (node.kind) { - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: return visitImportDeclaration(node); - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return visitImportEqualsDeclaration(node); - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: return visitExportDeclaration(node); - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: return visitExportAssignment(node); - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: return visitVariableStatement(node); - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: return visitFunctionDeclaration(node); - case 245 /* ClassDeclaration */: + case 249 /* ClassDeclaration */: return visitClassDeclaration(node); - case 328 /* MergeDeclarationMarker */: + case 333 /* MergeDeclarationMarker */: return visitMergeDeclarationMarker(node); - case 329 /* EndOfDeclarationMarker */: + case 334 /* EndOfDeclarationMarker */: return visitEndOfDeclarationMarker(node); default: return ts.visitEachChild(node, moduleExpressionElementVisitor, context); @@ -89526,24 +92230,24 @@ var ts; for (var _i = 0, _a = node.properties; _i < _a.length; _i++) { var elem = _a[_i]; switch (elem.kind) { - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: if (destructuringNeedsFlattening(elem.initializer)) { return true; } break; - case 282 /* ShorthandPropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: if (destructuringNeedsFlattening(elem.name)) { return true; } break; - case 283 /* SpreadAssignment */: + case 287 /* SpreadAssignment */: if (destructuringNeedsFlattening(elem.expression)) { return true; } break; - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return false; default: ts.Debug.assertNever(elem, "Unhandled object member kind"); } @@ -89580,7 +92284,7 @@ var ts; case ts.ModuleKind.AMD: return createImportCallExpressionAMD(argument, containsLexicalThis); case ts.ModuleKind.UMD: - return createImportCallExpressionUMD(argument, containsLexicalThis); + return createImportCallExpressionUMD(argument !== null && argument !== void 0 ? argument : factory.createVoidZero(), containsLexicalThis); case ts.ModuleKind.CommonJS: default: return createImportCallExpressionCommonJS(argument, containsLexicalThis); @@ -89602,17 +92306,21 @@ var ts; // }); needUMDDynamicImportHelper = true; if (ts.isSimpleCopiableExpression(arg)) { - var argClone = ts.isGeneratedIdentifier(arg) ? arg : ts.isStringLiteral(arg) ? ts.createLiteral(arg) : ts.setEmitFlags(ts.setTextRange(ts.getSynthesizedClone(arg), arg), 1536 /* NoComments */); - return ts.createConditional( - /*condition*/ ts.createIdentifier("__syncRequire"), + var argClone = ts.isGeneratedIdentifier(arg) ? arg : ts.isStringLiteral(arg) ? factory.createStringLiteralFromNode(arg) : ts.setEmitFlags(ts.setTextRange(factory.cloneNode(arg), arg), 1536 /* NoComments */); + return factory.createConditionalExpression( + /*condition*/ factory.createIdentifier("__syncRequire"), + /*questionToken*/ undefined, /*whenTrue*/ createImportCallExpressionCommonJS(arg, containsLexicalThis), + /*colonToken*/ undefined, /*whenFalse*/ createImportCallExpressionAMD(argClone, containsLexicalThis)); } else { - var temp = ts.createTempVariable(hoistVariableDeclaration); - return ts.createComma(ts.createAssignment(temp, arg), ts.createConditional( - /*condition*/ ts.createIdentifier("__syncRequire"), + var temp = factory.createTempVariable(hoistVariableDeclaration); + return factory.createComma(factory.createAssignment(temp, arg), factory.createConditionalExpression( + /*condition*/ factory.createIdentifier("__syncRequire"), + /*questionToken*/ undefined, /*whenTrue*/ createImportCallExpressionCommonJS(temp, containsLexicalThis), + /*colonToken*/ undefined, /*whenFalse*/ createImportCallExpressionAMD(temp, containsLexicalThis))); } } @@ -89623,26 +92331,26 @@ var ts; // ... // new Promise(function (_a, _b) { require([x], _a, _b); }); /*Amd Require*/ // }); - var resolve = ts.createUniqueName("resolve"); - var reject = ts.createUniqueName("reject"); + var resolve = factory.createUniqueName("resolve"); + var reject = factory.createUniqueName("reject"); var parameters = [ - ts.createParameter(/*decorator*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, /*name*/ resolve), - ts.createParameter(/*decorator*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, /*name*/ reject) + factory.createParameterDeclaration(/*decorator*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, /*name*/ resolve), + factory.createParameterDeclaration(/*decorator*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, /*name*/ reject) ]; - var body = ts.createBlock([ - ts.createExpressionStatement(ts.createCall(ts.createIdentifier("require"), - /*typeArguments*/ undefined, [ts.createArrayLiteral([arg || ts.createOmittedExpression()]), resolve, reject])) + var body = factory.createBlock([ + factory.createExpressionStatement(factory.createCallExpression(factory.createIdentifier("require"), + /*typeArguments*/ undefined, [factory.createArrayLiteralExpression([arg || factory.createOmittedExpression()]), resolve, reject])) ]); var func; if (languageVersion >= 2 /* ES2015 */) { - func = ts.createArrowFunction( + func = factory.createArrowFunction( /*modifiers*/ undefined, /*typeParameters*/ undefined, parameters, /*type*/ undefined, /*equalsGreaterThanToken*/ undefined, body); } else { - func = ts.createFunctionExpression( + func = factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, @@ -89655,10 +92363,9 @@ var ts; ts.setEmitFlags(func, 8 /* CapturesThis */); } } - var promise = ts.createNew(ts.createIdentifier("Promise"), /*typeArguments*/ undefined, [func]); + var promise = factory.createNewExpression(factory.createIdentifier("Promise"), /*typeArguments*/ undefined, [func]); if (compilerOptions.esModuleInterop) { - context.requestEmitHelper(ts.importStarHelper); - return ts.createCall(ts.createPropertyAccess(promise, ts.createIdentifier("then")), /*typeArguments*/ undefined, [ts.getUnscopedHelperName("__importStar")]); + return factory.createCallExpression(factory.createPropertyAccessExpression(promise, factory.createIdentifier("then")), /*typeArguments*/ undefined, [emitHelpers().createImportStarCallbackHelper()]); } return promise; } @@ -89668,15 +92375,14 @@ var ts; // Promise.resolve().then(function () { return require(x); }) /*CommonJs Require*/ // We have to wrap require in then callback so that require is done in asynchronously // if we simply do require in resolve callback in Promise constructor. We will execute the loading immediately - var promiseResolveCall = ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Promise"), "resolve"), /*typeArguments*/ undefined, /*argumentsArray*/ []); - var requireCall = ts.createCall(ts.createIdentifier("require"), /*typeArguments*/ undefined, arg ? [arg] : []); + var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), /*typeArguments*/ undefined, /*argumentsArray*/ []); + var requireCall = factory.createCallExpression(factory.createIdentifier("require"), /*typeArguments*/ undefined, arg ? [arg] : []); if (compilerOptions.esModuleInterop) { - context.requestEmitHelper(ts.importStarHelper); - requireCall = ts.createCall(ts.getUnscopedHelperName("__importStar"), /*typeArguments*/ undefined, [requireCall]); + requireCall = emitHelpers().createImportStarHelper(requireCall); } var func; if (languageVersion >= 2 /* ES2015 */) { - func = ts.createArrowFunction( + func = factory.createArrowFunction( /*modifiers*/ undefined, /*typeParameters*/ undefined, /*parameters*/ [], @@ -89684,13 +92390,13 @@ var ts; /*equalsGreaterThanToken*/ undefined, requireCall); } else { - func = ts.createFunctionExpression( + func = factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, /*typeParameters*/ undefined, /*parameters*/ [], - /*type*/ undefined, ts.createBlock([ts.createReturn(requireCall)])); + /*type*/ undefined, factory.createBlock([factory.createReturnStatement(requireCall)])); // if there is a lexical 'this' in the import call arguments, ensure we indicate // that this new function expression indicates it captures 'this' so that the // es2015 transformer will properly substitute 'this' with '_this'. @@ -89698,15 +92404,14 @@ var ts; ts.setEmitFlags(func, 8 /* CapturesThis */); } } - return ts.createCall(ts.createPropertyAccess(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]); + return factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]); } function getHelperExpressionForExport(node, innerExpr) { if (!compilerOptions.esModuleInterop || ts.getEmitFlags(node) & 67108864 /* NeverApplyImportHelper */) { return innerExpr; } if (ts.getExportNeedsImportStarHelper(node)) { - context.requestEmitHelper(ts.importStarHelper); - return ts.createCall(ts.getUnscopedHelperName("__importStar"), /*typeArguments*/ undefined, [innerExpr]); + return emitHelpers().createImportStarHelper(innerExpr); } return innerExpr; } @@ -89715,12 +92420,10 @@ var ts; return innerExpr; } if (ts.getImportNeedsImportStarHelper(node)) { - context.requestEmitHelper(ts.importStarHelper); - return ts.createCall(ts.getUnscopedHelperName("__importStar"), /*typeArguments*/ undefined, [innerExpr]); + return emitHelpers().createImportStarHelper(innerExpr); } if (ts.getImportNeedsImportDefaultHelper(node)) { - context.requestEmitHelper(ts.importDefaultHelper); - return ts.createCall(ts.getUnscopedHelperName("__importDefault"), /*typeArguments*/ undefined, [innerExpr]); + return emitHelpers().createImportDefaultHelper(innerExpr); } return innerExpr; } @@ -89735,13 +92438,14 @@ var ts; if (moduleKind !== ts.ModuleKind.AMD) { if (!node.importClause) { // import "mod"; - return ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(createRequireCall(node)), node), node); + return ts.setOriginalNode(ts.setTextRange(factory.createExpressionStatement(createRequireCall(node)), node), node); } else { var variables = []; if (namespaceDeclaration && !ts.isDefaultImport(node)) { // import * as n from "mod"; - variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), + variables.push(factory.createVariableDeclaration(factory.cloneNode(namespaceDeclaration.name), + /*exclamationToken*/ undefined, /*type*/ undefined, getHelperExpressionForImport(node, createRequireCall(node)))); } else { @@ -89749,25 +92453,28 @@ var ts; // import { x, y } from "mod"; // import d, { x, y } from "mod"; // import d, * as n from "mod"; - variables.push(ts.createVariableDeclaration(ts.getGeneratedNameForNode(node), + variables.push(factory.createVariableDeclaration(factory.getGeneratedNameForNode(node), + /*exclamationToken*/ undefined, /*type*/ undefined, getHelperExpressionForImport(node, createRequireCall(node)))); if (namespaceDeclaration && ts.isDefaultImport(node)) { - variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), - /*type*/ undefined, ts.getGeneratedNameForNode(node))); + variables.push(factory.createVariableDeclaration(factory.cloneNode(namespaceDeclaration.name), + /*exclamationToken*/ undefined, + /*type*/ undefined, factory.getGeneratedNameForNode(node))); } } - statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList(variables, languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */)), + statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList(variables, languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */)), /*location*/ node), /*original*/ node)); } } else if (namespaceDeclaration && ts.isDefaultImport(node)) { // import d, * as n from "mod"; - statements = ts.append(statements, ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.setOriginalNode(ts.setTextRange(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), - /*type*/ undefined, ts.getGeneratedNameForNode(node)), + statements = ts.append(statements, factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList([ + ts.setOriginalNode(ts.setTextRange(factory.createVariableDeclaration(factory.cloneNode(namespaceDeclaration.name), + /*exclamationToken*/ undefined, + /*type*/ undefined, factory.getGeneratedNameForNode(node)), /*location*/ node), /*original*/ node) ], languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */))); @@ -89788,12 +92495,12 @@ var ts; * @param importNode The declararation to import. */ function createRequireCall(importNode) { - var moduleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions); + var moduleName = ts.getExternalModuleNameLiteral(factory, importNode, currentSourceFile, host, resolver, compilerOptions); var args = []; if (moduleName) { args.push(moduleName); } - return ts.createCall(ts.createIdentifier("require"), /*typeArguments*/ undefined, args); + return factory.createCallExpression(factory.createIdentifier("require"), /*typeArguments*/ undefined, args); } /** * Visits an ImportEqualsDeclaration node. @@ -89804,21 +92511,22 @@ var ts; ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer."); var statements; if (moduleKind !== ts.ModuleKind.AMD) { - if (ts.hasModifier(node, 1 /* Export */)) { - statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(createExportExpression(node.name, createRequireCall(node))), node), node)); + if (ts.hasSyntacticModifier(node, 1 /* Export */)) { + statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(factory.createExpressionStatement(createExportExpression(node.name, createRequireCall(node))), node), node)); } else { - statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(ts.getSynthesizedClone(node.name), + statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList([ + factory.createVariableDeclaration(factory.cloneNode(node.name), + /*exclamationToken*/ undefined, /*type*/ undefined, createRequireCall(node)) ], /*flags*/ languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */)), node), node)); } } else { - if (ts.hasModifier(node, 1 /* Export */)) { - statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(createExportExpression(ts.getExportName(node), ts.getLocalName(node))), node), node)); + if (ts.hasSyntacticModifier(node, 1 /* Export */)) { + statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(factory.createExpressionStatement(createExportExpression(factory.getExportName(node), factory.getLocalName(node))), node), node)); } } if (hasAssociatedEndOfDeclarationMarker(node)) { @@ -89842,14 +92550,15 @@ var ts; // elsewhere. return undefined; } - var generatedName = ts.getGeneratedNameForNode(node); + var generatedName = factory.getGeneratedNameForNode(node); if (node.exportClause && ts.isNamedExports(node.exportClause)) { var statements = []; // export { x, y } from "mod"; if (moduleKind !== ts.ModuleKind.AMD) { - statements.push(ts.setOriginalNode(ts.setTextRange(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(generatedName, + statements.push(ts.setOriginalNode(ts.setTextRange(factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList([ + factory.createVariableDeclaration(generatedName, + /*exclamationToken*/ undefined, /*type*/ undefined, createRequireCall(node)) ])), /*location*/ node), @@ -89858,11 +92567,14 @@ var ts; for (var _i = 0, _a = node.exportClause.elements; _i < _a.length; _i++) { var specifier = _a[_i]; if (languageVersion === 0 /* ES3 */) { - statements.push(ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(createCreateBindingHelper(context, generatedName, ts.createLiteral(specifier.propertyName || specifier.name), specifier.propertyName ? ts.createLiteral(specifier.name) : undefined)), specifier), specifier)); + statements.push(ts.setOriginalNode(ts.setTextRange(factory.createExpressionStatement(emitHelpers().createCreateBindingHelper(generatedName, factory.createStringLiteralFromNode(specifier.propertyName || specifier.name), specifier.propertyName ? factory.createStringLiteralFromNode(specifier.name) : undefined)), specifier), specifier)); } else { - var exportedValue = ts.createPropertyAccess(generatedName, specifier.propertyName || specifier.name); - statements.push(ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(createExportExpression(ts.getExportName(specifier), exportedValue, /* location */ undefined, /* liveBinding */ true)), specifier), specifier)); + var exportNeedsImportDefault = !!compilerOptions.esModuleInterop && + !(ts.getEmitFlags(node) & 67108864 /* NeverApplyImportHelper */) && + ts.idText(specifier.propertyName || specifier.name) === "default"; + var exportedValue = factory.createPropertyAccessExpression(exportNeedsImportDefault ? emitHelpers().createImportDefaultHelper(generatedName) : generatedName, specifier.propertyName || specifier.name); + statements.push(ts.setOriginalNode(ts.setTextRange(factory.createExpressionStatement(createExportExpression(factory.getExportName(specifier), exportedValue, /* location */ undefined, /* liveBinding */ true)), specifier), specifier)); } } return ts.singleOrMany(statements); @@ -89870,14 +92582,14 @@ var ts; else if (node.exportClause) { var statements = []; // export * as ns from "mod"; - statements.push(ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(createExportExpression(ts.getSynthesizedClone(node.exportClause.name), moduleKind !== ts.ModuleKind.AMD ? - getHelperExpressionForExport(node, createRequireCall(node)) : - ts.createIdentifier(ts.idText(node.exportClause.name)))), node), node)); + statements.push(ts.setOriginalNode(ts.setTextRange(factory.createExpressionStatement(createExportExpression(factory.cloneNode(node.exportClause.name), getHelperExpressionForExport(node, moduleKind !== ts.ModuleKind.AMD ? + createRequireCall(node) : + factory.createIdentifier(ts.idText(node.exportClause.name))))), node), node)); return ts.singleOrMany(statements); } else { // export * from "mod"; - return ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(createExportStarHelper(context, moduleKind !== ts.ModuleKind.AMD ? createRequireCall(node) : generatedName)), node), node); + return ts.setOriginalNode(ts.setTextRange(factory.createExpressionStatement(emitHelpers().createExportStarHelper(moduleKind !== ts.ModuleKind.AMD ? createRequireCall(node) : generatedName)), node), node); } } /** @@ -89894,10 +92606,10 @@ var ts; if (original && hasAssociatedEndOfDeclarationMarker(original)) { // Defer exports until we encounter an EndOfDeclarationMarker node var id = ts.getOriginalNodeId(node); - deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), ts.visitNode(node.expression, moduleExpressionElementVisitor), /*location*/ node, /*allowComments*/ true); + deferredExports[id] = appendExportStatement(deferredExports[id], factory.createIdentifier("default"), ts.visitNode(node.expression, moduleExpressionElementVisitor), /*location*/ node, /*allowComments*/ true); } else { - statements = appendExportStatement(statements, ts.createIdentifier("default"), ts.visitNode(node.expression, moduleExpressionElementVisitor), /*location*/ node, /*allowComments*/ true); + statements = appendExportStatement(statements, factory.createIdentifier("default"), ts.visitNode(node.expression, moduleExpressionElementVisitor), /*location*/ node, /*allowComments*/ true); } return ts.singleOrMany(statements); } @@ -89908,9 +92620,9 @@ var ts; */ function visitFunctionDeclaration(node) { var statements; - if (ts.hasModifier(node, 1 /* Export */)) { - statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createFunctionDeclaration( - /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, ts.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), + if (ts.hasSyntacticModifier(node, 1 /* Export */)) { + statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(factory.createFunctionDeclaration( + /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, factory.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), /*typeParameters*/ undefined, ts.visitNodes(node.parameters, moduleExpressionElementVisitor), /*type*/ undefined, ts.visitEachChild(node.body, moduleExpressionElementVisitor, context)), /*location*/ node), @@ -89936,9 +92648,9 @@ var ts; */ function visitClassDeclaration(node) { var statements; - if (ts.hasModifier(node, 1 /* Export */)) { - statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createClassDeclaration( - /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), + if (ts.hasSyntacticModifier(node, 1 /* Export */)) { + statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(factory.createClassDeclaration( + /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), factory.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, moduleExpressionElementVisitor), ts.visitNodes(node.members, moduleExpressionElementVisitor)), node), node)); } else { @@ -89963,7 +92675,7 @@ var ts; var statements; var variables; var expressions; - if (ts.hasModifier(node, 1 /* Export */)) { + if (ts.hasSyntacticModifier(node, 1 /* Export */)) { var modifiers = void 0; // If we're exporting these variables, then these just become assignments to 'exports.x'. for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) { @@ -89979,10 +92691,10 @@ var ts; } } if (variables) { - statements = ts.append(statements, ts.updateVariableStatement(node, modifiers, ts.updateVariableDeclarationList(node.declarationList, variables))); + statements = ts.append(statements, factory.updateVariableStatement(node, modifiers, factory.updateVariableDeclarationList(node.declarationList, variables))); } if (expressions) { - statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(ts.inlineExpressions(expressions)), node), node)); + statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(factory.createExpressionStatement(factory.inlineExpressions(expressions)), node), node)); } } else { @@ -90002,7 +92714,7 @@ var ts; var exportedNames = getExports(name); if (exportedNames) { // For each additional export of the declaration, apply an export assignment. - var expression = ts.isExportName(name) ? value : ts.createAssignment(name, value); + var expression = ts.isExportName(name) ? value : factory.createAssignment(name, value); for (var _i = 0, exportedNames_1 = exportedNames; _i < exportedNames_1.length; _i++) { var exportName = exportedNames_1[_i]; // Mark the node to prevent triggering substitution. @@ -90011,7 +92723,7 @@ var ts; } return expression; } - return ts.createAssignment(name, value); + return factory.createAssignment(name, value); } /** * Transforms an exported variable with an initializer into an expression. @@ -90025,8 +92737,8 @@ var ts; /*needsValue*/ false, createAllExportExpressions); } else { - return ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createIdentifier("exports"), node.name), - /*location*/ node.name), node.initializer ? ts.visitNode(node.initializer, moduleExpressionElementVisitor) : ts.createVoidZero()); + return factory.createAssignment(ts.setTextRange(factory.createPropertyAccessExpression(factory.createIdentifier("exports"), node.name), + /*location*/ node.name), node.initializer ? ts.visitNode(node.initializer, moduleExpressionElementVisitor) : factory.createVoidZero()); } } /** @@ -90043,7 +92755,7 @@ var ts; // // To balance the declaration, add the exports of the elided variable // statement. - if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 225 /* VariableStatement */) { + if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 229 /* VariableStatement */) { var id = ts.getOriginalNodeId(node); deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original); } @@ -90098,10 +92810,10 @@ var ts; var namedBindings = importClause.namedBindings; if (namedBindings) { switch (namedBindings.kind) { - case 256 /* NamespaceImport */: + case 260 /* NamespaceImport */: statements = appendExportsOfDeclaration(statements, namedBindings); break; - case 257 /* NamedImports */: + case 261 /* NamedImports */: for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) { var importBinding = _a[_i]; statements = appendExportsOfDeclaration(statements, importBinding, /* liveBinding */ true); @@ -90184,9 +92896,9 @@ var ts; if (currentModuleInfo.exportEquals) { return statements; } - if (ts.hasModifier(decl, 1 /* Export */)) { - var exportName = ts.hasModifier(decl, 512 /* Default */) ? ts.createIdentifier("default") : ts.getDeclarationName(decl); - statements = appendExportStatement(statements, exportName, ts.getLocalName(decl), /*location*/ decl); + if (ts.hasSyntacticModifier(decl, 1 /* Export */)) { + var exportName = ts.hasSyntacticModifier(decl, 512 /* Default */) ? factory.createIdentifier("default") : factory.getDeclarationName(decl); + statements = appendExportStatement(statements, exportName, factory.getLocalName(decl), /*location*/ decl); } if (decl.name) { statements = appendExportsOfDeclaration(statements, decl); @@ -90202,7 +92914,7 @@ var ts; * @param decl The declaration to export. */ function appendExportsOfDeclaration(statements, decl, liveBinding) { - var name = ts.getDeclarationName(decl); + var name = factory.getDeclarationName(decl); var exportSpecifiers = currentModuleInfo.exportSpecifiers.get(ts.idText(name)); if (exportSpecifiers) { for (var _i = 0, exportSpecifiers_1 = exportSpecifiers; _i < exportSpecifiers_1.length; _i++) { @@ -90231,15 +92943,15 @@ var ts; function createUnderscoreUnderscoreESModule() { var statement; if (languageVersion === 0 /* ES3 */) { - statement = ts.createExpressionStatement(createExportExpression(ts.createIdentifier("__esModule"), ts.createLiteral(/*value*/ true))); + statement = factory.createExpressionStatement(createExportExpression(factory.createIdentifier("__esModule"), factory.createTrue())); } else { - statement = ts.createExpressionStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), + statement = factory.createExpressionStatement(factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Object"), "defineProperty"), /*typeArguments*/ undefined, [ - ts.createIdentifier("exports"), - ts.createLiteral("__esModule"), - ts.createObjectLiteral([ - ts.createPropertyAssignment("value", ts.createLiteral(/*value*/ true)) + factory.createIdentifier("exports"), + factory.createStringLiteral("__esModule"), + factory.createObjectLiteralExpression([ + factory.createPropertyAssignment("value", factory.createTrue()) ]) ])); } @@ -90255,7 +92967,7 @@ var ts; * @param allowComments An optional value indicating whether to emit comments for the statement. */ function createExportStatement(name, value, location, allowComments, liveBinding) { - var statement = ts.setTextRange(ts.createExpressionStatement(createExportExpression(name, value, /* location */ undefined, liveBinding)), location); + var statement = ts.setTextRange(factory.createExpressionStatement(createExportExpression(name, value, /* location */ undefined, liveBinding)), location); ts.startOnNewLine(statement); if (!allowComments) { ts.setEmitFlags(statement, 1536 /* NoComments */); @@ -90270,21 +92982,21 @@ var ts; * @param location The location to use for source maps and comments for the export. */ function createExportExpression(name, value, location, liveBinding) { - return ts.setTextRange(liveBinding && languageVersion !== 0 /* ES3 */ ? ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), + return ts.setTextRange(liveBinding && languageVersion !== 0 /* ES3 */ ? factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Object"), "defineProperty"), /*typeArguments*/ undefined, [ - ts.createIdentifier("exports"), - ts.createLiteral(name), - ts.createObjectLiteral([ - ts.createPropertyAssignment("enumerable", ts.createLiteral(/*value*/ true)), - ts.createPropertyAssignment("get", ts.createFunctionExpression( + factory.createIdentifier("exports"), + factory.createStringLiteralFromNode(name), + factory.createObjectLiteralExpression([ + factory.createPropertyAssignment("enumerable", factory.createTrue()), + factory.createPropertyAssignment("get", factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, /*typeParameters*/ undefined, /*parameters*/ [], - /*type*/ undefined, ts.createBlock([ts.createReturn(value)]))) + /*type*/ undefined, factory.createBlock([factory.createReturnStatement(value)]))) ]) - ]) : ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(name)), value), location); + ]) : factory.createAssignment(factory.createPropertyAccessExpression(factory.createIdentifier("exports"), factory.cloneNode(name)), value), location); } // // Modifier Visitors @@ -90297,8 +93009,8 @@ var ts; function modifierVisitor(node) { // Elide module-specific modifiers. switch (node.kind) { - case 89 /* ExportKeyword */: - case 84 /* DefaultKeyword */: + case 92 /* ExportKeyword */: + case 87 /* DefaultKeyword */: return undefined; } return node; @@ -90314,7 +93026,7 @@ var ts; * @param emit A callback used to emit the node in the printer. */ function onEmitNode(hint, node, emitCallback) { - if (node.kind === 290 /* SourceFile */) { + if (node.kind === 294 /* SourceFile */) { currentSourceFile = node; currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)]; noSubstitution = []; @@ -90362,10 +93074,10 @@ var ts; // A shorthand property with an assignment initializer is probably part of a // destructuring assignment if (node.objectAssignmentInitializer) { - var initializer = ts.createAssignment(exportedOrImportedName, node.objectAssignmentInitializer); - return ts.setTextRange(ts.createPropertyAssignment(name, initializer), node); + var initializer = factory.createAssignment(exportedOrImportedName, node.objectAssignmentInitializer); + return ts.setTextRange(factory.createPropertyAssignment(name, initializer), node); } - return ts.setTextRange(ts.createPropertyAssignment(name, exportedOrImportedName), node); + return ts.setTextRange(factory.createPropertyAssignment(name, exportedOrImportedName), node); } return node; } @@ -90376,12 +93088,12 @@ var ts; */ function substituteExpression(node) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return substituteExpressionIdentifier(node); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return substituteBinaryExpression(node); - case 208 /* PostfixUnaryExpression */: - case 207 /* PrefixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: return substituteUnaryExpression(node); } return node; @@ -90396,25 +93108,25 @@ var ts; if (ts.getEmitFlags(node) & 4096 /* HelperName */) { var externalHelpersModuleName = ts.getExternalHelpersModuleName(currentSourceFile); if (externalHelpersModuleName) { - return ts.createPropertyAccess(externalHelpersModuleName, node); + return factory.createPropertyAccessExpression(externalHelpersModuleName, node); } return node; } if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) { var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node)); - if (exportContainer && exportContainer.kind === 290 /* SourceFile */) { - return ts.setTextRange(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node)), + if (exportContainer && exportContainer.kind === 294 /* SourceFile */) { + return ts.setTextRange(factory.createPropertyAccessExpression(factory.createIdentifier("exports"), factory.cloneNode(node)), /*location*/ node); } var importDeclaration = resolver.getReferencedImportDeclaration(node); if (importDeclaration) { if (ts.isImportClause(importDeclaration)) { - return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default")), + return ts.setTextRange(factory.createPropertyAccessExpression(factory.getGeneratedNameForNode(importDeclaration.parent), factory.createIdentifier("default")), /*location*/ node); } else if (ts.isImportSpecifier(importDeclaration)) { var name = importDeclaration.propertyName || importDeclaration.name; - return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(name)), + return ts.setTextRange(factory.createPropertyAccessExpression(factory.getGeneratedNameForNode(importDeclaration.parent.parent.parent), factory.cloneNode(name)), /*location*/ node); } } @@ -90477,8 +93189,8 @@ var ts; && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) { var exportedNames = getExports(node.operand); if (exportedNames) { - var expression = node.kind === 208 /* PostfixUnaryExpression */ - ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 45 /* PlusPlusToken */ ? 63 /* PlusEqualsToken */ : 64 /* MinusEqualsToken */), ts.createLiteral(1)), + var expression = node.kind === 212 /* PostfixUnaryExpression */ + ? ts.setTextRange(factory.createBinaryExpression(node.operand, factory.createToken(node.operator === 45 /* PlusPlusToken */ ? 63 /* PlusEqualsToken */ : 64 /* MinusEqualsToken */), factory.createNumericLiteral(1)), /*location*/ node) : node; for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) { @@ -90509,65 +93221,18 @@ var ts; } } ts.transformModule = transformModule; - ts.createBindingHelper = { - name: "typescript:commonjscreatebinding", - importName: "__createBinding", - scoped: false, - priority: 1, - text: "\nvar __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {\n if (k2 === undefined) k2 = k;\n Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });\n}) : (function(o, m, k, k2) {\n if (k2 === undefined) k2 = k;\n o[k2] = m[k];\n}));" - }; - function createCreateBindingHelper(context, module, inputName, outputName) { - context.requestEmitHelper(ts.createBindingHelper); - return ts.createCall(ts.getUnscopedHelperName("__createBinding"), /*typeArguments*/ undefined, __spreadArrays([ts.createIdentifier("exports"), module, inputName], (outputName ? [outputName] : []))); - } - ts.setModuleDefaultHelper = { - name: "typescript:commonjscreatevalue", - importName: "__setModuleDefault", - scoped: false, - priority: 1, - text: "\nvar __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {\n Object.defineProperty(o, \"default\", { enumerable: true, value: v });\n}) : function(o, v) {\n o[\"default\"] = v;\n});" - }; - // emit output for the __export helper function - var exportStarHelper = { - name: "typescript:export-star", - importName: "__exportStar", - scoped: false, - dependencies: [ts.createBindingHelper], - priority: 2, - text: "\n var __exportStar = (this && this.__exportStar) || function(m, exports) {\n for (var p in m) if (p !== \"default\" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);\n };" - }; - function createExportStarHelper(context, module) { - context.requestEmitHelper(exportStarHelper); - return ts.createCall(ts.getUnscopedHelperName("__exportStar"), /*typeArguments*/ undefined, [module, ts.createIdentifier("exports")]); - } // emit helper for dynamic import var dynamicImportUMDHelper = { name: "typescript:dynamicimport-sync-require", scoped: true, text: "\n var __syncRequire = typeof module === \"object\" && typeof module.exports === \"object\";" }; - // emit helper for `import * as Name from "foo"` - ts.importStarHelper = { - name: "typescript:commonjsimportstar", - importName: "__importStar", - scoped: false, - dependencies: [ts.createBindingHelper, ts.setModuleDefaultHelper], - priority: 2, - text: "\nvar __importStar = (this && this.__importStar) || function (mod) {\n if (mod && mod.__esModule) return mod;\n var result = {};\n if (mod != null) for (var k in mod) if (k !== \"default\" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);\n __setModuleDefault(result, mod);\n return result;\n};" - }; - // emit helper for `import Name from "foo"` - ts.importDefaultHelper = { - name: "typescript:commonjsimportdefault", - importName: "__importDefault", - scoped: false, - text: "\nvar __importDefault = (this && this.__importDefault) || function (mod) {\n return (mod && mod.__esModule) ? mod : { \"default\": mod };\n};" - }; })(ts || (ts = {})); /*@internal*/ var ts; (function (ts) { function transformSystemModule(context) { - var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration; + var factory = context.factory, startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration; var compilerOptions = context.getCompilerOptions(); var resolver = context.getEmitResolver(); var host = context.getEmitHost(); @@ -90575,13 +93240,13 @@ var ts; var previousOnEmitNode = context.onEmitNode; context.onSubstituteNode = onSubstituteNode; context.onEmitNode = onEmitNode; - context.enableSubstitution(75 /* Identifier */); // Substitutes expression identifiers for imported symbols. - context.enableSubstitution(282 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols - context.enableSubstitution(209 /* BinaryExpression */); // Substitutes assignments to exported symbols. - context.enableSubstitution(207 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols. - context.enableSubstitution(208 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols. - context.enableSubstitution(219 /* MetaProperty */); // Substitutes 'import.meta' - context.enableEmitNotification(290 /* SourceFile */); // Restore state when substituting nodes in a file. + context.enableSubstitution(78 /* Identifier */); // Substitutes expression identifiers for imported symbols. + context.enableSubstitution(286 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols + context.enableSubstitution(213 /* BinaryExpression */); // Substitutes assignments to exported symbols. + context.enableSubstitution(211 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols. + context.enableSubstitution(212 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols. + context.enableSubstitution(223 /* MetaProperty */); // Substitutes 'import.meta' + context.enableEmitNotification(294 /* SourceFile */); // Restore state when substituting nodes in a file. var moduleInfoMap = []; // The ExternalModuleInfo for each file. var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found. var exportFunctionsMap = []; // The export function associated with a source file. @@ -90594,7 +93259,7 @@ var ts; var hoistedStatements; var enclosingBlockScopedContainer; var noSubstitution; // Set of nodes for which substitution rules should be ignored. - return ts.chainBundle(transformSourceFile); + return ts.chainBundle(context, transformSourceFile); /** * Transforms the module aspects of a SourceFile. * @@ -90620,36 +93285,36 @@ var ts; // The only exception in this rule is postfix unary operators, // see comment to 'substitutePostfixUnaryExpression' for more details // Collect information about the external module and dependency groups. - moduleInfo = moduleInfoMap[id] = ts.collectExternalModuleInfo(node, resolver, compilerOptions); + moduleInfo = moduleInfoMap[id] = ts.collectExternalModuleInfo(context, node, resolver, compilerOptions); // Make sure that the name of the 'exports' function does not conflict with // existing identifiers. - exportFunction = ts.createUniqueName("exports"); + exportFunction = factory.createUniqueName("exports"); exportFunctionsMap[id] = exportFunction; - contextObject = contextObjectMap[id] = ts.createUniqueName("context"); + contextObject = contextObjectMap[id] = factory.createUniqueName("context"); // Add the body of the module. var dependencyGroups = collectDependencyGroups(moduleInfo.externalImports); var moduleBodyBlock = createSystemModuleBody(node, dependencyGroups); - var moduleBodyFunction = ts.createFunctionExpression( + var moduleBodyFunction = factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, /*typeParameters*/ undefined, [ - ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, exportFunction), - ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, contextObject) + factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, exportFunction), + factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, contextObject) ], /*type*/ undefined, moduleBodyBlock); // Write the call to `System.register` // Clear the emit-helpers flag for later passes since we'll have already used it in the module body // So the helper will be emit at the correct position instead of at the top of the source-file - var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions); - var dependencies = ts.createArrayLiteral(ts.map(dependencyGroups, function (dependencyGroup) { return dependencyGroup.name; })); - var updated = ts.setEmitFlags(ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray([ - ts.createExpressionStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("System"), "register"), + var moduleName = ts.tryGetModuleNameFromFile(factory, node, host, compilerOptions); + var dependencies = factory.createArrayLiteralExpression(ts.map(dependencyGroups, function (dependencyGroup) { return dependencyGroup.name; })); + var updated = ts.setEmitFlags(factory.updateSourceFile(node, ts.setTextRange(factory.createNodeArray([ + factory.createExpressionStatement(factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("System"), "register"), /*typeArguments*/ undefined, moduleName ? [moduleName, dependencies, moduleBodyFunction] : [dependencies, moduleBodyFunction])) ]), node.statements)), 1024 /* NoTrailingComments */); - if (!(compilerOptions.outFile || compilerOptions.out)) { + if (!ts.outFile(compilerOptions)) { ts.moveEmitHelpers(updated, moduleBodyBlock, function (helper) { return !helper.scoped; }); } if (noSubstitution) { @@ -90662,7 +93327,7 @@ var ts; contextObject = undefined; hoistedStatements = undefined; enclosingBlockScopedContainer = undefined; - return ts.aggregateTransformFlags(updated); + return updated; } /** * Collects the dependency groups for this files imports. @@ -90670,11 +93335,11 @@ var ts; * @param externalImports The imports for the file. */ function collectDependencyGroups(externalImports) { - var groupIndices = ts.createMap(); + var groupIndices = new ts.Map(); var dependencyGroups = []; for (var _i = 0, externalImports_1 = externalImports; _i < externalImports_1.length; _i++) { var externalImport = externalImports_1[_i]; - var externalModuleName = ts.getExternalModuleNameLiteral(externalImport, currentSourceFile, host, resolver, compilerOptions); + var externalModuleName = ts.getExternalModuleNameLiteral(factory, externalImport, currentSourceFile, host, resolver, compilerOptions); if (externalModuleName) { var text = externalModuleName.text; var groupIndex = groupIndices.get(text); @@ -90747,12 +93412,13 @@ var ts; startLexicalEnvironment(); // Add any prologue directives. var ensureUseStrict = ts.getStrictOptionValue(compilerOptions, "alwaysStrict") || (!compilerOptions.noImplicitUseStrict && ts.isExternalModule(currentSourceFile)); - var statementOffset = ts.addPrologue(statements, node.statements, ensureUseStrict, sourceElementVisitor); + var statementOffset = factory.copyPrologue(node.statements, statements, ensureUseStrict, sourceElementVisitor); // var __moduleName = context_1 && context_1.id; - statements.push(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration("__moduleName", - /*type*/ undefined, ts.createLogicalAnd(contextObject, ts.createPropertyAccess(contextObject, "id"))) + statements.push(factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList([ + factory.createVariableDeclaration("__moduleName", + /*exclamationToken*/ undefined, + /*type*/ undefined, factory.createLogicalAnd(contextObject, factory.createPropertyAccessExpression(contextObject, "id"))) ]))); // Visit the synthetic external helpers import declaration if present ts.visitNode(moduleInfo.externalHelpersImportDeclaration, sourceElementVisitor, ts.isStatement); @@ -90770,20 +93436,19 @@ var ts; ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment()); var exportStarFunction = addExportStarIfNeeded(statements); // TODO: GH#18217 var modifiers = node.transformFlags & 524288 /* ContainsAwait */ ? - ts.createModifiersFromModifierFlags(256 /* Async */) : + factory.createModifiersFromModifierFlags(256 /* Async */) : undefined; - var moduleObject = ts.createObjectLiteral([ - ts.createPropertyAssignment("setters", createSettersArray(exportStarFunction, dependencyGroups)), - ts.createPropertyAssignment("execute", ts.createFunctionExpression(modifiers, + var moduleObject = factory.createObjectLiteralExpression([ + factory.createPropertyAssignment("setters", createSettersArray(exportStarFunction, dependencyGroups)), + factory.createPropertyAssignment("execute", factory.createFunctionExpression(modifiers, /*asteriskToken*/ undefined, /*name*/ undefined, /*typeParameters*/ undefined, /*parameters*/ [], - /*type*/ undefined, ts.createBlock(executeStatements, /*multiLine*/ true))) - ]); - moduleObject.multiLine = true; - statements.push(ts.createReturn(moduleObject)); - return ts.createBlock(statements, /*multiLine*/ true); + /*type*/ undefined, factory.createBlock(executeStatements, /*multiLine*/ true))) + ], /*multiLine*/ true); + statements.push(factory.createReturnStatement(moduleObject)); + return factory.createBlock(statements, /*multiLine*/ true); } /** * Adds an exportStar function to a statement list if it is needed for the file. @@ -90805,7 +93470,7 @@ var ts; var hasExportDeclarationWithExportClause = false; for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) { var externalImport = _a[_i]; - if (externalImport.kind === 260 /* ExportDeclaration */ && externalImport.exportClause) { + if (externalImport.kind === 264 /* ExportDeclaration */ && externalImport.exportClause) { hasExportDeclarationWithExportClause = true; break; } @@ -90825,34 +93490,15 @@ var ts; continue; } // write name of exported declaration, i.e 'export var x...' - exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(exportedLocalName), ts.createTrue())); + exportedNames.push(factory.createPropertyAssignment(factory.createStringLiteralFromNode(exportedLocalName), factory.createTrue())); } } - for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) { - var externalImport = _e[_d]; - if (externalImport.kind !== 260 /* ExportDeclaration */) { - continue; - } - if (!externalImport.exportClause) { - // export * from ... - continue; - } - if (ts.isNamedExports(externalImport.exportClause)) { - for (var _f = 0, _g = externalImport.exportClause.elements; _f < _g.length; _f++) { - var element = _g[_f]; - // write name of indirectly exported entry, i.e. 'export {x} from ...' - exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(ts.idText(element.name || element.propertyName)), ts.createTrue())); - } - } - else { - exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(ts.idText(externalImport.exportClause.name)), ts.createTrue())); - } - } - var exportedNamesStorageRef = ts.createUniqueName("exportedNames"); - statements.push(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(exportedNamesStorageRef, - /*type*/ undefined, ts.createObjectLiteral(exportedNames, /*multiline*/ true)) + var exportedNamesStorageRef = factory.createUniqueName("exportedNames"); + statements.push(factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList([ + factory.createVariableDeclaration(exportedNamesStorageRef, + /*exclamationToken*/ undefined, + /*type*/ undefined, factory.createObjectLiteralExpression(exportedNames, /*multiline*/ true)) ]))); var exportStarFunction = createExportStarFunction(exportedNamesStorageRef); statements.push(exportStarFunction); @@ -90866,32 +93512,33 @@ var ts; * names. */ function createExportStarFunction(localNames) { - var exportStarFunction = ts.createUniqueName("exportStar"); - var m = ts.createIdentifier("m"); - var n = ts.createIdentifier("n"); - var exports = ts.createIdentifier("exports"); - var condition = ts.createStrictInequality(n, ts.createLiteral("default")); + var exportStarFunction = factory.createUniqueName("exportStar"); + var m = factory.createIdentifier("m"); + var n = factory.createIdentifier("n"); + var exports = factory.createIdentifier("exports"); + var condition = factory.createStrictInequality(n, factory.createStringLiteral("default")); if (localNames) { - condition = ts.createLogicalAnd(condition, ts.createLogicalNot(ts.createCall(ts.createPropertyAccess(localNames, "hasOwnProperty"), + condition = factory.createLogicalAnd(condition, factory.createLogicalNot(factory.createCallExpression(factory.createPropertyAccessExpression(localNames, "hasOwnProperty"), /*typeArguments*/ undefined, [n]))); } - return ts.createFunctionDeclaration( + return factory.createFunctionDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, /*asteriskToken*/ undefined, exportStarFunction, - /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, m)], - /*type*/ undefined, ts.createBlock([ - ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(exports, - /*type*/ undefined, ts.createObjectLiteral([])) + /*typeParameters*/ undefined, [factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, m)], + /*type*/ undefined, factory.createBlock([ + factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList([ + factory.createVariableDeclaration(exports, + /*exclamationToken*/ undefined, + /*type*/ undefined, factory.createObjectLiteralExpression([])) ])), - ts.createForIn(ts.createVariableDeclarationList([ - ts.createVariableDeclaration(n, /*type*/ undefined) - ]), m, ts.createBlock([ - ts.setEmitFlags(ts.createIf(condition, ts.createExpressionStatement(ts.createAssignment(ts.createElementAccess(exports, n), ts.createElementAccess(m, n)))), 1 /* SingleLine */) + factory.createForInStatement(factory.createVariableDeclarationList([ + factory.createVariableDeclaration(n) + ]), m, factory.createBlock([ + ts.setEmitFlags(factory.createIfStatement(condition, factory.createExpressionStatement(factory.createAssignment(factory.createElementAccessExpression(exports, n), factory.createElementAccessExpression(m, n)))), 1 /* SingleLine */) ])), - ts.createExpressionStatement(ts.createCall(exportFunction, + factory.createExpressionStatement(factory.createCallExpression(exportFunction, /*typeArguments*/ undefined, [exports])) ], /*multiline*/ true)); } @@ -90906,26 +93553,26 @@ var ts; for (var _i = 0, dependencyGroups_1 = dependencyGroups; _i < dependencyGroups_1.length; _i++) { var group_2 = dependencyGroups_1[_i]; // derive a unique name for parameter from the first named entry in the group - var localName = ts.forEach(group_2.externalImports, function (i) { return ts.getLocalNameForExternalImport(i, currentSourceFile); }); - var parameterName = localName ? ts.getGeneratedNameForNode(localName) : ts.createUniqueName(""); + var localName = ts.forEach(group_2.externalImports, function (i) { return ts.getLocalNameForExternalImport(factory, i, currentSourceFile); }); + var parameterName = localName ? factory.getGeneratedNameForNode(localName) : factory.createUniqueName(""); var statements = []; for (var _a = 0, _b = group_2.externalImports; _a < _b.length; _a++) { var entry = _b[_a]; - var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile); // TODO: GH#18217 + var importVariableName = ts.getLocalNameForExternalImport(factory, entry, currentSourceFile); // TODO: GH#18217 switch (entry.kind) { - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: if (!entry.importClause) { // 'import "..."' case // module is imported only for side-effects, no emit required break; } // falls through - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: ts.Debug.assert(importVariableName !== undefined); // save import into the local - statements.push(ts.createExpressionStatement(ts.createAssignment(importVariableName, parameterName))); + statements.push(factory.createExpressionStatement(factory.createAssignment(importVariableName, parameterName))); break; - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: ts.Debug.assert(importVariableName !== undefined); if (entry.exportClause) { if (ts.isNamedExports(entry.exportClause)) { @@ -90940,15 +93587,15 @@ var ts; var properties = []; for (var _c = 0, _d = entry.exportClause.elements; _c < _d.length; _c++) { var e = _d[_c]; - properties.push(ts.createPropertyAssignment(ts.createLiteral(ts.idText(e.name)), ts.createElementAccess(parameterName, ts.createLiteral(ts.idText(e.propertyName || e.name))))); + properties.push(factory.createPropertyAssignment(factory.createStringLiteral(ts.idText(e.name)), factory.createElementAccessExpression(parameterName, factory.createStringLiteral(ts.idText(e.propertyName || e.name))))); } - statements.push(ts.createExpressionStatement(ts.createCall(exportFunction, - /*typeArguments*/ undefined, [ts.createObjectLiteral(properties, /*multiline*/ true)]))); + statements.push(factory.createExpressionStatement(factory.createCallExpression(exportFunction, + /*typeArguments*/ undefined, [factory.createObjectLiteralExpression(properties, /*multiline*/ true)]))); } else { - statements.push(ts.createExpressionStatement(ts.createCall(exportFunction, + statements.push(factory.createExpressionStatement(factory.createCallExpression(exportFunction, /*typeArguments*/ undefined, [ - ts.createLiteral(ts.idText(entry.exportClause.name)), + factory.createStringLiteral(ts.idText(entry.exportClause.name)), parameterName ]))); } @@ -90959,20 +93606,20 @@ var ts; // emit as: // // exportStar(foo_1_1); - statements.push(ts.createExpressionStatement(ts.createCall(exportStarFunction, + statements.push(factory.createExpressionStatement(factory.createCallExpression(exportStarFunction, /*typeArguments*/ undefined, [parameterName]))); } break; } } - setters.push(ts.createFunctionExpression( + setters.push(factory.createFunctionExpression( /*modifiers*/ undefined, /*asteriskToken*/ undefined, /*name*/ undefined, - /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], - /*type*/ undefined, ts.createBlock(statements, /*multiLine*/ true))); + /*typeParameters*/ undefined, [factory.createParameterDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], + /*type*/ undefined, factory.createBlock(statements, /*multiLine*/ true))); } - return ts.createArrayLiteral(setters, /*multiLine*/ true); + return factory.createArrayLiteralExpression(setters, /*multiLine*/ true); } // // Top-level Source Element Visitors @@ -90984,13 +93631,13 @@ var ts; */ function sourceElementVisitor(node) { switch (node.kind) { - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: return visitImportDeclaration(node); - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return visitImportEqualsDeclaration(node); - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: return visitExportDeclaration(node); - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: return visitExportAssignment(node); default: return nestedElementVisitor(node); @@ -91004,7 +93651,7 @@ var ts; function visitImportDeclaration(node) { var statements; if (node.importClause) { - hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile)); // TODO: GH#18217 + hoistVariableDeclaration(ts.getLocalNameForExternalImport(factory, node, currentSourceFile)); // TODO: GH#18217 } if (hasAssociatedEndOfDeclarationMarker(node)) { // Defer exports until we encounter an EndOfDeclarationMarker node @@ -91028,7 +93675,7 @@ var ts; function visitImportEqualsDeclaration(node) { ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer."); var statements; - hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile)); // TODO: GH#18217 + hoistVariableDeclaration(ts.getLocalNameForExternalImport(factory, node, currentSourceFile)); // TODO: GH#18217 if (hasAssociatedEndOfDeclarationMarker(node)) { // Defer exports until we encounter an EndOfDeclarationMarker node var id = ts.getOriginalNodeId(node); @@ -91054,10 +93701,10 @@ var ts; if (original && hasAssociatedEndOfDeclarationMarker(original)) { // Defer exports until we encounter an EndOfDeclarationMarker node var id = ts.getOriginalNodeId(node); - deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), expression, /*allowComments*/ true); + deferredExports[id] = appendExportStatement(deferredExports[id], factory.createIdentifier("default"), expression, /*allowComments*/ true); } else { - return createExportStatement(ts.createIdentifier("default"), expression, /*allowComments*/ true); + return createExportStatement(factory.createIdentifier("default"), expression, /*allowComments*/ true); } } /** @@ -91066,8 +93713,8 @@ var ts; * @param node The node to visit. */ function visitFunctionDeclaration(node) { - if (ts.hasModifier(node, 1 /* Export */)) { - hoistedStatements = ts.append(hoistedStatements, ts.updateFunctionDeclaration(node, node.decorators, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, ts.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), + if (ts.hasSyntacticModifier(node, 1 /* Export */)) { + hoistedStatements = ts.append(hoistedStatements, factory.updateFunctionDeclaration(node, node.decorators, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, factory.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), /*typeParameters*/ undefined, ts.visitNodes(node.parameters, destructuringAndImportCallVisitor, ts.isParameterDeclaration), /*type*/ undefined, ts.visitNode(node.body, destructuringAndImportCallVisitor, ts.isBlock))); } @@ -91092,10 +93739,10 @@ var ts; function visitClassDeclaration(node) { var statements; // Hoist the name of the class declaration to the outer module body function. - var name = ts.getLocalName(node); + var name = factory.getLocalName(node); hoistVariableDeclaration(name); // Rewrite the class declaration into an assignment of a class expression. - statements = ts.append(statements, ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(name, ts.setTextRange(ts.createClassExpression( + statements = ts.append(statements, ts.setTextRange(factory.createExpressionStatement(factory.createAssignment(name, ts.setTextRange(factory.createClassExpression(ts.visitNodes(node.decorators, destructuringAndImportCallVisitor, ts.isDecorator), /*modifiers*/ undefined, node.name, /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, destructuringAndImportCallVisitor, ts.isHeritageClause), ts.visitNodes(node.members, destructuringAndImportCallVisitor, ts.isClassElement)), node))), node)); if (hasAssociatedEndOfDeclarationMarker(node)) { @@ -91119,7 +93766,7 @@ var ts; return ts.visitNode(node, destructuringAndImportCallVisitor, ts.isStatement); } var expressions; - var isExportedDeclaration = ts.hasModifier(node, 1 /* Export */); + var isExportedDeclaration = ts.hasSyntacticModifier(node, 1 /* Export */); var isMarkedDeclaration = hasAssociatedEndOfDeclarationMarker(node); for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) { var variable = _a[_i]; @@ -91132,7 +93779,7 @@ var ts; } var statements; if (expressions) { - statements = ts.append(statements, ts.setTextRange(ts.createExpressionStatement(ts.inlineExpressions(expressions)), node)); + statements = ts.append(statements, ts.setTextRange(factory.createExpressionStatement(factory.inlineExpressions(expressions)), node)); } if (isMarkedDeclaration) { // Defer exports until we encounter an EndOfDeclarationMarker node @@ -91159,7 +93806,7 @@ var ts; } } else { - hoistVariableDeclaration(ts.getSynthesizedClone(node.name)); + hoistVariableDeclaration(factory.cloneNode(node.name)); } } /** @@ -91170,7 +93817,7 @@ var ts; function shouldHoistVariableDeclarationList(node) { // hoist only non-block scoped declarations or block scoped declarations parented by source file return (ts.getEmitFlags(node) & 2097152 /* NoHoisting */) === 0 - && (enclosingBlockScopedContainer.kind === 290 /* SourceFile */ + && (enclosingBlockScopedContainer.kind === 294 /* SourceFile */ || (ts.getOriginalNode(node).flags & 3 /* BlockScoped */) === 0); } /** @@ -91215,10 +93862,10 @@ var ts; * @param isExportedDeclaration A value indicating whether the variable is exported. */ function createVariableAssignment(name, value, location, isExportedDeclaration) { - hoistVariableDeclaration(ts.getSynthesizedClone(name)); + hoistVariableDeclaration(factory.cloneNode(name)); return isExportedDeclaration - ? createExportExpression(name, preventSubstitution(ts.setTextRange(ts.createAssignment(name, value), location))) - : preventSubstitution(ts.setTextRange(ts.createAssignment(name, value), location)); + ? createExportExpression(name, preventSubstitution(ts.setTextRange(factory.createAssignment(name, value), location))) + : preventSubstitution(ts.setTextRange(factory.createAssignment(name, value), location)); } /** * Visits a MergeDeclarationMarker used as a placeholder for the beginning of a merged @@ -91234,9 +93881,9 @@ var ts; // // To balance the declaration, we defer the exports of the elided variable // statement until we visit this declaration's `EndOfDeclarationMarker`. - if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 225 /* VariableStatement */) { + if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 229 /* VariableStatement */) { var id = ts.getOriginalNodeId(node); - var isExportedDeclaration = ts.hasModifier(node.original, 1 /* Export */); + var isExportedDeclaration = ts.hasSyntacticModifier(node.original, 1 /* Export */); deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration); } return node; @@ -91296,10 +93943,10 @@ var ts; var namedBindings = importClause.namedBindings; if (namedBindings) { switch (namedBindings.kind) { - case 256 /* NamespaceImport */: + case 260 /* NamespaceImport */: statements = appendExportsOfDeclaration(statements, namedBindings); break; - case 257 /* NamedImports */: + case 261 /* NamedImports */: for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) { var importBinding = _a[_i]; statements = appendExportsOfDeclaration(statements, importBinding); @@ -91372,7 +94019,7 @@ var ts; else if (!ts.isGeneratedIdentifier(decl.name)) { var excludeName = void 0; if (exportSelf) { - statements = appendExportStatement(statements, decl.name, ts.getLocalName(decl)); + statements = appendExportStatement(statements, decl.name, factory.getLocalName(decl)); excludeName = ts.idText(decl.name); } statements = appendExportsOfDeclaration(statements, decl, excludeName); @@ -91393,9 +94040,9 @@ var ts; return statements; } var excludeName; - if (ts.hasModifier(decl, 1 /* Export */)) { - var exportName = ts.hasModifier(decl, 512 /* Default */) ? ts.createLiteral("default") : decl.name; - statements = appendExportStatement(statements, exportName, ts.getLocalName(decl)); + if (ts.hasSyntacticModifier(decl, 1 /* Export */)) { + var exportName = ts.hasSyntacticModifier(decl, 512 /* Default */) ? factory.createStringLiteral("default") : decl.name; + statements = appendExportStatement(statements, exportName, factory.getLocalName(decl)); excludeName = ts.getTextOfIdentifierOrLiteral(exportName); } if (decl.name) { @@ -91416,7 +94063,7 @@ var ts; if (moduleInfo.exportEquals) { return statements; } - var name = ts.getDeclarationName(decl); + var name = factory.getDeclarationName(decl); var exportSpecifiers = moduleInfo.exportSpecifiers.get(ts.idText(name)); if (exportSpecifiers) { for (var _i = 0, exportSpecifiers_2 = exportSpecifiers; _i < exportSpecifiers_2.length; _i++) { @@ -91451,7 +94098,7 @@ var ts; * @param allowComments An optional value indicating whether to emit comments for the statement. */ function createExportStatement(name, value, allowComments) { - var statement = ts.createExpressionStatement(createExportExpression(name, value)); + var statement = factory.createExpressionStatement(createExportExpression(name, value)); ts.startOnNewLine(statement); if (!allowComments) { ts.setEmitFlags(statement, 1536 /* NoComments */); @@ -91465,9 +94112,9 @@ var ts; * @param value The exported value. */ function createExportExpression(name, value) { - var exportName = ts.isIdentifier(name) ? ts.createLiteral(name) : name; + var exportName = ts.isIdentifier(name) ? factory.createStringLiteralFromNode(name) : name; ts.setEmitFlags(value, ts.getEmitFlags(value) | 1536 /* NoComments */); - return ts.setCommentRange(ts.createCall(exportFunction, /*typeArguments*/ undefined, [exportName, value]), value); + return ts.setCommentRange(factory.createCallExpression(exportFunction, /*typeArguments*/ undefined, [exportName, value]), value); } // // Top-Level or Nested Source Element Visitors @@ -91479,43 +94126,43 @@ var ts; */ function nestedElementVisitor(node) { switch (node.kind) { - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: return visitVariableStatement(node); - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: return visitFunctionDeclaration(node); - case 245 /* ClassDeclaration */: + case 249 /* ClassDeclaration */: return visitClassDeclaration(node); - case 230 /* ForStatement */: + case 234 /* ForStatement */: return visitForStatement(node); - case 231 /* ForInStatement */: + case 235 /* ForInStatement */: return visitForInStatement(node); - case 232 /* ForOfStatement */: + case 236 /* ForOfStatement */: return visitForOfStatement(node); - case 228 /* DoStatement */: + case 232 /* DoStatement */: return visitDoStatement(node); - case 229 /* WhileStatement */: + case 233 /* WhileStatement */: return visitWhileStatement(node); - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: return visitLabeledStatement(node); - case 236 /* WithStatement */: + case 240 /* WithStatement */: return visitWithStatement(node); - case 237 /* SwitchStatement */: + case 241 /* SwitchStatement */: return visitSwitchStatement(node); - case 251 /* CaseBlock */: + case 255 /* CaseBlock */: return visitCaseBlock(node); - case 277 /* CaseClause */: + case 281 /* CaseClause */: return visitCaseClause(node); - case 278 /* DefaultClause */: + case 282 /* DefaultClause */: return visitDefaultClause(node); - case 240 /* TryStatement */: + case 244 /* TryStatement */: return visitTryStatement(node); - case 280 /* CatchClause */: + case 284 /* CatchClause */: return visitCatchClause(node); - case 223 /* Block */: + case 227 /* Block */: return visitBlock(node); - case 328 /* MergeDeclarationMarker */: + case 333 /* MergeDeclarationMarker */: return visitMergeDeclarationMarker(node); - case 329 /* EndOfDeclarationMarker */: + case 334 /* EndOfDeclarationMarker */: return visitEndOfDeclarationMarker(node); default: return destructuringAndImportCallVisitor(node); @@ -91529,7 +94176,7 @@ var ts; function visitForStatement(node) { var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer; enclosingBlockScopedContainer = node; - node = ts.updateFor(node, node.initializer && visitForInitializer(node.initializer), ts.visitNode(node.condition, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.incrementor, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement)); + node = factory.updateForStatement(node, node.initializer && visitForInitializer(node.initializer), ts.visitNode(node.condition, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.incrementor, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement)); enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer; return node; } @@ -91541,7 +94188,7 @@ var ts; function visitForInStatement(node) { var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer; enclosingBlockScopedContainer = node; - node = ts.updateForIn(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, ts.liftToBlock)); + node = factory.updateForInStatement(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, factory.liftToBlock)); enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer; return node; } @@ -91553,7 +94200,7 @@ var ts; function visitForOfStatement(node) { var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer; enclosingBlockScopedContainer = node; - node = ts.updateForOf(node, node.awaitModifier, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, ts.liftToBlock)); + node = factory.updateForOfStatement(node, node.awaitModifier, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, factory.liftToBlock)); enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer; return node; } @@ -91582,7 +94229,7 @@ var ts; hoistBindingElement(variable); } } - return expressions ? ts.inlineExpressions(expressions) : ts.createOmittedExpression(); + return expressions ? factory.inlineExpressions(expressions) : factory.createOmittedExpression(); } else { return ts.visitEachChild(node, nestedElementVisitor, context); @@ -91594,7 +94241,7 @@ var ts; * @param node The node to visit. */ function visitDoStatement(node) { - return ts.updateDo(node, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, ts.liftToBlock), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression)); + return factory.updateDoStatement(node, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, factory.liftToBlock), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression)); } /** * Visits the body of a WhileStatement to hoist declarations. @@ -91602,7 +94249,7 @@ var ts; * @param node The node to visit. */ function visitWhileStatement(node) { - return ts.updateWhile(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, ts.liftToBlock)); + return factory.updateWhileStatement(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, factory.liftToBlock)); } /** * Visits the body of a LabeledStatement to hoist declarations. @@ -91610,7 +94257,7 @@ var ts; * @param node The node to visit. */ function visitLabeledStatement(node) { - return ts.updateLabel(node, node.label, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, ts.liftToBlock)); + return factory.updateLabeledStatement(node, node.label, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, factory.liftToBlock)); } /** * Visits the body of a WithStatement to hoist declarations. @@ -91618,7 +94265,7 @@ var ts; * @param node The node to visit. */ function visitWithStatement(node) { - return ts.updateWith(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, ts.liftToBlock)); + return factory.updateWithStatement(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, factory.liftToBlock)); } /** * Visits the body of a SwitchStatement to hoist declarations. @@ -91626,7 +94273,7 @@ var ts; * @param node The node to visit. */ function visitSwitchStatement(node) { - return ts.updateSwitch(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.caseBlock, nestedElementVisitor, ts.isCaseBlock)); + return factory.updateSwitchStatement(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.caseBlock, nestedElementVisitor, ts.isCaseBlock)); } /** * Visits the body of a CaseBlock to hoist declarations. @@ -91636,7 +94283,7 @@ var ts; function visitCaseBlock(node) { var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer; enclosingBlockScopedContainer = node; - node = ts.updateCaseBlock(node, ts.visitNodes(node.clauses, nestedElementVisitor, ts.isCaseOrDefaultClause)); + node = factory.updateCaseBlock(node, ts.visitNodes(node.clauses, nestedElementVisitor, ts.isCaseOrDefaultClause)); enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer; return node; } @@ -91646,7 +94293,7 @@ var ts; * @param node The node to visit. */ function visitCaseClause(node) { - return ts.updateCaseClause(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNodes(node.statements, nestedElementVisitor, ts.isStatement)); + return factory.updateCaseClause(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNodes(node.statements, nestedElementVisitor, ts.isStatement)); } /** * Visits the body of a DefaultClause to hoist declarations. @@ -91672,7 +94319,7 @@ var ts; function visitCatchClause(node) { var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer; enclosingBlockScopedContainer = node; - node = ts.updateCatchClause(node, node.variableDeclaration, ts.visitNode(node.block, nestedElementVisitor, ts.isBlock)); + node = factory.updateCatchClause(node, node.variableDeclaration, ts.visitNode(node.block, nestedElementVisitor, ts.isBlock)); enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer; return node; } @@ -91721,7 +94368,7 @@ var ts; // } // }; // }); - return ts.createCall(ts.createPropertyAccess(contextObject, ts.createIdentifier("import")), + return factory.createCallExpression(factory.createPropertyAccessExpression(contextObject, factory.createIdentifier("import")), /*typeArguments*/ undefined, ts.some(node.arguments) ? [ts.visitNode(node.arguments[0], destructuringAndImportCallVisitor)] : []); } /** @@ -91762,7 +94409,7 @@ var ts; } else if (ts.isIdentifier(node)) { var container = resolver.getReferencedExportContainer(node); - return container !== undefined && container.kind === 290 /* SourceFile */; + return container !== undefined && container.kind === 294 /* SourceFile */; } else { return false; @@ -91778,8 +94425,8 @@ var ts; */ function modifierVisitor(node) { switch (node.kind) { - case 89 /* ExportKeyword */: - case 84 /* DefaultKeyword */: + case 92 /* ExportKeyword */: + case 87 /* DefaultKeyword */: return undefined; } return node; @@ -91795,7 +94442,7 @@ var ts; * @param emitCallback A callback used to emit the node in the printer. */ function onEmitNode(hint, node, emitCallback) { - if (node.kind === 290 /* SourceFile */) { + if (node.kind === 294 /* SourceFile */) { var id = ts.getOriginalNodeId(node); currentSourceFile = node; moduleInfo = moduleInfoMap[id]; @@ -91845,7 +94492,7 @@ var ts; */ function substituteUnspecified(node) { switch (node.kind) { - case 282 /* ShorthandPropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: return substituteShorthandPropertyAssignment(node); } return node; @@ -91861,11 +94508,11 @@ var ts; var importDeclaration = resolver.getReferencedImportDeclaration(name); if (importDeclaration) { if (ts.isImportClause(importDeclaration)) { - return ts.setTextRange(ts.createPropertyAssignment(ts.getSynthesizedClone(name), ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default"))), + return ts.setTextRange(factory.createPropertyAssignment(factory.cloneNode(name), factory.createPropertyAccessExpression(factory.getGeneratedNameForNode(importDeclaration.parent), factory.createIdentifier("default"))), /*location*/ node); } else if (ts.isImportSpecifier(importDeclaration)) { - return ts.setTextRange(ts.createPropertyAssignment(ts.getSynthesizedClone(name), ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(importDeclaration.propertyName || importDeclaration.name))), + return ts.setTextRange(factory.createPropertyAssignment(factory.cloneNode(name), factory.createPropertyAccessExpression(factory.getGeneratedNameForNode(importDeclaration.parent.parent.parent), factory.cloneNode(importDeclaration.propertyName || importDeclaration.name))), /*location*/ node); } } @@ -91879,14 +94526,14 @@ var ts; */ function substituteExpression(node) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return substituteExpressionIdentifier(node); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return substituteBinaryExpression(node); - case 207 /* PrefixUnaryExpression */: - case 208 /* PostfixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: return substituteUnaryExpression(node); - case 219 /* MetaProperty */: + case 223 /* MetaProperty */: return substituteMetaProperty(node); } return node; @@ -91900,7 +94547,7 @@ var ts; if (ts.getEmitFlags(node) & 4096 /* HelperName */) { var externalHelpersModuleName = ts.getExternalHelpersModuleName(currentSourceFile); if (externalHelpersModuleName) { - return ts.createPropertyAccess(externalHelpersModuleName, node); + return factory.createPropertyAccessExpression(externalHelpersModuleName, node); } return node; } @@ -91914,11 +94561,11 @@ var ts; var importDeclaration = resolver.getReferencedImportDeclaration(node); if (importDeclaration) { if (ts.isImportClause(importDeclaration)) { - return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default")), + return ts.setTextRange(factory.createPropertyAccessExpression(factory.getGeneratedNameForNode(importDeclaration.parent), factory.createIdentifier("default")), /*location*/ node); } else if (ts.isImportSpecifier(importDeclaration)) { - return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(importDeclaration.propertyName || importDeclaration.name)), + return ts.setTextRange(factory.createPropertyAccessExpression(factory.getGeneratedNameForNode(importDeclaration.parent.parent.parent), factory.cloneNode(importDeclaration.propertyName || importDeclaration.name)), /*location*/ node); } } @@ -91979,17 +94626,17 @@ var ts; && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) { var exportedNames = getExports(node.operand); if (exportedNames) { - var expression = node.kind === 208 /* PostfixUnaryExpression */ - ? ts.setTextRange(ts.createPrefix(node.operator, node.operand), node) + var expression = node.kind === 212 /* PostfixUnaryExpression */ + ? ts.setTextRange(factory.createPrefixUnaryExpression(node.operator, node.operand), node) : node; for (var _i = 0, exportedNames_5 = exportedNames; _i < exportedNames_5.length; _i++) { var exportName = exportedNames_5[_i]; expression = createExportExpression(exportName, preventSubstitution(expression)); } - if (node.kind === 208 /* PostfixUnaryExpression */) { + if (node.kind === 212 /* PostfixUnaryExpression */) { expression = node.operator === 45 /* PlusPlusToken */ - ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1)) - : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1)); + ? factory.createSubtract(preventSubstitution(expression), factory.createNumericLiteral(1)) + : factory.createAdd(preventSubstitution(expression), factory.createNumericLiteral(1)); } return expression; } @@ -91998,7 +94645,7 @@ var ts; } function substituteMetaProperty(node) { if (ts.isImportMeta(node)) { - return ts.createPropertyAccess(contextObject, ts.createIdentifier("meta")); + return factory.createPropertyAccessExpression(contextObject, factory.createIdentifier("meta")); } return node; } @@ -92014,8 +94661,8 @@ var ts; || resolver.getReferencedValueDeclaration(name); if (valueDeclaration) { var exportContainer = resolver.getReferencedExportContainer(name, /*prefixLocals*/ false); - if (exportContainer && exportContainer.kind === 290 /* SourceFile */) { - exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration)); + if (exportContainer && exportContainer.kind === 294 /* SourceFile */) { + exportedNames = ts.append(exportedNames, factory.getDeclarationName(valueDeclaration)); } exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]); } @@ -92048,42 +94695,50 @@ var ts; var ts; (function (ts) { function transformECMAScriptModule(context) { + var factory = context.factory, emitHelpers = context.getEmitHelperFactory; var compilerOptions = context.getCompilerOptions(); var previousOnEmitNode = context.onEmitNode; var previousOnSubstituteNode = context.onSubstituteNode; context.onEmitNode = onEmitNode; context.onSubstituteNode = onSubstituteNode; - context.enableEmitNotification(290 /* SourceFile */); - context.enableSubstitution(75 /* Identifier */); + context.enableEmitNotification(294 /* SourceFile */); + context.enableSubstitution(78 /* Identifier */); var helperNameSubstitutions; - return ts.chainBundle(transformSourceFile); + return ts.chainBundle(context, transformSourceFile); function transformSourceFile(node) { if (node.isDeclarationFile) { return node; } if (ts.isExternalModule(node) || compilerOptions.isolatedModules) { - var externalHelpersImportDeclaration = ts.createExternalHelpersImportDeclarationIfNeeded(node, compilerOptions); - if (externalHelpersImportDeclaration) { - var statements = []; - var statementOffset = ts.addPrologue(statements, node.statements); - ts.append(statements, externalHelpersImportDeclaration); - ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset)); - return ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray(statements), node.statements)); - } - else { - return ts.visitEachChild(node, visitor, context); + var result = updateExternalModule(node); + if (!ts.isExternalModule(node) || ts.some(result.statements, ts.isExternalModuleIndicator)) { + return result; } + return factory.updateSourceFile(result, ts.setTextRange(factory.createNodeArray(__spreadArrays(result.statements, [ts.createEmptyExports(factory)])), result.statements)); } return node; } + function updateExternalModule(node) { + var externalHelpersImportDeclaration = ts.createExternalHelpersImportDeclarationIfNeeded(factory, emitHelpers(), node, compilerOptions); + if (externalHelpersImportDeclaration) { + var statements = []; + var statementOffset = factory.copyPrologue(node.statements, statements); + ts.append(statements, externalHelpersImportDeclaration); + ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset)); + return factory.updateSourceFile(node, ts.setTextRange(factory.createNodeArray(statements), node.statements)); + } + else { + return ts.visitEachChild(node, visitor, context); + } + } function visitor(node) { switch (node.kind) { - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: // Elide `import=` as it is not legal with --module ES6 return undefined; - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: return visitExportAssignment(node); - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: var exportDecl = node; return visitExportDeclaration(exportDecl); } @@ -92103,14 +94758,17 @@ var ts; return node; } var oldIdentifier = node.exportClause.name; - var synthName = ts.getGeneratedNameForNode(oldIdentifier); - var importDecl = ts.createImportDeclaration( + var synthName = factory.getGeneratedNameForNode(oldIdentifier); + var importDecl = factory.createImportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createImportClause(/*name*/ undefined, ts.createNamespaceImport(synthName)), node.moduleSpecifier); + /*modifiers*/ undefined, factory.createImportClause( + /*isTypeOnly*/ false, + /*name*/ undefined, factory.createNamespaceImport(synthName)), node.moduleSpecifier); ts.setOriginalNode(importDecl, node.exportClause); - var exportDecl = ts.createExportDeclaration( + var exportDecl = factory.createExportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createNamedExports([ts.createExportSpecifier(synthName, oldIdentifier)])); + /*modifiers*/ undefined, + /*isTypeOnly*/ false, factory.createNamedExports([factory.createExportSpecifier(synthName, oldIdentifier)])); ts.setOriginalNode(exportDecl, node); return [importDecl, exportDecl]; } @@ -92127,7 +94785,7 @@ var ts; function onEmitNode(hint, node, emitCallback) { if (ts.isSourceFile(node)) { if ((ts.isExternalModule(node) || compilerOptions.isolatedModules) && compilerOptions.importHelpers) { - helperNameSubstitutions = ts.createMap(); + helperNameSubstitutions = new ts.Map(); } previousOnEmitNode(hint, node, emitCallback); helperNameSubstitutions = undefined; @@ -92156,7 +94814,7 @@ var ts; var name = ts.idText(node); var substitution = helperNameSubstitutions.get(name); if (!substitution) { - helperNameSubstitutions.set(name, substitution = ts.createFileLevelUniqueName(name)); + helperNameSubstitutions.set(name, substitution = factory.createUniqueName(name, 16 /* Optimistic */ | 32 /* FileLevel */)); } return substitution; } @@ -92207,14 +94865,14 @@ var ts; } : undefined; } function getAccessorNameVisibilityDiagnosticMessage(symbolAccessibilityResult) { - if (ts.hasModifier(node, 32 /* Static */)) { + if (ts.hasSyntacticModifier(node, 32 /* Static */)) { return symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1; } - else if (node.parent.kind === 245 /* ClassDeclaration */) { + else if (node.parent.kind === 249 /* ClassDeclaration */) { return symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : @@ -92236,14 +94894,14 @@ var ts; } : undefined; } function getMethodNameVisibilityDiagnosticMessage(symbolAccessibilityResult) { - if (ts.hasModifier(node, 32 /* Static */)) { + if (ts.hasSyntacticModifier(node, 32 /* Static */)) { return symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_private_name_1; } - else if (node.parent.kind === 245 /* ClassDeclaration */) { + else if (node.parent.kind === 249 /* ClassDeclaration */) { return symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Public_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : @@ -92269,7 +94927,7 @@ var ts; return getReturnTypeVisibilityError; } else if (ts.isParameter(node)) { - if (ts.isParameterPropertyDeclaration(node, node.parent) && ts.hasModifier(node.parent, 8 /* Private */)) { + if (ts.isParameterPropertyDeclaration(node, node.parent) && ts.hasSyntacticModifier(node.parent, 8 /* Private */)) { return getVariableDeclarationTypeVisibilityError; } return getParameterDeclarationTypeVisibilityError; @@ -92290,7 +94948,7 @@ var ts; return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]); } function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) { - if (node.kind === 242 /* VariableDeclaration */ || node.kind === 191 /* BindingElement */) { + if (node.kind === 246 /* VariableDeclaration */ || node.kind === 195 /* BindingElement */) { return symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : @@ -92299,17 +94957,17 @@ var ts; } // This check is to ensure we don't report error on constructor parameter property as that error would be reported during parameter emit // The only exception here is if the constructor was marked as private. we are not emitting the constructor parameters at all. - else if (node.kind === 159 /* PropertyDeclaration */ || node.kind === 194 /* PropertyAccessExpression */ || node.kind === 158 /* PropertySignature */ || - (node.kind === 156 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) { + else if (node.kind === 162 /* PropertyDeclaration */ || node.kind === 198 /* PropertyAccessExpression */ || node.kind === 161 /* PropertySignature */ || + (node.kind === 159 /* Parameter */ && ts.hasSyntacticModifier(node.parent, 8 /* Private */))) { // TODO(jfreeman): Deal with computed properties in error reporting. - if (ts.hasModifier(node, 32 /* Static */)) { + if (ts.hasSyntacticModifier(node, 32 /* Static */)) { return symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1; } - else if (node.parent.kind === 245 /* ClassDeclaration */ || node.kind === 156 /* Parameter */) { + else if (node.parent.kind === 249 /* ClassDeclaration */ || node.kind === 159 /* Parameter */) { return symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : @@ -92334,10 +94992,10 @@ var ts; } function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) { var diagnosticMessage; - if (node.kind === 164 /* SetAccessor */) { + if (node.kind === 167 /* SetAccessor */) { // Getters can infer the return type from the returned expression, but setters cannot, so the // "_from_external_module_1_but_cannot_be_named" case cannot occur. - if (ts.hasModifier(node, 32 /* Static */)) { + if (ts.hasSyntacticModifier(node, 32 /* Static */)) { diagnosticMessage = symbolAccessibilityResult.errorModuleName ? ts.Diagnostics.Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_private_name_1; @@ -92349,7 +95007,7 @@ var ts; } } else { - if (ts.hasModifier(node, 32 /* Static */)) { + if (ts.hasSyntacticModifier(node, 32 /* Static */)) { diagnosticMessage = symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : @@ -92373,34 +95031,34 @@ var ts; function getReturnTypeVisibilityError(symbolAccessibilityResult) { var diagnosticMessage; switch (node.kind) { - case 166 /* ConstructSignature */: + case 169 /* ConstructSignature */: // Interfaces cannot have return types that cannot be named diagnosticMessage = symbolAccessibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0; break; - case 165 /* CallSignature */: + case 168 /* CallSignature */: // Interfaces cannot have return types that cannot be named diagnosticMessage = symbolAccessibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0; break; - case 167 /* IndexSignature */: + case 170 /* IndexSignature */: // Interfaces cannot have return types that cannot be named diagnosticMessage = symbolAccessibilityResult.errorModuleName ? ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0; break; - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - if (ts.hasModifier(node, 32 /* Static */)) { + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + if (ts.hasSyntacticModifier(node, 32 /* Static */)) { diagnosticMessage = symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0; } - else if (node.parent.kind === 245 /* ClassDeclaration */) { + else if (node.parent.kind === 249 /* ClassDeclaration */) { diagnosticMessage = symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : @@ -92414,7 +95072,7 @@ var ts; ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0; } break; - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: diagnosticMessage = symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : @@ -92439,38 +95097,38 @@ var ts; } function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) { switch (node.parent.kind) { - case 162 /* Constructor */: + case 165 /* Constructor */: return symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1; - case 166 /* ConstructSignature */: - case 171 /* ConstructorType */: + case 169 /* ConstructSignature */: + case 174 /* ConstructorType */: // Interfaces cannot have parameter types that cannot be named return symbolAccessibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1; - case 165 /* CallSignature */: + case 168 /* CallSignature */: // Interfaces cannot have parameter types that cannot be named return symbolAccessibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1; - case 167 /* IndexSignature */: + case 170 /* IndexSignature */: // Interfaces cannot have parameter types that cannot be named return symbolAccessibilityResult.errorModuleName ? ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1; - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - if (ts.hasModifier(node.parent, 32 /* Static */)) { + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + if (ts.hasSyntacticModifier(node.parent, 32 /* Static */)) { return symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1; } - else if (node.parent.parent.kind === 245 /* ClassDeclaration */) { + else if (node.parent.parent.kind === 249 /* ClassDeclaration */) { return symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : @@ -92483,15 +95141,15 @@ var ts; ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1; } - case 244 /* FunctionDeclaration */: - case 170 /* FunctionType */: + case 248 /* FunctionDeclaration */: + case 173 /* FunctionType */: return symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 : ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1; - case 164 /* SetAccessor */: - case 163 /* GetAccessor */: + case 167 /* SetAccessor */: + case 166 /* GetAccessor */: return symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : @@ -92505,39 +95163,39 @@ var ts; // Type parameter constraints are named by user so we should always be able to name it var diagnosticMessage; switch (node.parent.kind) { - case 245 /* ClassDeclaration */: + case 249 /* ClassDeclaration */: diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1; break; - case 246 /* InterfaceDeclaration */: + case 250 /* InterfaceDeclaration */: diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1; break; - case 186 /* MappedType */: + case 189 /* MappedType */: diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1; break; - case 171 /* ConstructorType */: - case 166 /* ConstructSignature */: + case 174 /* ConstructorType */: + case 169 /* ConstructSignature */: diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1; break; - case 165 /* CallSignature */: + case 168 /* CallSignature */: diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1; break; - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - if (ts.hasModifier(node.parent, 32 /* Static */)) { + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + if (ts.hasSyntacticModifier(node.parent, 32 /* Static */)) { diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1; } - else if (node.parent.parent.kind === 245 /* ClassDeclaration */) { + else if (node.parent.parent.kind === 249 /* ClassDeclaration */) { diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1; } else { diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1; } break; - case 170 /* FunctionType */: - case 244 /* FunctionDeclaration */: + case 173 /* FunctionType */: + case 248 /* FunctionDeclaration */: diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1; break; - case 247 /* TypeAliasDeclaration */: + case 251 /* TypeAliasDeclaration */: diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1; break; default: @@ -92552,11 +95210,12 @@ var ts; function getHeritageClauseVisibilityError() { var diagnosticMessage; // Heritage clause is written by user so it can always be named - if (node.parent.parent.kind === 245 /* ClassDeclaration */) { + if (ts.isClassDeclaration(node.parent.parent)) { // Class or Interface implemented/extended is inaccessible - diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 113 /* ImplementsKeyword */ ? + diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 116 /* ImplementsKeyword */ ? ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : - ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1; + node.parent.parent.name ? ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1 : + ts.Diagnostics.extends_clause_of_exported_class_has_or_is_using_private_name_0; } else { // interface is inaccessible @@ -92589,11 +95248,8 @@ var ts; var ts; (function (ts) { function getDeclarationDiagnostics(host, resolver, file) { - if (file && ts.isJsonSourceFile(file)) { - return []; // No declaration diagnostics for json for now - } var compilerOptions = host.getCompilerOptions(); - var result = ts.transformNodes(resolver, host, compilerOptions, file ? [file] : ts.filter(host.getSourceFiles(), ts.isSourceFileNotJson), [transformDeclarations], /*allowDtsFiles*/ false); + var result = ts.transformNodes(resolver, host, ts.factory, compilerOptions, file ? [file] : ts.filter(host.getSourceFiles(), ts.isSourceFileNotJson), [transformDeclarations], /*allowDtsFiles*/ false); return result.diagnostics; } ts.getDeclarationDiagnostics = getDeclarationDiagnostics; @@ -92603,7 +95259,7 @@ var ts; } function isInternalDeclaration(node, currentSourceFile) { var parseTreeNode = ts.getParseTreeNode(node); - if (parseTreeNode && parseTreeNode.kind === 156 /* Parameter */) { + if (parseTreeNode && parseTreeNode.kind === 159 /* Parameter */) { var paramIdx = parseTreeNode.parent.parameters.indexOf(parseTreeNode); var previousSibling = paramIdx > 0 ? parseTreeNode.parent.parameters[paramIdx - 1] : undefined; var text = currentSourceFile.text; @@ -92649,6 +95305,7 @@ var ts; var lateStatementReplacementMap; var suppressNewDiagnosticContexts; var exportedModulesFromDeclarationEmit; + var factory = context.factory; var host = context.getEmitHost(); var symbolTracker = { trackSymbol: trackSymbol, @@ -92675,10 +95332,10 @@ var ts; if (!typeReferenceDirectives) { return; } - necessaryTypeReferences = necessaryTypeReferences || ts.createMap(); + necessaryTypeReferences = necessaryTypeReferences || new ts.Set(); for (var _i = 0, typeReferenceDirectives_2 = typeReferenceDirectives; _i < typeReferenceDirectives_2.length; _i++) { var ref = typeReferenceDirectives_2[_i]; - necessaryTypeReferences.set(ref, true); + necessaryTypeReferences.add(ref); } } function trackReferencedAmbientModule(node, symbol) { @@ -92689,7 +95346,7 @@ var ts; } // Otherwise we should emit a path-based reference var container = ts.getSourceFileOfNode(node); - refs.set("" + ts.getOriginalNodeId(container), container); + refs.set(ts.getOriginalNodeId(container), container); } function handleSymbolAccessibilityError(symbolAccessibilityResult) { if (symbolAccessibilityResult.accessibility === 0 /* Accessible */) { @@ -92777,15 +95434,15 @@ var ts; return result; } function transformRoot(node) { - if (node.kind === 290 /* SourceFile */ && node.isDeclarationFile) { + if (node.kind === 294 /* SourceFile */ && node.isDeclarationFile) { return node; } - if (node.kind === 291 /* Bundle */) { + if (node.kind === 295 /* Bundle */) { isBundledEmit = true; - refs = ts.createMap(); - libs = ts.createMap(); + refs = new ts.Map(); + libs = new ts.Map(); var hasNoDefaultLib_1 = false; - var bundle = ts.createBundle(ts.map(node.sourceFiles, function (sourceFile) { + var bundle = factory.createBundle(ts.map(node.sourceFiles, function (sourceFile) { if (sourceFile.isDeclarationFile) return undefined; // Omit declaration files from bundle results, too // TODO: GH#18217 hasNoDefaultLib_1 = hasNoDefaultLib_1 || sourceFile.hasNoDefaultLib; @@ -92793,7 +95450,7 @@ var ts; enclosingDeclaration = sourceFile; lateMarkedStatements = undefined; suppressNewDiagnosticContexts = false; - lateStatementReplacementMap = ts.createMap(); + lateStatementReplacementMap = new ts.Map(); getSymbolAccessibilityDiagnostic = throwDiagnostic; needsScopeFixMarker = false; resultHasScopeMarker = false; @@ -92802,15 +95459,15 @@ var ts; if (ts.isExternalOrCommonJsModule(sourceFile) || ts.isJsonSourceFile(sourceFile)) { resultHasExternalModuleIndicator = false; // unused in external module bundle emit (all external modules are within module blocks, therefore are known to be modules) needsDeclare = false; - var statements = ts.isSourceFileJS(sourceFile) ? ts.createNodeArray(transformDeclarationsForJS(sourceFile, /*bundled*/ true)) : ts.visitNodes(sourceFile.statements, visitDeclarationStatements); - var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(130 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []); + var statements = ts.isSourceFileJS(sourceFile) ? factory.createNodeArray(transformDeclarationsForJS(sourceFile, /*bundled*/ true)) : ts.visitNodes(sourceFile.statements, visitDeclarationStatements); + var newFile = factory.updateSourceFile(sourceFile, [factory.createModuleDeclaration([], [factory.createModifier(133 /* DeclareKeyword */)], factory.createStringLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), factory.createModuleBlock(ts.setTextRange(factory.createNodeArray(transformAndReplaceLatePaintedStatements(statements)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []); return newFile; } needsDeclare = true; - var updated = ts.isSourceFileJS(sourceFile) ? ts.createNodeArray(transformDeclarationsForJS(sourceFile)) : ts.visitNodes(sourceFile.statements, visitDeclarationStatements); - return ts.updateSourceFileNode(sourceFile, transformAndReplaceLatePaintedStatements(updated), /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []); + var updated = ts.isSourceFileJS(sourceFile) ? factory.createNodeArray(transformDeclarationsForJS(sourceFile)) : ts.visitNodes(sourceFile.statements, visitDeclarationStatements); + return factory.updateSourceFile(sourceFile, transformAndReplaceLatePaintedStatements(updated), /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []); }), ts.mapDefined(node.prepends, function (prepend) { - if (prepend.kind === 293 /* InputFiles */) { + if (prepend.kind === 297 /* InputFiles */) { var sourceFile = ts.createUnparsedSourceFile(prepend, "dts", stripInternal); hasNoDefaultLib_1 = hasNoDefaultLib_1 || !!sourceFile.hasNoDefaultLib; collectReferences(sourceFile, refs); @@ -92840,29 +95497,29 @@ var ts; resultHasExternalModuleIndicator = false; suppressNewDiagnosticContexts = false; lateMarkedStatements = undefined; - lateStatementReplacementMap = ts.createMap(); + lateStatementReplacementMap = new ts.Map(); necessaryTypeReferences = undefined; - refs = collectReferences(currentSourceFile, ts.createMap()); - libs = collectLibs(currentSourceFile, ts.createMap()); + refs = collectReferences(currentSourceFile, new ts.Map()); + libs = collectLibs(currentSourceFile, new ts.Map()); var references = []; var outputFilePath = ts.getDirectoryPath(ts.normalizeSlashes(ts.getOutputPathsFor(node, host, /*forceDtsPaths*/ true).declarationFilePath)); var referenceVisitor = mapReferencesIntoArray(references, outputFilePath); var combinedStatements; if (ts.isSourceFileJS(currentSourceFile)) { - combinedStatements = ts.createNodeArray(transformDeclarationsForJS(node)); + combinedStatements = factory.createNodeArray(transformDeclarationsForJS(node)); refs.forEach(referenceVisitor); emittedImports = ts.filter(combinedStatements, ts.isAnyImportSyntax); } else { var statements = ts.visitNodes(node.statements, visitDeclarationStatements); - combinedStatements = ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements)), node.statements); + combinedStatements = ts.setTextRange(factory.createNodeArray(transformAndReplaceLatePaintedStatements(statements)), node.statements); refs.forEach(referenceVisitor); emittedImports = ts.filter(combinedStatements, ts.isAnyImportSyntax); if (ts.isExternalModule(node) && (!resultHasExternalModuleIndicator || (needsScopeFixMarker && !resultHasScopeMarker))) { - combinedStatements = ts.setTextRange(ts.createNodeArray(__spreadArrays(combinedStatements, [ts.createEmptyExports()])), combinedStatements); + combinedStatements = ts.setTextRange(factory.createNodeArray(__spreadArrays(combinedStatements, [ts.createEmptyExports(factory)])), combinedStatements); } } - var updated = ts.updateSourceFileNode(node, combinedStatements, /*isDeclarationFile*/ true, references, getFileReferencesForUsedTypeReferences(), node.hasNoDefaultLib, getLibReferences()); + var updated = factory.updateSourceFile(node, combinedStatements, /*isDeclarationFile*/ true, references, getFileReferencesForUsedTypeReferences(), node.hasNoDefaultLib, getLibReferences()); updated.exportedModulesFromDeclarationEmit = exportedModulesFromDeclarationEmit; return updated; function getLibReferences() { @@ -92932,7 +95589,7 @@ var ts; ts.forEach(sourceFile.referencedFiles, function (f) { var elem = host.getSourceFileFromReference(sourceFile, f); if (elem) { - ret.set("" + ts.getOriginalNodeId(elem), elem); + ret.set(ts.getOriginalNodeId(elem), elem); } }); return ret; @@ -92947,22 +95604,22 @@ var ts; return ret; } function filterBindingPatternInitializers(name) { - if (name.kind === 75 /* Identifier */) { + if (name.kind === 78 /* Identifier */) { return name; } else { - if (name.kind === 190 /* ArrayBindingPattern */) { - return ts.updateArrayBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement)); + if (name.kind === 194 /* ArrayBindingPattern */) { + return factory.updateArrayBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement)); } else { - return ts.updateObjectBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement)); + return factory.updateObjectBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement)); } } function visitBindingElement(elem) { - if (elem.kind === 215 /* OmittedExpression */) { + if (elem.kind === 219 /* OmittedExpression */) { return elem; } - return ts.updateBindingElement(elem, elem.dotDotDotToken, elem.propertyName, filterBindingPatternInitializers(elem.name), shouldPrintWithInitializer(elem) ? elem.initializer : undefined); + return factory.updateBindingElement(elem, elem.dotDotDotToken, elem.propertyName, filterBindingPatternInitializers(elem.name), shouldPrintWithInitializer(elem) ? elem.initializer : undefined); } } function ensureParameter(p, modifierMask, type) { @@ -92971,8 +95628,8 @@ var ts; oldDiag = getSymbolAccessibilityDiagnostic; getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(p); } - var newParam = ts.updateParameter(p, - /*decorators*/ undefined, maskModifiers(p, modifierMask), p.dotDotDotToken, filterBindingPatternInitializers(p.name), resolver.isOptionalParameter(p) ? (p.questionToken || ts.createToken(57 /* QuestionToken */)) : undefined, ensureType(p, type || p.type, /*ignorePrivate*/ true), // Ignore private param props, since this type is going straight back into a param + var newParam = factory.updateParameterDeclaration(p, + /*decorators*/ undefined, maskModifiers(p, modifierMask), p.dotDotDotToken, filterBindingPatternInitializers(p.name), resolver.isOptionalParameter(p) ? (p.questionToken || factory.createToken(57 /* QuestionToken */)) : undefined, ensureType(p, type || p.type, /*ignorePrivate*/ true), // Ignore private param props, since this type is going straight back into a param ensureNoInitializer(p)); if (!suppressNewDiagnosticContexts) { getSymbolAccessibilityDiagnostic = oldDiag; @@ -92989,7 +95646,7 @@ var ts; return undefined; } function ensureType(node, type, ignorePrivate) { - if (!ignorePrivate && ts.hasModifier(node, 8 /* Private */)) { + if (!ignorePrivate && ts.hasEffectiveModifier(node, 8 /* Private */)) { // Private nodes emit no types (except private parameter properties, whose parameter types are actually visible) return; } @@ -92997,19 +95654,19 @@ var ts; // Literal const declarations will have an initializer ensured rather than a type return; } - var shouldUseResolverType = node.kind === 156 /* Parameter */ && + var shouldUseResolverType = node.kind === 159 /* Parameter */ && (resolver.isRequiredInitializedParameter(node) || resolver.isOptionalUninitializedParameterProperty(node)); if (type && !shouldUseResolverType) { return ts.visitNode(type, visitDeclarationSubtree); } if (!ts.getParseTreeNode(node)) { - return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(125 /* AnyKeyword */); + return type ? ts.visitNode(type, visitDeclarationSubtree) : factory.createKeywordTypeNode(128 /* AnyKeyword */); } - if (node.kind === 164 /* SetAccessor */) { + if (node.kind === 167 /* SetAccessor */) { // Set accessors with no associated type node (from it's param or get accessor return) are `any` since they are never contextually typed right now // (The inferred type here will be void, but the old declaration emitter printed `any`, so this replicates that) - return ts.createKeywordTypeNode(125 /* AnyKeyword */); + return factory.createKeywordTypeNode(128 /* AnyKeyword */); } errorNameNode = node.name; var oldDiag; @@ -93017,12 +95674,12 @@ var ts; oldDiag = getSymbolAccessibilityDiagnostic; getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(node); } - if (node.kind === 242 /* VariableDeclaration */ || node.kind === 191 /* BindingElement */) { + if (node.kind === 246 /* VariableDeclaration */ || node.kind === 195 /* BindingElement */) { return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker)); } - if (node.kind === 156 /* Parameter */ - || node.kind === 159 /* PropertyDeclaration */ - || node.kind === 158 /* PropertySignature */) { + if (node.kind === 159 /* Parameter */ + || node.kind === 162 /* PropertyDeclaration */ + || node.kind === 161 /* PropertySignature */) { if (!node.initializer) return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType)); return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType) || resolver.createTypeOfExpression(node.initializer, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker)); @@ -93033,26 +95690,26 @@ var ts; if (!suppressNewDiagnosticContexts) { getSymbolAccessibilityDiagnostic = oldDiag; } - return returnValue || ts.createKeywordTypeNode(125 /* AnyKeyword */); + return returnValue || factory.createKeywordTypeNode(128 /* AnyKeyword */); } } function isDeclarationAndNotVisible(node) { node = ts.getParseTreeNode(node); switch (node.kind) { - case 244 /* FunctionDeclaration */: - case 249 /* ModuleDeclaration */: - case 246 /* InterfaceDeclaration */: - case 245 /* ClassDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 248 /* EnumDeclaration */: + case 248 /* FunctionDeclaration */: + case 253 /* ModuleDeclaration */: + case 250 /* InterfaceDeclaration */: + case 249 /* ClassDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 252 /* EnumDeclaration */: return !resolver.isDeclarationVisible(node); // The following should be doing their own visibility checks based on filtering their members - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return !getBindingNameVisible(node); - case 253 /* ImportEqualsDeclaration */: - case 254 /* ImportDeclaration */: - case 260 /* ExportDeclaration */: - case 259 /* ExportAssignment */: + case 257 /* ImportEqualsDeclaration */: + case 258 /* ImportDeclaration */: + case 264 /* ExportDeclaration */: + case 263 /* ExportAssignment */: return false; } return false; @@ -93070,14 +95727,14 @@ var ts; } } function updateParamsList(node, params, modifierMask) { - if (ts.hasModifier(node, 8 /* Private */)) { + if (ts.hasEffectiveModifier(node, 8 /* Private */)) { return undefined; // TODO: GH#18217 } var newParams = ts.map(params, function (p) { return ensureParameter(p, modifierMask); }); if (!newParams) { return undefined; // TODO: GH#18217 } - return ts.createNodeArray(newParams, params.hasTrailingComma); + return factory.createNodeArray(newParams, params.hasTrailingComma); } function updateAccessorParamsList(input, isPrivate) { var newParams; @@ -93097,17 +95754,17 @@ var ts; } } if (!newValueParameter) { - newValueParameter = ts.createParameter( + newValueParameter = factory.createParameterDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "value"); } newParams = ts.append(newParams, newValueParameter); } - return ts.createNodeArray(newParams || ts.emptyArray); + return factory.createNodeArray(newParams || ts.emptyArray); } function ensureTypeParams(node, params) { - return ts.hasModifier(node, 8 /* Private */) ? undefined : ts.visitNodes(params, visitDeclarationSubtree); + return ts.hasEffectiveModifier(node, 8 /* Private */) ? undefined : ts.visitNodes(params, visitDeclarationSubtree); } function isEnclosingDeclaration(node) { return ts.isSourceFile(node) @@ -93133,12 +95790,12 @@ var ts; function rewriteModuleSpecifier(parent, input) { if (!input) return undefined; // TODO: GH#18217 - resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 249 /* ModuleDeclaration */ && parent.kind !== 188 /* ImportType */); + resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 253 /* ModuleDeclaration */ && parent.kind !== 192 /* ImportType */); if (ts.isStringLiteralLike(input)) { if (isBundledEmit) { var newName = ts.getExternalModuleNameFromDeclaration(context.getEmitHost(), resolver, parent); if (newName) { - return ts.createLiteral(newName); + return factory.createStringLiteral(newName); } } else { @@ -93153,11 +95810,11 @@ var ts; function transformImportEqualsDeclaration(decl) { if (!resolver.isDeclarationVisible(decl)) return; - if (decl.moduleReference.kind === 265 /* ExternalModuleReference */) { + if (decl.moduleReference.kind === 269 /* ExternalModuleReference */) { // Rewrite external module names if necessary var specifier = ts.getExternalModuleImportEqualsDeclarationExpression(decl); - return ts.updateImportEqualsDeclaration(decl, - /*decorators*/ undefined, decl.modifiers, decl.name, ts.updateExternalModuleReference(decl.moduleReference, rewriteModuleSpecifier(decl, specifier))); + return factory.updateImportEqualsDeclaration(decl, + /*decorators*/ undefined, decl.modifiers, decl.name, factory.updateExternalModuleReference(decl.moduleReference, rewriteModuleSpecifier(decl, specifier))); } else { var oldDiag = getSymbolAccessibilityDiagnostic; @@ -93170,30 +95827,30 @@ var ts; function transformImportDeclaration(decl) { if (!decl.importClause) { // import "mod" - possibly needed for side effects? (global interface patches, module augmentations, etc) - return ts.updateImportDeclaration(decl, + return factory.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, decl.importClause, rewriteModuleSpecifier(decl, decl.moduleSpecifier)); } // The `importClause` visibility corresponds to the default's visibility. var visibleDefaultBinding = decl.importClause && decl.importClause.name && resolver.isDeclarationVisible(decl.importClause) ? decl.importClause.name : undefined; if (!decl.importClause.namedBindings) { // No named bindings (either namespace or list), meaning the import is just default or should be elided - return visibleDefaultBinding && ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, - /*namedBindings*/ undefined, decl.importClause.isTypeOnly), rewriteModuleSpecifier(decl, decl.moduleSpecifier)); + return visibleDefaultBinding && factory.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, factory.updateImportClause(decl.importClause, decl.importClause.isTypeOnly, visibleDefaultBinding, + /*namedBindings*/ undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier)); } - if (decl.importClause.namedBindings.kind === 256 /* NamespaceImport */) { + if (decl.importClause.namedBindings.kind === 260 /* NamespaceImport */) { // Namespace import (optionally with visible default) var namedBindings = resolver.isDeclarationVisible(decl.importClause.namedBindings) ? decl.importClause.namedBindings : /*namedBindings*/ undefined; - return visibleDefaultBinding || namedBindings ? ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, namedBindings, decl.importClause.isTypeOnly), rewriteModuleSpecifier(decl, decl.moduleSpecifier)) : undefined; + return visibleDefaultBinding || namedBindings ? factory.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, factory.updateImportClause(decl.importClause, decl.importClause.isTypeOnly, visibleDefaultBinding, namedBindings), rewriteModuleSpecifier(decl, decl.moduleSpecifier)) : undefined; } // Named imports (optionally with visible default) var bindingList = ts.mapDefined(decl.importClause.namedBindings.elements, function (b) { return resolver.isDeclarationVisible(b) ? b : undefined; }); if ((bindingList && bindingList.length) || visibleDefaultBinding) { - return ts.updateImportDeclaration(decl, - /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, bindingList && bindingList.length ? ts.updateNamedImports(decl.importClause.namedBindings, bindingList) : undefined, decl.importClause.isTypeOnly), rewriteModuleSpecifier(decl, decl.moduleSpecifier)); + return factory.updateImportDeclaration(decl, + /*decorators*/ undefined, decl.modifiers, factory.updateImportClause(decl.importClause, decl.importClause.isTypeOnly, visibleDefaultBinding, bindingList && bindingList.length ? factory.updateNamedImports(decl.importClause.namedBindings, bindingList) : undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier)); } // Augmentation of export depends on import if (resolver.isImportRequiredByAugmentation(decl)) { - return ts.updateImportDeclaration(decl, + return factory.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, /*importClause*/ undefined, rewriteModuleSpecifier(decl, decl.moduleSpecifier)); } @@ -93223,14 +95880,14 @@ var ts; needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit); var result = transformTopLevelDeclaration(i); needsDeclare = priorNeedsDeclare; - lateStatementReplacementMap.set("" + ts.getOriginalNodeId(i), result); + lateStatementReplacementMap.set(ts.getOriginalNodeId(i), result); } // And lastly, we need to get the final form of all those indetermine import declarations from before and add them to the output list // (and remove them from the set to examine for outter declarations) return ts.visitNodes(statements, visitLateVisibilityMarkedStatements); function visitLateVisibilityMarkedStatements(statement) { if (ts.isLateVisibilityPaintedStatement(statement)) { - var key = "" + ts.getOriginalNodeId(statement); + var key = ts.getOriginalNodeId(statement); if (lateStatementReplacementMap.has(key)) { var result = lateStatementReplacementMap.get(key); lateStatementReplacementMap.delete(key); @@ -93275,13 +95932,13 @@ var ts; // We'd see a TDZ violation at runtime var canProduceDiagnostic = ts.canProduceDiagnostics(input); var oldWithinObjectLiteralType = suppressNewDiagnosticContexts; - var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 173 /* TypeLiteral */ || input.kind === 186 /* MappedType */) && input.parent.kind !== 247 /* TypeAliasDeclaration */); + var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 176 /* TypeLiteral */ || input.kind === 189 /* MappedType */) && input.parent.kind !== 251 /* TypeAliasDeclaration */); // Emit methods which are private as properties with no type information if (ts.isMethodDeclaration(input) || ts.isMethodSignature(input)) { - if (ts.hasModifier(input, 8 /* Private */)) { + if (ts.hasEffectiveModifier(input, 8 /* Private */)) { if (input.symbol && input.symbol.declarations && input.symbol.declarations[0] !== input) return; // Elide all but the first overload - return cleanup(ts.createProperty(/*decorators*/ undefined, ensureModifiers(input), input.name, /*questionToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined)); + return cleanup(factory.createPropertyDeclaration(/*decorators*/ undefined, ensureModifiers(input), input.name, /*questionToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined)); } } if (canProduceDiagnostic && !suppressNewDiagnosticContexts) { @@ -93296,93 +95953,94 @@ var ts; } if (isProcessedComponent(input)) { switch (input.kind) { - case 216 /* ExpressionWithTypeArguments */: { + case 220 /* ExpressionWithTypeArguments */: { if ((ts.isEntityName(input.expression) || ts.isEntityNameExpression(input.expression))) { checkEntityNameVisibility(input.expression, enclosingDeclaration); } var node = ts.visitEachChild(input, visitDeclarationSubtree, context); - return cleanup(ts.updateExpressionWithTypeArguments(node, ts.parenthesizeTypeParameters(node.typeArguments), node.expression)); + return cleanup(factory.updateExpressionWithTypeArguments(node, node.expression, node.typeArguments)); } - case 169 /* TypeReference */: { + case 172 /* TypeReference */: { checkEntityNameVisibility(input.typeName, enclosingDeclaration); var node = ts.visitEachChild(input, visitDeclarationSubtree, context); - return cleanup(ts.updateTypeReferenceNode(node, node.typeName, ts.parenthesizeTypeParameters(node.typeArguments))); + return cleanup(factory.updateTypeReferenceNode(node, node.typeName, node.typeArguments)); } - case 166 /* ConstructSignature */: - return cleanup(ts.updateConstructSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type))); - case 162 /* Constructor */: { + case 169 /* ConstructSignature */: + return cleanup(factory.updateConstructSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type))); + case 165 /* Constructor */: { // A constructor declaration may not have a type annotation - var ctor = ts.createSignatureDeclaration(162 /* Constructor */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters, 0 /* None */), - /*type*/ undefined); - ctor.modifiers = ts.createNodeArray(ensureModifiers(input)); + var ctor = factory.createConstructorDeclaration( + /*decorators*/ undefined, + /*modifiers*/ ensureModifiers(input), updateParamsList(input, input.parameters, 0 /* None */), + /*body*/ undefined); return cleanup(ctor); } - case 161 /* MethodDeclaration */: { + case 164 /* MethodDeclaration */: { if (ts.isPrivateIdentifier(input.name)) { return cleanup(/*returnValue*/ undefined); } - var sig = ts.createSignatureDeclaration(160 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)); - sig.name = input.name; - sig.modifiers = ts.createNodeArray(ensureModifiers(input)); - sig.questionToken = input.questionToken; + var sig = factory.createMethodDeclaration( + /*decorators*/ undefined, ensureModifiers(input), + /*asteriskToken*/ undefined, input.name, input.questionToken, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), + /*body*/ undefined); return cleanup(sig); } - case 163 /* GetAccessor */: { + case 166 /* GetAccessor */: { if (ts.isPrivateIdentifier(input.name)) { return cleanup(/*returnValue*/ undefined); } var accessorType = getTypeAnnotationFromAllAccessorDeclarations(input, resolver.getAllAccessorDeclarations(input)); - return cleanup(ts.updateGetAccessor(input, - /*decorators*/ undefined, ensureModifiers(input), input.name, updateAccessorParamsList(input, ts.hasModifier(input, 8 /* Private */)), ensureType(input, accessorType), + return cleanup(factory.updateGetAccessorDeclaration(input, + /*decorators*/ undefined, ensureModifiers(input), input.name, updateAccessorParamsList(input, ts.hasEffectiveModifier(input, 8 /* Private */)), ensureType(input, accessorType), /*body*/ undefined)); } - case 164 /* SetAccessor */: { + case 167 /* SetAccessor */: { if (ts.isPrivateIdentifier(input.name)) { return cleanup(/*returnValue*/ undefined); } - return cleanup(ts.updateSetAccessor(input, - /*decorators*/ undefined, ensureModifiers(input), input.name, updateAccessorParamsList(input, ts.hasModifier(input, 8 /* Private */)), + return cleanup(factory.updateSetAccessorDeclaration(input, + /*decorators*/ undefined, ensureModifiers(input), input.name, updateAccessorParamsList(input, ts.hasEffectiveModifier(input, 8 /* Private */)), /*body*/ undefined)); } - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: if (ts.isPrivateIdentifier(input.name)) { return cleanup(/*returnValue*/ undefined); } - return cleanup(ts.updateProperty(input, + return cleanup(factory.updatePropertyDeclaration(input, /*decorators*/ undefined, ensureModifiers(input), input.name, input.questionToken, ensureType(input, input.type), ensureNoInitializer(input))); - case 158 /* PropertySignature */: + case 161 /* PropertySignature */: if (ts.isPrivateIdentifier(input.name)) { return cleanup(/*returnValue*/ undefined); } - return cleanup(ts.updatePropertySignature(input, ensureModifiers(input), input.name, input.questionToken, ensureType(input, input.type), ensureNoInitializer(input))); - case 160 /* MethodSignature */: { + return cleanup(factory.updatePropertySignature(input, ensureModifiers(input), input.name, input.questionToken, ensureType(input, input.type))); + case 163 /* MethodSignature */: { if (ts.isPrivateIdentifier(input.name)) { return cleanup(/*returnValue*/ undefined); } - return cleanup(ts.updateMethodSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), input.name, input.questionToken)); + return cleanup(factory.updateMethodSignature(input, ensureModifiers(input), input.name, input.questionToken, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type))); } - case 165 /* CallSignature */: { - return cleanup(ts.updateCallSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type))); + case 168 /* CallSignature */: { + return cleanup(factory.updateCallSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type))); } - case 167 /* IndexSignature */: { - return cleanup(ts.updateIndexSignature(input, - /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(125 /* AnyKeyword */))); + case 170 /* IndexSignature */: { + return cleanup(factory.updateIndexSignature(input, + /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || factory.createKeywordTypeNode(128 /* AnyKeyword */))); } - case 242 /* VariableDeclaration */: { + case 246 /* VariableDeclaration */: { if (ts.isBindingPattern(input.name)) { return recreateBindingPattern(input.name); } shouldEnterSuppressNewDiagnosticsContextContext = true; suppressNewDiagnosticContexts = true; // Variable declaration types also suppress new diagnostic contexts, provided the contexts wouldn't be made for binding pattern types - return cleanup(ts.updateTypeScriptVariableDeclaration(input, input.name, /*exclaimationToken*/ undefined, ensureType(input, input.type), ensureNoInitializer(input))); + return cleanup(factory.updateVariableDeclaration(input, input.name, /*exclamationToken*/ undefined, ensureType(input, input.type), ensureNoInitializer(input))); } - case 155 /* TypeParameter */: { + case 158 /* TypeParameter */: { if (isPrivateMethodTypeParameter(input) && (input.default || input.constraint)) { - return cleanup(ts.updateTypeParameterDeclaration(input, input.name, /*constraint*/ undefined, /*defaultType*/ undefined)); + return cleanup(factory.updateTypeParameterDeclaration(input, input.name, /*constraint*/ undefined, /*defaultType*/ undefined)); } return cleanup(ts.visitEachChild(input, visitDeclarationSubtree, context)); } - case 180 /* ConditionalType */: { + case 183 /* ConditionalType */: { // We have to process conditional types in a special way because for visibility purposes we need to push a new enclosingDeclaration // just for the `infer` types in the true branch. It's an implicit declaration scope that only applies to _part_ of the type. var checkType = ts.visitNode(input.checkType, visitDeclarationSubtree); @@ -93392,22 +96050,25 @@ var ts; var trueType = ts.visitNode(input.trueType, visitDeclarationSubtree); enclosingDeclaration = oldEnclosingDecl; var falseType = ts.visitNode(input.falseType, visitDeclarationSubtree); - return cleanup(ts.updateConditionalTypeNode(input, checkType, extendsType, trueType, falseType)); + return cleanup(factory.updateConditionalTypeNode(input, checkType, extendsType, trueType, falseType)); } - case 170 /* FunctionType */: { - return cleanup(ts.updateFunctionTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree))); + case 173 /* FunctionType */: { + return cleanup(factory.updateFunctionTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree))); } - case 171 /* ConstructorType */: { - return cleanup(ts.updateConstructorTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree))); + case 174 /* ConstructorType */: { + return cleanup(factory.updateConstructorTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree))); } - case 188 /* ImportType */: { + case 192 /* ImportType */: { if (!ts.isLiteralImportTypeNode(input)) return cleanup(input); - return cleanup(ts.updateImportTypeNode(input, ts.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf)); + return cleanup(factory.updateImportTypeNode(input, factory.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf)); } default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.SyntaxKind[input.kind]); } } + if (ts.isTupleTypeNode(input) && (ts.getLineAndCharacterOfPosition(currentSourceFile, input.pos).line === ts.getLineAndCharacterOfPosition(currentSourceFile, input.end).line)) { + ts.setEmitFlags(input, 1 /* SingleLine */); + } return cleanup(ts.visitEachChild(input, visitDeclarationSubtree, context)); function cleanup(returnValue) { if (returnValue && canProduceDiagnostic && ts.hasDynamicName(input)) { @@ -93429,7 +96090,7 @@ var ts; } } function isPrivateMethodTypeParameter(node) { - return node.parent.kind === 161 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */); + return node.parent.kind === 164 /* MethodDeclaration */ && ts.hasEffectiveModifier(node.parent, 8 /* Private */); } function visitDeclarationStatements(input) { if (!isPreservedDeclarationStatement(input)) { @@ -93439,61 +96100,59 @@ var ts; if (shouldStripInternal(input)) return; switch (input.kind) { - case 260 /* ExportDeclaration */: { + case 264 /* ExportDeclaration */: { if (ts.isSourceFile(input.parent)) { resultHasExternalModuleIndicator = true; } resultHasScopeMarker = true; // Always visible if the parent node isn't dropped for being not visible // Rewrite external module names if necessary - return ts.updateExportDeclaration(input, - /*decorators*/ undefined, input.modifiers, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier), input.isTypeOnly); + return factory.updateExportDeclaration(input, + /*decorators*/ undefined, input.modifiers, input.isTypeOnly, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier)); } - case 259 /* ExportAssignment */: { + case 263 /* ExportAssignment */: { // Always visible if the parent node isn't dropped for being not visible if (ts.isSourceFile(input.parent)) { resultHasExternalModuleIndicator = true; } resultHasScopeMarker = true; - if (input.expression.kind === 75 /* Identifier */) { + if (input.expression.kind === 78 /* Identifier */) { return input; } else { - var newId = ts.createOptimisticUniqueName("_default"); + var newId = factory.createUniqueName("_default", 16 /* Optimistic */); getSymbolAccessibilityDiagnostic = function () { return ({ diagnosticMessage: ts.Diagnostics.Default_export_of_the_module_has_or_is_using_private_name_0, errorNode: input }); }; - var varDecl = ts.createVariableDeclaration(newId, resolver.createTypeOfExpression(input.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined); - var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(130 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */)); - return [statement, ts.updateExportAssignment(input, input.decorators, input.modifiers, newId)]; + var varDecl = factory.createVariableDeclaration(newId, /*exclamationToken*/ undefined, resolver.createTypeOfExpression(input.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined); + var statement = factory.createVariableStatement(needsDeclare ? [factory.createModifier(133 /* DeclareKeyword */)] : [], factory.createVariableDeclarationList([varDecl], 2 /* Const */)); + return [statement, factory.updateExportAssignment(input, input.decorators, input.modifiers, newId)]; } } } var result = transformTopLevelDeclaration(input); // Don't actually transform yet; just leave as original node - will be elided/swapped by late pass - lateStatementReplacementMap.set("" + ts.getOriginalNodeId(input), result); + lateStatementReplacementMap.set(ts.getOriginalNodeId(input), result); return input; } function stripExportModifiers(statement) { - if (ts.isImportEqualsDeclaration(statement) || ts.hasModifier(statement, 512 /* Default */)) { + if (ts.isImportEqualsDeclaration(statement) || ts.hasEffectiveModifier(statement, 512 /* Default */) || !ts.canHaveModifiers(statement)) { // `export import` statements should remain as-is, as imports are _not_ implicitly exported in an ambient namespace // Likewise, `export default` classes and the like and just be `default`, so we preserve their `export` modifiers, too return statement; } - var clone = ts.getMutableClone(statement); - var modifiers = ts.createModifiersFromModifierFlags(ts.getModifierFlags(statement) & (3071 /* All */ ^ 1 /* Export */)); - clone.modifiers = modifiers.length ? ts.createNodeArray(modifiers) : undefined; - return clone; + var modifiers = factory.createModifiersFromModifierFlags(ts.getEffectiveModifierFlags(statement) & (11263 /* All */ ^ 1 /* Export */)); + return factory.updateModifiers(statement, modifiers); } function transformTopLevelDeclaration(input) { if (shouldStripInternal(input)) return; switch (input.kind) { - case 253 /* ImportEqualsDeclaration */: { + case 257 /* ImportEqualsDeclaration */: { return transformImportEqualsDeclaration(input); } - case 254 /* ImportDeclaration */: { + case 258 /* ImportDeclaration */: { return transformImportDeclaration(input); } } @@ -93514,26 +96173,27 @@ var ts; } var previousNeedsDeclare = needsDeclare; switch (input.kind) { - case 247 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all - return cleanup(ts.updateTypeAliasDeclaration(input, + case 251 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all + return cleanup(factory.updateTypeAliasDeclaration(input, /*decorators*/ undefined, ensureModifiers(input), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode))); - case 246 /* InterfaceDeclaration */: { - return cleanup(ts.updateInterfaceDeclaration(input, + case 250 /* InterfaceDeclaration */: { + return cleanup(factory.updateInterfaceDeclaration(input, /*decorators*/ undefined, ensureModifiers(input), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree))); } - case 244 /* FunctionDeclaration */: { + case 248 /* FunctionDeclaration */: { // Generators lose their generator-ness, excepting their return type - var clean = cleanup(ts.updateFunctionDeclaration(input, + var clean = cleanup(factory.updateFunctionDeclaration(input, /*decorators*/ undefined, ensureModifiers(input), /*asteriskToken*/ undefined, input.name, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), /*body*/ undefined)); if (clean && resolver.isExpandoFunctionDeclaration(input)) { var props = resolver.getPropertiesOfContainerFunction(input); - var fakespace_1 = ts.createModuleDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, clean.name || ts.createIdentifier("_default"), ts.createModuleBlock([]), 16 /* Namespace */); - fakespace_1.flags ^= 8 /* Synthesized */; // unset synthesized so it is usable as an enclosing declaration - fakespace_1.parent = enclosingDeclaration; + // Use parseNodeFactory so it is usable as an enclosing declaration + var fakespace_1 = ts.parseNodeFactory.createModuleDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, clean.name || factory.createIdentifier("_default"), factory.createModuleBlock([]), 16 /* Namespace */); + ts.setParent(fakespace_1, enclosingDeclaration); fakespace_1.locals = ts.createSymbolTable(props); fakespace_1.symbol = props[0].parent; + var exportMappings_1 = []; var declarations = ts.mapDefined(props, function (p) { if (!ts.isPropertyAccessExpression(p.valueDeclaration)) { return undefined; // TODO GH#33569: Handle element access expressions that created late bound names (rather than silently omitting them) @@ -93541,21 +96201,39 @@ var ts; getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(p.valueDeclaration); var type = resolver.createTypeOfDeclaration(p.valueDeclaration, fakespace_1, declarationEmitNodeBuilderFlags, symbolTracker); getSymbolAccessibilityDiagnostic = oldDiag; - var varDecl = ts.createVariableDeclaration(ts.unescapeLeadingUnderscores(p.escapedName), type, /*initializer*/ undefined); - return ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([varDecl])); + var nameStr = ts.unescapeLeadingUnderscores(p.escapedName); + var isNonContextualKeywordName = ts.isStringANonContextualKeyword(nameStr); + var name = isNonContextualKeywordName ? factory.getGeneratedNameForNode(p.valueDeclaration) : factory.createIdentifier(nameStr); + if (isNonContextualKeywordName) { + exportMappings_1.push([name, nameStr]); + } + var varDecl = factory.createVariableDeclaration(name, /*exclamationToken*/ undefined, type, /*initializer*/ undefined); + return factory.createVariableStatement(isNonContextualKeywordName ? undefined : [factory.createToken(92 /* ExportKeyword */)], factory.createVariableDeclarationList([varDecl])); }); - var namespaceDecl = ts.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input), input.name, ts.createModuleBlock(declarations), 16 /* Namespace */); - if (!ts.hasModifier(clean, 512 /* Default */)) { + if (!exportMappings_1.length) { + declarations = ts.mapDefined(declarations, function (declaration) { return factory.updateModifiers(declaration, 0 /* None */); }); + } + else { + declarations.push(factory.createExportDeclaration( + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*isTypeOnly*/ false, factory.createNamedExports(ts.map(exportMappings_1, function (_a) { + var gen = _a[0], exp = _a[1]; + return factory.createExportSpecifier(gen, exp); + })))); + } + var namespaceDecl = factory.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input), input.name, factory.createModuleBlock(declarations), 16 /* Namespace */); + if (!ts.hasEffectiveModifier(clean, 512 /* Default */)) { return [clean, namespaceDecl]; } - var modifiers = ts.createModifiersFromModifierFlags((ts.getModifierFlags(clean) & ~513 /* ExportDefault */) | 2 /* Ambient */); - var cleanDeclaration = ts.updateFunctionDeclaration(clean, + var modifiers = factory.createModifiersFromModifierFlags((ts.getEffectiveModifierFlags(clean) & ~513 /* ExportDefault */) | 2 /* Ambient */); + var cleanDeclaration = factory.updateFunctionDeclaration(clean, /*decorators*/ undefined, modifiers, /*asteriskToken*/ undefined, clean.name, clean.typeParameters, clean.parameters, clean.type, /*body*/ undefined); - var namespaceDeclaration = ts.updateModuleDeclaration(namespaceDecl, + var namespaceDeclaration = factory.updateModuleDeclaration(namespaceDecl, /*decorators*/ undefined, modifiers, namespaceDecl.name, namespaceDecl.body); - var exportDefaultDeclaration = ts.createExportAssignment( + var exportDefaultDeclaration = factory.createExportAssignment( /*decorators*/ undefined, /*modifiers*/ undefined, /*isExportEquals*/ false, namespaceDecl.name); @@ -93569,10 +96247,10 @@ var ts; return clean; } } - case 249 /* ModuleDeclaration */: { + case 253 /* ModuleDeclaration */: { needsDeclare = false; var inner = input.body; - if (inner && inner.kind === 250 /* ModuleBlock */) { + if (inner && inner.kind === 254 /* ModuleBlock */) { var oldNeedsScopeFix = needsScopeFixMarker; var oldHasScopeFix = resultHasScopeMarker; resultHasScopeMarker = false; @@ -93588,18 +96266,18 @@ var ts; // 3. Some things are exported, some are not, and there's no marker - add an empty marker if (!ts.isGlobalScopeAugmentation(input) && !hasScopeMarker(lateStatements) && !resultHasScopeMarker) { if (needsScopeFixMarker) { - lateStatements = ts.createNodeArray(__spreadArrays(lateStatements, [ts.createEmptyExports()])); + lateStatements = factory.createNodeArray(__spreadArrays(lateStatements, [ts.createEmptyExports(factory)])); } else { lateStatements = ts.visitNodes(lateStatements, stripExportModifiers); } } - var body = ts.updateModuleBlock(inner, lateStatements); + var body = factory.updateModuleBlock(inner, lateStatements); needsDeclare = previousNeedsDeclare; needsScopeFixMarker = oldNeedsScopeFix; resultHasScopeMarker = oldHasScopeFix; var mods = ensureModifiers(input); - return cleanup(ts.updateModuleDeclaration(input, + return cleanup(factory.updateModuleDeclaration(input, /*decorators*/ undefined, mods, ts.isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name, body)); } else { @@ -93608,26 +96286,26 @@ var ts; needsDeclare = false; ts.visitNode(inner, visitDeclarationStatements); // eagerly transform nested namespaces (the nesting doesn't need any elision or painting done) - var id = "" + ts.getOriginalNodeId(inner); // TODO: GH#18217 + var id = ts.getOriginalNodeId(inner); // TODO: GH#18217 var body = lateStatementReplacementMap.get(id); lateStatementReplacementMap.delete(id); - return cleanup(ts.updateModuleDeclaration(input, + return cleanup(factory.updateModuleDeclaration(input, /*decorators*/ undefined, mods, input.name, body)); } } - case 245 /* ClassDeclaration */: { - var modifiers = ts.createNodeArray(ensureModifiers(input)); + case 249 /* ClassDeclaration */: { + var modifiers = factory.createNodeArray(ensureModifiers(input)); var typeParameters = ensureTypeParams(input, input.typeParameters); var ctor = ts.getFirstConstructorWithBody(input); var parameterProperties = void 0; if (ctor) { var oldDiag_1 = getSymbolAccessibilityDiagnostic; parameterProperties = ts.compact(ts.flatMap(ctor.parameters, function (param) { - if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */) || shouldStripInternal(param)) + if (!ts.hasSyntacticModifier(param, 92 /* ParameterPropertyModifier */) || shouldStripInternal(param)) return; getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(param); - if (param.name.kind === 75 /* Identifier */) { - return preserveJsDoc(ts.createProperty( + if (param.name.kind === 78 /* Identifier */) { + return preserveJsDoc(factory.createPropertyDeclaration( /*decorators*/ undefined, ensureModifiers(param), param.name, param.questionToken, ensureType(param, param.type), ensureNoInitializer(param)), param); } else { @@ -93644,7 +96322,7 @@ var ts; elems = ts.concatenate(elems, walkBindingPattern(elem.name)); } elems = elems || []; - elems.push(ts.createProperty( + elems.push(factory.createPropertyDeclaration( /*decorators*/ undefined, ensureModifiers(param), elem.name, /*questionToken*/ undefined, ensureType(elem, /*type*/ undefined), /*initializer*/ undefined)); @@ -93656,56 +96334,56 @@ var ts; } var hasPrivateIdentifier = ts.some(input.members, function (member) { return !!member.name && ts.isPrivateIdentifier(member.name); }); var privateIdentifier = hasPrivateIdentifier ? [ - ts.createProperty( + factory.createPropertyDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createPrivateIdentifier("#private"), + /*modifiers*/ undefined, factory.createPrivateIdentifier("#private"), /*questionToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined) ] : undefined; var memberNodes = ts.concatenate(ts.concatenate(privateIdentifier, parameterProperties), ts.visitNodes(input.members, visitDeclarationSubtree)); - var members = ts.createNodeArray(memberNodes); + var members = factory.createNodeArray(memberNodes); var extendsClause_1 = ts.getEffectiveBaseTypeNode(input); - if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 100 /* NullKeyword */) { + if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 103 /* NullKeyword */) { // We must add a temporary declaration for the extends clause expression var oldId = input.name ? ts.unescapeLeadingUnderscores(input.name.escapedText) : "default"; - var newId_1 = ts.createOptimisticUniqueName(oldId + "_base"); + var newId_1 = factory.createUniqueName(oldId + "_base", 16 /* Optimistic */); getSymbolAccessibilityDiagnostic = function () { return ({ diagnosticMessage: ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1, errorNode: extendsClause_1, typeName: input.name }); }; - var varDecl = ts.createVariableDeclaration(newId_1, resolver.createTypeOfExpression(extendsClause_1.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined); - var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(130 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */)); - var heritageClauses = ts.createNodeArray(ts.map(input.heritageClauses, function (clause) { - if (clause.token === 90 /* ExtendsKeyword */) { + var varDecl = factory.createVariableDeclaration(newId_1, /*exclamationToken*/ undefined, resolver.createTypeOfExpression(extendsClause_1.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined); + var statement = factory.createVariableStatement(needsDeclare ? [factory.createModifier(133 /* DeclareKeyword */)] : [], factory.createVariableDeclarationList([varDecl], 2 /* Const */)); + var heritageClauses = factory.createNodeArray(ts.map(input.heritageClauses, function (clause) { + if (clause.token === 93 /* ExtendsKeyword */) { var oldDiag_2 = getSymbolAccessibilityDiagnostic; getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(clause.types[0]); - var newClause = ts.updateHeritageClause(clause, ts.map(clause.types, function (t) { return ts.updateExpressionWithTypeArguments(t, ts.visitNodes(t.typeArguments, visitDeclarationSubtree), newId_1); })); + var newClause = factory.updateHeritageClause(clause, ts.map(clause.types, function (t) { return factory.updateExpressionWithTypeArguments(t, newId_1, ts.visitNodes(t.typeArguments, visitDeclarationSubtree)); })); getSymbolAccessibilityDiagnostic = oldDiag_2; return newClause; } - return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 100 /* NullKeyword */; })), visitDeclarationSubtree)); + return factory.updateHeritageClause(clause, ts.visitNodes(factory.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 103 /* NullKeyword */; })), visitDeclarationSubtree)); })); - return [statement, cleanup(ts.updateClassDeclaration(input, + return [statement, cleanup(factory.updateClassDeclaration(input, /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members))]; // TODO: GH#18217 } else { var heritageClauses = transformHeritageClauses(input.heritageClauses); - return cleanup(ts.updateClassDeclaration(input, + return cleanup(factory.updateClassDeclaration(input, /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members)); } } - case 225 /* VariableStatement */: { + case 229 /* VariableStatement */: { return cleanup(transformVariableStatement(input)); } - case 248 /* EnumDeclaration */: { - return cleanup(ts.updateEnumDeclaration(input, /*decorators*/ undefined, ts.createNodeArray(ensureModifiers(input)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) { + case 252 /* EnumDeclaration */: { + return cleanup(factory.updateEnumDeclaration(input, /*decorators*/ undefined, factory.createNodeArray(ensureModifiers(input)), input.name, factory.createNodeArray(ts.mapDefined(input.members, function (m) { if (shouldStripInternal(m)) return; // Rewrite enum values to their constants, if available var constValue = resolver.getConstantValue(m); - return preserveJsDoc(ts.updateEnumMember(m, m.name, constValue !== undefined ? ts.createLiteral(constValue) : undefined), m); + return preserveJsDoc(factory.updateEnumMember(m, m.name, constValue !== undefined ? typeof constValue === "string" ? factory.createStringLiteral(constValue) : factory.createNumericLiteral(constValue) : undefined), m); })))); } } @@ -93718,7 +96396,7 @@ var ts; if (canProdiceDiagnostic) { getSymbolAccessibilityDiagnostic = oldDiag; } - if (input.kind === 249 /* ModuleDeclaration */) { + if (input.kind === 253 /* ModuleDeclaration */) { needsDeclare = previousNeedsDeclare; } if (node === input) { @@ -93733,13 +96411,13 @@ var ts; var nodes = ts.visitNodes(input.declarationList.declarations, visitDeclarationSubtree); if (!ts.length(nodes)) return; - return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input)), ts.updateVariableDeclarationList(input.declarationList, nodes)); + return factory.updateVariableStatement(input, factory.createNodeArray(ensureModifiers(input)), factory.updateVariableDeclarationList(input.declarationList, nodes)); } function recreateBindingPattern(d) { return ts.flatten(ts.mapDefined(d.elements, function (e) { return recreateBindingElement(e); })); } function recreateBindingElement(e) { - if (e.kind === 215 /* OmittedExpression */) { + if (e.kind === 219 /* OmittedExpression */) { return; } if (e.name) { @@ -93749,7 +96427,7 @@ var ts; return recreateBindingPattern(e.name); } else { - return ts.createVariableDeclaration(e.name, ensureType(e, /*type*/ undefined), /*initializer*/ undefined); + return factory.createVariableDeclaration(e.name, /*exclamationToken*/ undefined, ensureType(e, /*type*/ undefined), /*initializer*/ undefined); } } } @@ -93779,17 +96457,17 @@ var ts; return ts.some(statements, isScopeMarker); } function ensureModifiers(node) { - var currentFlags = ts.getModifierFlags(node); + var currentFlags = ts.getEffectiveModifierFlags(node); var newFlags = ensureModifierFlags(node); if (currentFlags === newFlags) { return node.modifiers; } - return ts.createModifiersFromModifierFlags(newFlags); + return factory.createModifiersFromModifierFlags(newFlags); } function ensureModifierFlags(node) { - var mask = 3071 /* All */ ^ (4 /* Public */ | 256 /* Async */); // No async modifiers in declaration files + var mask = 11263 /* All */ ^ (4 /* Public */ | 256 /* Async */); // No async modifiers in declaration files var additions = (needsDeclare && !isAlwaysType(node)) ? 2 /* Ambient */ : 0 /* None */; - var parentIsFile = node.parent.kind === 290 /* SourceFile */; + var parentIsFile = node.parent.kind === 294 /* SourceFile */; if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) { mask ^= 2 /* Ambient */; additions = 0 /* None */; @@ -93811,26 +96489,26 @@ var ts; return accessorType; } function transformHeritageClauses(nodes) { - return ts.createNodeArray(ts.filter(ts.map(nodes, function (clause) { return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { - return ts.isEntityNameExpression(t.expression) || (clause.token === 90 /* ExtendsKeyword */ && t.expression.kind === 100 /* NullKeyword */); + return factory.createNodeArray(ts.filter(ts.map(nodes, function (clause) { return factory.updateHeritageClause(clause, ts.visitNodes(factory.createNodeArray(ts.filter(clause.types, function (t) { + return ts.isEntityNameExpression(t.expression) || (clause.token === 93 /* ExtendsKeyword */ && t.expression.kind === 103 /* NullKeyword */); })), visitDeclarationSubtree)); }), function (clause) { return clause.types && !!clause.types.length; })); } } ts.transformDeclarations = transformDeclarations; function isAlwaysType(node) { - if (node.kind === 246 /* InterfaceDeclaration */) { + if (node.kind === 250 /* InterfaceDeclaration */) { return true; } return false; } // Elide "public" modifier, as it is the default function maskModifiers(node, modifierMask, modifierAdditions) { - return ts.createModifiersFromModifierFlags(maskModifierFlags(node, modifierMask, modifierAdditions)); + return ts.factory.createModifiersFromModifierFlags(maskModifierFlags(node, modifierMask, modifierAdditions)); } function maskModifierFlags(node, modifierMask, modifierAdditions) { - if (modifierMask === void 0) { modifierMask = 3071 /* All */ ^ 4 /* Public */; } + if (modifierMask === void 0) { modifierMask = 11263 /* All */ ^ 4 /* Public */; } if (modifierAdditions === void 0) { modifierAdditions = 0 /* None */; } - var flags = (ts.getModifierFlags(node) & modifierMask) | modifierAdditions; + var flags = (ts.getEffectiveModifierFlags(node) & modifierMask) | modifierAdditions; if (flags & 512 /* Default */ && !(flags & 1 /* Export */)) { // A non-exported default is a nonsequitor - we usually try to remove all export modifiers // from statements in ambient declarations; but a default export must retain its export modifier to be syntactically valid @@ -93843,7 +96521,7 @@ var ts; } function getTypeAnnotationFromAccessor(accessor) { if (accessor) { - return accessor.kind === 163 /* GetAccessor */ + return accessor.kind === 166 /* GetAccessor */ ? accessor.type // Getter - return type : accessor.parameters.length > 0 ? accessor.parameters[0].type // Setter parameter type @@ -93852,52 +96530,52 @@ var ts; } function canHaveLiteralInitializer(node) { switch (node.kind) { - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - return !ts.hasModifier(node, 8 /* Private */); - case 156 /* Parameter */: - case 242 /* VariableDeclaration */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + return !ts.hasEffectiveModifier(node, 8 /* Private */); + case 159 /* Parameter */: + case 246 /* VariableDeclaration */: return true; } return false; } function isPreservedDeclarationStatement(node) { switch (node.kind) { - case 244 /* FunctionDeclaration */: - case 249 /* ModuleDeclaration */: - case 253 /* ImportEqualsDeclaration */: - case 246 /* InterfaceDeclaration */: - case 245 /* ClassDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 248 /* EnumDeclaration */: - case 225 /* VariableStatement */: - case 254 /* ImportDeclaration */: - case 260 /* ExportDeclaration */: - case 259 /* ExportAssignment */: + case 248 /* FunctionDeclaration */: + case 253 /* ModuleDeclaration */: + case 257 /* ImportEqualsDeclaration */: + case 250 /* InterfaceDeclaration */: + case 249 /* ClassDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 252 /* EnumDeclaration */: + case 229 /* VariableStatement */: + case 258 /* ImportDeclaration */: + case 264 /* ExportDeclaration */: + case 263 /* ExportAssignment */: return true; } return false; } function isProcessedComponent(node) { switch (node.kind) { - case 166 /* ConstructSignature */: - case 162 /* Constructor */: - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 160 /* MethodSignature */: - case 165 /* CallSignature */: - case 167 /* IndexSignature */: - case 242 /* VariableDeclaration */: - case 155 /* TypeParameter */: - case 216 /* ExpressionWithTypeArguments */: - case 169 /* TypeReference */: - case 180 /* ConditionalType */: - case 170 /* FunctionType */: - case 171 /* ConstructorType */: - case 188 /* ImportType */: + case 169 /* ConstructSignature */: + case 165 /* Constructor */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 163 /* MethodSignature */: + case 168 /* CallSignature */: + case 170 /* IndexSignature */: + case 246 /* VariableDeclaration */: + case 158 /* TypeParameter */: + case 220 /* ExpressionWithTypeArguments */: + case 172 /* TypeReference */: + case 183 /* ConditionalType */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: + case 192 /* ImportType */: return true; } return false; @@ -94001,7 +96679,7 @@ var ts; return function (context) { var customTransformer = transformer(context); return typeof customTransformer === "function" - ? handleDefault(customTransformer) + ? handleDefault(context, customTransformer) : wrapCustomTransformer(customTransformer); }; } @@ -94009,7 +96687,7 @@ var ts; return wrapCustomTransformerFactory(transformer, ts.chainBundle); } function wrapDeclarationTransformerFactory(transformer) { - return wrapCustomTransformerFactory(transformer, ts.identity); + return wrapCustomTransformerFactory(transformer, function (_, node) { return node; }); } function noEmitSubstitution(_hint, node) { return node; @@ -94029,8 +96707,8 @@ var ts; * @param transforms An array of `TransformerFactory` callbacks. * @param allowDtsFiles A value indicating whether to allow the transformation of .d.ts files. */ - function transformNodes(resolver, host, options, nodes, transformers, allowDtsFiles) { - var enabledSyntaxKindFeatures = new Array(331 /* Count */); + function transformNodes(resolver, host, factory, options, nodes, transformers, allowDtsFiles) { + var enabledSyntaxKindFeatures = new Array(336 /* Count */); var lexicalEnvironmentVariableDeclarations; var lexicalEnvironmentFunctionDeclarations; var lexicalEnvironmentStatements; @@ -94049,9 +96727,11 @@ var ts; // The transformation context is provided to each transformer as part of transformer // initialization. var context = { + factory: factory, getCompilerOptions: function () { return options; }, getEmitResolver: function () { return resolver; }, getEmitHost: function () { return host; }, + getEmitHelperFactory: ts.memoize(function () { return ts.createEmitHelperFactory(context); }), startLexicalEnvironment: startLexicalEnvironment, suspendLexicalEnvironment: suspendLexicalEnvironment, resumeLexicalEnvironment: resumeLexicalEnvironment, @@ -94084,8 +96764,8 @@ var ts; } }; // Ensure the parse tree is clean before applying transformations - for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) { - var node = nodes_4[_i]; + for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) { + var node = nodes_2[_i]; ts.disposeEmitNodes(ts.getSourceFileOfNode(ts.getParseTreeNode(node))); } ts.performance.mark("beforeTransform"); @@ -94183,7 +96863,7 @@ var ts; function hoistVariableDeclaration(name) { ts.Debug.assert(state > 0 /* Uninitialized */, "Cannot modify the lexical environment during initialization."); ts.Debug.assert(state < 2 /* Completed */, "Cannot modify the lexical environment after transformation has completed."); - var decl = ts.setEmitFlags(ts.createVariableDeclaration(name), 64 /* NoNestedSourceMaps */); + var decl = ts.setEmitFlags(factory.createVariableDeclaration(name), 64 /* NoNestedSourceMaps */); if (!lexicalEnvironmentVariableDeclarations) { lexicalEnvironmentVariableDeclarations = [decl]; } @@ -94274,8 +96954,8 @@ var ts; statements = __spreadArrays(lexicalEnvironmentFunctionDeclarations); } if (lexicalEnvironmentVariableDeclarations) { - var statement = ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList(lexicalEnvironmentVariableDeclarations)); + var statement = factory.createVariableStatement( + /*modifiers*/ undefined, factory.createVariableDeclarationList(lexicalEnvironmentVariableDeclarations)); ts.setEmitFlags(statement, 1048576 /* CustomPrologue */); if (!statements) { statements = [statement]; @@ -94337,8 +97017,8 @@ var ts; function dispose() { if (state < 3 /* Disposed */) { // Clean up emit nodes on parse tree - for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) { - var node = nodes_5[_i]; + for (var _i = 0, nodes_3 = nodes; _i < nodes_3.length; _i++) { + var node = nodes_3[_i]; ts.disposeEmitNodes(ts.getSourceFileOfNode(ts.getParseTreeNode(node))); } // Release references to external entries for GC purposes. @@ -94355,6 +97035,31 @@ var ts; } } ts.transformNodes = transformNodes; + ts.nullTransformationContext = { + get factory() { return ts.factory; }, + enableEmitNotification: ts.noop, + enableSubstitution: ts.noop, + endLexicalEnvironment: ts.returnUndefined, + getCompilerOptions: function () { return ({}); }, + getEmitHost: ts.notImplemented, + getEmitResolver: ts.notImplemented, + getEmitHelperFactory: ts.notImplemented, + setLexicalEnvironmentFlags: ts.noop, + getLexicalEnvironmentFlags: function () { return 0; }, + hoistFunctionDeclaration: ts.noop, + hoistVariableDeclaration: ts.noop, + addInitializationStatement: ts.noop, + isEmitNotificationEnabled: ts.notImplemented, + isSubstitutionEnabled: ts.notImplemented, + onEmitNode: ts.noop, + onSubstituteNode: ts.notImplemented, + readEmitHelpers: ts.notImplemented, + requestEmitHelper: ts.noop, + resumeLexicalEnvironment: ts.noop, + startLexicalEnvironment: ts.noop, + suspendLexicalEnvironment: ts.noop, + addDiagnostic: ts.noop, + }; })(ts || (ts = {})); var ts; (function (ts) { @@ -94379,10 +97084,10 @@ var ts; if (forceDtsEmit === void 0) { forceDtsEmit = false; } var sourceFiles = ts.isArray(sourceFilesOrTargetSourceFile) ? sourceFilesOrTargetSourceFile : ts.getSourceFilesToEmit(host, sourceFilesOrTargetSourceFile, forceDtsEmit); var options = host.getCompilerOptions(); - if (options.outFile || options.out) { + if (ts.outFile(options)) { var prepends = host.getPrependNodes(); if (sourceFiles.length || prepends.length) { - var bundle = ts.createBundle(sourceFiles, prepends); + var bundle = ts.factory.createBundle(sourceFiles, prepends); var result = action(getOutputPathsFor(bundle, host, forceDtsEmit), bundle); if (result) { return result; @@ -94400,7 +97105,7 @@ var ts; } } if (includeBuildInfo) { - var buildInfoPath = getTsBuildInfoEmitOutputFilePath(host.getCompilerOptions()); + var buildInfoPath = getTsBuildInfoEmitOutputFilePath(options); if (buildInfoPath) return action({ buildInfoPath: buildInfoPath }, /*sourceFileOrBundle*/ undefined); } @@ -94413,7 +97118,7 @@ var ts; return undefined; if (options.tsBuildInfoFile) return options.tsBuildInfoFile; - var outPath = options.outFile || options.out; + var outPath = ts.outFile(options); var buildInfoExtensionLess; if (outPath) { buildInfoExtensionLess = ts.removeFileExtension(outPath); @@ -94433,7 +97138,7 @@ var ts; ts.getTsBuildInfoEmitOutputFilePath = getTsBuildInfoEmitOutputFilePath; /*@internal*/ function getOutputPathsForBundle(options, forceDtsPaths) { - var outPath = options.outFile || options.out; + var outPath = ts.outFile(options); var jsFilePath = options.emitDeclarationOnly ? undefined : outPath; var sourceMapFilePath = jsFilePath && getSourceMapFilePath(jsFilePath, options); var declarationFilePath = (forceDtsPaths || ts.getEmitDeclarations(options)) ? ts.removeFileExtension(outPath) + ".d.ts" /* Dts */ : undefined; @@ -94445,7 +97150,7 @@ var ts; /*@internal*/ function getOutputPathsFor(sourceFile, host, forceDtsPaths) { var options = host.getCompilerOptions(); - if (sourceFile.kind === 291 /* Bundle */) { + if (sourceFile.kind === 295 /* Bundle */) { return getOutputPathsForBundle(options, forceDtsPaths); } else { @@ -94555,7 +97260,7 @@ var ts; /*@internal*/ function getAllProjectOutputs(configFile, ignoreCase) { var _a = createAddOutput(), addOutput = _a.addOutput, getOutputs = _a.getOutputs; - if (configFile.options.outFile || configFile.options.out) { + if (ts.outFile(configFile.options)) { getSingleOutputFileNames(configFile, addOutput); } else { @@ -94572,7 +97277,7 @@ var ts; inputFileName = ts.normalizePath(inputFileName); ts.Debug.assert(ts.contains(commandLine.fileNames, inputFileName), "Expected fileName to be present in command line"); var _a = createAddOutput(), addOutput = _a.addOutput, getOutputs = _a.getOutputs; - if (commandLine.options.outFile || commandLine.options.out) { + if (ts.outFile(commandLine.options)) { getSingleOutputFileNames(commandLine, addOutput); } else { @@ -94583,7 +97288,7 @@ var ts; ts.getOutputFileNames = getOutputFileNames; /*@internal*/ function getFirstProjectOutput(configFile, ignoreCase) { - if (configFile.options.outFile || configFile.options.out) { + if (ts.outFile(configFile.options)) { var jsFilePath = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false).jsFilePath; return ts.Debug.checkDefined(jsFilePath, "project " + configFile.options.configFilePath + " expected to have at least one output"); } @@ -94672,7 +97377,7 @@ var ts; if (!buildInfoPath || targetSourceFile || emitSkipped) return; var program = host.getProgramBuildInfo(); - if (host.isEmitBlocked(buildInfoPath) || compilerOptions.noEmit) { + if (host.isEmitBlocked(buildInfoPath)) { emitSkipped = true; return; } @@ -94689,7 +97394,7 @@ var ts; return; } // Transform the source files - var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], scriptTransformers, /*allowDtsFiles*/ false); + var transform = ts.transformNodes(resolver, host, ts.factory, compilerOptions, [sourceFileOrBundle], scriptTransformers, /*allowDtsFiles*/ false); var printerOptions = { removeComments: compilerOptions.removeComments, newLine: compilerOptions.newLine, @@ -94730,13 +97435,13 @@ var ts; var sourceFiles = ts.isSourceFile(sourceFileOrBundle) ? [sourceFileOrBundle] : sourceFileOrBundle.sourceFiles; var filesForEmit = forceDtsEmit ? sourceFiles : ts.filter(sourceFiles, ts.isSourceFileNotJson); // Setup and perform the transformation to retrieve declarations from the input files - var inputListOrBundle = (compilerOptions.outFile || compilerOptions.out) ? [ts.createBundle(filesForEmit, !ts.isSourceFile(sourceFileOrBundle) ? sourceFileOrBundle.prepends : undefined)] : filesForEmit; + var inputListOrBundle = ts.outFile(compilerOptions) ? [ts.factory.createBundle(filesForEmit, !ts.isSourceFile(sourceFileOrBundle) ? sourceFileOrBundle.prepends : undefined)] : filesForEmit; if (emitOnlyDtsFiles && !ts.getEmitDeclarations(compilerOptions)) { // Checker wont collect the linked aliases since thats only done when declaration is enabled. // Do that here when emitting only dts files filesForEmit.forEach(collectLinkedAliases); } - var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false); + var declarationTransform = ts.transformNodes(resolver, host, ts.factory, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false); if (ts.length(declarationTransform.diagnostics)) { for (var _a = 0, _b = declarationTransform.diagnostics; _a < _b.length; _a++) { var diagnostic = _b[_a]; @@ -94775,7 +97480,7 @@ var ts; mapRoot: compilerOptions.mapRoot, extendedDiagnostics: compilerOptions.extendedDiagnostics, }); - if (forceDtsEmit && declarationTransform.transformed[0].kind === 290 /* SourceFile */) { + if (forceDtsEmit && declarationTransform.transformed[0].kind === 294 /* SourceFile */) { var sourceFile = declarationTransform.transformed[0]; exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit; } @@ -94786,7 +97491,7 @@ var ts; } function collectLinkedAliases(node) { if (ts.isExportAssignment(node)) { - if (node.expression.kind === 75 /* Identifier */) { + if (node.expression.kind === 78 /* Identifier */) { resolver.collectLinkedAliases(node.expression, /*setVisibility*/ true); } return; @@ -94798,8 +97503,8 @@ var ts; ts.forEachChild(node, collectLinkedAliases); } function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, printer, mapOptions) { - var bundle = sourceFileOrBundle.kind === 291 /* Bundle */ ? sourceFileOrBundle : undefined; - var sourceFile = sourceFileOrBundle.kind === 290 /* SourceFile */ ? sourceFileOrBundle : undefined; + var bundle = sourceFileOrBundle.kind === 295 /* Bundle */ ? sourceFileOrBundle : undefined; + var sourceFile = sourceFileOrBundle.kind === 294 /* SourceFile */ ? sourceFileOrBundle : undefined; var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile]; var sourceMapGenerator; if (shouldEmitSourceMaps(mapOptions, sourceFileOrBundle)) { @@ -94840,7 +97545,7 @@ var ts; } function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) { return (mapOptions.sourceMap || mapOptions.inlineSourceMap) - && (sourceFileOrBundle.kind !== 290 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */)); + && (sourceFileOrBundle.kind !== 294 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */)); } function getSourceRoot(mapOptions) { // Normalize source root and make sure it has trailing "/" so that it can be used to combine paths with the @@ -94944,6 +97649,7 @@ var ts; getTypeReferenceDirectivesForSymbol: ts.notImplemented, isLiteralConstDeclaration: ts.notImplemented, getJsxFactoryEntity: ts.notImplemented, + getJsxFragmentFactoryEntity: ts.notImplemented, getAllAccessorDeclarations: ts.notImplemented, getSymbolOfExternalModuleSpecifier: ts.notImplemented, isBindingCapturedByNode: ts.notImplemented, @@ -94951,26 +97657,28 @@ var ts; isImportRequiredByAugmentation: ts.notImplemented, }; function createSourceFilesFromBundleBuildInfo(bundle, buildInfoDirectory, host) { - var sourceFiles = bundle.sourceFiles.map(function (fileName) { - var sourceFile = ts.createNode(290 /* SourceFile */, 0, 0); + var _a; + var jsBundle = ts.Debug.checkDefined(bundle.js); + var prologueMap = ((_a = jsBundle.sources) === null || _a === void 0 ? void 0 : _a.prologues) && ts.arrayToMap(jsBundle.sources.prologues, function (prologueInfo) { return prologueInfo.file; }); + return bundle.sourceFiles.map(function (fileName, index) { + var _a, _b; + var prologueInfo = prologueMap === null || prologueMap === void 0 ? void 0 : prologueMap.get(index); + var statements = prologueInfo === null || prologueInfo === void 0 ? void 0 : prologueInfo.directives.map(function (directive) { + var literal = ts.setTextRange(ts.factory.createStringLiteral(directive.expression.text), directive.expression); + var statement = ts.setTextRange(ts.factory.createExpressionStatement(literal), directive); + ts.setParent(literal, statement); + return statement; + }); + var eofToken = ts.factory.createToken(1 /* EndOfFileToken */); + var sourceFile = ts.factory.createSourceFile(statements !== null && statements !== void 0 ? statements : [], eofToken, 0 /* None */); sourceFile.fileName = ts.getRelativePathFromDirectory(host.getCurrentDirectory(), ts.getNormalizedAbsolutePath(fileName, buildInfoDirectory), !host.useCaseSensitiveFileNames()); - sourceFile.text = ""; - sourceFile.statements = ts.createNodeArray(); + sourceFile.text = (_a = prologueInfo === null || prologueInfo === void 0 ? void 0 : prologueInfo.text) !== null && _a !== void 0 ? _a : ""; + ts.setTextRangePosWidth(sourceFile, 0, (_b = prologueInfo === null || prologueInfo === void 0 ? void 0 : prologueInfo.text.length) !== null && _b !== void 0 ? _b : 0); + ts.setEachParent(sourceFile.statements, sourceFile); + ts.setTextRangePosWidth(eofToken, sourceFile.end, 0); + ts.setParent(eofToken, sourceFile); return sourceFile; }); - var jsBundle = ts.Debug.checkDefined(bundle.js); - ts.forEach(jsBundle.sources && jsBundle.sources.prologues, function (prologueInfo) { - var sourceFile = sourceFiles[prologueInfo.file]; - sourceFile.text = prologueInfo.text; - sourceFile.end = prologueInfo.text.length; - sourceFile.statements = ts.createNodeArray(prologueInfo.directives.map(function (directive) { - var statement = ts.createNode(226 /* ExpressionStatement */, directive.pos, directive.end); - statement.expression = ts.createNode(10 /* StringLiteral */, directive.expression.pos, directive.expression.end); - statement.expression.text = directive.expression.text; - return statement; - })); - }); - return sourceFiles; } /*@internal*/ function emitUsingBuildInfo(config, host, getCommandLine, customTransformers) { @@ -95080,7 +97788,7 @@ var ts; var extendedDiagnostics = !!printerOptions.extendedDiagnostics; var newLine = ts.getNewLineCharacter(printerOptions); var moduleKind = ts.getEmitModuleKind(printerOptions); - var bundledHelpers = ts.createMap(); + var bundledHelpers = new ts.Map(); var currentSourceFile; var nodeIdToGeneratedName; // Map of generated names for specific nodes. var autoGeneratedIdToGeneratedName; // Map of generated names for temp and loop variables. @@ -95090,6 +97798,7 @@ var ts; var reservedNamesStack; // Stack of TempFlags reserved in enclosing name generation scopes. var reservedNames; // TempFlags to reserve in nested name generation scopes. var preserveSourceNewlines = printerOptions.preserveSourceNewlines; // Can be overridden inside nodes with the `IgnoreSourceNewlines` emit flag. + var nextListElementPos; // See comment in `getLeadingLineTerminatorCount`. var writer; var ownWriter; // Reusable `EmitTextWriter` for basic printing. var write = writeBase; @@ -95142,9 +97851,9 @@ var ts; break; } switch (node.kind) { - case 290 /* SourceFile */: return printFile(node); - case 291 /* Bundle */: return printBundle(node); - case 292 /* UnparsedSource */: return printUnparsedSource(node); + case 294 /* SourceFile */: return printFile(node); + case 295 /* Bundle */: return printBundle(node); + case 296 /* UnparsedSource */: return printUnparsedSource(node); } writeNode(hint, node, sourceFile, beginPrint()); return endPrint(); @@ -95334,7 +98043,7 @@ var ts; function reset() { nodeIdToGeneratedName = []; autoGeneratedIdToGeneratedName = []; - generatedNames = ts.createMap(); + generatedNames = new ts.Set(); tempFlagsStack = []; tempFlags = 0 /* Auto */; reservedNamesStack = []; @@ -95400,12 +98109,12 @@ var ts; } // falls through case 2 /* Comments */: - if (!commentsDisabled && node.kind !== 290 /* SourceFile */) { + if (!commentsDisabled && node.kind !== 294 /* SourceFile */) { return pipelineEmitWithComments; } // falls through case 3 /* SourceMaps */: - if (!sourceMapsDisabled && node.kind !== 290 /* SourceFile */ && !ts.isInJsonFile(node)) { + if (!sourceMapsDisabled && node.kind !== 294 /* SourceFile */ && !ts.isInJsonFile(node)) { return pipelineEmitWithSourceMap; } // falls through @@ -95447,278 +98156,280 @@ var ts; case 16 /* TemplateMiddle */: case 17 /* TemplateTail */: return emitLiteral(node, /*jsxAttributeEscape*/ false); - case 292 /* UnparsedSource */: - case 286 /* UnparsedPrepend */: + case 296 /* UnparsedSource */: + case 290 /* UnparsedPrepend */: return emitUnparsedSourceOrPrepend(node); - case 285 /* UnparsedPrologue */: + case 289 /* UnparsedPrologue */: return writeUnparsedNode(node); - case 287 /* UnparsedText */: - case 288 /* UnparsedInternalText */: + case 291 /* UnparsedText */: + case 292 /* UnparsedInternalText */: return emitUnparsedTextLike(node); - case 289 /* UnparsedSyntheticReference */: + case 293 /* UnparsedSyntheticReference */: return emitUnparsedSyntheticReference(node); // Identifiers - case 75 /* Identifier */: + case 78 /* Identifier */: return emitIdentifier(node); // PrivateIdentifiers - case 76 /* PrivateIdentifier */: + case 79 /* PrivateIdentifier */: return emitPrivateIdentifier(node); // Parse tree nodes // Names - case 153 /* QualifiedName */: + case 156 /* QualifiedName */: return emitQualifiedName(node); - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: return emitComputedPropertyName(node); // Signature elements - case 155 /* TypeParameter */: + case 158 /* TypeParameter */: return emitTypeParameter(node); - case 156 /* Parameter */: + case 159 /* Parameter */: return emitParameter(node); - case 157 /* Decorator */: + case 160 /* Decorator */: return emitDecorator(node); // Type members - case 158 /* PropertySignature */: + case 161 /* PropertySignature */: return emitPropertySignature(node); - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: return emitPropertyDeclaration(node); - case 160 /* MethodSignature */: + case 163 /* MethodSignature */: return emitMethodSignature(node); - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: return emitMethodDeclaration(node); - case 162 /* Constructor */: + case 165 /* Constructor */: return emitConstructor(node); - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return emitAccessorDeclaration(node); - case 165 /* CallSignature */: + case 168 /* CallSignature */: return emitCallSignature(node); - case 166 /* ConstructSignature */: + case 169 /* ConstructSignature */: return emitConstructSignature(node); - case 167 /* IndexSignature */: + case 170 /* IndexSignature */: return emitIndexSignature(node); // Types - case 168 /* TypePredicate */: + case 171 /* TypePredicate */: return emitTypePredicate(node); - case 169 /* TypeReference */: + case 172 /* TypeReference */: return emitTypeReference(node); - case 170 /* FunctionType */: + case 173 /* FunctionType */: return emitFunctionType(node); - case 300 /* JSDocFunctionType */: + case 304 /* JSDocFunctionType */: return emitJSDocFunctionType(node); - case 171 /* ConstructorType */: + case 174 /* ConstructorType */: return emitConstructorType(node); - case 172 /* TypeQuery */: + case 175 /* TypeQuery */: return emitTypeQuery(node); - case 173 /* TypeLiteral */: + case 176 /* TypeLiteral */: return emitTypeLiteral(node); - case 174 /* ArrayType */: + case 177 /* ArrayType */: return emitArrayType(node); - case 175 /* TupleType */: + case 178 /* TupleType */: return emitTupleType(node); - case 176 /* OptionalType */: + case 179 /* OptionalType */: return emitOptionalType(node); - case 178 /* UnionType */: + case 181 /* UnionType */: return emitUnionType(node); - case 179 /* IntersectionType */: + case 182 /* IntersectionType */: return emitIntersectionType(node); - case 180 /* ConditionalType */: + case 183 /* ConditionalType */: return emitConditionalType(node); - case 181 /* InferType */: + case 184 /* InferType */: return emitInferType(node); - case 182 /* ParenthesizedType */: + case 185 /* ParenthesizedType */: return emitParenthesizedType(node); - case 216 /* ExpressionWithTypeArguments */: + case 220 /* ExpressionWithTypeArguments */: return emitExpressionWithTypeArguments(node); - case 183 /* ThisType */: + case 186 /* ThisType */: return emitThisType(); - case 184 /* TypeOperator */: + case 187 /* TypeOperator */: return emitTypeOperator(node); - case 185 /* IndexedAccessType */: + case 188 /* IndexedAccessType */: return emitIndexedAccessType(node); - case 186 /* MappedType */: + case 189 /* MappedType */: return emitMappedType(node); - case 187 /* LiteralType */: + case 190 /* LiteralType */: return emitLiteralType(node); - case 188 /* ImportType */: + case 192 /* ImportType */: return emitImportTypeNode(node); - case 295 /* JSDocAllType */: + case 299 /* JSDocAllType */: writePunctuation("*"); return; - case 296 /* JSDocUnknownType */: + case 300 /* JSDocUnknownType */: writePunctuation("?"); return; - case 297 /* JSDocNullableType */: + case 301 /* JSDocNullableType */: return emitJSDocNullableType(node); - case 298 /* JSDocNonNullableType */: + case 302 /* JSDocNonNullableType */: return emitJSDocNonNullableType(node); - case 299 /* JSDocOptionalType */: + case 303 /* JSDocOptionalType */: return emitJSDocOptionalType(node); - case 177 /* RestType */: - case 301 /* JSDocVariadicType */: + case 180 /* RestType */: + case 305 /* JSDocVariadicType */: return emitRestOrJSDocVariadicType(node); + case 191 /* NamedTupleMember */: + return emitNamedTupleMember(node); // Binding patterns - case 189 /* ObjectBindingPattern */: + case 193 /* ObjectBindingPattern */: return emitObjectBindingPattern(node); - case 190 /* ArrayBindingPattern */: + case 194 /* ArrayBindingPattern */: return emitArrayBindingPattern(node); - case 191 /* BindingElement */: + case 195 /* BindingElement */: return emitBindingElement(node); // Misc - case 221 /* TemplateSpan */: + case 225 /* TemplateSpan */: return emitTemplateSpan(node); - case 222 /* SemicolonClassElement */: + case 226 /* SemicolonClassElement */: return emitSemicolonClassElement(); // Statements - case 223 /* Block */: + case 227 /* Block */: return emitBlock(node); - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: return emitVariableStatement(node); - case 224 /* EmptyStatement */: + case 228 /* EmptyStatement */: return emitEmptyStatement(/*isEmbeddedStatement*/ false); - case 226 /* ExpressionStatement */: + case 230 /* ExpressionStatement */: return emitExpressionStatement(node); - case 227 /* IfStatement */: + case 231 /* IfStatement */: return emitIfStatement(node); - case 228 /* DoStatement */: + case 232 /* DoStatement */: return emitDoStatement(node); - case 229 /* WhileStatement */: + case 233 /* WhileStatement */: return emitWhileStatement(node); - case 230 /* ForStatement */: + case 234 /* ForStatement */: return emitForStatement(node); - case 231 /* ForInStatement */: + case 235 /* ForInStatement */: return emitForInStatement(node); - case 232 /* ForOfStatement */: + case 236 /* ForOfStatement */: return emitForOfStatement(node); - case 233 /* ContinueStatement */: + case 237 /* ContinueStatement */: return emitContinueStatement(node); - case 234 /* BreakStatement */: + case 238 /* BreakStatement */: return emitBreakStatement(node); - case 235 /* ReturnStatement */: + case 239 /* ReturnStatement */: return emitReturnStatement(node); - case 236 /* WithStatement */: + case 240 /* WithStatement */: return emitWithStatement(node); - case 237 /* SwitchStatement */: + case 241 /* SwitchStatement */: return emitSwitchStatement(node); - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: return emitLabeledStatement(node); - case 239 /* ThrowStatement */: + case 243 /* ThrowStatement */: return emitThrowStatement(node); - case 240 /* TryStatement */: + case 244 /* TryStatement */: return emitTryStatement(node); - case 241 /* DebuggerStatement */: + case 245 /* DebuggerStatement */: return emitDebuggerStatement(node); // Declarations - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return emitVariableDeclaration(node); - case 243 /* VariableDeclarationList */: + case 247 /* VariableDeclarationList */: return emitVariableDeclarationList(node); - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: return emitFunctionDeclaration(node); - case 245 /* ClassDeclaration */: + case 249 /* ClassDeclaration */: return emitClassDeclaration(node); - case 246 /* InterfaceDeclaration */: + case 250 /* InterfaceDeclaration */: return emitInterfaceDeclaration(node); - case 247 /* TypeAliasDeclaration */: + case 251 /* TypeAliasDeclaration */: return emitTypeAliasDeclaration(node); - case 248 /* EnumDeclaration */: + case 252 /* EnumDeclaration */: return emitEnumDeclaration(node); - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: return emitModuleDeclaration(node); - case 250 /* ModuleBlock */: + case 254 /* ModuleBlock */: return emitModuleBlock(node); - case 251 /* CaseBlock */: + case 255 /* CaseBlock */: return emitCaseBlock(node); - case 252 /* NamespaceExportDeclaration */: + case 256 /* NamespaceExportDeclaration */: return emitNamespaceExportDeclaration(node); - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return emitImportEqualsDeclaration(node); - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: return emitImportDeclaration(node); - case 255 /* ImportClause */: + case 259 /* ImportClause */: return emitImportClause(node); - case 256 /* NamespaceImport */: + case 260 /* NamespaceImport */: return emitNamespaceImport(node); - case 262 /* NamespaceExport */: + case 266 /* NamespaceExport */: return emitNamespaceExport(node); - case 257 /* NamedImports */: + case 261 /* NamedImports */: return emitNamedImports(node); - case 258 /* ImportSpecifier */: + case 262 /* ImportSpecifier */: return emitImportSpecifier(node); - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: return emitExportAssignment(node); - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: return emitExportDeclaration(node); - case 261 /* NamedExports */: + case 265 /* NamedExports */: return emitNamedExports(node); - case 263 /* ExportSpecifier */: + case 267 /* ExportSpecifier */: return emitExportSpecifier(node); - case 264 /* MissingDeclaration */: + case 268 /* MissingDeclaration */: return; // Module references - case 265 /* ExternalModuleReference */: + case 269 /* ExternalModuleReference */: return emitExternalModuleReference(node); // JSX (non-expression) case 11 /* JsxText */: return emitJsxText(node); - case 268 /* JsxOpeningElement */: - case 271 /* JsxOpeningFragment */: + case 272 /* JsxOpeningElement */: + case 275 /* JsxOpeningFragment */: return emitJsxOpeningElementOrFragment(node); - case 269 /* JsxClosingElement */: - case 272 /* JsxClosingFragment */: + case 273 /* JsxClosingElement */: + case 276 /* JsxClosingFragment */: return emitJsxClosingElementOrFragment(node); - case 273 /* JsxAttribute */: + case 277 /* JsxAttribute */: return emitJsxAttribute(node); - case 274 /* JsxAttributes */: + case 278 /* JsxAttributes */: return emitJsxAttributes(node); - case 275 /* JsxSpreadAttribute */: + case 279 /* JsxSpreadAttribute */: return emitJsxSpreadAttribute(node); - case 276 /* JsxExpression */: + case 280 /* JsxExpression */: return emitJsxExpression(node); // Clauses - case 277 /* CaseClause */: + case 281 /* CaseClause */: return emitCaseClause(node); - case 278 /* DefaultClause */: + case 282 /* DefaultClause */: return emitDefaultClause(node); - case 279 /* HeritageClause */: + case 283 /* HeritageClause */: return emitHeritageClause(node); - case 280 /* CatchClause */: + case 284 /* CatchClause */: return emitCatchClause(node); // Property assignments - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: return emitPropertyAssignment(node); - case 282 /* ShorthandPropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: return emitShorthandPropertyAssignment(node); - case 283 /* SpreadAssignment */: + case 287 /* SpreadAssignment */: return emitSpreadAssignment(node); // Enum - case 284 /* EnumMember */: + case 288 /* EnumMember */: return emitEnumMember(node); // JSDoc nodes (only used in codefixes currently) - case 317 /* JSDocParameterTag */: - case 323 /* JSDocPropertyTag */: + case 322 /* JSDocParameterTag */: + case 328 /* JSDocPropertyTag */: return emitJSDocPropertyLikeTag(node); - case 318 /* JSDocReturnTag */: - case 320 /* JSDocTypeTag */: - case 319 /* JSDocThisTag */: - case 316 /* JSDocEnumTag */: + case 323 /* JSDocReturnTag */: + case 325 /* JSDocTypeTag */: + case 324 /* JSDocThisTag */: + case 321 /* JSDocEnumTag */: return emitJSDocSimpleTypedTag(node); - case 308 /* JSDocImplementsTag */: - case 307 /* JSDocAugmentsTag */: + case 312 /* JSDocImplementsTag */: + case 311 /* JSDocAugmentsTag */: return emitJSDocHeritageTag(node); - case 321 /* JSDocTemplateTag */: + case 326 /* JSDocTemplateTag */: return emitJSDocTemplateTag(node); - case 322 /* JSDocTypedefTag */: + case 327 /* JSDocTypedefTag */: return emitJSDocTypedefTag(node); - case 315 /* JSDocCallbackTag */: + case 320 /* JSDocCallbackTag */: return emitJSDocCallbackTag(node); - case 305 /* JSDocSignature */: + case 309 /* JSDocSignature */: return emitJSDocSignature(node); - case 304 /* JSDocTypeLiteral */: + case 308 /* JSDocTypeLiteral */: return emitJSDocTypeLiteral(node); - case 310 /* JSDocClassTag */: - case 306 /* JSDocTag */: + case 315 /* JSDocClassTag */: + case 310 /* JSDocTag */: return emitJSDocSimpleTag(node); - case 303 /* JSDocComment */: + case 307 /* JSDocComment */: return emitJSDoc(node); // Transformation nodes (ignored) } @@ -95743,83 +98454,83 @@ var ts; case 14 /* NoSubstitutionTemplateLiteral */: return emitLiteral(node, /*jsxAttributeEscape*/ false); // Identifiers - case 75 /* Identifier */: + case 78 /* Identifier */: return emitIdentifier(node); // Reserved words - case 91 /* FalseKeyword */: - case 100 /* NullKeyword */: - case 102 /* SuperKeyword */: - case 106 /* TrueKeyword */: - case 104 /* ThisKeyword */: - case 96 /* ImportKeyword */: + case 94 /* FalseKeyword */: + case 103 /* NullKeyword */: + case 105 /* SuperKeyword */: + case 109 /* TrueKeyword */: + case 107 /* ThisKeyword */: + case 99 /* ImportKeyword */: writeTokenNode(node, writeKeyword); return; // Expressions - case 192 /* ArrayLiteralExpression */: + case 196 /* ArrayLiteralExpression */: return emitArrayLiteralExpression(node); - case 193 /* ObjectLiteralExpression */: + case 197 /* ObjectLiteralExpression */: return emitObjectLiteralExpression(node); - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: return emitPropertyAccessExpression(node); - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: return emitElementAccessExpression(node); - case 196 /* CallExpression */: + case 200 /* CallExpression */: return emitCallExpression(node); - case 197 /* NewExpression */: + case 201 /* NewExpression */: return emitNewExpression(node); - case 198 /* TaggedTemplateExpression */: + case 202 /* TaggedTemplateExpression */: return emitTaggedTemplateExpression(node); - case 199 /* TypeAssertionExpression */: + case 203 /* TypeAssertionExpression */: return emitTypeAssertionExpression(node); - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return emitParenthesizedExpression(node); - case 201 /* FunctionExpression */: + case 205 /* FunctionExpression */: return emitFunctionExpression(node); - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: return emitArrowFunction(node); - case 203 /* DeleteExpression */: + case 207 /* DeleteExpression */: return emitDeleteExpression(node); - case 204 /* TypeOfExpression */: + case 208 /* TypeOfExpression */: return emitTypeOfExpression(node); - case 205 /* VoidExpression */: + case 209 /* VoidExpression */: return emitVoidExpression(node); - case 206 /* AwaitExpression */: + case 210 /* AwaitExpression */: return emitAwaitExpression(node); - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: return emitPrefixUnaryExpression(node); - case 208 /* PostfixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: return emitPostfixUnaryExpression(node); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return emitBinaryExpression(node); - case 210 /* ConditionalExpression */: + case 214 /* ConditionalExpression */: return emitConditionalExpression(node); - case 211 /* TemplateExpression */: + case 215 /* TemplateExpression */: return emitTemplateExpression(node); - case 212 /* YieldExpression */: + case 216 /* YieldExpression */: return emitYieldExpression(node); - case 213 /* SpreadElement */: + case 217 /* SpreadElement */: return emitSpreadExpression(node); - case 214 /* ClassExpression */: + case 218 /* ClassExpression */: return emitClassExpression(node); - case 215 /* OmittedExpression */: + case 219 /* OmittedExpression */: return; - case 217 /* AsExpression */: + case 221 /* AsExpression */: return emitAsExpression(node); - case 218 /* NonNullExpression */: + case 222 /* NonNullExpression */: return emitNonNullExpression(node); - case 219 /* MetaProperty */: + case 223 /* MetaProperty */: return emitMetaProperty(node); // JSX - case 266 /* JsxElement */: + case 270 /* JsxElement */: return emitJsxElement(node); - case 267 /* JsxSelfClosingElement */: + case 271 /* JsxSelfClosingElement */: return emitJsxSelfClosingElement(node); - case 270 /* JsxFragment */: + case 274 /* JsxFragment */: return emitJsxFragment(node); // Transformation nodes - case 326 /* PartiallyEmittedExpression */: + case 331 /* PartiallyEmittedExpression */: return emitPartiallyEmittedExpression(node); - case 327 /* CommaListExpression */: + case 332 /* CommaListExpression */: return emitCommaList(node); } } @@ -95842,15 +98553,15 @@ var ts; if (moduleKind === ts.ModuleKind.None || printerOptions.noEmitHelpers) { return undefined; } - var bundledHelpers = ts.createMap(); + var bundledHelpers = new ts.Map(); for (var _a = 0, _b = bundle.sourceFiles; _a < _b.length; _a++) { var sourceFile = _b[_a]; var shouldSkip = ts.getExternalHelpersModuleName(sourceFile) !== undefined; var helpers = getSortedEmitHelpers(sourceFile); if (!helpers) continue; - for (var _c = 0, helpers_4 = helpers; _c < helpers_4.length; _c++) { - var helper = helpers_4[_c]; + for (var _c = 0, helpers_5 = helpers; _c < helpers_5.length; _c++) { + var helper = helpers_5[_c]; if (!helper.scoped && !shouldSkip && !bundledHelpers.get(helper.name)) { bundledHelpers.set(helper.name, true); (result || (result = [])).push(helper.name); @@ -95861,7 +98572,7 @@ var ts; } function emitHelpers(node) { var helpersEmitted = false; - var bundle = node.kind === 291 /* Bundle */ ? node : undefined; + var bundle = node.kind === 295 /* Bundle */ ? node : undefined; if (bundle && moduleKind === ts.ModuleKind.None) { return; } @@ -95874,8 +98585,8 @@ var ts; var shouldBundle = (ts.isSourceFile(currentNode) || ts.isUnparsedSource(currentNode)) && !isOwnFileEmit; var helpers = ts.isUnparsedSource(currentNode) ? currentNode.helpers : getSortedEmitHelpers(currentNode); if (helpers) { - for (var _a = 0, helpers_5 = helpers; _a < helpers_5.length; _a++) { - var helper = helpers_5[_a]; + for (var _a = 0, helpers_6 = helpers; _a < helpers_6.length; _a++) { + var helper = helpers_6[_a]; if (!helper.scoped) { // Skip the helper if it can be skipped and the noEmitHelpers compiler // option is set, or if it can be imported and the importHelpers compiler @@ -95961,7 +98672,7 @@ var ts; var pos = getTextPosWithWriteLine(); writeUnparsedNode(unparsed); if (bundleFileInfo) { - updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 287 /* UnparsedText */ ? + updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 291 /* UnparsedText */ ? "text" /* Text */ : "internal" /* Internal */); } @@ -95998,7 +98709,7 @@ var ts; emit(node.right); } function emitEntityName(node) { - if (node.kind === 75 /* Identifier */) { + if (node.kind === 78 /* Identifier */) { emitExpression(node); } else { @@ -96034,7 +98745,7 @@ var ts; emit(node.dotDotDotToken); emitNodeWithWriter(node.name, writeParameter); emit(node.questionToken); - if (node.parent && node.parent.kind === 300 /* JSDocFunctionType */ && !node.name) { + if (node.parent && node.parent.kind === 304 /* JSDocFunctionType */ && !node.name) { emit(node.type); } else { @@ -96096,7 +98807,7 @@ var ts; function emitAccessorDeclaration(node) { emitDecorators(node, node.decorators); emitModifiers(node, node.modifiers); - writeKeyword(node.kind === 163 /* GetAccessor */ ? "get" : "set"); + writeKeyword(node.kind === 166 /* GetAccessor */ ? "get" : "set"); writeSpace(); emit(node.name); emitSignatureAndBody(node, emitSignatureHead); @@ -96214,9 +98925,18 @@ var ts; emit(node.type); } function emitTupleType(node) { - writePunctuation("["); - emitList(node, node.elementTypes, 528 /* TupleTypeElements */); - writePunctuation("]"); + emitTokenWithComment(22 /* OpenBracketToken */, node.pos, writePunctuation, node); + var flags = ts.getEmitFlags(node) & 1 /* SingleLine */ ? 528 /* SingleLineTupleTypeElements */ : 657 /* MultiLineTupleTypeElements */; + emitList(node, node.elements, flags | 524288 /* NoSpaceIfEmpty */); + emitTokenWithComment(23 /* CloseBracketToken */, node.elements.end, writePunctuation, node); + } + function emitNamedTupleMember(node) { + emit(node.dotDotDotToken); + emit(node.name); + emit(node.questionToken); + emitTokenWithComment(58 /* ColonToken */, node.name.end, writePunctuation, node); + writeSpace(); + emit(node.type); } function emitOptionalType(node) { emit(node.type); @@ -96279,7 +98999,7 @@ var ts; } if (node.readonlyToken) { emit(node.readonlyToken); - if (node.readonlyToken.kind !== 138 /* ReadonlyKeyword */) { + if (node.readonlyToken.kind !== 141 /* ReadonlyKeyword */) { writeKeyword("readonly"); } writeSpace(); @@ -96370,7 +99090,7 @@ var ts; } function emitPropertyAccessExpression(node) { var expression = ts.cast(emitExpression(node.expression), ts.isExpression); - var token = node.questionDotToken || ts.createNode(24 /* DotToken */, node.expression.end, node.name.pos); + var token = node.questionDotToken || ts.setTextRangePosEnd(ts.factory.createToken(24 /* DotToken */), node.expression.end, node.name.pos); var linesBeforeDot = getLinesBetweenNodes(node, node.expression, token); var linesAfterDot = getLinesBetweenNodes(node, token, node.name); writeLinesAndIndent(linesBeforeDot, /*writeSpaceIfNotIndenting*/ false); @@ -96424,7 +99144,7 @@ var ts; emitExpressionList(node, node.arguments, 2576 /* CallExpressionArguments */); } function emitNewExpression(node) { - emitTokenWithComment(99 /* NewKeyword */, node.pos, writeKeyword, node); + emitTokenWithComment(102 /* NewKeyword */, node.pos, writeKeyword, node); writeSpace(); emitExpression(node.expression); emitTypeArguments(node, node.typeArguments); @@ -96467,22 +99187,22 @@ var ts; emit(node.equalsGreaterThanToken); } function emitDeleteExpression(node) { - emitTokenWithComment(85 /* DeleteKeyword */, node.pos, writeKeyword, node); + emitTokenWithComment(88 /* DeleteKeyword */, node.pos, writeKeyword, node); writeSpace(); emitExpression(node.expression); } function emitTypeOfExpression(node) { - emitTokenWithComment(108 /* TypeOfKeyword */, node.pos, writeKeyword, node); + emitTokenWithComment(111 /* TypeOfKeyword */, node.pos, writeKeyword, node); writeSpace(); emitExpression(node.expression); } function emitVoidExpression(node) { - emitTokenWithComment(110 /* VoidKeyword */, node.pos, writeKeyword, node); + emitTokenWithComment(113 /* VoidKeyword */, node.pos, writeKeyword, node); writeSpace(); emitExpression(node.expression); } function emitAwaitExpression(node) { - emitTokenWithComment(127 /* AwaitKeyword */, node.pos, writeKeyword, node); + emitTokenWithComment(130 /* AwaitKeyword */, node.pos, writeKeyword, node); writeSpace(); emitExpression(node.expression); } @@ -96507,7 +99227,7 @@ var ts; // expression a prefix increment whose operand is a plus expression - (++(+x)) // The same is true of minus of course. var operand = node.operand; - return operand.kind === 207 /* PrefixUnaryExpression */ + return operand.kind === 211 /* PrefixUnaryExpression */ && ((node.operator === 39 /* PlusToken */ && (operand.operator === 39 /* PlusToken */ || operand.operator === 45 /* PlusPlusToken */)) || (node.operator === 40 /* MinusToken */ && (operand.operator === 40 /* MinusToken */ || operand.operator === 46 /* MinusMinusToken */))); } @@ -96543,7 +99263,7 @@ var ts; var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right); writeLinesAndIndent(linesBeforeOperator, isCommaOperator); emitLeadingCommentsOfPosition(node.operatorToken.pos); - writeTokenNode(node.operatorToken, node.operatorToken.kind === 97 /* InKeyword */ ? writeKeyword : writeOperator); + writeTokenNode(node.operatorToken, node.operatorToken.kind === 100 /* InKeyword */ ? writeKeyword : writeOperator); emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts writeLinesAndIndent(linesAfterOperator, /*writeSpaceIfNotIndenting*/ true); maybePipelineEmitExpression(node.right); @@ -96609,7 +99329,7 @@ var ts; emitList(node, node.templateSpans, 262144 /* TemplateExpressionSpans */); } function emitYieldExpression(node) { - emitTokenWithComment(121 /* YieldKeyword */, node.pos, writeKeyword, node); + emitTokenWithComment(124 /* YieldKeyword */, node.pos, writeKeyword, node); emit(node.asteriskToken); emitExpressionWithLeadingSpace(node.expression); } @@ -96686,16 +99406,16 @@ var ts; } } function emitIfStatement(node) { - var openParenPos = emitTokenWithComment(95 /* IfKeyword */, node.pos, writeKeyword, node); + var openParenPos = emitTokenWithComment(98 /* IfKeyword */, node.pos, writeKeyword, node); writeSpace(); emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node); emitExpression(node.expression); emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node); emitEmbeddedStatement(node, node.thenStatement); if (node.elseStatement) { - writeLineOrSpace(node); - emitTokenWithComment(87 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node); - if (node.elseStatement.kind === 227 /* IfStatement */) { + writeLineOrSpace(node, node.thenStatement, node.elseStatement); + emitTokenWithComment(90 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node); + if (node.elseStatement.kind === 231 /* IfStatement */) { writeSpace(); emit(node.elseStatement); } @@ -96705,20 +99425,20 @@ var ts; } } function emitWhileClause(node, startPos) { - var openParenPos = emitTokenWithComment(111 /* WhileKeyword */, startPos, writeKeyword, node); + var openParenPos = emitTokenWithComment(114 /* WhileKeyword */, startPos, writeKeyword, node); writeSpace(); emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node); emitExpression(node.expression); emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node); } function emitDoStatement(node) { - emitTokenWithComment(86 /* DoKeyword */, node.pos, writeKeyword, node); + emitTokenWithComment(89 /* DoKeyword */, node.pos, writeKeyword, node); emitEmbeddedStatement(node, node.statement); - if (ts.isBlock(node.statement)) { + if (ts.isBlock(node.statement) && !preserveSourceNewlines) { writeSpace(); } else { - writeLineOrSpace(node); + writeLineOrSpace(node, node.statement, node.expression); } emitWhileClause(node, node.statement.end); writeTrailingSemicolon(); @@ -96728,7 +99448,7 @@ var ts; emitEmbeddedStatement(node, node.statement); } function emitForStatement(node) { - var openParenPos = emitTokenWithComment(93 /* ForKeyword */, node.pos, writeKeyword, node); + var openParenPos = emitTokenWithComment(96 /* ForKeyword */, node.pos, writeKeyword, node); writeSpace(); var pos = emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, /*contextNode*/ node); emitForBinding(node.initializer); @@ -96740,25 +99460,25 @@ var ts; emitEmbeddedStatement(node, node.statement); } function emitForInStatement(node) { - var openParenPos = emitTokenWithComment(93 /* ForKeyword */, node.pos, writeKeyword, node); + var openParenPos = emitTokenWithComment(96 /* ForKeyword */, node.pos, writeKeyword, node); writeSpace(); emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node); emitForBinding(node.initializer); writeSpace(); - emitTokenWithComment(97 /* InKeyword */, node.initializer.end, writeKeyword, node); + emitTokenWithComment(100 /* InKeyword */, node.initializer.end, writeKeyword, node); writeSpace(); emitExpression(node.expression); emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node); emitEmbeddedStatement(node, node.statement); } function emitForOfStatement(node) { - var openParenPos = emitTokenWithComment(93 /* ForKeyword */, node.pos, writeKeyword, node); + var openParenPos = emitTokenWithComment(96 /* ForKeyword */, node.pos, writeKeyword, node); writeSpace(); emitWithTrailingSpace(node.awaitModifier); emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node); emitForBinding(node.initializer); writeSpace(); - emitTokenWithComment(152 /* OfKeyword */, node.initializer.end, writeKeyword, node); + emitTokenWithComment(155 /* OfKeyword */, node.initializer.end, writeKeyword, node); writeSpace(); emitExpression(node.expression); emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node); @@ -96766,7 +99486,7 @@ var ts; } function emitForBinding(node) { if (node !== undefined) { - if (node.kind === 243 /* VariableDeclarationList */) { + if (node.kind === 247 /* VariableDeclarationList */) { emit(node); } else { @@ -96775,12 +99495,12 @@ var ts; } } function emitContinueStatement(node) { - emitTokenWithComment(82 /* ContinueKeyword */, node.pos, writeKeyword, node); + emitTokenWithComment(85 /* ContinueKeyword */, node.pos, writeKeyword, node); emitWithLeadingSpace(node.label); writeTrailingSemicolon(); } function emitBreakStatement(node) { - emitTokenWithComment(77 /* BreakKeyword */, node.pos, writeKeyword, node); + emitTokenWithComment(80 /* BreakKeyword */, node.pos, writeKeyword, node); emitWithLeadingSpace(node.label); writeTrailingSemicolon(); } @@ -96808,12 +99528,12 @@ var ts; return pos; } function emitReturnStatement(node) { - emitTokenWithComment(101 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node); + emitTokenWithComment(104 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node); emitExpressionWithLeadingSpace(node.expression); writeTrailingSemicolon(); } function emitWithStatement(node) { - var openParenPos = emitTokenWithComment(112 /* WithKeyword */, node.pos, writeKeyword, node); + var openParenPos = emitTokenWithComment(115 /* WithKeyword */, node.pos, writeKeyword, node); writeSpace(); emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node); emitExpression(node.expression); @@ -96821,7 +99541,7 @@ var ts; emitEmbeddedStatement(node, node.statement); } function emitSwitchStatement(node) { - var openParenPos = emitTokenWithComment(103 /* SwitchKeyword */, node.pos, writeKeyword, node); + var openParenPos = emitTokenWithComment(106 /* SwitchKeyword */, node.pos, writeKeyword, node); writeSpace(); emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node); emitExpression(node.expression); @@ -96836,27 +99556,27 @@ var ts; emit(node.statement); } function emitThrowStatement(node) { - emitTokenWithComment(105 /* ThrowKeyword */, node.pos, writeKeyword, node); + emitTokenWithComment(108 /* ThrowKeyword */, node.pos, writeKeyword, node); emitExpressionWithLeadingSpace(node.expression); writeTrailingSemicolon(); } function emitTryStatement(node) { - emitTokenWithComment(107 /* TryKeyword */, node.pos, writeKeyword, node); + emitTokenWithComment(110 /* TryKeyword */, node.pos, writeKeyword, node); writeSpace(); emit(node.tryBlock); if (node.catchClause) { - writeLineOrSpace(node); + writeLineOrSpace(node, node.tryBlock, node.catchClause); emit(node.catchClause); } if (node.finallyBlock) { - writeLineOrSpace(node); - emitTokenWithComment(92 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node); + writeLineOrSpace(node, node.catchClause || node.tryBlock, node.finallyBlock); + emitTokenWithComment(95 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node); writeSpace(); emit(node.finallyBlock); } } function emitDebuggerStatement(node) { - writeToken(83 /* DebuggerKeyword */, node.pos, writeKeyword); + writeToken(86 /* DebuggerKeyword */, node.pos, writeKeyword); writeTrailingSemicolon(); } // @@ -97062,7 +99782,7 @@ var ts; var body = node.body; if (!body) return writeTrailingSemicolon(); - while (body.kind === 249 /* ModuleDeclaration */) { + while (body.kind === 253 /* ModuleDeclaration */) { writePunctuation("."); emit(body.name); body = body.body; @@ -97083,7 +99803,7 @@ var ts; } function emitImportEqualsDeclaration(node) { emitModifiers(node, node.modifiers); - emitTokenWithComment(96 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node); + emitTokenWithComment(99 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node); writeSpace(); emit(node.name); writeSpace(); @@ -97093,7 +99813,7 @@ var ts; writeTrailingSemicolon(); } function emitModuleReference(node) { - if (node.kind === 75 /* Identifier */) { + if (node.kind === 78 /* Identifier */) { emitExpression(node); } else { @@ -97102,12 +99822,12 @@ var ts; } function emitImportDeclaration(node) { emitModifiers(node, node.modifiers); - emitTokenWithComment(96 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node); + emitTokenWithComment(99 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node); writeSpace(); if (node.importClause) { emit(node.importClause); writeSpace(); - emitTokenWithComment(149 /* FromKeyword */, node.importClause.end, writeKeyword, node); + emitTokenWithComment(152 /* FromKeyword */, node.importClause.end, writeKeyword, node); writeSpace(); } emitExpression(node.moduleSpecifier); @@ -97115,7 +99835,7 @@ var ts; } function emitImportClause(node) { if (node.isTypeOnly) { - emitTokenWithComment(145 /* TypeKeyword */, node.pos, writeKeyword, node); + emitTokenWithComment(148 /* TypeKeyword */, node.pos, writeKeyword, node); writeSpace(); } emit(node.name); @@ -97128,7 +99848,7 @@ var ts; function emitNamespaceImport(node) { var asPos = emitTokenWithComment(41 /* AsteriskToken */, node.pos, writePunctuation, node); writeSpace(); - emitTokenWithComment(123 /* AsKeyword */, asPos, writeKeyword, node); + emitTokenWithComment(126 /* AsKeyword */, asPos, writeKeyword, node); writeSpace(); emit(node.name); } @@ -97139,23 +99859,23 @@ var ts; emitImportOrExportSpecifier(node); } function emitExportAssignment(node) { - var nextPos = emitTokenWithComment(89 /* ExportKeyword */, node.pos, writeKeyword, node); + var nextPos = emitTokenWithComment(92 /* ExportKeyword */, node.pos, writeKeyword, node); writeSpace(); if (node.isExportEquals) { emitTokenWithComment(62 /* EqualsToken */, nextPos, writeOperator, node); } else { - emitTokenWithComment(84 /* DefaultKeyword */, nextPos, writeKeyword, node); + emitTokenWithComment(87 /* DefaultKeyword */, nextPos, writeKeyword, node); } writeSpace(); emitExpression(node.expression); writeTrailingSemicolon(); } function emitExportDeclaration(node) { - var nextPos = emitTokenWithComment(89 /* ExportKeyword */, node.pos, writeKeyword, node); + var nextPos = emitTokenWithComment(92 /* ExportKeyword */, node.pos, writeKeyword, node); writeSpace(); if (node.isTypeOnly) { - nextPos = emitTokenWithComment(145 /* TypeKeyword */, nextPos, writeKeyword, node); + nextPos = emitTokenWithComment(148 /* TypeKeyword */, nextPos, writeKeyword, node); writeSpace(); } if (node.exportClause) { @@ -97167,18 +99887,18 @@ var ts; if (node.moduleSpecifier) { writeSpace(); var fromPos = node.exportClause ? node.exportClause.end : nextPos; - emitTokenWithComment(149 /* FromKeyword */, fromPos, writeKeyword, node); + emitTokenWithComment(152 /* FromKeyword */, fromPos, writeKeyword, node); writeSpace(); emitExpression(node.moduleSpecifier); } writeTrailingSemicolon(); } function emitNamespaceExportDeclaration(node) { - var nextPos = emitTokenWithComment(89 /* ExportKeyword */, node.pos, writeKeyword, node); + var nextPos = emitTokenWithComment(92 /* ExportKeyword */, node.pos, writeKeyword, node); writeSpace(); - nextPos = emitTokenWithComment(123 /* AsKeyword */, nextPos, writeKeyword, node); + nextPos = emitTokenWithComment(126 /* AsKeyword */, nextPos, writeKeyword, node); writeSpace(); - nextPos = emitTokenWithComment(136 /* NamespaceKeyword */, nextPos, writeKeyword, node); + nextPos = emitTokenWithComment(139 /* NamespaceKeyword */, nextPos, writeKeyword, node); writeSpace(); emit(node.name); writeTrailingSemicolon(); @@ -97186,7 +99906,7 @@ var ts; function emitNamespaceExport(node) { var asPos = emitTokenWithComment(41 /* AsteriskToken */, node.pos, writePunctuation, node); writeSpace(); - emitTokenWithComment(123 /* AsKeyword */, asPos, writeKeyword, node); + emitTokenWithComment(126 /* AsKeyword */, asPos, writeKeyword, node); writeSpace(); emit(node.name); } @@ -97205,7 +99925,7 @@ var ts; if (node.propertyName) { emit(node.propertyName); writeSpace(); - emitTokenWithComment(123 /* AsKeyword */, node.propertyName.end, writeKeyword, node); + emitTokenWithComment(126 /* AsKeyword */, node.propertyName.end, writeKeyword, node); writeSpace(); } emit(node.name); @@ -97286,7 +100006,7 @@ var ts; } } function emitJsxTagName(node) { - if (node.kind === 75 /* Identifier */) { + if (node.kind === 78 /* Identifier */) { emitExpression(node); } else { @@ -97297,13 +100017,13 @@ var ts; // Clauses // function emitCaseClause(node) { - emitTokenWithComment(78 /* CaseKeyword */, node.pos, writeKeyword, node); + emitTokenWithComment(81 /* CaseKeyword */, node.pos, writeKeyword, node); writeSpace(); emitExpression(node.expression); emitCaseOrDefaultClauseRest(node, node.statements, node.expression.end); } function emitDefaultClause(node) { - var pos = emitTokenWithComment(84 /* DefaultKeyword */, node.pos, writeKeyword, node); + var pos = emitTokenWithComment(87 /* DefaultKeyword */, node.pos, writeKeyword, node); emitCaseOrDefaultClauseRest(node, node.statements, pos); } function emitCaseOrDefaultClauseRest(parentNode, statements, colonPos) { @@ -97331,7 +100051,7 @@ var ts; emitList(node, node.types, 528 /* HeritageClauseTypes */); } function emitCatchClause(node) { - var openParenPos = emitTokenWithComment(79 /* CatchKeyword */, node.pos, writeKeyword, node); + var openParenPos = emitTokenWithComment(82 /* CatchKeyword */, node.pos, writeKeyword, node); writeSpace(); if (node.variableDeclaration) { emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node); @@ -97401,7 +100121,7 @@ var ts; } } if (node.tags) { - if (node.tags.length === 1 && node.tags[0].kind === 320 /* JSDocTypeTag */ && !node.comment) { + if (node.tags.length === 1 && node.tags[0].kind === 325 /* JSDocTypeTag */ && !node.comment) { writeSpace(); emit(node.tags[0]); } @@ -97435,7 +100155,7 @@ var ts; function emitJSDocTypedefTag(tag) { emitJSDocTagName(tag.tagName); if (tag.typeExpression) { - if (tag.typeExpression.kind === 294 /* JSDocTypeExpression */) { + if (tag.typeExpression.kind === 298 /* JSDocTypeExpression */) { emitJSDocTypeExpression(tag.typeExpression); } else { @@ -97454,7 +100174,7 @@ var ts; emit(tag.fullName); } emitJSDocComment(tag.comment); - if (tag.typeExpression && tag.typeExpression.kind === 304 /* JSDocTypeLiteral */) { + if (tag.typeExpression && tag.typeExpression.kind === 308 /* JSDocTypeLiteral */) { emitJSDocTypeLiteral(tag.typeExpression); } } @@ -97472,14 +100192,14 @@ var ts; emitJSDocComment(tag.comment); } function emitJSDocTypeLiteral(lit) { - emitList(lit, ts.createNodeArray(lit.jsDocPropertyTags), 33 /* JSDocComment */); + emitList(lit, ts.factory.createNodeArray(lit.jsDocPropertyTags), 33 /* JSDocComment */); } function emitJSDocSignature(sig) { if (sig.typeParameters) { - emitList(sig, ts.createNodeArray(sig.typeParameters), 33 /* JSDocComment */); + emitList(sig, ts.factory.createNodeArray(sig.typeParameters), 33 /* JSDocComment */); } if (sig.parameters) { - emitList(sig, ts.createNodeArray(sig.parameters), 33 /* JSDocComment */); + emitList(sig, ts.factory.createNodeArray(sig.parameters), 33 /* JSDocComment */); } if (sig.type) { writeLine(); @@ -97643,7 +100363,7 @@ var ts; if (recordBundleFileSection && bundleFileInfo) bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "prologue" /* Prologue */, data: statement.expression.text }); if (seenPrologueDirectives) { - seenPrologueDirectives.set(statement.expression.text, true); + seenPrologueDirectives.add(statement.expression.text); } } } @@ -97664,7 +100384,7 @@ var ts; if (bundleFileInfo) bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "prologue" /* Prologue */, data: prologue.data }); if (seenPrologueDirectives) { - seenPrologueDirectives.set(prologue.data, true); + seenPrologueDirectives.add(prologue.data); } } } @@ -97674,7 +100394,7 @@ var ts; emitPrologueDirectives(sourceFileOrBundle.statements, sourceFileOrBundle); } else { - var seenPrologueDirectives = ts.createMap(); + var seenPrologueDirectives = new ts.Set(); for (var _a = 0, _b = sourceFileOrBundle.prepends; _a < _b.length; _a++) { var prepend = _b[_a]; emitUnparsedPrologues(prepend.prologues, seenPrologueDirectives); @@ -97687,7 +100407,7 @@ var ts; } } function getPrologueDirectivesFromBundledSourceFiles(bundle) { - var seenPrologueDirectives = ts.createMap(); + var seenPrologueDirectives = new ts.Set(); var prologues; for (var index = 0; index < bundle.sourceFiles.length; index++) { var sourceFile = bundle.sourceFiles[index]; @@ -97699,7 +100419,7 @@ var ts; break; if (seenPrologueDirectives.has(statement.expression.text)) continue; - seenPrologueDirectives.set(statement.expression.text, true); + seenPrologueDirectives.add(statement.expression.text); (directives || (directives = [])).push({ pos: statement.pos, end: statement.end, @@ -97989,6 +100709,7 @@ var ts; else { shouldEmitInterveningComments = mayEmitInterveningComments; } + nextListElementPos = child.pos; emit(child); if (shouldDecreaseIndentAfterEmit) { decreaseIndent(); @@ -98103,10 +100824,19 @@ var ts; writer(tokenString); return pos < 0 ? pos : pos + tokenString.length; } - function writeLineOrSpace(node) { - if (ts.getEmitFlags(node) & 1 /* SingleLine */) { + function writeLineOrSpace(parentNode, prevChildNode, nextChildNode) { + if (ts.getEmitFlags(parentNode) & 1 /* SingleLine */) { writeSpace(); } + else if (preserveSourceNewlines) { + var lines = getLinesBetweenNodes(parentNode, prevChildNode, nextChildNode); + if (lines) { + writeLine(lines); + } + else { + writeSpace(); + } + } else { writeLine(); } @@ -98153,11 +100883,31 @@ var ts; if (firstChild_1 === undefined) { return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1; } + if (firstChild_1.pos === nextListElementPos) { + // If this child starts at the beginning of a list item in a parent list, its leading + // line terminators have already been written as the separating line terminators of the + // parent list. Example: + // + // class Foo { + // constructor() {} + // public foo() {} + // } + // + // The outer list is the list of class members, with one line terminator between the + // constructor and the method. The constructor is written, the separating line terminator + // is written, and then we start emitting the method. Its modifiers ([public]) constitute an inner + // list, so we look for its leading line terminators. If we didn't know that we had already + // written a newline as part of the parent list, it would appear that we need to write a + // leading newline to start the modifiers. + return 0; + } if (firstChild_1.kind === 11 /* JsxText */) { // JsxText will be written with its leading whitespace, so don't add more manually. return 0; } - if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(firstChild_1) && (!firstChild_1.parent || firstChild_1.parent === parentNode)) { + if (!ts.positionIsSynthesized(parentNode.pos) && + !ts.nodeIsSynthesized(firstChild_1) && + (!firstChild_1.parent || ts.getOriginalNode(firstChild_1.parent) === ts.getOriginalNode(parentNode))) { if (preserveSourceNewlines) { return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(firstChild_1.pos, parentNode.pos, currentSourceFile, includeComments); }); } @@ -98198,17 +100948,18 @@ var ts; if (format & 65536 /* PreferNewLine */) { return 1; } - var lastChild_1 = ts.lastOrUndefined(children); - if (lastChild_1 === undefined) { + var lastChild = ts.lastOrUndefined(children); + if (lastChild === undefined) { return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1; } - if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild_1) && (!lastChild_1.parent || lastChild_1.parent === parentNode)) { + if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild) && (!lastChild.parent || lastChild.parent === parentNode)) { if (preserveSourceNewlines) { - return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter(lastChild_1.end, parentNode.end, currentSourceFile, includeComments); }); + var end_2 = ts.isNodeArray(children) && !ts.positionIsSynthesized(children.end) ? children.end : lastChild.end; + return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter(end_2, parentNode.end, currentSourceFile, includeComments); }); } - return ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild_1, currentSourceFile) ? 0 : 1; + return ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile) ? 0 : 1; } - if (synthesizedNodeStartsOnNewLine(lastChild_1, format)) { + if (synthesizedNodeStartsOnNewLine(lastChild, format)) { return 1; } } @@ -98287,7 +101038,7 @@ var ts; && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile); } function skipSynthesizedParentheses(node) { - while (node.kind === 200 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) { + while (node.kind === 204 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) { node = node.expression; } return node; @@ -98310,10 +101061,11 @@ var ts; function getLiteralTextOfNode(node, neverAsciiEscape, jsxAttributeEscape) { if (node.kind === 10 /* StringLiteral */ && node.textSourceNode) { var textSourceNode = node.textSourceNode; - if (ts.isIdentifier(textSourceNode)) { - return jsxAttributeEscape ? "\"" + ts.escapeJsxAttributeString(getTextOfNode(textSourceNode)) + "\"" : - neverAsciiEscape || (ts.getEmitFlags(node) & 16777216 /* NoAsciiEscaping */) ? "\"" + ts.escapeString(getTextOfNode(textSourceNode)) + "\"" : - "\"" + ts.escapeNonAsciiString(getTextOfNode(textSourceNode)) + "\""; + if (ts.isIdentifier(textSourceNode) || ts.isNumericLiteral(textSourceNode)) { + var text = ts.isNumericLiteral(textSourceNode) ? textSourceNode.text : getTextOfNode(textSourceNode); + return jsxAttributeEscape ? "\"" + ts.escapeJsxAttributeString(text) + "\"" : + neverAsciiEscape || (ts.getEmitFlags(node) & 16777216 /* NoAsciiEscaping */) ? "\"" + ts.escapeString(text) + "\"" : + "\"" + ts.escapeNonAsciiString(text) + "\""; } else { return getLiteralTextOfNode(textSourceNode, neverAsciiEscape, jsxAttributeEscape); @@ -98344,92 +101096,92 @@ var ts; } function reserveNameInNestedScopes(name) { if (!reservedNames || reservedNames === ts.lastOrUndefined(reservedNamesStack)) { - reservedNames = ts.createMap(); + reservedNames = new ts.Set(); } - reservedNames.set(name, true); + reservedNames.add(name); } function generateNames(node) { if (!node) return; switch (node.kind) { - case 223 /* Block */: + case 227 /* Block */: ts.forEach(node.statements, generateNames); break; - case 238 /* LabeledStatement */: - case 236 /* WithStatement */: - case 228 /* DoStatement */: - case 229 /* WhileStatement */: + case 242 /* LabeledStatement */: + case 240 /* WithStatement */: + case 232 /* DoStatement */: + case 233 /* WhileStatement */: generateNames(node.statement); break; - case 227 /* IfStatement */: + case 231 /* IfStatement */: generateNames(node.thenStatement); generateNames(node.elseStatement); break; - case 230 /* ForStatement */: - case 232 /* ForOfStatement */: - case 231 /* ForInStatement */: + case 234 /* ForStatement */: + case 236 /* ForOfStatement */: + case 235 /* ForInStatement */: generateNames(node.initializer); generateNames(node.statement); break; - case 237 /* SwitchStatement */: + case 241 /* SwitchStatement */: generateNames(node.caseBlock); break; - case 251 /* CaseBlock */: + case 255 /* CaseBlock */: ts.forEach(node.clauses, generateNames); break; - case 277 /* CaseClause */: - case 278 /* DefaultClause */: + case 281 /* CaseClause */: + case 282 /* DefaultClause */: ts.forEach(node.statements, generateNames); break; - case 240 /* TryStatement */: + case 244 /* TryStatement */: generateNames(node.tryBlock); generateNames(node.catchClause); generateNames(node.finallyBlock); break; - case 280 /* CatchClause */: + case 284 /* CatchClause */: generateNames(node.variableDeclaration); generateNames(node.block); break; - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: generateNames(node.declarationList); break; - case 243 /* VariableDeclarationList */: + case 247 /* VariableDeclarationList */: ts.forEach(node.declarations, generateNames); break; - case 242 /* VariableDeclaration */: - case 156 /* Parameter */: - case 191 /* BindingElement */: - case 245 /* ClassDeclaration */: + case 246 /* VariableDeclaration */: + case 159 /* Parameter */: + case 195 /* BindingElement */: + case 249 /* ClassDeclaration */: generateNameIfNeeded(node.name); break; - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: generateNameIfNeeded(node.name); if (ts.getEmitFlags(node) & 524288 /* ReuseTempVariableScope */) { ts.forEach(node.parameters, generateNames); generateNames(node.body); } break; - case 189 /* ObjectBindingPattern */: - case 190 /* ArrayBindingPattern */: + case 193 /* ObjectBindingPattern */: + case 194 /* ArrayBindingPattern */: ts.forEach(node.elements, generateNames); break; - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: generateNames(node.importClause); break; - case 255 /* ImportClause */: + case 259 /* ImportClause */: generateNameIfNeeded(node.name); generateNames(node.namedBindings); break; - case 256 /* NamespaceImport */: + case 260 /* NamespaceImport */: generateNameIfNeeded(node.name); break; - case 262 /* NamespaceExport */: + case 266 /* NamespaceExport */: generateNameIfNeeded(node.name); break; - case 257 /* NamedImports */: + case 261 /* NamedImports */: ts.forEach(node.elements, generateNames); break; - case 258 /* ImportSpecifier */: + case 262 /* ImportSpecifier */: generateNameIfNeeded(node.propertyName || node.name); break; } @@ -98438,12 +101190,12 @@ var ts; if (!node) return; switch (node.kind) { - case 281 /* PropertyAssignment */: - case 282 /* ShorthandPropertyAssignment */: - case 159 /* PropertyDeclaration */: - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 285 /* PropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: + case 162 /* PropertyDeclaration */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: generateNameIfNeeded(node.name); break; } @@ -98556,7 +101308,7 @@ var ts; reserveNameInNestedScopes(baseName); } else { - generatedNames.set(baseName, true); + generatedNames.add(baseName); } return baseName; } @@ -98573,7 +101325,7 @@ var ts; reserveNameInNestedScopes(generatedName); } else { - generatedNames.set(generatedName, true); + generatedNames.add(generatedName); } return generatedName; } @@ -98623,25 +101375,25 @@ var ts; */ function generateNameForNode(node, flags) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return makeUniqueName(getTextOfNode(node), isUniqueName, !!(flags & 16 /* Optimistic */), !!(flags & 8 /* ReservedInNestedScopes */)); - case 249 /* ModuleDeclaration */: - case 248 /* EnumDeclaration */: + case 253 /* ModuleDeclaration */: + case 252 /* EnumDeclaration */: return generateNameForModuleOrEnum(node); - case 254 /* ImportDeclaration */: - case 260 /* ExportDeclaration */: + case 258 /* ImportDeclaration */: + case 264 /* ExportDeclaration */: return generateNameForImportOrExportDeclaration(node); - case 244 /* FunctionDeclaration */: - case 245 /* ClassDeclaration */: - case 259 /* ExportAssignment */: + case 248 /* FunctionDeclaration */: + case 249 /* ClassDeclaration */: + case 263 /* ExportAssignment */: return generateNameForExportDefault(); - case 214 /* ClassExpression */: + case 218 /* ClassExpression */: return generateNameForClassExpression(); - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return generateNameForMethodOrAccessor(node); - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: return makeTempVariableName(0 /* Auto */, /*reserveInNestedScopes*/ true); default: return makeTempVariableName(0 /* Auto */); @@ -98689,7 +101441,7 @@ var ts; hasWrittenComment = false; var emitFlags = ts.getEmitFlags(node); var _a = ts.getCommentRange(node), pos = _a.pos, end = _a.end; - var isEmittedNode = node.kind !== 325 /* NotEmittedStatement */; + var isEmittedNode = node.kind !== 330 /* NotEmittedStatement */; // We have to explicitly check that the node is JsxText because if the compilerOptions.jsx is "preserve" we will not do any transformation. // It is expensive to walk entire tree just to set one kind of node to have no comments. var skipLeadingComments = pos < 0 || (emitFlags & 512 /* NoLeadingComments */) !== 0 || node.kind === 11 /* JsxText */; @@ -98713,7 +101465,7 @@ var ts; containerEnd = end; // To avoid invalid comment emit in a down-level binding pattern, we // keep track of the last declaration list container's end - if (node.kind === 243 /* VariableDeclarationList */) { + if (node.kind === 247 /* VariableDeclarationList */) { declarationListContainerEnd = end; } } @@ -98746,7 +101498,7 @@ var ts; ts.Debug.assert(lastNode === node || lastSubstitution === node); } function emitLeadingSynthesizedComment(comment) { - if (comment.kind === 2 /* SingleLineCommentTrivia */) { + if (comment.hasLeadingNewline || comment.kind === 2 /* SingleLineCommentTrivia */) { writer.writeLine(); } writeSynthesizedComment(comment); @@ -98972,7 +101724,7 @@ var ts; else { var _a = ts.getSourceMapRange(node), pos = _a.pos, end = _a.end, _b = _a.source, source = _b === void 0 ? sourceMapSource : _b; var emitFlags = ts.getEmitFlags(node); - if (node.kind !== 325 /* NotEmittedStatement */ + if (node.kind !== 330 /* NotEmittedStatement */ && (emitFlags & 16 /* NoLeadingSourceMap */) === 0 && pos >= 0) { emitSourcePos(source, skipSourceTrivia(source, pos)); @@ -98985,7 +101737,7 @@ var ts; else { pipelinePhase(hint, node); } - if (node.kind !== 325 /* NotEmittedStatement */ + if (node.kind !== 330 /* NotEmittedStatement */ && (emitFlags & 32 /* NoTrailingSourceMap */) === 0 && end >= 0) { emitSourcePos(source, end); @@ -99101,7 +101853,7 @@ var ts; if (!host.getDirectories || !host.readDirectory) { return undefined; } - var cachedReadDirectoryResult = ts.createMap(); + var cachedReadDirectoryResult = new ts.Map(); var getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames); return { useCaseSensitiveFileNames: useCaseSensitiveFileNames, @@ -99290,7 +102042,8 @@ var ts; */ function updateMissingFilePathsWatch(program, missingFileWatches, createMissingFileWatch) { var missingFilePaths = program.getMissingFilePaths(); - var newMissingFilePathMap = ts.arrayToSet(missingFilePaths); + // TODO(rbuckton): Should be a `Set` but that requires changing the below code that uses `mutateMap` + var newMissingFilePathMap = ts.arrayToMap(missingFilePaths, ts.identity, ts.returnTrue); // Update the missing file paths watcher ts.mutateMap(missingFileWatches, newMissingFilePathMap, { // Watch the missing files @@ -99333,6 +102086,61 @@ var ts; } } ts.updateWatchingWildcardDirectories = updateWatchingWildcardDirectories; + /* @internal */ + function isIgnoredFileFromWildCardWatching(_a) { + var watchedDirPath = _a.watchedDirPath, fileOrDirectory = _a.fileOrDirectory, fileOrDirectoryPath = _a.fileOrDirectoryPath, configFileName = _a.configFileName, options = _a.options, configFileSpecs = _a.configFileSpecs, program = _a.program, extraFileExtensions = _a.extraFileExtensions, currentDirectory = _a.currentDirectory, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, writeLog = _a.writeLog; + var newPath = ts.removeIgnoredPath(fileOrDirectoryPath); + if (!newPath) { + writeLog("Project: " + configFileName + " Detected ignored path: " + fileOrDirectory); + return true; + } + fileOrDirectoryPath = newPath; + if (fileOrDirectoryPath === watchedDirPath) + return false; + // If the the added or created file or directory is not supported file name, ignore the file + // But when watched directory is added/removed, we need to reload the file list + if (ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions)) { + writeLog("Project: " + configFileName + " Detected file add/remove of non supported extension: " + fileOrDirectory); + return true; + } + if (ts.isExcludedFile(fileOrDirectory, configFileSpecs, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), currentDirectory), useCaseSensitiveFileNames, currentDirectory)) { + writeLog("Project: " + configFileName + " Detected excluded file: " + fileOrDirectory); + return true; + } + if (!program) + return false; + // We want to ignore emit file check if file is not going to be emitted next to source file + // In that case we follow config file inclusion rules + if (options.outFile || options.outDir) + return false; + // File if emitted next to input needs to be ignored + if (ts.fileExtensionIs(fileOrDirectoryPath, ".d.ts" /* Dts */)) { + // If its declaration directory: its not ignored if not excluded by config + if (options.declarationDir) + return false; + } + else if (!ts.fileExtensionIsOneOf(fileOrDirectoryPath, ts.supportedJSExtensions)) { + return false; + } + // just check if sourceFile with the name exists + var filePathWithoutExtension = ts.removeFileExtension(fileOrDirectoryPath); + var realProgram = isBuilderProgram(program) ? program.getProgramOrUndefined() : program; + if (hasSourceFile((filePathWithoutExtension + ".ts" /* Ts */)) || + hasSourceFile((filePathWithoutExtension + ".tsx" /* Tsx */))) { + writeLog("Project: " + configFileName + " Detected output file: " + fileOrDirectory); + return true; + } + return false; + function hasSourceFile(file) { + return realProgram ? + !!realProgram.getSourceFileByPath(file) : + program.getState().fileInfos.has(file); + } + } + ts.isIgnoredFileFromWildCardWatching = isIgnoredFileFromWildCardWatching; + function isBuilderProgram(program) { + return !!program.getState; + } function isEmittedFileOfProgram(program, file) { if (!program) { return false; @@ -99506,7 +102314,7 @@ var ts; // TODO(shkamat): update this after reworking ts build API function createCompilerHostWorker(options, setParentNodes, system) { if (system === void 0) { system = ts.sys; } - var existingDirectories = ts.createMap(); + var existingDirectories = new ts.Map(); var getCanonicalFileName = ts.createGetCanonicalFileName(system.useCaseSensitiveFileNames); function getSourceFile(fileName, languageVersion, onError) { var text; @@ -99557,7 +102365,7 @@ var ts; return; } if (!outputFingerprints) { - outputFingerprints = ts.createMap(); + outputFingerprints = new ts.Map(); } var hash = system.createHash(data); var mtimeBefore = system.getModifiedTime(fileName); @@ -99614,10 +102422,10 @@ var ts; var originalDirectoryExists = host.directoryExists; var originalCreateDirectory = host.createDirectory; var originalWriteFile = host.writeFile; - var readFileCache = ts.createMap(); - var fileExistsCache = ts.createMap(); - var directoryExistsCache = ts.createMap(); - var sourceFileCache = ts.createMap(); + var readFileCache = new ts.Map(); + var fileExistsCache = new ts.Map(); + var directoryExistsCache = new ts.Map(); + var sourceFileCache = new ts.Map(); var readFileWithCache = function (fileName) { var key = toPath(fileName); var value = readFileCache.get(key); @@ -99723,8 +102531,8 @@ var ts; ts.getPreEmitDiagnostics = getPreEmitDiagnostics; function formatDiagnostics(diagnostics, host) { var output = ""; - for (var _i = 0, diagnostics_2 = diagnostics; _i < diagnostics_2.length; _i++) { - var diagnostic = diagnostics_2[_i]; + for (var _i = 0, diagnostics_3 = diagnostics; _i < diagnostics_3.length; _i++) { + var diagnostic = diagnostics_3[_i]; output += formatDiagnostic(diagnostic, host); } return output; @@ -99832,8 +102640,8 @@ var ts; ts.formatLocation = formatLocation; function formatDiagnosticsWithColorAndContext(diagnostics, host) { var output = ""; - for (var _i = 0, diagnostics_3 = diagnostics; _i < diagnostics_3.length; _i++) { - var diagnostic = diagnostics_3[_i]; + for (var _i = 0, diagnostics_4 = diagnostics; _i < diagnostics_4.length; _i++) { + var diagnostic = diagnostics_4[_i]; if (diagnostic.file) { var file = diagnostic.file, start = diagnostic.start; output += formatLocation(file, start, host); // TODO: GH#18217 @@ -99896,7 +102704,7 @@ var ts; return []; } var resolutions = []; - var cache = ts.createMap(); + var cache = new ts.Map(); for (var _i = 0, names_2 = names; _i < names_2.length; _i++) { var name = names_2[_i]; var result = void 0; @@ -99919,7 +102727,7 @@ var ts; /* @internal */ function isProgramUptoDate(program, rootFileNames, newOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences) { // If we haven't created a program yet or have changed automatic type directives, then it is not up-to-date - if (!program || hasChangedAutomaticTypeDirectiveNames) { + if (!program || (hasChangedAutomaticTypeDirectiveNames === null || hasChangedAutomaticTypeDirectiveNames === void 0 ? void 0 : hasChangedAutomaticTypeDirectiveNames())) { return false; } // If root file names don't match @@ -100014,7 +102822,7 @@ var ts; }; } function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _configFileParsingDiagnostics) { - var _a; + var _a, _b; var createProgramOptions = ts.isArray(rootNamesOrOptions) ? createCreateProgramOptions(rootNamesOrOptions, _options, _host, _oldProgram, _configFileParsingDiagnostics) : rootNamesOrOptions; // TODO: GH#18217 var rootNames = createProgramOptions.rootNames, options = createProgramOptions.options, configFileParsingDiagnostics = createProgramOptions.configFileParsingDiagnostics, projectReferences = createProgramOptions.projectReferences; var oldProgram = createProgramOptions.oldProgram; @@ -100026,12 +102834,12 @@ var ts; var diagnosticsProducingTypeChecker; var noDiagnosticsTypeChecker; var classifiableNames; - var ambientModuleNameToUnmodifiedFileName = ts.createMap(); + var ambientModuleNameToUnmodifiedFileName = new ts.Map(); // Todo:: Use this to report why file was included in --extendedDiagnostics var refFileMap; var cachedBindAndCheckDiagnosticsForFile = {}; var cachedDeclarationDiagnosticsForFile = {}; - var resolvedTypeReferenceDirectives = ts.createMap(); + var resolvedTypeReferenceDirectives = new ts.Map(); var fileProcessingDiagnostics = ts.createDiagnosticCollection(); // The below settings are to track if a .js file should be add to the program if loaded via searching under node_modules. // This works as imported modules are discovered recursively in a depth first manner, specifically: @@ -100044,9 +102852,9 @@ var ts; var currentNodeModulesDepth = 0; // If a module has some of its imports skipped due to being at the depth limit under node_modules, then track // this, as it may be imported at a shallower depth later, and then it will need its skipped imports processed. - var modulesWithElidedImports = ts.createMap(); + var modulesWithElidedImports = new ts.Map(); // Track source files that are source files found by searching under node_modules, as these shouldn't be compiled. - var sourceFilesFoundSearchingNodeModules = ts.createMap(); + var sourceFilesFoundSearchingNodeModules = new ts.Map(); ts.performance.mark("beforeProgram"); var host = createProgramOptions.host || createCompilerHost(options); var configParsingHost = parseConfigHostFromCompilerHostLike(host); @@ -100058,7 +102866,7 @@ var ts; var supportedExtensions = ts.getSupportedExtensions(options); var supportedExtensionsWithJsonIfResolveJsonModule = ts.getSuppoertedExtensionsWithJsonIfResolveJsonModule(options, supportedExtensions); // Map storing if there is emit blocking diagnostics for given input - var hasEmitBlockingDiagnostics = ts.createMap(); + var hasEmitBlockingDiagnostics = new ts.Map(); var _compilerOptionsObjectLiteralSyntax; var moduleResolutionCache; var actualResolveModuleNamesWorker; @@ -100090,9 +102898,9 @@ var ts; // Map from a stringified PackageId to the source file with that id. // Only one source file may have a given packageId. Others become redirects (see createRedirectSourceFile). // `packageIdToSourceFile` is only used while building the program, while `sourceFileToPackageName` and `isSourceFileTargetOfRedirect` are kept around. - var packageIdToSourceFile = ts.createMap(); + var packageIdToSourceFile = new ts.Map(); // Maps from a SourceFile's `.path` to the name of the package it was imported with. - var sourceFileToPackageName = ts.createMap(); + var sourceFileToPackageName = new ts.Map(); // Key is a file name. Value is the (non-empty, or undefined) list of files that redirect to it. var redirectTargetsMap = ts.createMultiMap(); /** @@ -100101,11 +102909,11 @@ var ts; * - false if sourceFile missing for source of project reference redirect * - undefined otherwise */ - var filesByName = ts.createMap(); + var filesByName = new ts.Map(); var missingFilePaths; // stores 'filename -> file association' ignoring case // used to track cases when two file names differ only in casing - var filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? ts.createMap() : undefined; + var filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? new ts.Map() : undefined; // A parallel array to projectReferences storing the results of reading in the referenced tsconfig files var resolvedProjectReferences; var projectReferenceRedirects; @@ -100113,14 +102921,15 @@ var ts; var mapFromToProjectReferenceRedirectSource; var useSourceOfProjectReferenceRedirect = !!((_a = host.useSourceOfProjectReferenceRedirect) === null || _a === void 0 ? void 0 : _a.call(host)) && !options.disableSourceOfProjectReferenceRedirect; - var _b = updateHostForUseSourceOfProjectReferenceRedirect({ + var _c = updateHostForUseSourceOfProjectReferenceRedirect({ compilerHost: host, + getSymlinkCache: getSymlinkCache, useSourceOfProjectReferenceRedirect: useSourceOfProjectReferenceRedirect, toPath: toPath, getResolvedProjectReferences: getResolvedProjectReferences, getSourceOfProjectReferenceRedirect: getSourceOfProjectReferenceRedirect, forEachResolvedProjectReference: forEachResolvedProjectReference - }), onProgramCreateComplete = _b.onProgramCreateComplete, fileExists = _b.fileExists; + }), onProgramCreateComplete = _c.onProgramCreateComplete, fileExists = _c.fileExists, directoryExists = _c.directoryExists; var shouldCreateNewSourceFile = shouldProgramCreateNewSourceFiles(oldProgram, options); // We set `structuralIsReused` to `undefined` because `tryReuseStructureFromOldProgram` calls `tryReuseStructureFromOldProgram` which checks // `structuralIsReused`, which would be a TDZ violation if it was not set in advance to `undefined`. @@ -100138,11 +102947,11 @@ var ts; var parsedRef = resolvedProjectReferences_1[_i]; if (!parsedRef) continue; - var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out; + var out = ts.outFile(parsedRef.commandLine.options); if (useSourceOfProjectReferenceRedirect) { if (out || ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) { - for (var _c = 0, _d = parsedRef.commandLine.fileNames; _c < _d.length; _c++) { - var fileName = _d[_c]; + for (var _d = 0, _e = parsedRef.commandLine.fileNames; _d < _e.length; _d++) { + var fileName = _e[_d]; processSourceFile(fileName, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined); } } @@ -100152,8 +102961,8 @@ var ts; processSourceFile(ts.changeExtension(out, ".d.ts"), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined); } else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) { - for (var _e = 0, _f = parsedRef.commandLine.fileNames; _e < _f.length; _e++) { - var fileName = _f[_e]; + for (var _f = 0, _g = parsedRef.commandLine.fileNames; _f < _g.length; _f++) { + var fileName = _g[_f]; if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) { processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined); } @@ -100205,8 +103014,8 @@ var ts; // not part of the new program. if (oldProgram && host.onReleaseOldSourceFile) { var oldSourceFiles = oldProgram.getSourceFiles(); - for (var _g = 0, oldSourceFiles_1 = oldSourceFiles; _g < oldSourceFiles_1.length; _g++) { - var oldSourceFile = oldSourceFiles_1[_g]; + for (var _h = 0, oldSourceFiles_1 = oldSourceFiles; _h < oldSourceFiles_1.length; _h++) { + var oldSourceFile = oldSourceFiles_1[_h]; var newFile = getSourceFileByPath(oldSourceFile.resolvedPath); if (shouldCreateNewSourceFile || !newFile || // old file wasnt redirect but new file is @@ -100272,7 +103081,9 @@ var ts; isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect, emitBuildInfo: emitBuildInfo, fileExists: fileExists, - getProbableSymlinks: getProbableSymlinks, + directoryExists: directoryExists, + getSymlinkCache: getSymlinkCache, + realpath: (_b = host.realpath) === null || _b === void 0 ? void 0 : _b.bind(host), useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, }; onProgramCreateComplete(); @@ -100340,13 +103151,14 @@ var ts; return commonSourceDirectory; } function getClassifiableNames() { + var _a; if (!classifiableNames) { // Initialize a checker so that all our files are bound. getTypeChecker(); - classifiableNames = ts.createUnderscoreEscapedMap(); + classifiableNames = new ts.Set(); for (var _i = 0, files_2 = files; _i < files_2.length; _i++) { var sourceFile = files_2[_i]; - ts.copyEntries(sourceFile.classifiableNames, classifiableNames); + (_a = sourceFile.classifiableNames) === null || _a === void 0 ? void 0 : _a.forEach(function (value) { return classifiableNames.add(value); }); } } return classifiableNames; @@ -100367,13 +103179,13 @@ var ts; // which per above occurred during the current program creation. // Since we assume the filesystem does not change during program creation, // it is safe to reuse resolutions from the earlier call. - var result_11 = []; + var result_12 = []; for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) { var moduleName = moduleNames_1[_i]; var resolvedModule = file.resolvedModules.get(moduleName); - result_11.push(resolvedModule); + result_12.push(resolvedModule); } - return result_11; + return result_12; } // At this point, we know at least one of the following hold: // - file has local declarations for ambient modules @@ -100398,7 +103210,7 @@ var ts; var moduleName = moduleNames[i]; // If the source file is unchanged and doesnt have invalidated resolution, reuse the module resolutions if (file === oldSourceFile && !hasInvalidatedResolution(oldSourceFile.path)) { - var oldResolvedModule = oldSourceFile && oldSourceFile.resolvedModules.get(moduleName); + var oldResolvedModule = ts.getResolvedModule(oldSourceFile, moduleName); if (oldResolvedModule) { if (ts.isTraceEnabled(options, host)) { ts.trace(host, ts.Diagnostics.Reusing_resolution_of_module_0_to_file_1_from_old_program, moduleName, containingFile); @@ -100497,6 +103309,7 @@ var ts; }); } function tryReuseStructureFromOldProgram() { + var _a; if (!oldProgram) { return 0 /* Not */; } @@ -100506,7 +103319,6 @@ var ts; if (ts.changesAffectModuleResolution(oldOptions, options)) { return oldProgram.structureIsReused = 0 /* Not */; } - ts.Debug.assert(!(oldProgram.structureIsReused & (2 /* Completely */ | 1 /* SafeModules */))); // there is an old program, check if we can reuse its structure var oldRootNames = oldProgram.getRootFileNames(); if (!ts.arrayIsEqualTo(oldRootNames, rootNames)) { @@ -100538,7 +103350,7 @@ var ts; SeenPackageName[SeenPackageName["Exists"] = 0] = "Exists"; SeenPackageName[SeenPackageName["Modified"] = 1] = "Modified"; })(SeenPackageName || (SeenPackageName = {})); - var seenPackageNames = ts.createMap(); + var seenPackageNames = new ts.Map(); for (var _i = 0, oldSourceFiles_2 = oldSourceFiles; _i < oldSourceFiles_2.length; _i++) { var oldSourceFile = oldSourceFiles_2[_i]; var newSourceFile = host.getSourceFileByPath @@ -100635,18 +103447,18 @@ var ts; return oldProgram.structureIsReused; } var modifiedFiles = modifiedSourceFiles.map(function (f) { return f.oldFile; }); - for (var _a = 0, oldSourceFiles_3 = oldSourceFiles; _a < oldSourceFiles_3.length; _a++) { - var oldFile = oldSourceFiles_3[_a]; + for (var _b = 0, oldSourceFiles_3 = oldSourceFiles; _b < oldSourceFiles_3.length; _b++) { + var oldFile = oldSourceFiles_3[_b]; if (!ts.contains(modifiedFiles, oldFile)) { - for (var _b = 0, _c = oldFile.ambientModuleNames; _b < _c.length; _b++) { - var moduleName = _c[_b]; + for (var _c = 0, _d = oldFile.ambientModuleNames; _c < _d.length; _c++) { + var moduleName = _d[_c]; ambientModuleNameToUnmodifiedFileName.set(moduleName, oldFile.fileName); } } } // try to verify results of module resolution - for (var _d = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _d < modifiedSourceFiles_1.length; _d++) { - var _e = modifiedSourceFiles_1[_d], oldSourceFile = _e.oldFile, newSourceFile = _e.newFile; + for (var _e = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _e < modifiedSourceFiles_1.length; _e++) { + var _f = modifiedSourceFiles_1[_e], oldSourceFile = _f.oldFile, newSourceFile = _f.newFile; var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.originalFileName, currentDirectory); var moduleNames = getModuleNames(newSourceFile); var resolutions = resolveModuleNamesReusingOldState(moduleNames, newSourceFilePath, newSourceFile); @@ -100677,15 +103489,15 @@ var ts; if (oldProgram.structureIsReused !== 2 /* Completely */) { return oldProgram.structureIsReused; } - if (host.hasChangedAutomaticTypeDirectiveNames) { + if ((_a = host.hasChangedAutomaticTypeDirectiveNames) === null || _a === void 0 ? void 0 : _a.call(host)) { return oldProgram.structureIsReused = 1 /* SafeModules */; } missingFilePaths = oldProgram.getMissingFilePaths(); refFileMap = oldProgram.getRefFileMap(); // update fileName -> file mapping ts.Debug.assert(newSourceFiles.length === oldProgram.getSourceFiles().length); - for (var _f = 0, newSourceFiles_1 = newSourceFiles; _f < newSourceFiles_1.length; _f++) { - var newSourceFile = newSourceFiles_1[_f]; + for (var _g = 0, newSourceFiles_1 = newSourceFiles; _g < newSourceFiles_1.length; _g++) { + var newSourceFile = newSourceFiles_1[_g]; filesByName.set(newSourceFile.path, newSourceFile); } var oldFilesByNameMap = oldProgram.getFilesByNameMap(); @@ -100705,8 +103517,8 @@ var ts; }); files = newSourceFiles; fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics(); - for (var _g = 0, modifiedSourceFiles_2 = modifiedSourceFiles; _g < modifiedSourceFiles_2.length; _g++) { - var modifiedFile = modifiedSourceFiles_2[_g]; + for (var _h = 0, modifiedSourceFiles_2 = modifiedSourceFiles; _h < modifiedSourceFiles_2.length; _h++) { + var modifiedFile = modifiedSourceFiles_2[_h]; fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile.newFile); } resolvedTypeReferenceDirectives = oldProgram.getResolvedTypeReferenceDirectives(); @@ -100730,7 +103542,7 @@ var ts; getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect, getProjectReferenceRedirect: getProjectReferenceRedirect, isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect, - getProbableSymlinks: getProbableSymlinks, + getSymlinkCache: getSymlinkCache, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, @@ -100751,7 +103563,7 @@ var ts; }; } function emitBuildInfo(writeFileCallback) { - ts.Debug.assert(!options.out && !options.outFile); + ts.Debug.assert(!ts.outFile(options)); ts.performance.mark("beforeEmit"); var emitResult = ts.emitFiles(ts.notImplementedResolver, getEmitHost(writeFileCallback), /*targetSourceFile*/ undefined, @@ -100769,7 +103581,7 @@ var ts; return projectReferences; } function getPrependNodes() { - return createPrependNodes(projectReferences, function (_ref, index) { return resolvedProjectReferences[index].commandLine; }, function (fileName) { + return createPrependNodes(projectReferences, function (_ref, index) { var _a; return (_a = resolvedProjectReferences[index]) === null || _a === void 0 ? void 0 : _a.commandLine; }, function (fileName) { var path = toPath(fileName); var sourceFile = getSourceFileByPath(path); return sourceFile ? sourceFile.text : filesByName.has(path) ? undefined : host.readFile(path); @@ -100812,7 +103624,7 @@ var ts; } function emitWorker(program, sourceFile, writeFileCallback, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit) { if (!forceDtsEmit) { - var result = handleNoEmitOptions(program, sourceFile, cancellationToken); + var result = handleNoEmitOptions(program, sourceFile, writeFileCallback, cancellationToken); if (result) return result; } @@ -100824,7 +103636,7 @@ var ts; // This is because in the -out scenario all files need to be emitted, and therefore all // files need to be type checked. And the way to specify that all files need to be type // checked is to not pass the file to getEmitResolver. - var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile, cancellationToken); + var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver(ts.outFile(options) ? undefined : sourceFile, cancellationToken); ts.performance.mark("beforeEmit"); var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, ts.getTransformers(options, customTransformers, emitOnlyDtsFiles), emitOnlyDtsFiles, /*onlyBuildInfo*/ false, forceDtsEmit); @@ -100881,7 +103693,7 @@ var ts; function getDeclarationDiagnostics(sourceFile, cancellationToken) { var options = program.getCompilerOptions(); // collect diagnostics from the program only once if either no source file was specified or out/outFile is set (bundled emit) - if (!sourceFile || options.out || options.outFile) { + if (!sourceFile || ts.outFile(options)) { return getDeclarationDiagnosticsWorker(sourceFile, cancellationToken); } else { @@ -100921,7 +103733,7 @@ var ts; } } function getSemanticDiagnosticsForFile(sourceFile, cancellationToken) { - return ts.concatenate(getBindAndCheckDiagnosticsForFile(sourceFile, cancellationToken), getProgramDiagnostics(sourceFile)); + return ts.concatenate(filterSemanticDiagnotics(getBindAndCheckDiagnosticsForFile(sourceFile, cancellationToken), options), getProgramDiagnostics(sourceFile)); } function getBindAndCheckDiagnosticsForFile(sourceFile, cancellationToken) { return getAndCacheDiagnostics(sourceFile, cancellationToken, cachedBindAndCheckDiagnosticsForFile, getBindAndCheckDiagnosticsForFileNoCache); @@ -101011,22 +103823,22 @@ var ts; // Return directly from the case if the given node doesnt want to visit each child // Otherwise break to visit each child switch (parent.kind) { - case 156 /* Parameter */: - case 159 /* PropertyDeclaration */: - case 161 /* MethodDeclaration */: + case 159 /* Parameter */: + case 162 /* PropertyDeclaration */: + case 164 /* MethodDeclaration */: if (parent.questionToken === node) { diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.The_0_modifier_can_only_be_used_in_TypeScript_files, "?")); return "skip"; } // falls through - case 160 /* MethodSignature */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 201 /* FunctionExpression */: - case 244 /* FunctionDeclaration */: - case 202 /* ArrowFunction */: - case 242 /* VariableDeclaration */: + case 163 /* MethodSignature */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 205 /* FunctionExpression */: + case 248 /* FunctionDeclaration */: + case 206 /* ArrowFunction */: + case 246 /* VariableDeclaration */: // type annotation if (parent.type === node) { diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Type_annotations_can_only_be_used_in_TypeScript_files)); @@ -101034,58 +103846,58 @@ var ts; } } switch (node.kind) { - case 255 /* ImportClause */: + case 259 /* ImportClause */: if (node.isTypeOnly) { diagnostics.push(createDiagnosticForNode(node.parent, ts.Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, "import type")); return "skip"; } break; - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: if (node.isTypeOnly) { diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, "export type")); return "skip"; } break; - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_TypeScript_files)); return "skip"; - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: if (node.isExportEquals) { diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_TypeScript_files)); return "skip"; } break; - case 279 /* HeritageClause */: + case 283 /* HeritageClause */: var heritageClause = node; - if (heritageClause.token === 113 /* ImplementsKeyword */) { + if (heritageClause.token === 116 /* ImplementsKeyword */) { diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_TypeScript_files)); return "skip"; } break; - case 246 /* InterfaceDeclaration */: - var interfaceKeyword = ts.tokenToString(114 /* InterfaceKeyword */); + case 250 /* InterfaceDeclaration */: + var interfaceKeyword = ts.tokenToString(117 /* InterfaceKeyword */); ts.Debug.assertIsDefined(interfaceKeyword); diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, interfaceKeyword)); return "skip"; - case 249 /* ModuleDeclaration */: - var moduleKeyword = node.flags & 16 /* Namespace */ ? ts.tokenToString(136 /* NamespaceKeyword */) : ts.tokenToString(135 /* ModuleKeyword */); + case 253 /* ModuleDeclaration */: + var moduleKeyword = node.flags & 16 /* Namespace */ ? ts.tokenToString(139 /* NamespaceKeyword */) : ts.tokenToString(138 /* ModuleKeyword */); ts.Debug.assertIsDefined(moduleKeyword); diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, moduleKeyword)); return "skip"; - case 247 /* TypeAliasDeclaration */: + case 251 /* TypeAliasDeclaration */: diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Type_aliases_can_only_be_used_in_TypeScript_files)); return "skip"; - case 248 /* EnumDeclaration */: - var enumKeyword = ts.Debug.checkDefined(ts.tokenToString(88 /* EnumKeyword */)); + case 252 /* EnumDeclaration */: + var enumKeyword = ts.Debug.checkDefined(ts.tokenToString(91 /* EnumKeyword */)); diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, enumKeyword)); return "skip"; - case 218 /* NonNullExpression */: + case 222 /* NonNullExpression */: diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Non_null_assertions_can_only_be_used_in_TypeScript_files)); return "skip"; - case 217 /* AsExpression */: + case 221 /* AsExpression */: diagnostics.push(createDiagnosticForNode(node.type, ts.Diagnostics.Type_assertion_expressions_can_only_be_used_in_TypeScript_files)); return "skip"; - case 199 /* TypeAssertionExpression */: + case 203 /* TypeAssertionExpression */: ts.Debug.fail(); // Won't parse these in a JS file anyway, as they are interpreted as JSX. } } @@ -101094,53 +103906,53 @@ var ts; diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning)); } switch (parent.kind) { - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 161 /* MethodDeclaration */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 201 /* FunctionExpression */: - case 244 /* FunctionDeclaration */: - case 202 /* ArrowFunction */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 164 /* MethodDeclaration */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 205 /* FunctionExpression */: + case 248 /* FunctionDeclaration */: + case 206 /* ArrowFunction */: // Check type parameters if (nodes === parent.typeParameters) { diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.Type_parameter_declarations_can_only_be_used_in_TypeScript_files)); return "skip"; } // falls through - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: // Check modifiers if (nodes === parent.modifiers) { - checkModifiers(parent.modifiers, parent.kind === 225 /* VariableStatement */); + checkModifiers(parent.modifiers, parent.kind === 229 /* VariableStatement */); return "skip"; } break; - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: // Check modifiers of property declaration if (nodes === parent.modifiers) { for (var _i = 0, _a = nodes; _i < _a.length; _i++) { var modifier = _a[_i]; - if (modifier.kind !== 120 /* StaticKeyword */) { + if (modifier.kind !== 123 /* StaticKeyword */) { diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics.The_0_modifier_can_only_be_used_in_TypeScript_files, ts.tokenToString(modifier.kind))); } } return "skip"; } break; - case 156 /* Parameter */: + case 159 /* Parameter */: // Check modifiers of parameter declaration if (nodes === parent.modifiers) { diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.Parameter_modifiers_can_only_be_used_in_TypeScript_files)); return "skip"; } break; - case 196 /* CallExpression */: - case 197 /* NewExpression */: - case 216 /* ExpressionWithTypeArguments */: - case 267 /* JsxSelfClosingElement */: - case 268 /* JsxOpeningElement */: - case 198 /* TaggedTemplateExpression */: + case 200 /* CallExpression */: + case 201 /* NewExpression */: + case 220 /* ExpressionWithTypeArguments */: + case 271 /* JsxSelfClosingElement */: + case 272 /* JsxOpeningElement */: + case 202 /* TaggedTemplateExpression */: // Check type arguments if (nodes === parent.typeArguments) { diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.Type_arguments_can_only_be_used_in_TypeScript_files)); @@ -101150,27 +103962,27 @@ var ts; } } function checkModifiers(modifiers, isConstValid) { - for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) { - var modifier = modifiers_1[_i]; + for (var _i = 0, modifiers_2 = modifiers; _i < modifiers_2.length; _i++) { + var modifier = modifiers_2[_i]; switch (modifier.kind) { - case 81 /* ConstKeyword */: + case 84 /* ConstKeyword */: if (isConstValid) { continue; } // to report error, // falls through - case 119 /* PublicKeyword */: - case 117 /* PrivateKeyword */: - case 118 /* ProtectedKeyword */: - case 138 /* ReadonlyKeyword */: - case 130 /* DeclareKeyword */: - case 122 /* AbstractKeyword */: + case 122 /* PublicKeyword */: + case 120 /* PrivateKeyword */: + case 121 /* ProtectedKeyword */: + case 141 /* ReadonlyKeyword */: + case 133 /* DeclareKeyword */: + case 125 /* AbstractKeyword */: diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics.The_0_modifier_can_only_be_used_in_TypeScript_files, ts.tokenToString(modifier.kind))); break; // These are all legal modifiers. - case 120 /* StaticKeyword */: - case 89 /* ExportKeyword */: - case 84 /* DefaultKeyword */: + case 123 /* StaticKeyword */: + case 92 /* ExportKeyword */: + case 87 /* DefaultKeyword */: } } } @@ -101196,18 +104008,15 @@ var ts; }); } function getAndCacheDiagnostics(sourceFile, cancellationToken, cache, getDiagnostics) { + var _a; var cachedResult = sourceFile - ? cache.perFile && cache.perFile.get(sourceFile.path) - : cache.allDiagnostics; + ? (_a = cache.perFile) === null || _a === void 0 ? void 0 : _a.get(sourceFile.path) : cache.allDiagnostics; if (cachedResult) { return cachedResult; } var result = getDiagnostics(sourceFile, cancellationToken); if (sourceFile) { - if (!cache.perFile) { - cache.perFile = ts.createMap(); - } - cache.perFile.set(sourceFile.path, result); + (cache.perFile || (cache.perFile = new ts.Map())).set(sourceFile.path, result); } else { cache.allDiagnostics = result; @@ -101245,8 +104054,8 @@ var ts; return a.fileName === b.fileName; } function moduleNameIsEqualTo(a, b) { - return a.kind === 75 /* Identifier */ - ? b.kind === 75 /* Identifier */ && a.escapedText === b.escapedText + return a.kind === 78 /* Identifier */ + ? b.kind === 78 /* Identifier */ && a.escapedText === b.escapedText : b.kind === 10 /* StringLiteral */ && a.text === b.text; } function collectExternalModuleReferences(file) { @@ -101265,11 +104074,11 @@ var ts; && (options.isolatedModules || isExternalModuleFile) && !file.isDeclarationFile) { // synthesize 'import "tslib"' declaration - var externalHelpersModuleReference = ts.createLiteral(ts.externalHelpersModuleNameText); - var importDecl = ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*importClause*/ undefined, externalHelpersModuleReference); + var externalHelpersModuleReference = ts.factory.createStringLiteral(ts.externalHelpersModuleNameText); + var importDecl = ts.factory.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*importClause*/ undefined, externalHelpersModuleReference); ts.addEmitFlags(importDecl, 67108864 /* NeverApplyImportHelper */); - externalHelpersModuleReference.parent = importDecl; - importDecl.parent = file; + ts.setParent(externalHelpersModuleReference, importDecl); + ts.setParent(importDecl, file); imports = [externalHelpersModuleReference]; } for (var _i = 0, _a = file.statements; _i < _a.length; _i++) { @@ -101294,7 +104103,7 @@ var ts; } } else if (ts.isModuleDeclaration(node)) { - if (ts.isAmbientModule(node) && (inAmbientModule || ts.hasModifier(node, 2 /* Ambient */) || file.isDeclarationFile)) { + if (ts.isAmbientModule(node) && (inAmbientModule || ts.hasSyntacticModifier(node, 2 /* Ambient */) || file.isDeclarationFile)) { var nameText = ts.getTextOfIdentifierOrLiteral(node.name); // Ambient module declarations can be interpreted as augmentations for some existing external modules. // This will happen in two cases: @@ -101329,7 +104138,7 @@ var ts; var r = /import|require/g; while (r.exec(file.text) !== null) { // eslint-disable-line no-null/no-null var node = getNodeAtPosition(file, r.lastIndex); - if (ts.isRequireCall(node, /*checkArgumentIsStringLiteralLike*/ true)) { + if (isJavaScriptFile && ts.isRequireCall(node, /*checkArgumentIsStringLiteralLike*/ true)) { imports = ts.append(imports, node.arguments[0]); } // we have to check the argument list has length of 1. We will still have to process these even though we have parsing error. @@ -101524,7 +104333,7 @@ var ts; if (refFile && !useSourceOfProjectReferenceRedirect) { var redirectProject = getProjectReferenceRedirectProject(fileName); if (redirectProject) { - if (redirectProject.commandLine.options.outFile || redirectProject.commandLine.options.out) { + if (ts.outFile(redirectProject.commandLine.options)) { // Shouldnt create many to 1 mapping file in --out scenario return undefined; } @@ -101630,7 +104439,7 @@ var ts; return getResolvedProjectReferenceToRedirect(fileName); } function getProjectReferenceOutputName(referencedProject, fileName) { - var out = referencedProject.commandLine.options.outFile || referencedProject.commandLine.options.out; + var out = ts.outFile(referencedProject.commandLine.options); return out ? ts.changeExtension(out, ".d.ts" /* Dts */) : ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine, !host.useCaseSensitiveFileNames()); @@ -101640,7 +104449,7 @@ var ts; */ function getResolvedProjectReferenceToRedirect(fileName) { if (mapFromFileToProjectReferenceRedirects === undefined) { - mapFromFileToProjectReferenceRedirects = ts.createMap(); + mapFromFileToProjectReferenceRedirects = new ts.Map(); forEachResolvedProjectReference(function (referencedProject, referenceProjectPath) { // not input file from the referenced project, ignore if (referencedProject && @@ -101665,10 +104474,10 @@ var ts; if (!ts.isDeclarationFileName(file)) return undefined; if (mapFromToProjectReferenceRedirectSource === undefined) { - mapFromToProjectReferenceRedirectSource = ts.createMap(); + mapFromToProjectReferenceRedirectSource = new ts.Map(); forEachResolvedProjectReference(function (resolvedRef) { if (resolvedRef) { - var out = resolvedRef.commandLine.options.outFile || resolvedRef.commandLine.options.out; + var out = ts.outFile(resolvedRef.commandLine.options); if (out) { // Dont know which source file it means so return true? var outputDts = ts.changeExtension(out, ".d.ts" /* Dts */); @@ -101725,7 +104534,7 @@ var ts; } function processReferencedFiles(file, isDefaultLib) { ts.forEach(file.referencedFiles, function (ref, index) { - var referencedFileName = resolveTripleslashReference(ref.fileName, file.originalFileName); + var referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName); processSourceFile(referencedFileName, isDefaultLib, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined, { @@ -101914,7 +104723,7 @@ var ts; var absoluteSourceFilePath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory)); if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) { if (!rootPaths) - rootPaths = ts.arrayToSet(rootNames, toPath); + rootPaths = new ts.Set(rootNames.map(toPath)); addProgramDiagnosticAtRefPath(sourceFile, rootPaths, ts.Diagnostics.File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files, sourceFile.fileName, rootDirectory); allFilesBelongToPath = false; } @@ -101924,7 +104733,7 @@ var ts; } function parseProjectReferenceConfigFile(ref) { if (!projectReferenceRedirects) { - projectReferenceRedirects = ts.createMap(); + projectReferenceRedirects = new ts.Map(); } // The actual filename (i.e. add "/tsconfig.json" if necessary) var refPath = resolveProjectReferencePath(ref); @@ -101999,21 +104808,19 @@ var ts; createDiagnosticForOptionName(ts.Diagnostics.Composite_projects_may_not_disable_incremental_compilation, "declaration"); } } + var outputFile = ts.outFile(options); if (options.tsBuildInfoFile) { if (!ts.isIncrementalCompilation(options)) { createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "tsBuildInfoFile", "incremental", "composite"); } } - else if (options.incremental && !options.outFile && !options.out && !options.configFilePath) { + else if (options.incremental && !outputFile && !options.configFilePath) { programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified)); } - if (!options.listFilesOnly && options.noEmit && ts.isIncrementalCompilation(options)) { - createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmit", options.incremental ? "incremental" : "composite"); - } verifyProjectReferences(); // List of collected files is complete; validate exhautiveness if this is a project with a file list if (options.composite) { - var rootPaths = ts.arrayToSet(rootNames, toPath); + var rootPaths = new ts.Set(rootNames.map(toPath)); for (var _i = 0, files_3 = files; _i < files_3.length; _i++) { var file = files_3[_i]; // Ignore file that is not emitted @@ -102072,7 +104879,7 @@ var ts; if (!ts.getEmitDeclarations(options)) { createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "declarationDir", "declaration", "composite"); } - if (options.out || options.outFile) { + if (outputFile) { createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "declarationDir", options.out ? "out" : "outFile"); } } @@ -102086,7 +104893,6 @@ var ts; createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noImplicitUseStrict", "alwaysStrict"); } var languageVersion = options.target || 0 /* ES3 */; - var outFile = options.outFile || options.out; var firstNonAmbientExternalModuleSourceFile = ts.find(files, function (f) { return ts.isExternalModule(f) && !f.isDeclarationFile; }); if (options.isolatedModules) { if (options.module === ts.ModuleKind.None && languageVersion < 2 /* ES2015 */) { @@ -102104,7 +104910,7 @@ var ts; programDiagnostics.add(ts.createFileDiagnostic(firstNonAmbientExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_use_imports_exports_or_module_augmentations_when_module_is_none)); } // Cannot specify module gen that isn't amd or system with --out - if (outFile && !options.emitDeclarationOnly) { + if (outputFile && !options.emitDeclarationOnly) { if (options.module && !(options.module === ts.ModuleKind.AMD || options.module === ts.ModuleKind.System)) { createDiagnosticForOptionName(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile", "module"); } @@ -102163,10 +104969,18 @@ var ts; else if (options.reactNamespace && !ts.isIdentifierText(options.reactNamespace, languageVersion)) { createOptionValueDiagnostic("reactNamespace", ts.Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace); } + if (options.jsxFragmentFactory) { + if (!options.jsxFactory) { + createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "jsxFragmentFactory", "jsxFactory"); + } + if (!ts.parseIsolatedEntityName(options.jsxFragmentFactory, languageVersion)) { + createOptionValueDiagnostic("jsxFragmentFactory", ts.Diagnostics.Invalid_value_for_jsxFragmentFactory_0_is_not_a_valid_identifier_or_qualified_name, options.jsxFragmentFactory); + } + } // If the emit is enabled make sure that every output file is unique and not overwriting any of the input files if (!options.noEmit && !options.suppressOutputPathCheck) { var emitHost = getEmitHost(); - var emitFilesSeen_1 = ts.createMap(); + var emitFilesSeen_1 = new ts.Set(); ts.forEachEmittedFile(emitHost, function (emitFileNames) { if (!options.emitDeclarationOnly) { verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen_1); @@ -102195,7 +105009,7 @@ var ts; blockEmittingOfFile(emitFileName, ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName)); } else { - emitFilesSeen.set(emitFileKey, true); + emitFilesSeen.add(emitFileKey); } } } @@ -102230,13 +105044,13 @@ var ts; for (var _i = 3; _i < arguments.length; _i++) { args[_i - 3] = arguments[_i]; } - var refPaths = refFileMap && refFileMap.get(file.path); + var refPaths = refFileMap === null || refFileMap === void 0 ? void 0 : refFileMap.get(file.path); var refPathToReportErrorOn = ts.forEach(refPaths, function (refPath) { return rootPaths.has(refPath.file) ? refPath : undefined; }) || ts.elementAt(refPaths, 0); programDiagnostics.add(refPathToReportErrorOn ? createFileDiagnosticAtReference.apply(void 0, __spreadArrays([refPathToReportErrorOn, message], args)) : ts.createCompilerDiagnostic.apply(void 0, __spreadArrays([message], args))); } function verifyProjectReferences() { - var buildInfoPath = !options.noEmit && !options.suppressOutputPathCheck ? ts.getTsBuildInfoEmitOutputFilePath(options) : undefined; + var buildInfoPath = !options.suppressOutputPathCheck ? ts.getTsBuildInfoEmitOutputFilePath(options) : undefined; forEachProjectReference(projectReferences, resolvedProjectReferences, function (resolvedRef, index, parent) { var ref = (parent ? parent.commandLine.projectReferences : projectReferences)[index]; var parentFile = parent && parent.sourceFile; @@ -102245,15 +105059,18 @@ var ts; return; } var options = resolvedRef.commandLine.options; - if (!options.composite) { + if (!options.composite || options.noEmit) { // ok to not have composite if the current program is container only var inputs = parent ? parent.commandLine.fileNames : rootNames; if (inputs.length) { - createDiagnosticForReference(parentFile, index, ts.Diagnostics.Referenced_project_0_must_have_setting_composite_Colon_true, ref.path); + if (!options.composite) + createDiagnosticForReference(parentFile, index, ts.Diagnostics.Referenced_project_0_must_have_setting_composite_Colon_true, ref.path); + if (options.noEmit) + createDiagnosticForReference(parentFile, index, ts.Diagnostics.Referenced_project_0_may_not_disable_emit, ref.path); } } if (ref.prepend) { - var out = options.outFile || options.out; + var out = ts.outFile(options); if (out) { if (!host.fileExists(out)) { createDiagnosticForReference(parentFile, index, ts.Diagnostics.Output_file_0_from_project_1_does_not_exist, out, ref.path); @@ -102374,7 +105191,7 @@ var ts; return false; } // If options have --outFile or --out just check that - var out = options.outFile || options.out; + var out = ts.outFile(options); if (out) { return isSameFile(filePath, out) || isSameFile(filePath, ts.removeFileExtension(out) + ".d.ts" /* Dts */); } @@ -102397,18 +105214,16 @@ var ts; function isSameFile(file1, file2) { return ts.comparePaths(file1, file2, currentDirectory, !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */; } - function getProbableSymlinks() { - if (host.getSymlinks) { - return host.getSymlinks(); + function getSymlinkCache() { + if (host.getSymlinkCache) { + return host.getSymlinkCache(); } return symlinks || (symlinks = ts.discoverProbableSymlinks(files, getCanonicalFileName, host.getCurrentDirectory())); } } ts.createProgram = createProgram; function updateHostForUseSourceOfProjectReferenceRedirect(host) { - var mapOfDeclarationDirectories; - var symlinkedDirectories; - var symlinkedFiles; + var setOfDeclarationDirectories; var originalFileExists = host.compilerHost.fileExists; var originalDirectoryExists = host.compilerHost.directoryExists; var originalGetDirectories = host.compilerHost.getDirectories; @@ -102416,31 +105231,32 @@ var ts; if (!host.useSourceOfProjectReferenceRedirect) return { onProgramCreateComplete: ts.noop, fileExists: fileExists }; host.compilerHost.fileExists = fileExists; + var directoryExists; if (originalDirectoryExists) { // This implementation of directoryExists checks if the directory being requested is // directory of .d.ts file for the referenced Project. // If it is it returns true irrespective of whether that directory exists on host - host.compilerHost.directoryExists = function (path) { + directoryExists = host.compilerHost.directoryExists = function (path) { if (originalDirectoryExists.call(host.compilerHost, path)) { handleDirectoryCouldBeSymlink(path); return true; } if (!host.getResolvedProjectReferences()) return false; - if (!mapOfDeclarationDirectories) { - mapOfDeclarationDirectories = ts.createMap(); + if (!setOfDeclarationDirectories) { + setOfDeclarationDirectories = new ts.Set(); host.forEachResolvedProjectReference(function (ref) { if (!ref) return; - var out = ref.commandLine.options.outFile || ref.commandLine.options.out; + var out = ts.outFile(ref.commandLine.options); if (out) { - mapOfDeclarationDirectories.set(ts.getDirectoryPath(host.toPath(out)), true); + setOfDeclarationDirectories.add(ts.getDirectoryPath(host.toPath(out))); } else { // Set declaration's in different locations only, if they are next to source the directory present doesnt change var declarationDir = ref.commandLine.options.declarationDir || ref.commandLine.options.outDir; if (declarationDir) { - mapOfDeclarationDirectories.set(host.toPath(declarationDir), true); + setOfDeclarationDirectories.add(host.toPath(declarationDir)); } } }); @@ -102460,11 +105276,12 @@ var ts; // This is something we keep for life time of the host if (originalRealpath) { host.compilerHost.realpath = function (s) { - return (symlinkedFiles === null || symlinkedFiles === void 0 ? void 0 : symlinkedFiles.get(host.toPath(s))) || + var _a; + return ((_a = host.getSymlinkCache().getSymlinkedFiles()) === null || _a === void 0 ? void 0 : _a.get(host.toPath(s))) || originalRealpath.call(host.compilerHost, s); }; } - return { onProgramCreateComplete: onProgramCreateComplete, fileExists: fileExists }; + return { onProgramCreateComplete: onProgramCreateComplete, fileExists: fileExists, directoryExists: directoryExists }; function onProgramCreateComplete() { host.compilerHost.fileExists = originalFileExists; host.compilerHost.directoryExists = originalDirectoryExists; @@ -102493,37 +105310,38 @@ var ts; function directoryExistsIfProjectReferenceDeclDir(dir) { var dirPath = host.toPath(dir); var dirPathWithTrailingDirectorySeparator = "" + dirPath + ts.directorySeparator; - return ts.forEachKey(mapOfDeclarationDirectories, function (declDirPath) { return dirPath === declDirPath || + return ts.forEachKey(setOfDeclarationDirectories, function (declDirPath) { return dirPath === declDirPath || // Any parent directory of declaration dir ts.startsWith(declDirPath, dirPathWithTrailingDirectorySeparator) || // Any directory inside declaration dir ts.startsWith(dirPath, declDirPath + "/"); }); } function handleDirectoryCouldBeSymlink(directory) { + var _a; if (!host.getResolvedProjectReferences()) return; // Because we already watch node_modules, handle symlinks in there if (!originalRealpath || !ts.stringContains(directory, ts.nodeModulesPathPart)) return; - if (!symlinkedDirectories) - symlinkedDirectories = ts.createMap(); + var symlinkCache = host.getSymlinkCache(); var directoryPath = ts.ensureTrailingDirectorySeparator(host.toPath(directory)); - if (symlinkedDirectories.has(directoryPath)) + if ((_a = symlinkCache.getSymlinkedDirectories()) === null || _a === void 0 ? void 0 : _a.has(directoryPath)) return; var real = ts.normalizePath(originalRealpath.call(host.compilerHost, directory)); var realPath; if (real === directory || (realPath = ts.ensureTrailingDirectorySeparator(host.toPath(real))) === directoryPath) { // not symlinked - symlinkedDirectories.set(directoryPath, false); + symlinkCache.setSymlinkedDirectory(directoryPath, false); return; } - symlinkedDirectories.set(directoryPath, { + symlinkCache.setSymlinkedDirectory(directoryPath, { real: ts.ensureTrailingDirectorySeparator(real), realPath: realPath }); } function fileOrDirectoryExistsUsingSource(fileOrDirectory, isFile) { + var _a; var fileOrDirectoryExistsUsingSource = isFile ? function (file) { return fileExistsIfProjectReferenceDts(file); } : function (dir) { return directoryExistsIfProjectReferenceDeclDir(dir); }; @@ -102531,12 +105349,14 @@ var ts; var result = fileOrDirectoryExistsUsingSource(fileOrDirectory); if (result !== undefined) return result; + var symlinkCache = host.getSymlinkCache(); + var symlinkedDirectories = symlinkCache.getSymlinkedDirectories(); if (!symlinkedDirectories) return false; var fileOrDirectoryPath = host.toPath(fileOrDirectory); if (!ts.stringContains(fileOrDirectoryPath, ts.nodeModulesPathPart)) return false; - if (isFile && symlinkedFiles && symlinkedFiles.has(fileOrDirectoryPath)) + if (isFile && ((_a = symlinkCache.getSymlinkedFiles()) === null || _a === void 0 ? void 0 : _a.has(fileOrDirectoryPath))) return true; // If it contains node_modules check if its one of the symlinked path we know of return ts.firstDefinedIterator(symlinkedDirectories.entries(), function (_a) { @@ -102545,21 +105365,25 @@ var ts; return undefined; var result = fileOrDirectoryExistsUsingSource(fileOrDirectoryPath.replace(directoryPath, symlinkedDirectory.realPath)); if (isFile && result) { - if (!symlinkedFiles) - symlinkedFiles = ts.createMap(); // Store the real path for the file' var absolutePath = ts.getNormalizedAbsolutePath(fileOrDirectory, host.compilerHost.getCurrentDirectory()); - symlinkedFiles.set(fileOrDirectoryPath, "" + symlinkedDirectory.real + absolutePath.replace(new RegExp(directoryPath, "i"), "")); + symlinkCache.setSymlinkedFile(fileOrDirectoryPath, "" + symlinkedDirectory.real + absolutePath.replace(new RegExp(directoryPath, "i"), "")); } return result; }) || false; } } /*@internal*/ - function handleNoEmitOptions(program, sourceFile, cancellationToken) { + ts.emitSkippedWithNoDiagnostics = { diagnostics: ts.emptyArray, sourceMaps: undefined, emittedFiles: undefined, emitSkipped: true }; + /*@internal*/ + function handleNoEmitOptions(program, sourceFile, writeFile, cancellationToken) { var options = program.getCompilerOptions(); if (options.noEmit) { - return { diagnostics: ts.emptyArray, sourceMaps: undefined, emittedFiles: undefined, emitSkipped: true }; + // Cache the semantic diagnostics + program.getSemanticDiagnostics(sourceFile, cancellationToken); + return sourceFile || ts.outFile(options) ? + ts.emitSkippedWithNoDiagnostics : + program.emitBuildInfo(writeFile, cancellationToken); } // If the noEmitOnError flag is set, then check if we have any errors so far. If so, // immediately bail out. Note that we pass 'undefined' for 'sourceFile' so that we @@ -102570,11 +105394,23 @@ var ts; if (diagnostics.length === 0 && ts.getEmitDeclarations(program.getCompilerOptions())) { diagnostics = program.getDeclarationDiagnostics(/*sourceFile*/ undefined, cancellationToken); } - return diagnostics.length > 0 ? - { diagnostics: diagnostics, sourceMaps: undefined, emittedFiles: undefined, emitSkipped: true } : - undefined; + if (!diagnostics.length) + return undefined; + var emittedFiles; + if (!sourceFile && !ts.outFile(options)) { + var emitResult = program.emitBuildInfo(writeFile, cancellationToken); + if (emitResult.diagnostics) + diagnostics = __spreadArrays(diagnostics, emitResult.diagnostics); + emittedFiles = emitResult.emittedFiles; + } + return { diagnostics: diagnostics, sourceMaps: undefined, emittedFiles: emittedFiles, emitSkipped: true }; } ts.handleNoEmitOptions = handleNoEmitOptions; + /*@internal*/ + function filterSemanticDiagnotics(diagnostic, option) { + return ts.filter(diagnostic, function (d) { return !d.skippedOn || !option[d.skippedOn]; }); + } + ts.filterSemanticDiagnotics = filterSemanticDiagnotics; /* @internal */ function parseConfigHostFromCompilerHostLike(host, directoryStructureHost) { if (directoryStructureHost === void 0) { directoryStructureHost = host; } @@ -102601,7 +105437,7 @@ var ts; var ref = projectReferences[i]; var resolvedRefOpts = getCommandLine(ref, i); if (ref.prepend && resolvedRefOpts && resolvedRefOpts.options) { - var out = resolvedRefOpts.options.outFile || resolvedRefOpts.options.out; + var out = ts.outFile(resolvedRefOpts.options); // Upstream project didn't have outFile set -- skip (error will have been issued earlier) if (!out) continue; @@ -102774,10 +105610,7 @@ var ts; } } function addReferencedFile(referencedPath) { - if (!referencedFiles) { - referencedFiles = ts.createMap(); - } - referencedFiles.set(referencedPath, true); + (referencedFiles || (referencedFiles = new ts.Set())).add(referencedPath); } } /** @@ -102791,11 +105624,13 @@ var ts; * Creates the state of file references and signature for the new program from oldState if it is safe */ function create(newProgram, getCanonicalFileName, oldState) { - var fileInfos = ts.createMap(); - var referencedMap = newProgram.getCompilerOptions().module !== ts.ModuleKind.None ? ts.createMap() : undefined; - var exportedModulesMap = referencedMap ? ts.createMap() : undefined; - var hasCalledUpdateShapeSignature = ts.createMap(); + var fileInfos = new ts.Map(); + var referencedMap = newProgram.getCompilerOptions().module !== ts.ModuleKind.None ? new ts.Map() : undefined; + var exportedModulesMap = referencedMap ? new ts.Map() : undefined; + var hasCalledUpdateShapeSignature = new ts.Set(); var useOldState = canReuseOldState(referencedMap, oldState); + // Ensure source files have parent pointers set + newProgram.getTypeChecker(); // Create the reference map, and set the file infos for (var _i = 0, _a = newProgram.getSourceFiles(); _i < _a.length; _i++) { var sourceFile = _a[_i]; @@ -102836,16 +105671,12 @@ var ts; * Creates a clone of the state */ function clone(state) { - var fileInfos = ts.createMap(); - state.fileInfos.forEach(function (value, key) { - fileInfos.set(key, __assign({}, value)); - }); // Dont need to backup allFiles info since its cache anyway return { - fileInfos: fileInfos, - referencedMap: cloneMapOrUndefined(state.referencedMap), - exportedModulesMap: cloneMapOrUndefined(state.exportedModulesMap), - hasCalledUpdateShapeSignature: ts.cloneMap(state.hasCalledUpdateShapeSignature), + fileInfos: new ts.Map(state.fileInfos), + referencedMap: state.referencedMap && new ts.Map(state.referencedMap), + exportedModulesMap: state.exportedModulesMap && new ts.Map(state.exportedModulesMap), + hasCalledUpdateShapeSignature: new ts.Set(state.hasCalledUpdateShapeSignature), }; } BuilderState.clone = clone; @@ -102857,7 +105688,7 @@ var ts; // They will be committed once it is safe to use them // eg when calling this api from tsserver, if there is no cancellation of the operation // In the other cases the affected files signatures are committed only after the iteration through the result is complete - var signatureCache = cacheToUpdateSignature || ts.createMap(); + var signatureCache = cacheToUpdateSignature || new ts.Map(); var sourceFile = programOfThisState.getSourceFileByPath(path); if (!sourceFile) { return ts.emptyArray; @@ -102883,7 +105714,7 @@ var ts; BuilderState.updateSignaturesFromCache = updateSignaturesFromCache; function updateSignatureOfFile(state, signature, path) { state.fileInfos.get(path).signature = signature; - state.hasCalledUpdateShapeSignature.set(path, true); + state.hasCalledUpdateShapeSignature.add(path); } BuilderState.updateSignatureOfFile = updateSignatureOfFile; /** @@ -102947,9 +105778,9 @@ var ts; function addExportedModule(exportedModulePath) { if (exportedModulePath) { if (!exportedModules) { - exportedModules = ts.createMap(); + exportedModules = new ts.Set(); } - exportedModules.set(exportedModulePath, true); + exportedModules.add(exportedModulePath); } } } @@ -102977,7 +105808,7 @@ var ts; function getAllDependencies(state, programOfThisState, sourceFile) { var compilerOptions = programOfThisState.getCompilerOptions(); // With --out or --outFile all outputs go into single file, all files depend on each other - if (compilerOptions.outFile || compilerOptions.out) { + if (ts.outFile(compilerOptions)) { return getAllFileNames(state, programOfThisState); } // If this is non module emit, or its a global file, it depends on all the source files @@ -102985,12 +105816,12 @@ var ts; return getAllFileNames(state, programOfThisState); } // Get the references, traversing deep from the referenceMap - var seenMap = ts.createMap(); + var seenMap = new ts.Set(); var queue = [sourceFile.resolvedPath]; while (queue.length) { var path = queue.pop(); if (!seenMap.has(path)) { - seenMap.set(path, true); + seenMap.add(path); var references = state.referencedMap.get(path); if (references) { var iterator = references.keys(); @@ -103000,10 +105831,7 @@ var ts; } } } - return ts.arrayFrom(ts.mapDefinedIterator(seenMap.keys(), function (path) { - var file = programOfThisState.getSourceFileByPath(path); - return file ? file.fileName : path; - })); + return ts.arrayFrom(ts.mapDefinedIterator(seenMap.keys(), function (path) { var _a, _b; return (_b = (_a = programOfThisState.getSourceFileByPath(path)) === null || _a === void 0 ? void 0 : _a.fileName) !== null && _b !== void 0 ? _b : path; })); } BuilderState.getAllDependencies = getAllDependencies; /** @@ -103088,7 +105916,7 @@ var ts; var compilerOptions = programOfThisState.getCompilerOptions(); // If `--out` or `--outFile` is specified, any new emit will result in re-emitting the entire project, // so returning the file itself is good enough. - if (compilerOptions && (compilerOptions.out || compilerOptions.outFile)) { + if (compilerOptions && ts.outFile(compilerOptions)) { return [sourceFileWithUpdatedShape]; } return getAllFilesExcludingDefaultLibraryFile(state, programOfThisState, sourceFileWithUpdatedShape); @@ -103101,13 +105929,13 @@ var ts; return getAllFilesExcludingDefaultLibraryFile(state, programOfThisState, sourceFileWithUpdatedShape); } var compilerOptions = programOfThisState.getCompilerOptions(); - if (compilerOptions && (compilerOptions.isolatedModules || compilerOptions.out || compilerOptions.outFile)) { + if (compilerOptions && (compilerOptions.isolatedModules || ts.outFile(compilerOptions))) { return [sourceFileWithUpdatedShape]; } // Now we need to if each file in the referencedBy list has a shape change as well. // Because if so, its own referencedBy files need to be saved as well to make the // emitting result consistent with files on disk. - var seenFileNamesMap = ts.createMap(); + var seenFileNamesMap = new ts.Map(); // Start with the paths this file was referenced by seenFileNamesMap.set(sourceFileWithUpdatedShape.resolvedPath, sourceFileWithUpdatedShape); var queue = getReferencedByPaths(state, sourceFileWithUpdatedShape.resolvedPath); @@ -103127,10 +105955,6 @@ var ts; return ts.arrayFrom(ts.mapDefinedIterator(seenFileNamesMap.values(), function (value) { return value; })); } })(BuilderState = ts.BuilderState || (ts.BuilderState = {})); - function cloneMapOrUndefined(map) { - return map ? ts.cloneMap(map) : undefined; - } - ts.cloneMapOrUndefined = cloneMapOrUndefined; })(ts || (ts = {})); /*@internal*/ var ts; @@ -103153,10 +105977,10 @@ var ts; var compilerOptions = newProgram.getCompilerOptions(); state.compilerOptions = compilerOptions; // With --out or --outFile, any change affects all semantic diagnostics so no need to cache them - if (!compilerOptions.outFile && !compilerOptions.out) { - state.semanticDiagnosticsPerFile = ts.createMap(); + if (!ts.outFile(compilerOptions)) { + state.semanticDiagnosticsPerFile = new ts.Map(); } - state.changedFilesSet = ts.createMap(); + state.changedFilesSet = new ts.Set(); var useOldState = ts.BuilderState.canReuseOldState(state.referencedMap, oldState); var oldCompilerOptions = useOldState ? oldState.compilerOptions : undefined; var canCopySemanticDiagnostics = useOldState && oldState.semanticDiagnosticsPerFile && !!state.semanticDiagnosticsPerFile && @@ -103172,14 +105996,12 @@ var ts; ts.Debug.assert(!changedFilesSet || !ts.forEachKey(changedFilesSet, function (path) { return oldState.semanticDiagnosticsPerFile.has(path); }), "Semantic diagnostics shouldnt be available for changed files"); } // Copy old state's changed files set - if (changedFilesSet) { - ts.copyEntries(changedFilesSet, state.changedFilesSet); - } - if (!compilerOptions.outFile && !compilerOptions.out && oldState.affectedFilesPendingEmit) { + changedFilesSet === null || changedFilesSet === void 0 ? void 0 : changedFilesSet.forEach(function (value) { return state.changedFilesSet.add(value); }); + if (!ts.outFile(compilerOptions) && oldState.affectedFilesPendingEmit) { state.affectedFilesPendingEmit = oldState.affectedFilesPendingEmit.slice(); - state.affectedFilesPendingEmitKind = ts.cloneMapOrUndefined(oldState.affectedFilesPendingEmitKind); + state.affectedFilesPendingEmitKind = oldState.affectedFilesPendingEmitKind && new ts.Map(oldState.affectedFilesPendingEmitKind); state.affectedFilesPendingEmitIndex = oldState.affectedFilesPendingEmitIndex; - state.seenAffectedFiles = ts.createMap(); + state.seenAffectedFiles = new ts.Set(); } } // Update changed files and copy semantic diagnostics if we can @@ -103201,7 +106023,7 @@ var ts; // Referenced file was deleted in the new program newReferences && ts.forEachKey(newReferences, function (path) { return !state.fileInfos.has(path) && oldState.fileInfos.has(path); })) { // Register file as changed file and do not copy semantic diagnostics, since all changed files need to be re-evaluated - state.changedFilesSet.set(sourceFilePath, true); + state.changedFilesSet.add(sourceFilePath); } else if (canCopySemanticDiagnostics) { var sourceFile = newProgram.getSourceFileByPath(sourceFilePath); @@ -103216,24 +106038,24 @@ var ts; if (diagnostics) { state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) : diagnostics); if (!state.semanticDiagnosticsFromOldState) { - state.semanticDiagnosticsFromOldState = ts.createMap(); + state.semanticDiagnosticsFromOldState = new ts.Set(); } - state.semanticDiagnosticsFromOldState.set(sourceFilePath, true); + state.semanticDiagnosticsFromOldState.add(sourceFilePath); } } }); // If the global file is removed, add all files as changed if (useOldState && ts.forEachEntry(oldState.fileInfos, function (info, sourceFilePath) { return info.affectsGlobalScope && !state.fileInfos.has(sourceFilePath); })) { ts.BuilderState.getAllFilesExcludingDefaultLibraryFile(state, newProgram, /*firstSourceFile*/ undefined) - .forEach(function (file) { return state.changedFilesSet.set(file.resolvedPath, true); }); + .forEach(function (file) { return state.changedFilesSet.add(file.resolvedPath); }); } - else if (oldCompilerOptions && ts.compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) { + else if (oldCompilerOptions && !ts.outFile(compilerOptions) && ts.compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) { // Add all files to affectedFilesPendingEmit since emit changed newProgram.getSourceFiles().forEach(function (f) { return addToAffectedFilesPendingEmit(state, f.resolvedPath, 1 /* Full */); }); ts.Debug.assert(!state.seenAffectedFiles || !state.seenAffectedFiles.size); - state.seenAffectedFiles = state.seenAffectedFiles || ts.createMap(); + state.seenAffectedFiles = state.seenAffectedFiles || new ts.Set(); } - state.emittedBuildInfo = !state.changedFilesSet.size && !state.affectedFilesPendingEmit; + state.buildInfoEmitPending = !!state.changedFilesSet.size; return state; } function convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) { @@ -103243,7 +106065,9 @@ var ts; return diagnostics.map(function (diagnostic) { var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath); result.reportsUnnecessary = diagnostic.reportsUnnecessary; + result.reportsDeprecated = diagnostic.reportDeprecated; result.source = diagnostic.source; + result.skippedOn = diagnostic.skippedOn; var relatedInformation = diagnostic.relatedInformation; result.relatedInformation = relatedInformation ? relatedInformation.length ? @@ -103272,22 +106096,22 @@ var ts; */ function cloneBuilderProgramState(state) { var newState = ts.BuilderState.clone(state); - newState.semanticDiagnosticsPerFile = ts.cloneMapOrUndefined(state.semanticDiagnosticsPerFile); - newState.changedFilesSet = ts.cloneMap(state.changedFilesSet); + newState.semanticDiagnosticsPerFile = state.semanticDiagnosticsPerFile && new ts.Map(state.semanticDiagnosticsPerFile); + newState.changedFilesSet = new ts.Set(state.changedFilesSet); newState.affectedFiles = state.affectedFiles; newState.affectedFilesIndex = state.affectedFilesIndex; newState.currentChangedFilePath = state.currentChangedFilePath; - newState.currentAffectedFilesSignatures = ts.cloneMapOrUndefined(state.currentAffectedFilesSignatures); - newState.currentAffectedFilesExportedModulesMap = ts.cloneMapOrUndefined(state.currentAffectedFilesExportedModulesMap); - newState.seenAffectedFiles = ts.cloneMapOrUndefined(state.seenAffectedFiles); + newState.currentAffectedFilesSignatures = state.currentAffectedFilesSignatures && new ts.Map(state.currentAffectedFilesSignatures); + newState.currentAffectedFilesExportedModulesMap = state.currentAffectedFilesExportedModulesMap && new ts.Map(state.currentAffectedFilesExportedModulesMap); + newState.seenAffectedFiles = state.seenAffectedFiles && new ts.Set(state.seenAffectedFiles); newState.cleanedDiagnosticsOfLibFiles = state.cleanedDiagnosticsOfLibFiles; - newState.semanticDiagnosticsFromOldState = ts.cloneMapOrUndefined(state.semanticDiagnosticsFromOldState); + newState.semanticDiagnosticsFromOldState = state.semanticDiagnosticsFromOldState && new ts.Set(state.semanticDiagnosticsFromOldState); newState.program = state.program; newState.compilerOptions = state.compilerOptions; newState.affectedFilesPendingEmit = state.affectedFilesPendingEmit && state.affectedFilesPendingEmit.slice(); - newState.affectedFilesPendingEmitKind = ts.cloneMapOrUndefined(state.affectedFilesPendingEmitKind); + newState.affectedFilesPendingEmitKind = state.affectedFilesPendingEmitKind && new ts.Map(state.affectedFilesPendingEmitKind); newState.affectedFilesPendingEmitIndex = state.affectedFilesPendingEmitIndex; - newState.seenEmittedFiles = ts.cloneMapOrUndefined(state.seenEmittedFiles); + newState.seenEmittedFiles = state.seenEmittedFiles && new ts.Map(state.seenEmittedFiles); newState.programEmitComplete = state.programEmitComplete; return newState; } @@ -103338,19 +106162,22 @@ var ts; // so operations are performed directly on program, return program var program = ts.Debug.checkDefined(state.program); var compilerOptions = program.getCompilerOptions(); - if (compilerOptions.outFile || compilerOptions.out) { + if (ts.outFile(compilerOptions)) { ts.Debug.assert(!state.semanticDiagnosticsPerFile); return program; } // Get next batch of affected files - state.currentAffectedFilesSignatures = state.currentAffectedFilesSignatures || ts.createMap(); + if (!state.currentAffectedFilesSignatures) + state.currentAffectedFilesSignatures = new ts.Map(); if (state.exportedModulesMap) { - state.currentAffectedFilesExportedModulesMap = state.currentAffectedFilesExportedModulesMap || ts.createMap(); + if (!state.currentAffectedFilesExportedModulesMap) + state.currentAffectedFilesExportedModulesMap = new ts.Map(); } state.affectedFiles = ts.BuilderState.getFilesAffectedBy(state, program, nextKey.value, cancellationToken, computeHash, state.currentAffectedFilesSignatures, state.currentAffectedFilesExportedModulesMap); state.currentChangedFilePath = nextKey.value; state.affectedFilesIndex = 0; - state.seenAffectedFiles = state.seenAffectedFiles || ts.createMap(); + if (!state.seenAffectedFiles) + state.seenAffectedFiles = new ts.Set(); } } /** @@ -103359,7 +106186,7 @@ var ts; function getNextAffectedFilePendingEmit(state) { var affectedFilesPendingEmit = state.affectedFilesPendingEmit; if (affectedFilesPendingEmit) { - var seenEmittedFiles = state.seenEmittedFiles || (state.seenEmittedFiles = ts.createMap()); + var seenEmittedFiles = (state.seenEmittedFiles || (state.seenEmittedFiles = new ts.Map())); for (var i = state.affectedFilesPendingEmitIndex; i < affectedFilesPendingEmit.length; i++) { var affectedFile = ts.Debug.checkDefined(state.program).getSourceFileByPath(affectedFilesPendingEmit[i]); if (affectedFile) { @@ -103456,7 +106283,7 @@ var ts; // Since isolated modules dont change js files, files affected by change in signature is itself // But we need to cleanup semantic diagnostics and queue dts emit for affected files if (state.compilerOptions.isolatedModules) { - var seenFileNamesMap = ts.createMap(); + var seenFileNamesMap = new ts.Map(); seenFileNamesMap.set(affectedFile.resolvedPath, true); var queue = ts.BuilderState.getReferencedByPaths(state, affectedFile.resolvedPath); while (queue.length > 0) { @@ -103472,7 +106299,7 @@ var ts; } } ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap); - var seenFileAndExportsOfFile = ts.createMap(); + var seenFileAndExportsOfFile = new ts.Set(); // Go through exported modules from cache first // If exported modules has path, all files referencing file exported from are affected if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) { @@ -103501,7 +106328,7 @@ var ts; * fn on file and iterate on anything that exports this file */ function forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn) { - if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) { + if (!ts.tryAddToSet(seenFileAndExportsOfFile, filePath)) { return false; } if (fn(state, filePath)) { @@ -103540,19 +106367,20 @@ var ts; */ function doneWithAffectedFile(state, affected, emitKind, isPendingEmit, isBuildInfoEmit) { if (isBuildInfoEmit) { - state.emittedBuildInfo = true; + state.buildInfoEmitPending = false; } else if (affected === state.program) { state.changedFilesSet.clear(); state.programEmitComplete = true; } else { - state.seenAffectedFiles.set(affected.resolvedPath, true); + state.seenAffectedFiles.add(affected.resolvedPath); if (emitKind !== undefined) { - (state.seenEmittedFiles || (state.seenEmittedFiles = ts.createMap())).set(affected.resolvedPath, emitKind); + (state.seenEmittedFiles || (state.seenEmittedFiles = new ts.Map())).set(affected.resolvedPath, emitKind); } if (isPendingEmit) { state.affectedFilesPendingEmitIndex++; + state.buildInfoEmitPending = true; } else { state.affectedFilesIndex++; @@ -103590,7 +106418,7 @@ var ts; var cachedDiagnostics = state.semanticDiagnosticsPerFile.get(path); // Report the bind and check diagnostics from the cache if we already have those diagnostics present if (cachedDiagnostics) { - return cachedDiagnostics; + return ts.filterSemanticDiagnotics(cachedDiagnostics, state.compilerOptions); } } // Diagnostics werent cached, get them from program, and cache the result @@ -103598,13 +106426,13 @@ var ts; if (state.semanticDiagnosticsPerFile) { state.semanticDiagnosticsPerFile.set(path, diagnostics); } - return diagnostics; + return ts.filterSemanticDiagnotics(diagnostics, state.compilerOptions); } /** * Gets the program information to be emitted in buildInfo so that we can use it to create new program */ function getProgramBuildInfo(state, getCanonicalFileName) { - if (state.compilerOptions.outFile || state.compilerOptions.out) + if (ts.outFile(state.compilerOptions)) return undefined; var currentDirectory = ts.Debug.checkDefined(state.program).getCurrentDirectory(); var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getTsBuildInfoEmitOutputFilePath(state.compilerOptions), currentDirectory)); @@ -103655,6 +106483,17 @@ var ts; } result.semanticDiagnosticsPerFile = semanticDiagnosticsPerFile; } + if (state.affectedFilesPendingEmit) { + var affectedFilesPendingEmit = []; + var seenFiles = new ts.Set(); + for (var _f = 0, _g = state.affectedFilesPendingEmit.slice(state.affectedFilesPendingEmitIndex).sort(ts.compareStringsCaseSensitive); _f < _g.length; _f++) { + var path = _g[_f]; + if (ts.tryAddToSet(seenFiles, path)) { + affectedFilesPendingEmit.push([relativeToBuildInfo(path), state.affectedFilesPendingEmitKind.get(path)]); + } + } + result.affectedFilesPendingEmit = affectedFilesPendingEmit; + } return result; function relativeToBuildInfoEnsuringAbsolutePath(path) { return relativeToBuildInfo(ts.getNormalizedAbsolutePath(path, currentDirectory)); @@ -103695,7 +106534,9 @@ var ts; return diagnostics.map(function (diagnostic) { var result = convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo); result.reportsUnnecessary = diagnostic.reportsUnnecessary; + result.reportDeprecated = diagnostic.reportsDeprecated; result.source = diagnostic.source; + result.skippedOn = diagnostic.skippedOn; var relatedInformation = diagnostic.relatedInformation; result.relatedInformation = relatedInformation ? relatedInformation.length ? @@ -103793,11 +106634,20 @@ var ts; else if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) { builderProgram.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile; builderProgram.emitNextAffectedFile = emitNextAffectedFile; + builderProgram.emitBuildInfo = emitBuildInfo; } else { ts.notImplemented(); } return builderProgram; + function emitBuildInfo(writeFile, cancellationToken) { + if (state.buildInfoEmitPending) { + var result = ts.Debug.checkDefined(state.program).emitBuildInfo(writeFile || ts.maybeBind(host, host.writeFile), cancellationToken); + state.buildInfoEmitPending = false; + return result; + } + return ts.emitSkippedWithNoDiagnostics; + } /** * Emits the next affected file's emit result (EmitResult and sourceFiles emitted) or returns undefined if iteration is complete * The first of writeFile if provided, writeFile of BuilderProgramHost if provided, writeFile of compiler host @@ -103808,10 +106658,10 @@ var ts; var emitKind = 1 /* Full */; var isPendingEmitFile = false; if (!affected) { - if (!state.compilerOptions.out && !state.compilerOptions.outFile) { + if (!ts.outFile(state.compilerOptions)) { var pendingAffectedFile = getNextAffectedFilePendingEmit(state); if (!pendingAffectedFile) { - if (state.emittedBuildInfo) { + if (!state.buildInfoEmitPending) { return undefined; } var affected_1 = ts.Debug.checkDefined(state.program); @@ -103851,7 +106701,7 @@ var ts; function emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) { if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) { assertSourceFileOkWithoutNextAffectedCall(state, targetSourceFile); - var result = ts.handleNoEmitOptions(builderProgram, targetSourceFile, cancellationToken); + var result = ts.handleNoEmitOptions(builderProgram, targetSourceFile, writeFile, cancellationToken); if (result) return result; if (!targetSourceFile) { @@ -103916,7 +106766,7 @@ var ts; function getSemanticDiagnostics(sourceFile, cancellationToken) { assertSourceFileOkWithoutNextAffectedCall(state, sourceFile); var compilerOptions = ts.Debug.checkDefined(state.program).getCompilerOptions(); - if (compilerOptions.outFile || compilerOptions.out) { + if (ts.outFile(compilerOptions)) { ts.Debug.assert(!state.semanticDiagnosticsPerFile); // We dont need to cache the diagnostics just return them from program return ts.Debug.checkDefined(state.program).getSemanticDiagnostics(sourceFile, cancellationToken); @@ -103942,7 +106792,7 @@ var ts; if (!state.affectedFilesPendingEmit) state.affectedFilesPendingEmit = []; if (!state.affectedFilesPendingEmitKind) - state.affectedFilesPendingEmitKind = ts.createMap(); + state.affectedFilesPendingEmitKind = new ts.Map(); var existingKind = state.affectedFilesPendingEmitKind.get(affectedFilePendingEmit); state.affectedFilesPendingEmit.push(affectedFilePendingEmit); state.affectedFilesPendingEmitKind.set(affectedFilePendingEmit, existingKind || kind); @@ -103957,12 +106807,12 @@ var ts; function getMapOfReferencedSet(mapLike, toPath) { if (!mapLike) return undefined; - var map = ts.createMap(); + var map = new ts.Map(); // Copies keys/values from template. Note that for..in will not throw if // template is undefined, and instead will just exit the loop. for (var key in mapLike) { if (ts.hasProperty(mapLike, key)) { - map.set(toPath(key), ts.arrayToSet(mapLike[key], toPath)); + map.set(toPath(key), new ts.Set(mapLike[key].map(toPath))); } } return map; @@ -103970,7 +106820,7 @@ var ts; function createBuildProgramUsingProgramBuildInfo(program, buildInfoPath, host) { var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory())); var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames()); - var fileInfos = ts.createMap(); + var fileInfos = new ts.Map(); for (var key in program.fileInfos) { if (ts.hasProperty(program.fileInfos, key)) { fileInfos.set(toPath(key), program.fileInfos[key]); @@ -103982,7 +106832,10 @@ var ts; referencedMap: getMapOfReferencedSet(program.referencedMap, toPath), exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath), semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && ts.arrayToMap(program.semanticDiagnosticsPerFile, function (value) { return toPath(ts.isString(value) ? value : value[0]); }, function (value) { return ts.isString(value) ? ts.emptyArray : value[1]; }), - hasReusableDiagnostic: true + hasReusableDiagnostic: true, + affectedFilesPendingEmit: ts.map(program.affectedFilesPendingEmit, function (value) { return toPath(value[0]); }), + affectedFilesPendingEmitKind: program.affectedFilesPendingEmit && ts.arrayToMap(program.affectedFilesPendingEmit, function (value) { return toPath(value[0]); }, function (value) { return value[1]; }), + affectedFilesPendingEmitIndex: program.affectedFilesPendingEmit && 0, }; return { getState: function () { return state; }, @@ -104005,6 +106858,7 @@ var ts; getCurrentDirectory: ts.notImplemented, emitNextAffectedFile: ts.notImplemented, getSemanticDiagnosticsOfNextAffectedFile: ts.notImplemented, + emitBuildInfo: ts.notImplemented, close: ts.noop, }; function toPath(path) { @@ -104033,6 +106887,7 @@ var ts; getDeclarationDiagnostics: function (sourceFile, cancellationToken) { return getProgram().getDeclarationDiagnostics(sourceFile, cancellationToken); }, getSemanticDiagnostics: function (sourceFile, cancellationToken) { return getProgram().getSemanticDiagnostics(sourceFile, cancellationToken); }, emit: function (sourceFile, writeFile, cancellationToken, emitOnlyDts, customTransformers) { return getProgram().emit(sourceFile, writeFile, cancellationToken, emitOnlyDts, customTransformers); }, + emitBuildInfo: function (writeFile, cancellationToken) { return getProgram().emitBuildInfo(writeFile, cancellationToken); }, getAllDependencies: ts.notImplemented, getCurrentDirectory: function () { return getProgram().getCurrentDirectory(); }, close: ts.noop, @@ -104123,16 +106978,20 @@ var ts; var nonRelativeExternalModuleResolutions = ts.createMultiMap(); var resolutionsWithFailedLookups = []; var resolvedFileToResolution = ts.createMultiMap(); + var hasChangedAutomaticTypeDirectiveNames = false; + var failedLookupChecks = []; + var startsWithPathChecks = []; + var isInDirectoryChecks = []; var getCurrentDirectory = ts.memoize(function () { return resolutionHost.getCurrentDirectory(); }); // TODO: GH#18217 var cachedDirectoryStructureHost = resolutionHost.getCachedDirectoryStructureHost(); // The resolvedModuleNames and resolvedTypeReferenceDirectives are the cache of resolutions per file. // The key in the map is source file's path. // The values are Map of resolutions with key being name lookedup. - var resolvedModuleNames = ts.createMap(); + var resolvedModuleNames = new ts.Map(); var perDirectoryResolvedModuleNames = ts.createCacheWithRedirects(); var nonRelativeModuleNameCache = ts.createCacheWithRedirects(); var moduleResolutionCache = ts.createModuleResolutionCacheWithMaps(perDirectoryResolvedModuleNames, nonRelativeModuleNameCache, getCurrentDirectory(), resolutionHost.getCanonicalFileName); - var resolvedTypeReferenceDirectives = ts.createMap(); + var resolvedTypeReferenceDirectives = new ts.Map(); var perDirectoryResolvedTypeReferenceDirectives = ts.createCacheWithRedirects(); /** * These are the extensions that failed lookup files will have by default, @@ -104141,13 +107000,13 @@ var ts; * Note that .d.ts file also has .d.ts extension hence will be part of default extensions */ var failedLookupDefaultExtensions = [".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */, ".json" /* Json */]; - var customFailedLookupPaths = ts.createMap(); - var directoryWatchesOfFailedLookups = ts.createMap(); + var customFailedLookupPaths = new ts.Map(); + var directoryWatchesOfFailedLookups = new ts.Map(); var rootDir = rootDirForResolution && ts.removeTrailingDirectorySeparator(ts.getNormalizedAbsolutePath(rootDirForResolution, getCurrentDirectory())); var rootPath = (rootDir && resolutionHost.toPath(rootDir)); // TODO: GH#18217 var rootSplitLength = rootPath !== undefined ? rootPath.split(ts.directorySeparator).length : 0; // TypeRoot watches for the types that get added as part of getAutomaticTypeDirectiveNames - var typeRootsWatches = ts.createMap(); + var typeRootsWatches = new ts.Map(); return { startRecordingFilesWithChangedResolutions: startRecordingFilesWithChangedResolutions, finishRecordingFilesWithChangedResolutions: finishRecordingFilesWithChangedResolutions, @@ -104160,7 +107019,9 @@ var ts; resolveTypeReferenceDirectives: resolveTypeReferenceDirectives, removeResolutionsFromProjectReferenceRedirects: removeResolutionsFromProjectReferenceRedirects, removeResolutionsOfFile: removeResolutionsOfFile, + hasChangedAutomaticTypeDirectiveNames: function () { return hasChangedAutomaticTypeDirectiveNames; }, invalidateResolutionOfFile: invalidateResolutionOfFile, + invalidateResolutionsOfFailedLookupLocations: invalidateResolutionsOfFailedLookupLocations, setFilesWithInvalidatedNonRelativeUnresolvedImports: setFilesWithInvalidatedNonRelativeUnresolvedImports, createHasInvalidatedResolution: createHasInvalidatedResolution, updateTypeRootsWatch: updateTypeRootsWatch, @@ -104188,9 +107049,13 @@ var ts; resolvedTypeReferenceDirectives.clear(); resolvedFileToResolution.clear(); resolutionsWithFailedLookups.length = 0; + failedLookupChecks.length = 0; + startsWithPathChecks.length = 0; + isInDirectoryChecks.length = 0; // perDirectoryResolvedModuleNames and perDirectoryResolvedTypeReferenceDirectives could be non empty if there was exception during program update // (between startCachingPerDirectoryResolution and finishCachingPerDirectoryResolution) clearPerDirectoryResolutions(); + hasChangedAutomaticTypeDirectiveNames = false; } function startRecordingFilesWithChangedResolutions() { filesWithChangedSetOfUnresolvedImports = []; @@ -104209,6 +107074,8 @@ var ts; return !!value && !!value.length; } function createHasInvalidatedResolution(forceAllFilesAsInvalidated) { + // Ensure pending resolutions are applied + invalidateResolutionsOfFailedLookupLocations(); if (forceAllFilesAsInvalidated) { // Any file asked would have invalidated resolution filesWithInvalidatedResolutions = undefined; @@ -104235,6 +107102,7 @@ var ts; watcher.watcher.close(); } }); + hasChangedAutomaticTypeDirectiveNames = false; } function resolveModuleName(moduleName, containingFile, compilerOptions, host, redirectedReference) { var _a; @@ -104263,12 +107131,12 @@ var ts; var _b; var names = _a.names, containingFile = _a.containingFile, redirectedReference = _a.redirectedReference, cache = _a.cache, perDirectoryCacheWithRedirects = _a.perDirectoryCacheWithRedirects, loader = _a.loader, getResolutionWithResolvedFileName = _a.getResolutionWithResolvedFileName, shouldRetryResolution = _a.shouldRetryResolution, reusedNames = _a.reusedNames, logChanges = _a.logChanges; var path = resolutionHost.toPath(containingFile); - var resolutionsInFile = cache.get(path) || cache.set(path, ts.createMap()).get(path); + var resolutionsInFile = cache.get(path) || cache.set(path, new ts.Map()).get(path); var dirPath = ts.getDirectoryPath(path); var perDirectoryCache = perDirectoryCacheWithRedirects.getOrCreateMapOfCacheRedirects(redirectedReference); var perDirectoryResolution = perDirectoryCache.get(dirPath); if (!perDirectoryResolution) { - perDirectoryResolution = ts.createMap(); + perDirectoryResolution = new ts.Map(); perDirectoryCache.set(dirPath, perDirectoryResolution); } var resolvedModules = []; @@ -104280,7 +107148,7 @@ var ts; var unmatchedRedirects = oldRedirect ? !redirectedReference || redirectedReference.sourceFile.path !== oldRedirect.sourceFile.path : !!redirectedReference; - var seenNamesInFile = ts.createMap(); + var seenNamesInFile = new ts.Map(); for (var _i = 0, names_3 = names; _i < names_3.length; _i++) { var name = names_3[_i]; var resolution = resolutionsInFile.get(name); @@ -104362,7 +107230,7 @@ var ts; getResolutionWithResolvedFileName: getResolvedModule, shouldRetryResolution: function (resolution) { return !resolution.resolvedModule || !ts.resolutionExtensionIsTSOrJson(resolution.resolvedModule.extension); }, reusedNames: reusedNames, - logChanges: logChangesWhenResolvingModule + logChanges: logChangesWhenResolvingModule, }); } function getResolvedModuleWithFailedLookupLocationsFromCache(moduleName, containingFile) { @@ -104435,7 +107303,7 @@ var ts; } else { resolution.refCount = 1; - ts.Debug.assert(resolution.files === undefined); + ts.Debug.assert(ts.length(resolution.files) === 0); // This resolution shouldnt be referenced by any file yet if (ts.isExternalModuleNameRelative(name)) { watchFailedLookupLocationOfResolution(resolution); } @@ -104554,9 +107422,7 @@ var ts; // Since the file existence changed, update the sourceFiles cache cachedDirectoryStructureHost.addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath); } - if (invalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath, dirPath === fileOrDirectoryPath)) { - resolutionHost.onInvalidatedResolution(); - } + scheduleInvalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath, dirPath === fileOrDirectoryPath); }, nonRecursive ? 0 /* None */ : 1 /* Recursive */); } function removeResolutionsOfFileFromCache(cache, filePath, getResolutionWithResolvedFileName) { @@ -104587,34 +107453,43 @@ var ts; removeResolutionsOfFileFromCache(resolvedModuleNames, filePath, getResolvedModule); removeResolutionsOfFileFromCache(resolvedTypeReferenceDirectives, filePath, getResolvedTypeReferenceDirective); } - function invalidateResolution(resolution) { - resolution.isInvalidated = true; - var changedInAutoTypeReferenced = false; - for (var _i = 0, _a = ts.Debug.assertDefined(resolution.files); _i < _a.length; _i++) { - var containingFilePath = _a[_i]; - (filesWithInvalidatedResolutions || (filesWithInvalidatedResolutions = ts.createMap())).set(containingFilePath, true); - // When its a file with inferred types resolution, invalidate type reference directive resolution - changedInAutoTypeReferenced = changedInAutoTypeReferenced || containingFilePath.endsWith(ts.inferredTypesContainingFile); - } - if (changedInAutoTypeReferenced) { - resolutionHost.onChangedAutomaticTypeDirectiveNames(); + function invalidateResolutions(resolutions, canInvalidate) { + if (!resolutions) + return false; + var invalidated = false; + for (var _i = 0, resolutions_2 = resolutions; _i < resolutions_2.length; _i++) { + var resolution = resolutions_2[_i]; + if (resolution.isInvalidated || !canInvalidate(resolution)) + continue; + resolution.isInvalidated = invalidated = true; + for (var _a = 0, _b = ts.Debug.assertDefined(resolution.files); _a < _b.length; _a++) { + var containingFilePath = _b[_a]; + (filesWithInvalidatedResolutions || (filesWithInvalidatedResolutions = new ts.Set())).add(containingFilePath); + // When its a file with inferred types resolution, invalidate type reference directive resolution + hasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames || ts.endsWith(containingFilePath, ts.inferredTypesContainingFile); + } } + return invalidated; } function invalidateResolutionOfFile(filePath) { removeResolutionsOfFile(filePath); // Resolution is invalidated if the resulting file name is same as the deleted file path - ts.forEach(resolvedFileToResolution.get(filePath), invalidateResolution); + var prevHasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames; + if (invalidateResolutions(resolvedFileToResolution.get(filePath), ts.returnTrue) && + hasChangedAutomaticTypeDirectiveNames && + !prevHasChangedAutomaticTypeDirectiveNames) { + resolutionHost.onChangedAutomaticTypeDirectiveNames(); + } } function setFilesWithInvalidatedNonRelativeUnresolvedImports(filesMap) { ts.Debug.assert(filesWithInvalidatedNonRelativeUnresolvedImports === filesMap || filesWithInvalidatedNonRelativeUnresolvedImports === undefined); filesWithInvalidatedNonRelativeUnresolvedImports = filesMap; } - function invalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath, isCreatingWatchedDirectory) { - var isChangedFailedLookupLocation; + function scheduleInvalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath, isCreatingWatchedDirectory) { if (isCreatingWatchedDirectory) { // Watching directory is created // Invalidate any resolution has failed lookup in this directory - isChangedFailedLookupLocation = function (location) { return isInDirectoryPath(fileOrDirectoryPath, resolutionHost.toPath(location)); }; + isInDirectoryChecks.push(fileOrDirectoryPath); } else { // If something to do with folder/file starting with "." in node_modules folder, skip it @@ -104632,10 +107507,8 @@ var ts; if (isNodeModulesAtTypesDirectory(fileOrDirectoryPath) || ts.isNodeModulesDirectory(fileOrDirectoryPath) || isNodeModulesAtTypesDirectory(dirOfFileOrDirectory) || ts.isNodeModulesDirectory(dirOfFileOrDirectory)) { // Invalidate any resolution from this directory - isChangedFailedLookupLocation = function (location) { - var locationPath = resolutionHost.toPath(location); - return locationPath === fileOrDirectoryPath || ts.startsWith(resolutionHost.toPath(location), fileOrDirectoryPath); - }; + failedLookupChecks.push(fileOrDirectoryPath); + startsWithPathChecks.push(fileOrDirectoryPath); } else { if (!isPathWithDefaultFailedLookupExtension(fileOrDirectoryPath) && !customFailedLookupPaths.has(fileOrDirectoryPath)) { @@ -104646,20 +107519,29 @@ var ts; return false; } // Resolution need to be invalidated if failed lookup location is same as the file or directory getting created - isChangedFailedLookupLocation = function (location) { return resolutionHost.toPath(location) === fileOrDirectoryPath; }; + failedLookupChecks.push(fileOrDirectoryPath); } } - var invalidated = false; - // Resolution is invalidated if the resulting file name is same as the deleted file path - for (var _i = 0, resolutionsWithFailedLookups_1 = resolutionsWithFailedLookups; _i < resolutionsWithFailedLookups_1.length; _i++) { - var resolution = resolutionsWithFailedLookups_1[_i]; - if (resolution.failedLookupLocations.some(isChangedFailedLookupLocation)) { - invalidateResolution(resolution); - invalidated = true; - } + resolutionHost.scheduleInvalidateResolutionsOfFailedLookupLocations(); + } + function invalidateResolutionsOfFailedLookupLocations() { + if (!failedLookupChecks.length && !startsWithPathChecks.length && !isInDirectoryChecks.length) { + return false; } + var invalidated = invalidateResolutions(resolutionsWithFailedLookups, canInvalidateFailedLookupResolution); + failedLookupChecks.length = 0; + startsWithPathChecks.length = 0; + isInDirectoryChecks.length = 0; return invalidated; } + function canInvalidateFailedLookupResolution(resolution) { + return resolution.failedLookupLocations.some(function (location) { + var locationPath = resolutionHost.toPath(location); + return ts.contains(failedLookupChecks, locationPath) || + startsWithPathChecks.some(function (fileOrDirectoryPath) { return ts.startsWith(locationPath, fileOrDirectoryPath); }) || + isInDirectoryChecks.some(function (fileOrDirectoryPath) { return isInDirectoryPath(fileOrDirectoryPath, locationPath); }); + }); + } function closeTypeRootsWatch() { ts.clearMap(typeRootsWatches, ts.closeFileWatcher); } @@ -104681,12 +107563,13 @@ var ts; // For now just recompile // We could potentially store more data here about whether it was/would be really be used or not // and with that determine to trigger compilation but for now this is enough + hasChangedAutomaticTypeDirectiveNames = true; resolutionHost.onChangedAutomaticTypeDirectiveNames(); // Since directory watchers invoked are flaky, the failed lookup location events might not be triggered // So handle to failed lookup locations here as well to ensure we are invalidating resolutions var dirPath = getDirectoryToWatchFailedLookupLocationFromTypeRoot(typeRoot, typeRootPath); - if (dirPath && invalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath, dirPath === fileOrDirectoryPath)) { - resolutionHost.onInvalidatedResolution(); + if (dirPath) { + scheduleInvalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath, dirPath === fileOrDirectoryPath); } }, 1 /* Recursive */); } @@ -104870,27 +107753,30 @@ var ts; var importedFileNames = __spreadArrays((referenceRedirect ? [referenceRedirect] : ts.emptyArray), [importedFileName], redirects); var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); }); if (!preferSymlinks) { - var result_12 = ts.forEach(targets, cb); - if (result_12) - return result_12; + var result_13 = ts.forEach(targets, cb); + if (result_13) + return result_13; } - var links = host.getProbableSymlinks - ? host.getProbableSymlinks(host.getSourceFiles()) + var links = host.getSymlinkCache + ? host.getSymlinkCache() : ts.discoverProbableSymlinks(host.getSourceFiles(), getCanonicalFileName, cwd); + var symlinkedDirectories = links.getSymlinkedDirectories(); var compareStrings = (!host.useCaseSensitiveFileNames || host.useCaseSensitiveFileNames()) ? ts.compareStringsCaseSensitive : ts.compareStringsCaseInsensitive; - var result = ts.forEachEntry(links, function (resolved, path) { - if (ts.startsWithDirectory(importingFileName, resolved, getCanonicalFileName)) { + var result = symlinkedDirectories && ts.forEachEntry(symlinkedDirectories, function (resolved, path) { + if (resolved === false) + return undefined; + if (ts.startsWithDirectory(importingFileName, resolved.realPath, getCanonicalFileName)) { return undefined; // Don't want to a package to globally import from itself } - var target = ts.find(targets, function (t) { return compareStrings(t.slice(0, resolved.length + 1), resolved + "/") === 0 /* EqualTo */; }); + var target = ts.find(targets, function (t) { return compareStrings(t.slice(0, resolved.real.length), resolved.real) === 0 /* EqualTo */; }); if (target === undefined) return undefined; - var relative = ts.getRelativePathFromDirectory(resolved, target, getCanonicalFileName); + var relative = ts.getRelativePathFromDirectory(resolved.real, target, getCanonicalFileName); var option = ts.resolvePath(path, relative); if (!host.fileExists || host.fileExists(option)) { - var result_13 = cb(option); - if (result_13) - return result_13; + var result_14 = cb(option); + if (result_14) + return result_14; } }); return result || @@ -104904,7 +107790,7 @@ var ts; function getAllModulePaths(importingFileName, importedFileName, host) { var cwd = host.getCurrentDirectory(); var getCanonicalFileName = ts.hostGetCanonicalFileName(host); - var allFileNames = ts.createMap(); + var allFileNames = new ts.Map(); var importedFileFromNodeModules = false; forEachFileNameOfModule(importingFileName, importedFileName, host, /*preferSymlinks*/ true, function (path) { @@ -104914,7 +107800,7 @@ var ts; }); // Sort by paths closest to importing file Name directory var sortedPaths = []; - var _loop_20 = function (directory) { + var _loop_23 = function (directory) { var directoryStart = ts.ensureTrailingDirectorySeparator(directory); var pathsInDirectory; allFileNames.forEach(function (canonicalFileName, fileName) { @@ -104940,7 +107826,7 @@ var ts; }; var out_directory_1; for (var directory = ts.getDirectoryPath(ts.toPath(importingFileName, cwd, getCanonicalFileName)); allFileNames.size !== 0;) { - var state_8 = _loop_20(directory); + var state_8 = _loop_23(directory); directory = out_directory_1; if (state_8 === "break") break; @@ -105363,13 +108249,14 @@ var ts; } ts.emitFilesAndReportErrorsAndGetExitStatus = emitFilesAndReportErrorsAndGetExitStatus; ts.noopFileWatcher = { close: ts.noop }; + ts.returnNoopFileWatcher = function () { return ts.noopFileWatcher; }; function createWatchHost(system, reportWatchStatus) { if (system === void 0) { system = ts.sys; } var onWatchStatusChange = reportWatchStatus || createWatchStatusReporter(system); return { onWatchStatusChange: onWatchStatusChange, - watchFile: ts.maybeBind(system, system.watchFile) || (function () { return ts.noopFileWatcher; }), - watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return ts.noopFileWatcher; }), + watchFile: ts.maybeBind(system, system.watchFile) || ts.returnNoopFileWatcher, + watchDirectory: ts.maybeBind(system, system.watchDirectory) || ts.returnNoopFileWatcher, setTimeout: ts.maybeBind(system, system.setTimeout) || ts.noop, clearTimeout: ts.maybeBind(system, system.clearTimeout) || ts.noop }; @@ -105553,7 +108440,7 @@ var ts; var ts; (function (ts) { function readBuilderProgram(compilerOptions, host) { - if (compilerOptions.out || compilerOptions.outFile) + if (ts.outFile(compilerOptions)) return undefined; var buildInfoPath = ts.getTsBuildInfoEmitOutputFilePath(compilerOptions); if (!buildInfoPath) @@ -105619,10 +108506,10 @@ var ts; var missingFilesMap; // Map of file watchers for the missing files var watchedWildcardDirectories; // map of watchers for the wild card directories in the config file var timerToUpdateProgram; // timer callback to recompile the program - var sourceFilesCache = ts.createMap(); // Cache that stores the source file and version info + var timerToInvalidateFailedLookupResolutions; // timer callback to invalidate resolutions for changes in failed lookup locations + var sourceFilesCache = new ts.Map(); // Cache that stores the source file and version info var missingFilePathsRequestedForRelease; // These paths are held temparirly so that we can remove the entry from source file cache if the file is not tracked by missing files var hasChangedCompilerOptions = false; // True if the compiler options have changed between compilations - var hasChangedAutomaticTypeDirectiveNames = false; // True if the automatic type directives have changed var useCaseSensitiveFileNames = host.useCaseSensitiveFileNames(); var currentDirectory = host.getCurrentDirectory(); var configFileName = host.configFileName, _a = host.optionsToExtend, optionsToExtendForConfigFile = _a === void 0 ? {} : _a, watchOptionsToExtend = host.watchOptionsToExtend, extraFileExtensions = host.extraFileExtensions, createProgram = host.createProgram; @@ -105676,11 +108563,9 @@ var ts; compilerHost.watchDirectoryOfFailedLookupLocation = function (dir, cb, flags) { return watchDirectory(host, dir, cb, flags, watchOptions, ts.WatchType.FailedLookupLocations); }; compilerHost.watchTypeRootsDirectory = function (dir, cb, flags) { return watchDirectory(host, dir, cb, flags, watchOptions, ts.WatchType.TypeRoots); }; compilerHost.getCachedDirectoryStructureHost = function () { return cachedDirectoryStructureHost; }; + compilerHost.scheduleInvalidateResolutionsOfFailedLookupLocations = scheduleInvalidateResolutionsOfFailedLookupLocations; compilerHost.onInvalidatedResolution = scheduleProgramUpdate; - compilerHost.onChangedAutomaticTypeDirectiveNames = function () { - hasChangedAutomaticTypeDirectiveNames = true; - scheduleProgramUpdate(); - }; + compilerHost.onChangedAutomaticTypeDirectiveNames = scheduleProgramUpdate; compilerHost.fileIsOpen = ts.returnFalse; compilerHost.getCurrentProgram = getCurrentProgram; compilerHost.writeLog = writeLog; @@ -105717,6 +108602,7 @@ var ts; { getCurrentProgram: getCurrentBuilderProgram, getProgram: updateProgram, close: close } : { getCurrentProgram: getCurrentBuilderProgram, getProgram: updateProgram, updateRootFileNames: updateRootFileNames, close: close }; function close() { + clearInvalidateResolutionsOfFailedLookupLocations(); resolutionCache.clear(); ts.clearMap(sourceFilesCache, function (value) { if (value && value.fileWatcher) { @@ -105745,6 +108631,7 @@ var ts; } function synchronizeProgram() { writeLog("Synchronizing program"); + clearInvalidateResolutionsOfFailedLookupLocations(); var program = getCurrentBuilderProgram(); if (hasChangedCompilerOptions) { newLine = updateNewLine(); @@ -105779,11 +108666,10 @@ var ts; resolutionCache.startCachingPerDirectoryResolution(); compilerHost.hasInvalidatedResolution = hasInvalidatedResolution; compilerHost.hasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames; - hasChangedAutomaticTypeDirectiveNames = false; builderProgram = createProgram(rootFileNames, compilerOptions, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences); resolutionCache.finishCachingPerDirectoryResolution(); // Update watches - ts.updateMissingFilePathsWatch(builderProgram.getProgram(), missingFilesMap || (missingFilesMap = ts.createMap()), watchMissingFilePath); + ts.updateMissingFilePathsWatch(builderProgram.getProgram(), missingFilesMap || (missingFilesMap = new ts.Map()), watchMissingFilePath); if (needsUpdateInTypeRootWatch) { resolutionCache.updateTypeRootsWatch(); } @@ -105910,6 +108796,30 @@ var ts; host.onWatchStatusChange(ts.createCompilerDiagnostic(message), newLine, compilerOptions || optionsToExtendForConfigFile); } } + function hasChangedAutomaticTypeDirectiveNames() { + return resolutionCache.hasChangedAutomaticTypeDirectiveNames(); + } + function clearInvalidateResolutionsOfFailedLookupLocations() { + if (!timerToInvalidateFailedLookupResolutions) + return false; + host.clearTimeout(timerToInvalidateFailedLookupResolutions); + timerToInvalidateFailedLookupResolutions = undefined; + return true; + } + function scheduleInvalidateResolutionsOfFailedLookupLocations() { + if (!host.setTimeout || !host.clearTimeout) { + return resolutionCache.invalidateResolutionsOfFailedLookupLocations(); + } + var pending = clearInvalidateResolutionsOfFailedLookupLocations(); + writeLog("Scheduling invalidateFailedLookup" + (pending ? ", Cancelled earlier one" : "")); + timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250); + } + function invalidateResolutionsOfFailedLookup() { + timerToInvalidateFailedLookupResolutions = undefined; + if (resolutionCache.invalidateResolutionsOfFailedLookupLocations()) { + scheduleProgramUpdate(); + } + } // Upon detecting a file change, wait for 250ms and then perform a recompilation. This gives batch // operations (such as saving all modified files in an editor) a chance to complete before we kick // off a new compilation. @@ -105983,7 +108893,7 @@ var ts; configFileSpecs = configFileParseResult.configFileSpecs; // TODO: GH#18217 projectReferences = configFileParseResult.projectReferences; configFileParsingDiagnostics = ts.getConfigFileParsingDiagnostics(configFileParseResult).slice(); - canConfigFileJsonReportNoInputFiles = ts.canJsonReportNoInutFiles(configFileParseResult.raw); + canConfigFileJsonReportNoInputFiles = ts.canJsonReportNoInputFiles(configFileParseResult.raw); hasChangedConfigFileParsingErrors = true; } function onSourceFileChange(fileName, eventKind, path) { @@ -106018,7 +108928,7 @@ var ts; } function watchConfigFileWildCardDirectories() { if (configFileSpecs) { - ts.updateWatchingWildcardDirectories(watchedWildcardDirectories || (watchedWildcardDirectories = ts.createMap()), ts.createMapFromTemplate(configFileSpecs.wildcardDirectories), watchWildcardDirectory); + ts.updateWatchingWildcardDirectories(watchedWildcardDirectories || (watchedWildcardDirectories = new ts.Map()), new ts.Map(ts.getEntries(configFileSpecs.wildcardDirectories)), watchWildcardDirectory); } else if (watchedWildcardDirectories) { ts.clearMap(watchedWildcardDirectories, ts.closeFileWatcherOf); @@ -106033,15 +108943,19 @@ var ts; cachedDirectoryStructureHost.addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath); } nextSourceFileVersion(fileOrDirectoryPath); - fileOrDirectoryPath = ts.removeIgnoredPath(fileOrDirectoryPath); - if (!fileOrDirectoryPath) + if (ts.isIgnoredFileFromWildCardWatching({ + watchedDirPath: toPath(directory), + fileOrDirectory: fileOrDirectory, + fileOrDirectoryPath: fileOrDirectoryPath, + configFileName: configFileName, + configFileSpecs: configFileSpecs, + options: compilerOptions, + program: getCurrentBuilderProgram(), + currentDirectory: currentDirectory, + useCaseSensitiveFileNames: useCaseSensitiveFileNames, + writeLog: writeLog + })) return; - // If the the added or created file or directory is not supported file name, ignore the file - // But when watched directory is added/removed, we need to reload the file list - if (fileOrDirectoryPath !== directory && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, compilerOptions)) { - writeLog("Project: " + configFileName + " Detected file add/remove of non supported extension: " + fileOrDirectory); - return; - } // Reload is pending, do the reload if (reloadLevel !== ts.ConfigFileProgramReloadLevel.Full) { reloadLevel = ts.ConfigFileProgramReloadLevel.Partial; @@ -106115,9 +109029,6 @@ var ts; BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors"; BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors"; })(BuildResultFlags || (BuildResultFlags = {})); - function createConfigFileMap() { - return ts.createMap(); - } function getOrCreateValueFromConfigFileMap(configFileMap, resolved, createT) { var existingValue = configFileMap.get(resolved); var newValue; @@ -106128,7 +109039,7 @@ var ts; return existingValue || newValue; } function getOrCreateValueMapFromConfigFileMap(configFileMap, resolved) { - return getOrCreateValueFromConfigFileMap(configFileMap, resolved, ts.createMap); + return getOrCreateValueFromConfigFileMap(configFileMap, resolved, function () { return new ts.Map(); }); } function newer(date1, date2) { return date2 > date1 ? date2 : date1; @@ -106230,15 +109141,15 @@ var ts; baseCompilerOptions: baseCompilerOptions, rootNames: rootNames, baseWatchOptions: baseWatchOptions, - resolvedConfigFilePaths: ts.createMap(), - configFileCache: createConfigFileMap(), - projectStatus: createConfigFileMap(), - buildInfoChecked: createConfigFileMap(), - extendedConfigCache: ts.createMap(), - builderPrograms: createConfigFileMap(), - diagnostics: createConfigFileMap(), - projectPendingBuild: createConfigFileMap(), - projectErrorsReported: createConfigFileMap(), + resolvedConfigFilePaths: new ts.Map(), + configFileCache: new ts.Map(), + projectStatus: new ts.Map(), + buildInfoChecked: new ts.Map(), + extendedConfigCache: new ts.Map(), + builderPrograms: new ts.Map(), + diagnostics: new ts.Map(), + projectPendingBuild: new ts.Map(), + projectErrorsReported: new ts.Map(), compilerHost: compilerHost, moduleResolutionCache: moduleResolutionCache, // Mutable state @@ -106252,9 +109163,9 @@ var ts; currentInvalidatedProject: undefined, // Watch state watch: watch, - allWatchedWildcardDirectories: createConfigFileMap(), - allWatchedInputFiles: createConfigFileMap(), - allWatchedConfigFiles: createConfigFileMap(), + allWatchedWildcardDirectories: new ts.Map(), + allWatchedInputFiles: new ts.Map(), + allWatchedConfigFiles: new ts.Map(), timerToBuildInvalidatedProject: undefined, reportFileChangeDetected: false, watchFile: watchFile, @@ -106305,8 +109216,8 @@ var ts; return ts.resolveConfigFileProjectName(ts.resolvePath(state.currentDirectory, name)); } function createBuildOrder(state, roots) { - var temporaryMarks = ts.createMap(); - var permanentMarks = ts.createMap(); + var temporaryMarks = new ts.Map(); + var permanentMarks = new ts.Map(); var circularityReportStack = []; var buildOrder; var circularDiagnostics; @@ -106351,7 +109262,8 @@ var ts; var buildOrder = createBuildOrder(state, state.rootNames.map(function (f) { return resolveProjectName(state, f); })); // Clear all to ResolvedConfigFilePaths cache to start fresh state.resolvedConfigFilePaths.clear(); - var currentProjects = ts.arrayToSet(getBuildOrderFromAnyBuildOrder(buildOrder), function (resolved) { return toResolvedConfigFilePath(state, resolved); }); + // TODO(rbuckton): Should be a `Set`, but that requires changing the code below that uses `mutateMapSkippingNewValues` + var currentProjects = new ts.Map(getBuildOrderFromAnyBuildOrder(buildOrder).map(function (resolved) { return [toResolvedConfigFilePath(state, resolved), true]; })); var noopOnDelete = { onDeleteValue: ts.noop }; // Config file cache ts.mutateMapSkippingNewValues(state.configFileCache, currentProjects, noopOnDelete); @@ -106495,19 +109407,20 @@ var ts; } }; } + var BuildStep; + (function (BuildStep) { + BuildStep[BuildStep["CreateProgram"] = 0] = "CreateProgram"; + BuildStep[BuildStep["SyntaxDiagnostics"] = 1] = "SyntaxDiagnostics"; + BuildStep[BuildStep["SemanticDiagnostics"] = 2] = "SemanticDiagnostics"; + BuildStep[BuildStep["Emit"] = 3] = "Emit"; + BuildStep[BuildStep["EmitBundle"] = 4] = "EmitBundle"; + BuildStep[BuildStep["EmitBuildInfo"] = 5] = "EmitBuildInfo"; + BuildStep[BuildStep["BuildInvalidatedProjectOfBundle"] = 6] = "BuildInvalidatedProjectOfBundle"; + BuildStep[BuildStep["QueueReferencingProjects"] = 7] = "QueueReferencingProjects"; + BuildStep[BuildStep["Done"] = 8] = "Done"; + })(BuildStep || (BuildStep = {})); function createBuildOrUpdateInvalidedProject(kind, state, project, projectPath, projectIndex, config, buildOrder) { - var Step; - (function (Step) { - Step[Step["CreateProgram"] = 0] = "CreateProgram"; - Step[Step["SyntaxDiagnostics"] = 1] = "SyntaxDiagnostics"; - Step[Step["SemanticDiagnostics"] = 2] = "SemanticDiagnostics"; - Step[Step["Emit"] = 3] = "Emit"; - Step[Step["EmitBundle"] = 4] = "EmitBundle"; - Step[Step["BuildInvalidatedProjectOfBundle"] = 5] = "BuildInvalidatedProjectOfBundle"; - Step[Step["QueueReferencingProjects"] = 6] = "QueueReferencingProjects"; - Step[Step["Done"] = 7] = "Done"; - })(Step || (Step = {})); - var step = kind === InvalidatedProjectKind.Build ? Step.CreateProgram : Step.EmitBundle; + var step = kind === InvalidatedProjectKind.Build ? BuildStep.CreateProgram : BuildStep.EmitBundle; var program; var buildResult; var invalidatedProjectOfBundle; @@ -106557,8 +109470,11 @@ var ts; if (targetSourceFile || emitOnlyDtsFiles) { return withProgramOrUndefined(function (program) { return program.emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers); }); } - executeSteps(Step.SemanticDiagnostics, cancellationToken); - if (step !== Step.Emit) + executeSteps(BuildStep.SemanticDiagnostics, cancellationToken); + if (step === BuildStep.EmitBuildInfo) { + return emitBuildInfo(writeFile, cancellationToken); + } + if (step !== BuildStep.Emit) return undefined; return emit(writeFile, cancellationToken, customTransformers); }, @@ -106572,18 +109488,18 @@ var ts; getCompilerOptions: function () { return config.options; }, getCurrentDirectory: function () { return state.currentDirectory; }, emit: function (writeFile, customTransformers) { - if (step !== Step.EmitBundle) + if (step !== BuildStep.EmitBundle) return invalidatedProjectOfBundle; return emitBundle(writeFile, customTransformers); }, done: done, }; function done(cancellationToken, writeFile, customTransformers) { - executeSteps(Step.Done, cancellationToken, writeFile, customTransformers); + executeSteps(BuildStep.Done, cancellationToken, writeFile, customTransformers); return doneInvalidatedProject(state, projectPath); } function withProgramOrUndefined(action) { - executeSteps(Step.CreateProgram); + executeSteps(BuildStep.CreateProgram); return program && action(program); } function withProgramOrEmptyArray(action) { @@ -106594,7 +109510,7 @@ var ts; if (state.options.dry) { reportStatus(state, ts.Diagnostics.A_non_dry_build_would_build_project_0, project); buildResult = BuildResultFlags.Success; - step = Step.QueueReferencingProjects; + step = BuildStep.QueueReferencingProjects; return; } if (state.options.verbose) @@ -106603,7 +109519,7 @@ var ts; reportAndStoreErrors(state, projectPath, ts.getConfigFileParsingDiagnostics(config)); // Nothing to build - must be a solution file, basically buildResult = BuildResultFlags.None; - step = Step.QueueReferencingProjects; + step = BuildStep.QueueReferencingProjects; return; } var host = state.host, compilerHost = state.compilerHost; @@ -106612,12 +109528,15 @@ var ts; updateModuleResolutionCache(state, project, config); // Create program program = host.createProgram(config.fileNames, config.options, compilerHost, getOldProgram(state, projectPath, config), ts.getConfigFileParsingDiagnostics(config), config.projectReferences); + if (state.watch) { + state.builderPrograms.set(projectPath, program); + } step++; } function handleDiagnostics(diagnostics, errorFlags, errorType) { + var _a; if (diagnostics.length) { - buildResult = buildErrors(state, projectPath, program, config, diagnostics, errorFlags, errorType); - step = Step.QueueReferencingProjects; + (_a = buildErrors(state, projectPath, program, config, diagnostics, errorFlags, errorType), buildResult = _a.buildResult, step = _a.step); } else { step++; @@ -106631,8 +109550,9 @@ var ts; handleDiagnostics(ts.Debug.checkDefined(program).getSemanticDiagnostics(/*sourceFile*/ undefined, cancellationToken), BuildResultFlags.TypeErrors, "Semantic"); } function emit(writeFileCallback, cancellationToken, customTransformers) { + var _a; ts.Debug.assertIsDefined(program); - ts.Debug.assert(step === Step.Emit); + ts.Debug.assert(step === BuildStep.Emit); // Before emitting lets backup state, so we can revert it back if there are declaration errors to handle emit and declaration errors correctly program.backupState(); var declDiagnostics; @@ -106645,8 +109565,7 @@ var ts; // Don't emit .d.ts if there are decl file errors if (declDiagnostics) { program.restoreState(); - buildResult = buildErrors(state, projectPath, program, config, declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file"); - step = Step.QueueReferencingProjects; + (_a = buildErrors(state, projectPath, program, config, declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file"), buildResult = _a.buildResult, step = _a.step); return { emitSkipped: true, diagnostics: emitResult.diagnostics @@ -106658,7 +109577,7 @@ var ts; var newestDeclarationFileContentChangedTime = minimumDate; var anyDtsChanged = false; var emitterDiagnostics = ts.createDiagnosticCollection(); - var emittedOutputs = ts.createMap(); + var emittedOutputs = new ts.Map(); outputFiles.forEach(function (_a) { var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark; var priorChangeTime; @@ -106682,17 +109601,31 @@ var ts; /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ anyDtsChanged, outputFiles.length ? outputFiles[0].name : ts.getFirstProjectOutput(config, !host.useCaseSensitiveFileNames()), resultFlags); return emitResult; } + function emitBuildInfo(writeFileCallback, cancellationToken) { + ts.Debug.assertIsDefined(program); + ts.Debug.assert(step === BuildStep.EmitBuildInfo); + var emitResult = program.emitBuildInfo(writeFileCallback, cancellationToken); + if (emitResult.diagnostics.length) { + reportErrors(state, emitResult.diagnostics); + state.diagnostics.set(projectPath, __spreadArrays(state.diagnostics.get(projectPath), emitResult.diagnostics)); + buildResult = BuildResultFlags.EmitErrors & buildResult; + } + if (emitResult.emittedFiles && state.writeFileName) { + emitResult.emittedFiles.forEach(function (name) { return listEmittedFile(state, config, name); }); + } + afterProgramDone(state, program, config); + step = BuildStep.QueueReferencingProjects; + return emitResult; + } function finishEmit(emitterDiagnostics, emittedOutputs, priorNewestUpdateTime, newestDeclarationFileContentChangedTimeIsMaximumDate, oldestOutputFileName, resultFlags) { + var _a; var emitDiagnostics = emitterDiagnostics.getDiagnostics(); if (emitDiagnostics.length) { - buildResult = buildErrors(state, projectPath, program, config, emitDiagnostics, BuildResultFlags.EmitErrors, "Emit"); - step = Step.QueueReferencingProjects; + (_a = buildErrors(state, projectPath, program, config, emitDiagnostics, BuildResultFlags.EmitErrors, "Emit"), buildResult = _a.buildResult, step = _a.step); return emitDiagnostics; } if (state.writeFileName) { emittedOutputs.forEach(function (name) { return listEmittedFile(state, config, name); }); - if (program) - ts.listFiles(program, state.writeFileName); } // Update time stamps for rest of the outputs var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(state, config, priorNewestUpdateTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs); @@ -106704,9 +109637,8 @@ var ts; newestDeclarationFileContentChangedTime, oldestOutputFileName: oldestOutputFileName }); - afterProgramDone(state, projectPath, program, config); - state.projectCompilerOptions = state.baseCompilerOptions; - step = Step.QueueReferencingProjects; + afterProgramDone(state, program, config); + step = BuildStep.QueueReferencingProjects; buildResult = resultFlags; return emitDiagnostics; } @@ -106715,7 +109647,7 @@ var ts; if (state.options.dry) { reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, project); buildResult = BuildResultFlags.Success; - step = Step.QueueReferencingProjects; + step = BuildStep.QueueReferencingProjects; return undefined; } if (state.options.verbose) @@ -106729,13 +109661,13 @@ var ts; }, customTransformers); if (ts.isString(outputFiles)) { reportStatus(state, ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, project, relName(state, outputFiles)); - step = Step.BuildInvalidatedProjectOfBundle; + step = BuildStep.BuildInvalidatedProjectOfBundle; return invalidatedProjectOfBundle = createBuildOrUpdateInvalidedProject(InvalidatedProjectKind.Build, state, project, projectPath, projectIndex, config, buildOrder); } // Actual Emit ts.Debug.assert(!!outputFiles.length); var emitterDiagnostics = ts.createDiagnosticCollection(); - var emittedOutputs = ts.createMap(); + var emittedOutputs = new ts.Map(); outputFiles.forEach(function (_a) { var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark; emittedOutputs.set(toPath(state, name), name); @@ -106746,34 +109678,37 @@ var ts; return { emitSkipped: false, diagnostics: emitDiagnostics }; } function executeSteps(till, cancellationToken, writeFile, customTransformers) { - while (step <= till && step < Step.Done) { + while (step <= till && step < BuildStep.Done) { var currentStep = step; switch (step) { - case Step.CreateProgram: + case BuildStep.CreateProgram: createProgram(); break; - case Step.SyntaxDiagnostics: + case BuildStep.SyntaxDiagnostics: getSyntaxDiagnostics(cancellationToken); break; - case Step.SemanticDiagnostics: + case BuildStep.SemanticDiagnostics: getSemanticDiagnostics(cancellationToken); break; - case Step.Emit: + case BuildStep.Emit: emit(writeFile, cancellationToken, customTransformers); break; - case Step.EmitBundle: + case BuildStep.EmitBuildInfo: + emitBuildInfo(writeFile, cancellationToken); + break; + case BuildStep.EmitBundle: emitBundle(writeFile, customTransformers); break; - case Step.BuildInvalidatedProjectOfBundle: + case BuildStep.BuildInvalidatedProjectOfBundle: ts.Debug.checkDefined(invalidatedProjectOfBundle).done(cancellationToken); - step = Step.Done; + step = BuildStep.Done; break; - case Step.QueueReferencingProjects: + case BuildStep.QueueReferencingProjects: queueReferencingProjects(state, project, projectPath, projectIndex, config, buildOrder, ts.Debug.checkDefined(buildResult)); step++; break; // Should never be done - case Step.Done: + case BuildStep.Done: default: ts.assertType(step); } @@ -106825,7 +109760,7 @@ var ts; else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) { // Update file names var result = ts.getFileNamesFromConfigSpecs(config.configFileSpecs, ts.getDirectoryPath(project), config.options, state.parseConfigFileHost); - ts.updateErrorForNoInputFiles(result, project, config.configFileSpecs, config.errors, ts.canJsonReportNoInutFiles(config.raw)); + ts.updateErrorForNoInputFiles(result, project, config.configFileSpecs, config.errors, ts.canJsonReportNoInputFiles(config.raw)); config.fileNames = result.fileNames; watchInputFiles(state, project, projectPath, config); } @@ -106884,30 +109819,29 @@ var ts; return value; return ts.readBuilderProgram(parsed.options, compilerHost); } - function afterProgramDone(_a, proj, program, config) { - var host = _a.host, watch = _a.watch, builderPrograms = _a.builderPrograms; + function afterProgramDone(state, program, config) { if (program) { - if (host.afterProgramEmitAndDiagnostics) { - host.afterProgramEmitAndDiagnostics(program); - } - if (watch) { - program.releaseProgram(); - builderPrograms.set(proj, program); + if (program && state.writeFileName) + ts.listFiles(program, state.writeFileName); + if (state.host.afterProgramEmitAndDiagnostics) { + state.host.afterProgramEmitAndDiagnostics(program); } + program.releaseProgram(); } - else if (host.afterEmitBundle) { - host.afterEmitBundle(config); + else if (state.host.afterEmitBundle) { + state.host.afterEmitBundle(config); } + state.projectCompilerOptions = state.baseCompilerOptions; } - function buildErrors(state, resolvedPath, program, config, diagnostics, errorFlags, errorType) { + function buildErrors(state, resolvedPath, program, config, diagnostics, buildResult, errorType) { + var canEmitBuildInfo = !(buildResult & BuildResultFlags.SyntaxErrors) && program && !ts.outFile(program.getCompilerOptions()); reportAndStoreErrors(state, resolvedPath, diagnostics); // List files if any other build error using program (emit errors already report files) - if (program && state.writeFileName) - ts.listFiles(program, state.writeFileName); state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType + " errors" }); - afterProgramDone(state, resolvedPath, program, config); - state.projectCompilerOptions = state.baseCompilerOptions; - return errorFlags; + if (canEmitBuildInfo) + return { buildResult: buildResult, step: BuildStep.EmitBuildInfo }; + afterProgramDone(state, program, config); + return { buildResult: buildResult, step: BuildStep.QueueReferencingProjects }; } function updateModuleResolutionCache(state, proj, config) { if (!state.moduleResolutionCache) @@ -106965,7 +109899,7 @@ var ts; } } // Container if no files are specified in the project - if (!project.fileNames.length && !ts.canJsonReportNoInutFiles(project.raw)) { + if (!project.fileNames.length && !ts.canJsonReportNoInputFiles(project.raw)) { return { type: ts.UpToDateStatusType.ContainerOnly }; @@ -107356,45 +110290,23 @@ var ts; invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Full); }, ts.PollingInterval.High, parsed === null || parsed === void 0 ? void 0 : parsed.watchOptions, ts.WatchType.ConfigFile, resolved)); } - function isSameFile(state, file1, file2) { - return ts.comparePaths(file1, file2, state.currentDirectory, !state.host.useCaseSensitiveFileNames()) === 0 /* EqualTo */; - } - function isOutputFile(state, fileName, configFile) { - if (configFile.options.noEmit) - return false; - // ts or tsx files are not output - if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && - (ts.fileExtensionIs(fileName, ".ts" /* Ts */) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */))) { - return false; - } - // If options have --outFile or --out, check if its that - var out = configFile.options.outFile || configFile.options.out; - if (out && (isSameFile(state, fileName, out) || isSameFile(state, fileName, ts.removeFileExtension(out) + ".d.ts" /* Dts */))) { - return true; - } - // If declarationDir is specified, return if its a file in that directory - if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) { - return true; - } - // If --outDir, check if file is in that directory - if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, state.currentDirectory, !state.host.useCaseSensitiveFileNames())) { - return true; - } - return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(state, fileName, inputFile); }); - } function watchWildCardDirectories(state, resolved, resolvedPath, parsed) { if (!state.watch) return; - ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(state.allWatchedWildcardDirectories, resolvedPath), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) { return state.watchDirectory(state.hostWithWatch, dir, function (fileOrDirectory) { - var fileOrDirectoryPath = toPath(state, fileOrDirectory); - if (fileOrDirectoryPath !== toPath(state, dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) { - state.writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory); + ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(state.allWatchedWildcardDirectories, resolvedPath), new ts.Map(ts.getEntries(parsed.configFileSpecs.wildcardDirectories)), function (dir, flags) { return state.watchDirectory(state.hostWithWatch, dir, function (fileOrDirectory) { + if (ts.isIgnoredFileFromWildCardWatching({ + watchedDirPath: toPath(state, dir), + fileOrDirectory: fileOrDirectory, + fileOrDirectoryPath: toPath(state, fileOrDirectory), + configFileName: resolved, + configFileSpecs: parsed.configFileSpecs, + currentDirectory: state.currentDirectory, + options: parsed.options, + program: state.builderPrograms.get(resolvedPath), + useCaseSensitiveFileNames: state.parseConfigFileHost.useCaseSensitiveFileNames, + writeLog: function (s) { return state.writeLog(s); } + })) return; - } - if (isOutputFile(state, fileOrDirectory, parsed)) { - state.writeLog(fileOrDirectory + " is output file"); - return; - } invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Partial); }, flags, parsed === null || parsed === void 0 ? void 0 : parsed.watchOptions, ts.WatchType.WildcardDirectory, resolved); }); } @@ -107678,20 +110590,20 @@ var ts; "vm", "zlib" ]; - JsTyping.nodeCoreModules = ts.arrayToSet(JsTyping.nodeCoreModuleList); + JsTyping.nodeCoreModules = new ts.Set(JsTyping.nodeCoreModuleList); function nonRelativeModuleNameForTypingCache(moduleName) { return JsTyping.nodeCoreModules.has(moduleName) ? "node" : moduleName; } JsTyping.nonRelativeModuleNameForTypingCache = nonRelativeModuleNameForTypingCache; function loadSafeList(host, safeListPath) { var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); }); - return ts.createMapFromTemplate(result.config); + return new ts.Map(ts.getEntries(result.config)); } JsTyping.loadSafeList = loadSafeList; function loadTypesMap(host, typesMapPath) { var result = ts.readConfigFile(typesMapPath, function (path) { return host.readFile(path); }); if (result.config) { - return ts.createMapFromTemplate(result.config.simpleMap); + return new ts.Map(ts.getEntries(result.config.simpleMap)); } return undefined; } @@ -107710,7 +110622,7 @@ var ts; return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] }; } // A typing name to typing file path mapping - var inferredTypings = ts.createMap(); + var inferredTypings = new ts.Map(); // Only infer typings for .js and .jsx files fileNames = ts.mapDefined(fileNames, function (fileName) { var path = ts.normalizePath(fileName); @@ -107723,9 +110635,9 @@ var ts; addInferredTypings(typeAcquisition.include, "Explicitly included types"); var exclude = typeAcquisition.exclude || []; // Directories to search for package.json, bower.json and other typing information - var possibleSearchDirs = ts.arrayToSet(fileNames, ts.getDirectoryPath); - possibleSearchDirs.set(projectRootPath, true); - possibleSearchDirs.forEach(function (_true, searchDir) { + var possibleSearchDirs = new ts.Set(fileNames.map(ts.getDirectoryPath)); + possibleSearchDirs.add(projectRootPath); + possibleSearchDirs.forEach(function (searchDir) { var packageJsonPath = ts.combinePaths(searchDir, "package.json"); getTypingNamesFromJson(packageJsonPath, filesToWatch); var bowerJsonPath = ts.combinePaths(searchDir, "bower.json"); @@ -107982,6 +110894,19 @@ var ts; PackageJsonDependencyGroup[PackageJsonDependencyGroup["All"] = 15] = "All"; })(PackageJsonDependencyGroup = ts.PackageJsonDependencyGroup || (ts.PackageJsonDependencyGroup = {})); /* @internal */ + var PackageJsonAutoImportPreference; + (function (PackageJsonAutoImportPreference) { + PackageJsonAutoImportPreference[PackageJsonAutoImportPreference["Off"] = 0] = "Off"; + PackageJsonAutoImportPreference[PackageJsonAutoImportPreference["On"] = 1] = "On"; + PackageJsonAutoImportPreference[PackageJsonAutoImportPreference["Auto"] = 2] = "Auto"; + })(PackageJsonAutoImportPreference = ts.PackageJsonAutoImportPreference || (ts.PackageJsonAutoImportPreference = {})); + var LanguageServiceMode; + (function (LanguageServiceMode) { + LanguageServiceMode[LanguageServiceMode["Semantic"] = 0] = "Semantic"; + LanguageServiceMode[LanguageServiceMode["PartialSemantic"] = 1] = "PartialSemantic"; + LanguageServiceMode[LanguageServiceMode["Syntactic"] = 2] = "Syntactic"; + })(LanguageServiceMode = ts.LanguageServiceMode || (ts.LanguageServiceMode = {})); + /* @internal */ ts.emptyOptions = {}; var HighlightSpanKind; (function (HighlightSpanKind) { @@ -108176,6 +111101,7 @@ var ts; ScriptElementKindModifier["staticModifier"] = "static"; ScriptElementKindModifier["abstractModifier"] = "abstract"; ScriptElementKindModifier["optionalModifier"] = "optional"; + ScriptElementKindModifier["deprecatedModifier"] = "deprecated"; ScriptElementKindModifier["dtsModifier"] = ".d.ts"; ScriptElementKindModifier["tsModifier"] = ".ts"; ScriptElementKindModifier["tsxModifier"] = ".tsx"; @@ -108255,37 +111181,37 @@ var ts; })(SemanticMeaning = ts.SemanticMeaning || (ts.SemanticMeaning = {})); function getMeaningFromDeclaration(node) { switch (node.kind) { - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return ts.isInJSFile(node) && ts.getJSDocEnumTag(node) ? 7 /* All */ : 1 /* Value */; - case 156 /* Parameter */: - case 191 /* BindingElement */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 281 /* PropertyAssignment */: - case 282 /* ShorthandPropertyAssignment */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: - case 280 /* CatchClause */: - case 273 /* JsxAttribute */: + case 159 /* Parameter */: + case 195 /* BindingElement */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 285 /* PropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 284 /* CatchClause */: + case 277 /* JsxAttribute */: return 1 /* Value */; - case 155 /* TypeParameter */: - case 246 /* InterfaceDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 173 /* TypeLiteral */: + case 158 /* TypeParameter */: + case 250 /* InterfaceDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 176 /* TypeLiteral */: return 2 /* Type */; - case 322 /* JSDocTypedefTag */: + case 327 /* JSDocTypedefTag */: // If it has no name node, it shares the name with the value declaration below it. return node.name === undefined ? 1 /* Value */ | 2 /* Type */ : 2 /* Type */; - case 284 /* EnumMember */: - case 245 /* ClassDeclaration */: + case 288 /* EnumMember */: + case 249 /* ClassDeclaration */: return 1 /* Value */ | 2 /* Type */; - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: if (ts.isAmbientModule(node)) { return 4 /* Namespace */ | 1 /* Value */; } @@ -108295,16 +111221,16 @@ var ts; else { return 4 /* Namespace */; } - case 248 /* EnumDeclaration */: - case 257 /* NamedImports */: - case 258 /* ImportSpecifier */: - case 253 /* ImportEqualsDeclaration */: - case 254 /* ImportDeclaration */: - case 259 /* ExportAssignment */: - case 260 /* ExportDeclaration */: + case 252 /* EnumDeclaration */: + case 261 /* NamedImports */: + case 262 /* ImportSpecifier */: + case 257 /* ImportEqualsDeclaration */: + case 258 /* ImportDeclaration */: + case 263 /* ExportAssignment */: + case 264 /* ExportDeclaration */: return 7 /* All */; // An external module can be a Value - case 290 /* SourceFile */: + case 294 /* SourceFile */: return 4 /* Namespace */ | 1 /* Value */; } return 7 /* All */; @@ -108312,13 +111238,13 @@ var ts; ts.getMeaningFromDeclaration = getMeaningFromDeclaration; function getMeaningFromLocation(node) { node = getAdjustedReferenceLocation(node); - if (node.kind === 290 /* SourceFile */) { + if (node.kind === 294 /* SourceFile */) { return 1 /* Value */; } - else if (node.parent.kind === 259 /* ExportAssignment */ - || node.parent.kind === 265 /* ExternalModuleReference */ - || node.parent.kind === 258 /* ImportSpecifier */ - || node.parent.kind === 255 /* ImportClause */ + else if (node.parent.kind === 263 /* ExportAssignment */ + || node.parent.kind === 269 /* ExternalModuleReference */ + || node.parent.kind === 262 /* ImportSpecifier */ + || node.parent.kind === 259 /* ImportClause */ || ts.isImportEqualsDeclaration(node.parent) && node === node.parent.name) { return 7 /* All */; } @@ -108351,11 +111277,11 @@ var ts; // import a = |b|; // Namespace // import a = |b.c|; // Value, type, namespace // import a = |b.c|.d; // Namespace - var name = node.kind === 153 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined; - return name && name.parent.kind === 253 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */; + var name = node.kind === 156 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined; + return name && name.parent.kind === 257 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */; } function isInRightSideOfInternalImportEqualsDeclaration(node) { - while (node.parent.kind === 153 /* QualifiedName */) { + while (node.parent.kind === 156 /* QualifiedName */) { node = node.parent; } return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node; @@ -108367,27 +111293,27 @@ var ts; function isQualifiedNameNamespaceReference(node) { var root = node; var isLastClause = true; - if (root.parent.kind === 153 /* QualifiedName */) { - while (root.parent && root.parent.kind === 153 /* QualifiedName */) { + if (root.parent.kind === 156 /* QualifiedName */) { + while (root.parent && root.parent.kind === 156 /* QualifiedName */) { root = root.parent; } isLastClause = root.right === node; } - return root.parent.kind === 169 /* TypeReference */ && !isLastClause; + return root.parent.kind === 172 /* TypeReference */ && !isLastClause; } function isPropertyAccessNamespaceReference(node) { var root = node; var isLastClause = true; - if (root.parent.kind === 194 /* PropertyAccessExpression */) { - while (root.parent && root.parent.kind === 194 /* PropertyAccessExpression */) { + if (root.parent.kind === 198 /* PropertyAccessExpression */) { + while (root.parent && root.parent.kind === 198 /* PropertyAccessExpression */) { root = root.parent; } isLastClause = root.name === node; } - if (!isLastClause && root.parent.kind === 216 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 279 /* HeritageClause */) { + if (!isLastClause && root.parent.kind === 220 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 283 /* HeritageClause */) { var decl = root.parent.parent.parent; - return (decl.kind === 245 /* ClassDeclaration */ && root.parent.parent.token === 113 /* ImplementsKeyword */) || - (decl.kind === 246 /* InterfaceDeclaration */ && root.parent.parent.token === 90 /* ExtendsKeyword */); + return (decl.kind === 249 /* ClassDeclaration */ && root.parent.parent.token === 116 /* ImplementsKeyword */) || + (decl.kind === 250 /* InterfaceDeclaration */ && root.parent.parent.token === 93 /* ExtendsKeyword */); } return false; } @@ -108396,17 +111322,17 @@ var ts; node = node.parent; } switch (node.kind) { - case 104 /* ThisKeyword */: + case 107 /* ThisKeyword */: return !ts.isExpressionNode(node); - case 183 /* ThisType */: + case 186 /* ThisType */: return true; } switch (node.parent.kind) { - case 169 /* TypeReference */: + case 172 /* TypeReference */: return true; - case 188 /* ImportType */: + case 192 /* ImportType */: return !node.parent.isTypeOf; - case 216 /* ExpressionWithTypeArguments */: + case 220 /* ExpressionWithTypeArguments */: return !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent); } return false; @@ -108473,7 +111399,7 @@ var ts; ts.climbPastPropertyOrElementAccess = climbPastPropertyOrElementAccess; function getTargetLabel(referenceNode, labelName) { while (referenceNode) { - if (referenceNode.kind === 238 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) { + if (referenceNode.kind === 242 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) { return referenceNode.label; } referenceNode = referenceNode.parent; @@ -108534,22 +111460,22 @@ var ts; ts.isNameOfFunctionDeclaration = isNameOfFunctionDeclaration; function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) { switch (node.parent.kind) { - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 281 /* PropertyAssignment */: - case 284 /* EnumMember */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 249 /* ModuleDeclaration */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 285 /* PropertyAssignment */: + case 288 /* EnumMember */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 253 /* ModuleDeclaration */: return ts.getNameOfDeclaration(node.parent) === node; - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: return node.parent.argumentExpression === node; - case 154 /* ComputedPropertyName */: + case 157 /* ComputedPropertyName */: return true; - case 187 /* LiteralType */: - return node.parent.parent.kind === 185 /* IndexedAccessType */; + case 190 /* LiteralType */: + return node.parent.parent.kind === 188 /* IndexedAccessType */; default: return false; } @@ -108573,17 +111499,17 @@ var ts; return undefined; } switch (node.kind) { - case 290 /* SourceFile */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: - case 248 /* EnumDeclaration */: - case 249 /* ModuleDeclaration */: + case 294 /* SourceFile */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: + case 252 /* EnumDeclaration */: + case 253 /* ModuleDeclaration */: return node; } } @@ -108591,54 +111517,54 @@ var ts; ts.getContainerNode = getContainerNode; function getNodeKind(node) { switch (node.kind) { - case 290 /* SourceFile */: + case 294 /* SourceFile */: return ts.isExternalModule(node) ? "module" /* moduleElement */ : "script" /* scriptElement */; - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: return "module" /* moduleElement */; - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: return "class" /* classElement */; - case 246 /* InterfaceDeclaration */: return "interface" /* interfaceElement */; - case 247 /* TypeAliasDeclaration */: - case 315 /* JSDocCallbackTag */: - case 322 /* JSDocTypedefTag */: + case 250 /* InterfaceDeclaration */: return "interface" /* interfaceElement */; + case 251 /* TypeAliasDeclaration */: + case 320 /* JSDocCallbackTag */: + case 327 /* JSDocTypedefTag */: return "type" /* typeElement */; - case 248 /* EnumDeclaration */: return "enum" /* enumElement */; - case 242 /* VariableDeclaration */: + case 252 /* EnumDeclaration */: return "enum" /* enumElement */; + case 246 /* VariableDeclaration */: return getKindOfVariableDeclaration(node); - case 191 /* BindingElement */: + case 195 /* BindingElement */: return getKindOfVariableDeclaration(ts.getRootDeclaration(node)); - case 202 /* ArrowFunction */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: return "function" /* functionElement */; - case 163 /* GetAccessor */: return "getter" /* memberGetAccessorElement */; - case 164 /* SetAccessor */: return "setter" /* memberSetAccessorElement */; - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: + case 166 /* GetAccessor */: return "getter" /* memberGetAccessorElement */; + case 167 /* SetAccessor */: return "setter" /* memberSetAccessorElement */; + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: return "method" /* memberFunctionElement */; - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: var initializer = node.initializer; return ts.isFunctionLike(initializer) ? "method" /* memberFunctionElement */ : "property" /* memberVariableElement */; - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 282 /* ShorthandPropertyAssignment */: - case 283 /* SpreadAssignment */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 286 /* ShorthandPropertyAssignment */: + case 287 /* SpreadAssignment */: return "property" /* memberVariableElement */; - case 167 /* IndexSignature */: return "index" /* indexSignatureElement */; - case 166 /* ConstructSignature */: return "construct" /* constructSignatureElement */; - case 165 /* CallSignature */: return "call" /* callSignatureElement */; - case 162 /* Constructor */: return "constructor" /* constructorImplementationElement */; - case 155 /* TypeParameter */: return "type parameter" /* typeParameterElement */; - case 284 /* EnumMember */: return "enum member" /* enumMemberElement */; - case 156 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */; - case 253 /* ImportEqualsDeclaration */: - case 258 /* ImportSpecifier */: - case 263 /* ExportSpecifier */: - case 256 /* NamespaceImport */: - case 262 /* NamespaceExport */: + case 170 /* IndexSignature */: return "index" /* indexSignatureElement */; + case 169 /* ConstructSignature */: return "construct" /* constructSignatureElement */; + case 168 /* CallSignature */: return "call" /* callSignatureElement */; + case 165 /* Constructor */: return "constructor" /* constructorImplementationElement */; + case 158 /* TypeParameter */: return "type parameter" /* typeParameterElement */; + case 288 /* EnumMember */: return "enum member" /* enumMemberElement */; + case 159 /* Parameter */: return ts.hasSyntacticModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */; + case 257 /* ImportEqualsDeclaration */: + case 262 /* ImportSpecifier */: + case 267 /* ExportSpecifier */: + case 260 /* NamespaceImport */: + case 266 /* NamespaceExport */: return "alias" /* alias */; - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: var kind = ts.getAssignmentDeclarationKind(node); var right = node.right; switch (kind) { @@ -108665,9 +111591,9 @@ var ts; return "" /* unknown */; } } - case 75 /* Identifier */: + case 78 /* Identifier */: return ts.isImportClause(node.parent) ? "alias" /* alias */ : "" /* unknown */; - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: var scriptKind = getNodeKind(node.expression); // If the expression didn't come back with something (like it does for an identifiers) return scriptKind === "" /* unknown */ ? "const" /* constElement */ : scriptKind; @@ -108685,12 +111611,12 @@ var ts; ts.getNodeKind = getNodeKind; function isThis(node) { switch (node.kind) { - case 104 /* ThisKeyword */: + case 107 /* ThisKeyword */: // case SyntaxKind.ThisType: TODO: GH#9267 return true; - case 75 /* Identifier */: + case 78 /* Identifier */: // 'this' as a parameter - return ts.identifierIsThisKeyword(node) && node.parent.kind === 156 /* Parameter */; + return ts.identifierIsThisKeyword(node) && node.parent.kind === 159 /* Parameter */; default: return false; } @@ -108755,42 +111681,42 @@ var ts; return false; } switch (n.kind) { - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: - case 248 /* EnumDeclaration */: - case 193 /* ObjectLiteralExpression */: - case 189 /* ObjectBindingPattern */: - case 173 /* TypeLiteral */: - case 223 /* Block */: - case 250 /* ModuleBlock */: - case 251 /* CaseBlock */: - case 257 /* NamedImports */: - case 261 /* NamedExports */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: + case 252 /* EnumDeclaration */: + case 197 /* ObjectLiteralExpression */: + case 193 /* ObjectBindingPattern */: + case 176 /* TypeLiteral */: + case 227 /* Block */: + case 254 /* ModuleBlock */: + case 255 /* CaseBlock */: + case 261 /* NamedImports */: + case 265 /* NamedExports */: return nodeEndsWith(n, 19 /* CloseBraceToken */, sourceFile); - case 280 /* CatchClause */: + case 284 /* CatchClause */: return isCompletedNode(n.block, sourceFile); - case 197 /* NewExpression */: + case 201 /* NewExpression */: if (!n.arguments) { return true; } // falls through - case 196 /* CallExpression */: - case 200 /* ParenthesizedExpression */: - case 182 /* ParenthesizedType */: + case 200 /* CallExpression */: + case 204 /* ParenthesizedExpression */: + case 185 /* ParenthesizedType */: return nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile); - case 170 /* FunctionType */: - case 171 /* ConstructorType */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: return isCompletedNode(n.type, sourceFile); - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 166 /* ConstructSignature */: - case 165 /* CallSignature */: - case 202 /* ArrowFunction */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 169 /* ConstructSignature */: + case 168 /* CallSignature */: + case 206 /* ArrowFunction */: if (n.body) { return isCompletedNode(n.body, sourceFile); } @@ -108800,65 +111726,65 @@ var ts; // Even though type parameters can be unclosed, we can get away with // having at least a closing paren. return hasChildOfKind(n, 21 /* CloseParenToken */, sourceFile); - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: return !!n.body && isCompletedNode(n.body, sourceFile); - case 227 /* IfStatement */: + case 231 /* IfStatement */: if (n.elseStatement) { return isCompletedNode(n.elseStatement, sourceFile); } return isCompletedNode(n.thenStatement, sourceFile); - case 226 /* ExpressionStatement */: + case 230 /* ExpressionStatement */: return isCompletedNode(n.expression, sourceFile) || hasChildOfKind(n, 26 /* SemicolonToken */, sourceFile); - case 192 /* ArrayLiteralExpression */: - case 190 /* ArrayBindingPattern */: - case 195 /* ElementAccessExpression */: - case 154 /* ComputedPropertyName */: - case 175 /* TupleType */: + case 196 /* ArrayLiteralExpression */: + case 194 /* ArrayBindingPattern */: + case 199 /* ElementAccessExpression */: + case 157 /* ComputedPropertyName */: + case 178 /* TupleType */: return nodeEndsWith(n, 23 /* CloseBracketToken */, sourceFile); - case 167 /* IndexSignature */: + case 170 /* IndexSignature */: if (n.type) { return isCompletedNode(n.type, sourceFile); } return hasChildOfKind(n, 23 /* CloseBracketToken */, sourceFile); - case 277 /* CaseClause */: - case 278 /* DefaultClause */: + case 281 /* CaseClause */: + case 282 /* DefaultClause */: // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed return false; - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - case 229 /* WhileStatement */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 233 /* WhileStatement */: return isCompletedNode(n.statement, sourceFile); - case 228 /* DoStatement */: + case 232 /* DoStatement */: // rough approximation: if DoStatement has While keyword - then if node is completed is checking the presence of ')'; - return hasChildOfKind(n, 111 /* WhileKeyword */, sourceFile) + return hasChildOfKind(n, 114 /* WhileKeyword */, sourceFile) ? nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile) : isCompletedNode(n.statement, sourceFile); - case 172 /* TypeQuery */: + case 175 /* TypeQuery */: return isCompletedNode(n.exprName, sourceFile); - case 204 /* TypeOfExpression */: - case 203 /* DeleteExpression */: - case 205 /* VoidExpression */: - case 212 /* YieldExpression */: - case 213 /* SpreadElement */: + case 208 /* TypeOfExpression */: + case 207 /* DeleteExpression */: + case 209 /* VoidExpression */: + case 216 /* YieldExpression */: + case 217 /* SpreadElement */: var unaryWordExpression = n; return isCompletedNode(unaryWordExpression.expression, sourceFile); - case 198 /* TaggedTemplateExpression */: + case 202 /* TaggedTemplateExpression */: return isCompletedNode(n.template, sourceFile); - case 211 /* TemplateExpression */: + case 215 /* TemplateExpression */: var lastSpan = ts.lastOrUndefined(n.templateSpans); return isCompletedNode(lastSpan, sourceFile); - case 221 /* TemplateSpan */: + case 225 /* TemplateSpan */: return ts.nodeIsPresent(n.literal); - case 260 /* ExportDeclaration */: - case 254 /* ImportDeclaration */: + case 264 /* ExportDeclaration */: + case 258 /* ImportDeclaration */: return ts.nodeIsPresent(n.moduleSpecifier); - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: return isCompletedNode(n.operand, sourceFile); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return isCompletedNode(n.right, sourceFile); - case 210 /* ConditionalExpression */: + case 214 /* ConditionalExpression */: return isCompletedNode(n.whenFalse, sourceFile); default: return true; @@ -108918,13 +111844,13 @@ var ts; } ts.findContainingList = findContainingList; function isDefaultModifier(node) { - return node.kind === 84 /* DefaultKeyword */; + return node.kind === 87 /* DefaultKeyword */; } function isClassKeyword(node) { - return node.kind === 80 /* ClassKeyword */; + return node.kind === 83 /* ClassKeyword */; } function isFunctionKeyword(node) { - return node.kind === 94 /* FunctionKeyword */; + return node.kind === 97 /* FunctionKeyword */; } function getAdjustedLocationForClass(node) { if (ts.isNamedDeclaration(node)) { @@ -108965,11 +111891,11 @@ var ts; function getAdjustedLocationForDeclaration(node, forRename) { if (!forRename) { switch (node.kind) { - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: return getAdjustedLocationForClass(node); - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: return getAdjustedLocationForFunction(node); } } @@ -109059,30 +111985,30 @@ var ts; // // NOTE: If the node is a modifier, we don't adjust its location if it is the `default` modifier as that is handled // specially by `getSymbolAtLocation`. - if (ts.isModifier(node) && (forRename || node.kind !== 84 /* DefaultKeyword */) ? ts.contains(parent.modifiers, node) : - node.kind === 80 /* ClassKeyword */ ? ts.isClassDeclaration(parent) || ts.isClassExpression(node) : - node.kind === 94 /* FunctionKeyword */ ? ts.isFunctionDeclaration(parent) || ts.isFunctionExpression(node) : - node.kind === 114 /* InterfaceKeyword */ ? ts.isInterfaceDeclaration(parent) : - node.kind === 88 /* EnumKeyword */ ? ts.isEnumDeclaration(parent) : - node.kind === 145 /* TypeKeyword */ ? ts.isTypeAliasDeclaration(parent) : - node.kind === 136 /* NamespaceKeyword */ || node.kind === 135 /* ModuleKeyword */ ? ts.isModuleDeclaration(parent) : - node.kind === 96 /* ImportKeyword */ ? ts.isImportEqualsDeclaration(parent) : - node.kind === 131 /* GetKeyword */ ? ts.isGetAccessorDeclaration(parent) : - node.kind === 142 /* SetKeyword */ && ts.isSetAccessorDeclaration(parent)) { + if (ts.isModifier(node) && (forRename || node.kind !== 87 /* DefaultKeyword */) ? ts.contains(parent.modifiers, node) : + node.kind === 83 /* ClassKeyword */ ? ts.isClassDeclaration(parent) || ts.isClassExpression(node) : + node.kind === 97 /* FunctionKeyword */ ? ts.isFunctionDeclaration(parent) || ts.isFunctionExpression(node) : + node.kind === 117 /* InterfaceKeyword */ ? ts.isInterfaceDeclaration(parent) : + node.kind === 91 /* EnumKeyword */ ? ts.isEnumDeclaration(parent) : + node.kind === 148 /* TypeKeyword */ ? ts.isTypeAliasDeclaration(parent) : + node.kind === 139 /* NamespaceKeyword */ || node.kind === 138 /* ModuleKeyword */ ? ts.isModuleDeclaration(parent) : + node.kind === 99 /* ImportKeyword */ ? ts.isImportEqualsDeclaration(parent) : + node.kind === 134 /* GetKeyword */ ? ts.isGetAccessorDeclaration(parent) : + node.kind === 145 /* SetKeyword */ && ts.isSetAccessorDeclaration(parent)) { var location = getAdjustedLocationForDeclaration(parent, forRename); if (location) { return location; } } // /**/ [|name|] ... - if ((node.kind === 109 /* VarKeyword */ || node.kind === 81 /* ConstKeyword */ || node.kind === 115 /* LetKeyword */) && + if ((node.kind === 112 /* VarKeyword */ || node.kind === 84 /* ConstKeyword */ || node.kind === 118 /* LetKeyword */) && ts.isVariableDeclarationList(parent) && parent.declarations.length === 1) { var decl = parent.declarations[0]; if (ts.isIdentifier(decl.name)) { return decl.name; } } - if (node.kind === 145 /* TypeKeyword */) { + if (node.kind === 148 /* TypeKeyword */) { // import /**/type [|name|] from ...; // import /**/type { [|name|] } from ...; // import /**/type { propertyName as [|name|] } from ...; @@ -109108,7 +112034,7 @@ var ts; // import * /**/as [|name|] ... // export { propertyName /**/as [|name|] } ... // export * /**/as [|name|] ... - if (node.kind === 123 /* AsKeyword */) { + if (node.kind === 126 /* AsKeyword */) { if (ts.isImportSpecifier(parent) && parent.propertyName || ts.isExportSpecifier(parent) && parent.propertyName || ts.isNamespaceImport(parent) || @@ -109124,13 +112050,13 @@ var ts; // /**/import { propertyName as [|name|] } from ...; // /**/import ... from "[|module|]"; // /**/import "[|module|]"; - if (node.kind === 96 /* ImportKeyword */ && ts.isImportDeclaration(parent)) { + if (node.kind === 99 /* ImportKeyword */ && ts.isImportDeclaration(parent)) { var location = getAdjustedLocationForImportDeclaration(parent, forRename); if (location) { return location; } } - if (node.kind === 89 /* ExportKeyword */) { + if (node.kind === 92 /* ExportKeyword */) { // /**/export { [|name|] } ...; // /**/export { propertyName as [|name|] } ...; // /**/export * from "[|module|]"; @@ -109149,12 +112075,12 @@ var ts; } } // import name = /**/require("[|module|]"); - if (node.kind === 139 /* RequireKeyword */ && ts.isExternalModuleReference(parent)) { + if (node.kind === 142 /* RequireKeyword */ && ts.isExternalModuleReference(parent)) { return parent.expression; } // import ... /**/from "[|module|]"; // export ... /**/from "[|module|]"; - if (node.kind === 149 /* FromKeyword */ && (ts.isImportDeclaration(parent) || ts.isExportDeclaration(parent)) && parent.moduleSpecifier) { + if (node.kind === 152 /* FromKeyword */ && (ts.isImportDeclaration(parent) || ts.isExportDeclaration(parent)) && parent.moduleSpecifier) { return parent.moduleSpecifier; } // class ... /**/extends [|name|] ... @@ -109162,13 +112088,13 @@ var ts; // class ... /**/implements name1, name2 ... // interface ... /**/extends [|name|] ... // interface ... /**/extends name1, name2 ... - if ((node.kind === 90 /* ExtendsKeyword */ || node.kind === 113 /* ImplementsKeyword */) && ts.isHeritageClause(parent) && parent.token === node.kind) { + if ((node.kind === 93 /* ExtendsKeyword */ || node.kind === 116 /* ImplementsKeyword */) && ts.isHeritageClause(parent) && parent.token === node.kind) { var location = getAdjustedLocationForHeritageClause(parent); if (location) { return location; } } - if (node.kind === 90 /* ExtendsKeyword */) { + if (node.kind === 93 /* ExtendsKeyword */) { // ... ... if (ts.isTypeParameterDeclaration(parent) && parent.constraint && ts.isTypeReferenceNode(parent.constraint)) { return parent.constraint.typeName; @@ -109179,20 +112105,20 @@ var ts; } } // ... T extends /**/infer [|U|] ? ... - if (node.kind === 132 /* InferKeyword */ && ts.isInferTypeNode(parent)) { + if (node.kind === 135 /* InferKeyword */ && ts.isInferTypeNode(parent)) { return parent.typeParameter.name; } // { [ [|K|] /**/in keyof T]: ... } - if (node.kind === 97 /* InKeyword */ && ts.isTypeParameterDeclaration(parent) && ts.isMappedTypeNode(parent.parent)) { + if (node.kind === 100 /* InKeyword */ && ts.isTypeParameterDeclaration(parent) && ts.isMappedTypeNode(parent.parent)) { return parent.name; } // /**/keyof [|T|] - if (node.kind === 134 /* KeyOfKeyword */ && ts.isTypeOperatorNode(parent) && parent.operator === 134 /* KeyOfKeyword */ && + if (node.kind === 137 /* KeyOfKeyword */ && ts.isTypeOperatorNode(parent) && parent.operator === 137 /* KeyOfKeyword */ && ts.isTypeReferenceNode(parent.type)) { return parent.type.typeName; } // /**/readonly [|name|][] - if (node.kind === 138 /* ReadonlyKeyword */ && ts.isTypeOperatorNode(parent) && parent.operator === 138 /* ReadonlyKeyword */ && + if (node.kind === 141 /* ReadonlyKeyword */ && ts.isTypeOperatorNode(parent) && parent.operator === 141 /* ReadonlyKeyword */ && ts.isArrayTypeNode(parent.type) && ts.isTypeReferenceNode(parent.type.elementType)) { return parent.type.elementType.typeName; } @@ -109207,29 +112133,29 @@ var ts; // /**/yield [|name|] // /**/yield obj.[|name|] // /**/delete obj.[|name|] - if (node.kind === 99 /* NewKeyword */ && ts.isNewExpression(parent) || - node.kind === 110 /* VoidKeyword */ && ts.isVoidExpression(parent) || - node.kind === 108 /* TypeOfKeyword */ && ts.isTypeOfExpression(parent) || - node.kind === 127 /* AwaitKeyword */ && ts.isAwaitExpression(parent) || - node.kind === 121 /* YieldKeyword */ && ts.isYieldExpression(parent) || - node.kind === 85 /* DeleteKeyword */ && ts.isDeleteExpression(parent)) { + if (node.kind === 102 /* NewKeyword */ && ts.isNewExpression(parent) || + node.kind === 113 /* VoidKeyword */ && ts.isVoidExpression(parent) || + node.kind === 111 /* TypeOfKeyword */ && ts.isTypeOfExpression(parent) || + node.kind === 130 /* AwaitKeyword */ && ts.isAwaitExpression(parent) || + node.kind === 124 /* YieldKeyword */ && ts.isYieldExpression(parent) || + node.kind === 88 /* DeleteKeyword */ && ts.isDeleteExpression(parent)) { if (parent.expression) { return ts.skipOuterExpressions(parent.expression); } } // left /**/in [|name|] // left /**/instanceof [|name|] - if ((node.kind === 97 /* InKeyword */ || node.kind === 98 /* InstanceOfKeyword */) && ts.isBinaryExpression(parent) && parent.operatorToken === node) { + if ((node.kind === 100 /* InKeyword */ || node.kind === 101 /* InstanceOfKeyword */) && ts.isBinaryExpression(parent) && parent.operatorToken === node) { return ts.skipOuterExpressions(parent.right); } // left /**/as [|name|] - if (node.kind === 123 /* AsKeyword */ && ts.isAsExpression(parent) && ts.isTypeReferenceNode(parent.type)) { + if (node.kind === 126 /* AsKeyword */ && ts.isAsExpression(parent) && ts.isTypeReferenceNode(parent.type)) { return parent.type.typeName; } // for (... /**/in [|name|]) // for (... /**/of [|name|]) - if (node.kind === 97 /* InKeyword */ && ts.isForInStatement(parent) || - node.kind === 152 /* OfKeyword */ && ts.isForOfStatement(parent)) { + if (node.kind === 100 /* InKeyword */ && ts.isForInStatement(parent) || + node.kind === 155 /* OfKeyword */ && ts.isForOfStatement(parent)) { return ts.skipOuterExpressions(parent.expression); } } @@ -109370,7 +112296,7 @@ var ts; } } } - ts.Debug.assert(startNode !== undefined || n.kind === 290 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n)); + ts.Debug.assert(startNode !== undefined || n.kind === 294 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n)); // Here we know that none of child token nodes embrace the position, // the only known case is when position is at the end of the file. // Try to find the rightmost token in the file without filtering. @@ -109440,17 +112366,17 @@ var ts; return true; } //
{ |
or
- if (token.kind === 29 /* LessThanToken */ && token.parent.kind === 276 /* JsxExpression */) { + if (token.kind === 29 /* LessThanToken */ && token.parent.kind === 280 /* JsxExpression */) { return true; } //
{ // | // } < /div> - if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 276 /* JsxExpression */) { + if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 280 /* JsxExpression */) { return true; } //
|
- if (token.kind === 29 /* LessThanToken */ && token.parent.kind === 269 /* JsxClosingElement */) { + if (token.kind === 29 /* LessThanToken */ && token.parent.kind === 273 /* JsxClosingElement */) { return true; } return false; @@ -109478,6 +112404,33 @@ var ts; return false; } ts.isInJSXText = isInJSXText; + function isInsideJsxElement(sourceFile, position) { + function isInsideJsxElementTraversal(node) { + while (node) { + if (node.kind >= 271 /* JsxSelfClosingElement */ && node.kind <= 280 /* JsxExpression */ + || node.kind === 11 /* JsxText */ + || node.kind === 29 /* LessThanToken */ + || node.kind === 31 /* GreaterThanToken */ + || node.kind === 78 /* Identifier */ + || node.kind === 19 /* CloseBraceToken */ + || node.kind === 18 /* OpenBraceToken */ + || node.kind === 43 /* SlashToken */) { + node = node.parent; + } + else if (node.kind === 270 /* JsxElement */) { + if (position > node.getStart(sourceFile)) + return true; + node = node.parent; + } + else { + return false; + } + } + return false; + } + return isInsideJsxElementTraversal(getTokenAtPosition(sourceFile, position)); + } + ts.isInsideJsxElement = isInsideJsxElement; function findPrecedingMatchingToken(token, matchingTokenKind, sourceFile) { var tokenKind = token.kind; var remainingMatchingTokens = 0; @@ -109582,16 +112535,16 @@ var ts; break; case 38 /* EqualsGreaterThanToken */: // falls through - case 75 /* Identifier */: + case 78 /* Identifier */: case 10 /* StringLiteral */: case 8 /* NumericLiteral */: case 9 /* BigIntLiteral */: - case 106 /* TrueKeyword */: - case 91 /* FalseKeyword */: + case 109 /* TrueKeyword */: + case 94 /* FalseKeyword */: // falls through - case 108 /* TypeOfKeyword */: - case 90 /* ExtendsKeyword */: - case 134 /* KeyOfKeyword */: + case 111 /* TypeOfKeyword */: + case 93 /* ExtendsKeyword */: + case 137 /* KeyOfKeyword */: case 24 /* DotToken */: case 51 /* BarToken */: case 57 /* QuestionToken */: @@ -109630,7 +112583,7 @@ var ts; return n.kind === 1 /* EndOfFileToken */ ? !!n.jsDoc : n.getWidth(sourceFile) !== 0; } function getNodeModifiers(node) { - var flags = ts.isDeclaration(node) ? ts.getCombinedModifierFlags(node) : 0 /* None */; + var flags = ts.isDeclaration(node) ? ts.getCombinedNodeFlagsAlwaysIncludeJSDoc(node) : 0 /* None */; var result = []; if (flags & 8 /* Private */) result.push("private" /* privateMemberModifier */); @@ -109644,18 +112597,20 @@ var ts; result.push("abstract" /* abstractModifier */); if (flags & 1 /* Export */) result.push("export" /* exportedModifier */); + if (flags & 8192 /* Deprecated */) + result.push("deprecated" /* deprecatedModifier */); if (node.flags & 8388608 /* Ambient */) result.push("declare" /* ambientModifier */); - if (node.kind === 259 /* ExportAssignment */) + if (node.kind === 263 /* ExportAssignment */) result.push("export" /* exportedModifier */); return result.length > 0 ? result.join(",") : "" /* none */; } ts.getNodeModifiers = getNodeModifiers; function getTypeArgumentOrTypeParameterList(node) { - if (node.kind === 169 /* TypeReference */ || node.kind === 196 /* CallExpression */) { + if (node.kind === 172 /* TypeReference */ || node.kind === 200 /* CallExpression */) { return node.typeArguments; } - if (ts.isFunctionLike(node) || node.kind === 245 /* ClassDeclaration */ || node.kind === 246 /* InterfaceDeclaration */) { + if (ts.isFunctionLike(node) || node.kind === 249 /* ClassDeclaration */ || node.kind === 250 /* InterfaceDeclaration */) { return node.typeParameters; } return undefined; @@ -109675,7 +112630,7 @@ var ts; } ts.isStringOrRegularExpressionOrTemplateLiteral = isStringOrRegularExpressionOrTemplateLiteral; function isPunctuation(kind) { - return 18 /* FirstPunctuation */ <= kind && kind <= 74 /* LastPunctuation */; + return 18 /* FirstPunctuation */ <= kind && kind <= 77 /* LastPunctuation */; } ts.isPunctuation = isPunctuation; function isInsideTemplateLiteral(node, position, sourceFile) { @@ -109685,9 +112640,9 @@ var ts; ts.isInsideTemplateLiteral = isInsideTemplateLiteral; function isAccessibilityModifier(kind) { switch (kind) { - case 119 /* PublicKeyword */: - case 117 /* PrivateKeyword */: - case 118 /* ProtectedKeyword */: + case 122 /* PublicKeyword */: + case 120 /* PrivateKeyword */: + case 121 /* ProtectedKeyword */: return true; } return false; @@ -109700,18 +112655,18 @@ var ts; } ts.cloneCompilerOptions = cloneCompilerOptions; function isArrayLiteralOrObjectLiteralDestructuringPattern(node) { - if (node.kind === 192 /* ArrayLiteralExpression */ || - node.kind === 193 /* ObjectLiteralExpression */) { + if (node.kind === 196 /* ArrayLiteralExpression */ || + node.kind === 197 /* ObjectLiteralExpression */) { // [a,b,c] from: // [a, b, c] = someExpression; - if (node.parent.kind === 209 /* BinaryExpression */ && + if (node.parent.kind === 213 /* BinaryExpression */ && node.parent.left === node && node.parent.operatorToken.kind === 62 /* EqualsToken */) { return true; } // [a, b, c] from: // for([a, b, c] of expression) - if (node.parent.kind === 232 /* ForOfStatement */ && + if (node.parent.kind === 236 /* ForOfStatement */ && node.parent.initializer === node) { return true; } @@ -109719,7 +112674,7 @@ var ts; // [x, [a, b, c] ] = someExpression // or // {x, a: {a, b, c} } = someExpression - if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 281 /* PropertyAssignment */ ? node.parent.parent : node.parent)) { + if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 285 /* PropertyAssignment */ ? node.parent.parent : node.parent)) { return true; } } @@ -109781,31 +112736,31 @@ var ts; } ts.createTextChange = createTextChange; ts.typeKeywords = [ - 125 /* AnyKeyword */, - 124 /* AssertsKeyword */, - 151 /* BigIntKeyword */, - 128 /* BooleanKeyword */, - 91 /* FalseKeyword */, - 134 /* KeyOfKeyword */, - 137 /* NeverKeyword */, - 100 /* NullKeyword */, - 140 /* NumberKeyword */, - 141 /* ObjectKeyword */, - 138 /* ReadonlyKeyword */, - 143 /* StringKeyword */, - 144 /* SymbolKeyword */, - 106 /* TrueKeyword */, - 110 /* VoidKeyword */, - 146 /* UndefinedKeyword */, - 147 /* UniqueKeyword */, - 148 /* UnknownKeyword */, + 128 /* AnyKeyword */, + 127 /* AssertsKeyword */, + 154 /* BigIntKeyword */, + 131 /* BooleanKeyword */, + 94 /* FalseKeyword */, + 137 /* KeyOfKeyword */, + 140 /* NeverKeyword */, + 103 /* NullKeyword */, + 143 /* NumberKeyword */, + 144 /* ObjectKeyword */, + 141 /* ReadonlyKeyword */, + 146 /* StringKeyword */, + 147 /* SymbolKeyword */, + 109 /* TrueKeyword */, + 113 /* VoidKeyword */, + 149 /* UndefinedKeyword */, + 150 /* UniqueKeyword */, + 151 /* UnknownKeyword */, ]; function isTypeKeyword(kind) { return ts.contains(ts.typeKeywords, kind); } ts.isTypeKeyword = isTypeKeyword; function isTypeKeywordToken(node) { - return node.kind === 145 /* TypeKeyword */; + return node.kind === 148 /* TypeKeyword */; } ts.isTypeKeywordToken = isTypeKeywordToken; /** True if the symbol is for an external module, as opposed to a namespace. */ @@ -109838,7 +112793,7 @@ var ts; } ts.skipConstraint = skipConstraint; function getNameFromPropertyName(name) { - return name.kind === 154 /* ComputedPropertyName */ + return name.kind === 157 /* ComputedPropertyName */ // treat computed property names where expression is string/numeric literal as just string/numeric literal ? ts.isStringOrNumericLiteralLike(name.expression) ? name.expression.text : undefined : ts.isPrivateIdentifier(name) ? ts.idText(name) : ts.getTextOfIdentifierOrLiteral(name); @@ -109864,7 +112819,7 @@ var ts; getCurrentDirectory: function () { return host.getCurrentDirectory(); }, readFile: ts.maybeBind(host, host.readFile), useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames), - getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks) || (function () { return program.getProbableSymlinks(); }), + getSymlinkCache: ts.maybeBind(host, host.getSymlinkCache) || program.getSymlinkCache, getGlobalTypingsCacheLocation: ts.maybeBind(host, host.getGlobalTypingsCacheLocation), getSourceFiles: function () { return program.getSourceFiles(); }, redirectTargetsMap: program.redirectTargetsMap, @@ -109882,15 +112837,15 @@ var ts; } ts.makeImportIfNecessary = makeImportIfNecessary; function makeImport(defaultImport, namedImports, moduleSpecifier, quotePreference, isTypeOnly) { - return ts.createImportDeclaration( + return ts.factory.createImportDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, defaultImport || namedImports - ? ts.createImportClause(defaultImport, namedImports && namedImports.length ? ts.createNamedImports(namedImports) : undefined, isTypeOnly) + ? ts.factory.createImportClause(!!isTypeOnly, defaultImport, namedImports && namedImports.length ? ts.factory.createNamedImports(namedImports) : undefined) : undefined, typeof moduleSpecifier === "string" ? makeStringLiteral(moduleSpecifier, quotePreference) : moduleSpecifier); } ts.makeImport = makeImport; function makeStringLiteral(text, quotePreference) { - return ts.createLiteral(text, quotePreference === 0 /* Single */); + return ts.factory.createStringLiteral(text, quotePreference === 0 /* Single */); } ts.makeStringLiteral = makeStringLiteral; var QuotePreference; @@ -109931,7 +112886,7 @@ var ts; } return ts.firstDefined(symbol.declarations, function (decl) { var name = ts.getNameOfDeclaration(decl); - return name && name.kind === 75 /* Identifier */ ? name.escapedText : undefined; + return name && name.kind === 78 /* Identifier */ ? name.escapedText : undefined; }); } ts.symbolEscapedNameNoDefault = symbolEscapedNameNoDefault; @@ -109956,7 +112911,7 @@ var ts; * The value of previousIterationSymbol is undefined when the function is first called. */ function getPropertySymbolsFromBaseTypes(symbol, propertyName, checker, cb) { - var seen = ts.createMap(); + var seen = new ts.Map(); return recur(symbol); function recur(symbol) { // Use `addToSeen` to ensure we don't infinitely recurse in this situation: @@ -109999,21 +112954,33 @@ var ts; ts.findModifier = findModifier; function insertImports(changes, sourceFile, imports, blankLineBetween) { var decl = ts.isArray(imports) ? imports[0] : imports; - var importKindPredicate = decl.kind === 225 /* VariableStatement */ ? ts.isRequireVariableDeclarationStatement : ts.isAnyImportSyntax; - var lastImportDeclaration = ts.findLast(sourceFile.statements, function (statement) { return importKindPredicate(statement); }); - if (lastImportDeclaration) { - if (ts.isArray(imports)) { - changes.insertNodesAfter(sourceFile, lastImportDeclaration, imports); - } - else { - changes.insertNodeAfter(sourceFile, lastImportDeclaration, imports); - } + var importKindPredicate = decl.kind === 229 /* VariableStatement */ ? ts.isRequireVariableStatement : ts.isAnyImportSyntax; + var existingImportStatements = ts.filter(sourceFile.statements, importKindPredicate); + var sortedNewImports = ts.isArray(imports) ? ts.stableSort(imports, ts.OrganizeImports.compareImportsOrRequireStatements) : [imports]; + if (!existingImportStatements.length) { + changes.insertNodesAtTopOfFile(sourceFile, sortedNewImports, blankLineBetween); } - else if (ts.isArray(imports)) { - changes.insertNodesAtTopOfFile(sourceFile, imports, blankLineBetween); + else if (existingImportStatements && ts.OrganizeImports.importsAreSorted(existingImportStatements)) { + for (var _i = 0, sortedNewImports_1 = sortedNewImports; _i < sortedNewImports_1.length; _i++) { + var newImport = sortedNewImports_1[_i]; + var insertionIndex = ts.OrganizeImports.getImportDeclarationInsertionIndex(existingImportStatements, newImport); + if (insertionIndex === 0) { + changes.insertNodeBefore(sourceFile, existingImportStatements[0], newImport, /*blankLineBetween*/ false); + } + else { + var prevImport = existingImportStatements[insertionIndex - 1]; + changes.insertNodeAfter(sourceFile, prevImport, newImport); + } + } } else { - changes.insertNodeAtTopOfFile(sourceFile, imports, blankLineBetween); + var lastExistingImport = ts.lastOrUndefined(existingImportStatements); + if (lastExistingImport) { + changes.insertNodesAfter(sourceFile, lastExistingImport, sortedNewImports); + } + else { + changes.insertNodesAtTopOfFile(sourceFile, sortedNewImports, blankLineBetween); + } } } ts.insertImports = insertImports; @@ -110049,11 +113016,20 @@ var ts; return undefined; } ts.forEachUnique = forEachUnique; + function isTextWhiteSpaceLike(text, startPos, endPos) { + for (var i = startPos; i < endPos; i++) { + if (!ts.isWhiteSpaceLike(text.charCodeAt(i))) { + return false; + } + } + return true; + } + ts.isTextWhiteSpaceLike = isTextWhiteSpaceLike; // #endregion // Display-part writer helpers // #region function isFirstDeclarationOfSymbolParameter(symbol) { - return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 156 /* Parameter */; + return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 159 /* Parameter */; } ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter; var displayPartWriter = getDisplayPartWriter(); @@ -110277,19 +113253,10 @@ var ts; return !!location.parent && ts.isImportOrExportSpecifier(location.parent) && location.parent.propertyName === location; } ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName; - function scriptKindIs(fileName, host) { - var scriptKinds = []; - for (var _i = 2; _i < arguments.length; _i++) { - scriptKinds[_i - 2] = arguments[_i]; - } - var scriptKind = getScriptKind(fileName, host); - return ts.some(scriptKinds, function (k) { return k === scriptKind; }); - } - ts.scriptKindIs = scriptKindIs; function getScriptKind(fileName, host) { // First check to see if the script kind was specified by the host. Chances are the host // may override the default script kind for the file extension. - return ts.ensureScriptKind(fileName, host && host.getScriptKind && host.getScriptKind(fileName)); + return ts.ensureScriptKind(fileName, host.getScriptKind && host.getScriptKind(fileName)); } ts.getScriptKind = getScriptKind; function getSymbolTarget(symbol, checker) { @@ -110350,14 +113317,14 @@ var ts; var symbol = checker.getSymbolAtLocation(node.name); var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol))); if (renameInfo && renameInfo.text !== (node.name || node.propertyName).getText()) { - clone = ts.setOriginalNode(ts.createBindingElement(node.dotDotDotToken, node.propertyName || node.name, renameInfo, node.initializer), node); + clone = ts.setOriginalNode(ts.factory.createBindingElement(node.dotDotDotToken, node.propertyName || node.name, renameInfo, node.initializer), node); } } else if (renameMap && checker && ts.isIdentifier(node)) { var symbol = checker.getSymbolAtLocation(node); var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol))); if (renameInfo) { - clone = ts.setOriginalNode(ts.createIdentifier(renameInfo.text), node); + clone = ts.setOriginalNode(ts.factory.createIdentifier(renameInfo.text), node); } } if (!clone) { @@ -110376,13 +113343,9 @@ var ts; ts.visitEachChild(node, getSynthesizedDeepClone, ts.nullTransformationContext); if (visited === node) { // This only happens for leaf nodes - internal nodes always see their children change. - var clone_1 = ts.getSynthesizedClone(node); - if (ts.isStringLiteral(clone_1)) { - clone_1.textSourceNode = node; - } - else if (ts.isNumericLiteral(clone_1)) { - clone_1.numericLiteralFlags = node.numericLiteralFlags; - } + var clone_1 = ts.isStringLiteral(node) ? ts.setOriginalNode(ts.factory.createStringLiteralFromNode(node), node) : + ts.isNumericLiteral(node) ? ts.setOriginalNode(ts.factory.createNumericLiteral(node.text, node.numericLiteralFlags), node) : + ts.factory.cloneNode(node); return ts.setTextRange(clone_1, node); } // PERF: As an optimization, rather than calling getSynthesizedClone, we'll update @@ -110396,7 +113359,7 @@ var ts; } function getSynthesizedDeepClones(nodes, includeTrivia) { if (includeTrivia === void 0) { includeTrivia = true; } - return nodes && ts.createNodeArray(nodes.map(function (n) { return getSynthesizedDeepClone(n, includeTrivia); }), nodes.hasTrailingComma); + return nodes && ts.factory.createNodeArray(nodes.map(function (n) { return getSynthesizedDeepClone(n, includeTrivia); }), nodes.hasTrailingComma); } ts.getSynthesizedDeepClones = getSynthesizedDeepClones; /** @@ -110543,15 +113506,15 @@ var ts; function getContextualTypeFromParent(node, checker) { var parent = node.parent; switch (parent.kind) { - case 197 /* NewExpression */: + case 201 /* NewExpression */: return checker.getContextualType(parent); - case 209 /* BinaryExpression */: { + case 213 /* BinaryExpression */: { var _a = parent, left = _a.left, operatorToken = _a.operatorToken, right = _a.right; return isEqualityOperatorKind(operatorToken.kind) ? checker.getTypeAtLocation(node === right ? left : right) : checker.getContextualType(node); } - case 277 /* CaseClause */: + case 281 /* CaseClause */: return parent.expression === node ? getSwitchedType(parent, checker) : undefined; default: return checker.getContextualType(node); @@ -110590,8 +113553,8 @@ var ts; switch (node.kind) { case 10 /* StringLiteral */: case 14 /* NoSubstitutionTemplateLiteral */: - case 211 /* TemplateExpression */: - case 198 /* TaggedTemplateExpression */: + case 215 /* TemplateExpression */: + case 202 /* TaggedTemplateExpression */: return true; default: return false; @@ -110624,41 +113587,41 @@ var ts; } ts.getTypeNodeIfAccessible = getTypeNodeIfAccessible; function syntaxRequiresTrailingCommaOrSemicolonOrASI(kind) { - return kind === 165 /* CallSignature */ - || kind === 166 /* ConstructSignature */ - || kind === 167 /* IndexSignature */ - || kind === 158 /* PropertySignature */ - || kind === 160 /* MethodSignature */; + return kind === 168 /* CallSignature */ + || kind === 169 /* ConstructSignature */ + || kind === 170 /* IndexSignature */ + || kind === 161 /* PropertySignature */ + || kind === 163 /* MethodSignature */; } ts.syntaxRequiresTrailingCommaOrSemicolonOrASI = syntaxRequiresTrailingCommaOrSemicolonOrASI; function syntaxRequiresTrailingFunctionBlockOrSemicolonOrASI(kind) { - return kind === 244 /* FunctionDeclaration */ - || kind === 162 /* Constructor */ - || kind === 161 /* MethodDeclaration */ - || kind === 163 /* GetAccessor */ - || kind === 164 /* SetAccessor */; + return kind === 248 /* FunctionDeclaration */ + || kind === 165 /* Constructor */ + || kind === 164 /* MethodDeclaration */ + || kind === 166 /* GetAccessor */ + || kind === 167 /* SetAccessor */; } ts.syntaxRequiresTrailingFunctionBlockOrSemicolonOrASI = syntaxRequiresTrailingFunctionBlockOrSemicolonOrASI; function syntaxRequiresTrailingModuleBlockOrSemicolonOrASI(kind) { - return kind === 249 /* ModuleDeclaration */; + return kind === 253 /* ModuleDeclaration */; } ts.syntaxRequiresTrailingModuleBlockOrSemicolonOrASI = syntaxRequiresTrailingModuleBlockOrSemicolonOrASI; function syntaxRequiresTrailingSemicolonOrASI(kind) { - return kind === 225 /* VariableStatement */ - || kind === 226 /* ExpressionStatement */ - || kind === 228 /* DoStatement */ - || kind === 233 /* ContinueStatement */ - || kind === 234 /* BreakStatement */ - || kind === 235 /* ReturnStatement */ - || kind === 239 /* ThrowStatement */ - || kind === 241 /* DebuggerStatement */ - || kind === 159 /* PropertyDeclaration */ - || kind === 247 /* TypeAliasDeclaration */ - || kind === 254 /* ImportDeclaration */ - || kind === 253 /* ImportEqualsDeclaration */ - || kind === 260 /* ExportDeclaration */ - || kind === 252 /* NamespaceExportDeclaration */ - || kind === 259 /* ExportAssignment */; + return kind === 229 /* VariableStatement */ + || kind === 230 /* ExpressionStatement */ + || kind === 232 /* DoStatement */ + || kind === 237 /* ContinueStatement */ + || kind === 238 /* BreakStatement */ + || kind === 239 /* ReturnStatement */ + || kind === 243 /* ThrowStatement */ + || kind === 245 /* DebuggerStatement */ + || kind === 162 /* PropertyDeclaration */ + || kind === 251 /* TypeAliasDeclaration */ + || kind === 258 /* ImportDeclaration */ + || kind === 257 /* ImportEqualsDeclaration */ + || kind === 264 /* ExportDeclaration */ + || kind === 256 /* NamespaceExportDeclaration */ + || kind === 263 /* ExportAssignment */; } ts.syntaxRequiresTrailingSemicolonOrASI = syntaxRequiresTrailingSemicolonOrASI; ts.syntaxMayBeASICandidate = ts.or(syntaxRequiresTrailingCommaOrSemicolonOrASI, syntaxRequiresTrailingFunctionBlockOrSemicolonOrASI, syntaxRequiresTrailingModuleBlockOrSemicolonOrASI, syntaxRequiresTrailingSemicolonOrASI); @@ -110688,7 +113651,7 @@ var ts; return false; } // See comment in parser’s `parseDoStatement` - if (node.kind === 228 /* DoStatement */) { + if (node.kind === 232 /* DoStatement */) { return true; } var topNode = ts.findAncestor(node, function (ancestor) { return !ancestor.parent; }); @@ -110820,24 +113783,22 @@ var ts; return undefined; } var dependencyKeys = ["dependencies", "devDependencies", "optionalDependencies", "peerDependencies"]; - var stringContent = host.readFile(fileName); - if (!stringContent) - return undefined; + var stringContent = host.readFile(fileName) || ""; var content = tryParseJson(stringContent); - if (!content) - return false; var info = {}; - for (var _i = 0, dependencyKeys_1 = dependencyKeys; _i < dependencyKeys_1.length; _i++) { - var key = dependencyKeys_1[_i]; - var dependencies = content[key]; - if (!dependencies) { - continue; + if (content) { + for (var _i = 0, dependencyKeys_1 = dependencyKeys; _i < dependencyKeys_1.length; _i++) { + var key = dependencyKeys_1[_i]; + var dependencies = content[key]; + if (!dependencies) { + continue; + } + var dependencyMap = new ts.Map(); + for (var packageName in dependencies) { + dependencyMap.set(packageName, dependencies[packageName]); + } + info[key] = dependencyMap; } - var dependencyMap = ts.createMap(); - for (var packageName in dependencies) { - dependencyMap.set(packageName, dependencies[packageName]); - } - info[key] = dependencyMap; } var dependencyGroups = [ [1 /* Dependencies */, info.dependencies], @@ -110845,7 +113806,7 @@ var ts; [8 /* OptionalDependencies */, info.optionalDependencies], [4 /* PeerDependencies */, info.peerDependencies], ]; - return __assign(__assign({}, info), { fileName: fileName, + return __assign(__assign({}, info), { parseable: !!content, fileName: fileName, get: get, has: function (dependencyName, inGroups) { return !!get(dependencyName, inGroups); @@ -110943,11 +113904,21 @@ var ts; if (symbol.escapedName === "export=" /* ExportEquals */ || symbol.escapedName === "default" /* Default */) { // Name of "export default foo;" is "foo". Name of "export default 0" is the filename converted to camelCase. return ts.firstDefined(symbol.declarations, function (d) { return ts.isExportAssignment(d) && ts.isIdentifier(d.expression) ? d.expression.text : undefined; }) - || ts.codefix.moduleSymbolToValidIdentifier(ts.Debug.checkDefined(symbol.parent), scriptTarget); + || ts.codefix.moduleSymbolToValidIdentifier(getSymbolParentOrFail(symbol), scriptTarget); } return symbol.name; } ts.getNameForExportedSymbol = getNameForExportedSymbol; + function getSymbolParentOrFail(symbol) { + var _a; + return ts.Debug.checkDefined(symbol.parent, "Symbol parent was undefined. Flags: " + ts.Debug.formatSymbolFlags(symbol.flags) + ". " + + ("Declarations: " + ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.map(function (d) { + var kind = ts.Debug.formatSyntaxKind(d.kind); + var inJS = ts.isInJSFile(d); + var expression = d.expression; + return (inJS ? "[JS]" : "") + kind + (expression ? " (expression: " + ts.Debug.formatSyntaxKind(expression.kind) + ")" : ""); + }).join(", ")) + ".")); + } /** * Useful to check whether a string contains another string at a specific index * without allocating another string or traversing the entire contents of the outer string. @@ -111085,7 +114056,7 @@ var ts; } break; case 29 /* LessThanToken */: - if (lastNonTriviaToken === 75 /* Identifier */) { + if (lastNonTriviaToken === 78 /* Identifier */) { // Could be the start of something generic. Keep track of that by bumping // up the current count of generic contexts we may be in. angleBracketStack++; @@ -111098,16 +114069,16 @@ var ts; angleBracketStack--; } break; - case 125 /* AnyKeyword */: - case 143 /* StringKeyword */: - case 140 /* NumberKeyword */: - case 128 /* BooleanKeyword */: - case 144 /* SymbolKeyword */: + case 128 /* AnyKeyword */: + case 146 /* StringKeyword */: + case 143 /* NumberKeyword */: + case 131 /* BooleanKeyword */: + case 147 /* SymbolKeyword */: if (angleBracketStack > 0 && !syntacticClassifierAbsent) { // If it looks like we're could be in something generic, don't classify this // as a keyword. We may just get overwritten by the syntactic classifier, // causing a noisy experience for the user. - token = 75 /* Identifier */; + token = 78 /* Identifier */; } break; case 15 /* TemplateHead */: @@ -111146,14 +114117,14 @@ var ts; break; } if (lastNonTriviaToken === 24 /* DotToken */) { - token = 75 /* Identifier */; + token = 78 /* Identifier */; } else if (ts.isKeyword(lastNonTriviaToken) && ts.isKeyword(token) && !canFollow(lastNonTriviaToken, token)) { // We have two keywords in a row. Only treat the second as a keyword if // it's a sequence that could legally occur in the language. Otherwise // treat it as an identifier. This way, if someone writes "private var" // we recognize that 'var' is actually an identifier here. - token = 75 /* Identifier */; + token = 78 /* Identifier */; } } } @@ -111167,19 +114138,19 @@ var ts; /// we have a series of divide operator. this list allows us to be more accurate by ruling out /// locations where a regexp cannot exist. var noRegexTable = ts.arrayToNumericMap([ - 75 /* Identifier */, + 78 /* Identifier */, 10 /* StringLiteral */, 8 /* NumericLiteral */, 9 /* BigIntLiteral */, 13 /* RegularExpressionLiteral */, - 104 /* ThisKeyword */, + 107 /* ThisKeyword */, 45 /* PlusPlusToken */, 46 /* MinusMinusToken */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 19 /* CloseBraceToken */, - 106 /* TrueKeyword */, - 91 /* FalseKeyword */, + 109 /* TrueKeyword */, + 94 /* FalseKeyword */, ], function (token) { return token; }, function () { return true; }); function getNewEndOfLineState(scanner, token, lastOnTemplateStack) { switch (token) { @@ -111291,10 +114262,10 @@ var ts; return true; } switch (keyword2) { - case 131 /* GetKeyword */: - case 142 /* SetKeyword */: - case 129 /* ConstructorKeyword */: - case 120 /* StaticKeyword */: + case 134 /* GetKeyword */: + case 145 /* SetKeyword */: + case 132 /* ConstructorKeyword */: + case 123 /* StaticKeyword */: return true; // Allow things like "public get", "public constructor" and "public static". default: return false; // Any other keyword following "public" is actually an identifier, not a real keyword. @@ -111339,9 +114310,9 @@ var ts; case 31 /* GreaterThanToken */: case 32 /* LessThanEqualsToken */: case 33 /* GreaterThanEqualsToken */: - case 98 /* InstanceOfKeyword */: - case 97 /* InKeyword */: - case 123 /* AsKeyword */: + case 101 /* InstanceOfKeyword */: + case 100 /* InKeyword */: + case 126 /* AsKeyword */: case 34 /* EqualsEqualsToken */: case 35 /* ExclamationEqualsToken */: case 36 /* EqualsEqualsEqualsToken */: @@ -111353,7 +114324,7 @@ var ts; case 56 /* BarBarToken */: case 73 /* BarEqualsToken */: case 72 /* AmpersandEqualsToken */: - case 74 /* CaretEqualsToken */: + case 77 /* CaretEqualsToken */: case 69 /* LessThanLessThanEqualsToken */: case 70 /* GreaterThanGreaterThanEqualsToken */: case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */: @@ -111365,6 +114336,9 @@ var ts; case 62 /* EqualsToken */: case 27 /* CommaToken */: case 60 /* QuestionQuestionToken */: + case 74 /* BarBarEqualsToken */: + case 75 /* AmpersandAmpersandEqualsToken */: + case 76 /* QuestionQuestionEqualsToken */: return true; default: return false; @@ -111390,7 +114364,7 @@ var ts; else if (isBinaryExpressionOperatorToken(token) || isPrefixUnaryExpressionOperatorToken(token)) { return 5 /* operator */; } - else if (token >= 18 /* FirstPunctuation */ && token <= 74 /* LastPunctuation */) { + else if (token >= 18 /* FirstPunctuation */ && token <= 77 /* LastPunctuation */) { return 10 /* punctuation */; } switch (token) { @@ -111409,7 +114383,7 @@ var ts; case 5 /* WhitespaceTrivia */: case 4 /* NewLineTrivia */: return 8 /* whiteSpace */; - case 75 /* Identifier */: + case 78 /* Identifier */: default: if (ts.isTemplateLiteralKind(token)) { return 6 /* stringLiteral */; @@ -111434,10 +114408,13 @@ var ts; // That means we're calling back into the host around every 1.2k of the file we process. // Lib.d.ts has similar numbers. switch (kind) { - case 249 /* ModuleDeclaration */: - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: - case 244 /* FunctionDeclaration */: + case 253 /* ModuleDeclaration */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: + case 248 /* FunctionDeclaration */: + case 218 /* ClassExpression */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: cancellationToken.throwIfCancellationRequested(); } } @@ -111627,7 +114604,7 @@ var ts; var docCommentAndDiagnostics = ts.parseIsolatedJSDocComment(sourceFile.text, start, width); if (docCommentAndDiagnostics && docCommentAndDiagnostics.jsDoc) { // TODO: This should be predicated on `token["kind"]` being compatible with `HasJSDoc["kind"]` - docCommentAndDiagnostics.jsDoc.parent = token; + ts.setParent(docCommentAndDiagnostics.jsDoc, token); classifyJSDocComment(docCommentAndDiagnostics.jsDoc); return; } @@ -111657,18 +114634,18 @@ var ts; pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */); // e.g. "param" pos = tag.tagName.end; switch (tag.kind) { - case 317 /* JSDocParameterTag */: + case 322 /* JSDocParameterTag */: processJSDocParameterTag(tag); break; - case 321 /* JSDocTemplateTag */: + case 326 /* JSDocTemplateTag */: processJSDocTemplateTag(tag); pos = tag.end; break; - case 320 /* JSDocTypeTag */: + case 325 /* JSDocTypeTag */: processElement(tag.typeExpression); pos = tag.end; break; - case 318 /* JSDocReturnTag */: + case 323 /* JSDocReturnTag */: processElement(tag.typeExpression); pos = tag.end; break; @@ -111819,22 +114796,22 @@ var ts; } function tryClassifyJsxElementName(token) { switch (token.parent && token.parent.kind) { - case 268 /* JsxOpeningElement */: + case 272 /* JsxOpeningElement */: if (token.parent.tagName === token) { return 19 /* jsxOpenTagName */; } break; - case 269 /* JsxClosingElement */: + case 273 /* JsxClosingElement */: if (token.parent.tagName === token) { return 20 /* jsxCloseTagName */; } break; - case 267 /* JsxSelfClosingElement */: + case 271 /* JsxSelfClosingElement */: if (token.parent.tagName === token) { return 21 /* jsxSelfClosingTagName */; } break; - case 273 /* JsxAttribute */: + case 277 /* JsxAttribute */: if (token.parent.name === token) { return 22 /* jsxAttribute */; } @@ -111863,17 +114840,17 @@ var ts; var parent = token.parent; if (tokenKind === 62 /* EqualsToken */) { // the '=' in a variable declaration is special cased here. - if (parent.kind === 242 /* VariableDeclaration */ || - parent.kind === 159 /* PropertyDeclaration */ || - parent.kind === 156 /* Parameter */ || - parent.kind === 273 /* JsxAttribute */) { + if (parent.kind === 246 /* VariableDeclaration */ || + parent.kind === 162 /* PropertyDeclaration */ || + parent.kind === 159 /* Parameter */ || + parent.kind === 277 /* JsxAttribute */) { return 5 /* operator */; } } - if (parent.kind === 209 /* BinaryExpression */ || - parent.kind === 207 /* PrefixUnaryExpression */ || - parent.kind === 208 /* PostfixUnaryExpression */ || - parent.kind === 210 /* ConditionalExpression */) { + if (parent.kind === 213 /* BinaryExpression */ || + parent.kind === 211 /* PrefixUnaryExpression */ || + parent.kind === 212 /* PostfixUnaryExpression */ || + parent.kind === 214 /* ConditionalExpression */) { return 5 /* operator */; } } @@ -111886,7 +114863,7 @@ var ts; return 25 /* bigintLiteral */; } else if (tokenKind === 10 /* StringLiteral */) { - return token && token.parent.kind === 273 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */; + return token && token.parent.kind === 277 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */; } else if (tokenKind === 13 /* RegularExpressionLiteral */) { // TODO: we should get another classification type for these literals. @@ -111899,35 +114876,35 @@ var ts; else if (tokenKind === 11 /* JsxText */) { return 23 /* jsxText */; } - else if (tokenKind === 75 /* Identifier */) { + else if (tokenKind === 78 /* Identifier */) { if (token) { switch (token.parent.kind) { - case 245 /* ClassDeclaration */: + case 249 /* ClassDeclaration */: if (token.parent.name === token) { return 11 /* className */; } return; - case 155 /* TypeParameter */: + case 158 /* TypeParameter */: if (token.parent.name === token) { return 15 /* typeParameterName */; } return; - case 246 /* InterfaceDeclaration */: + case 250 /* InterfaceDeclaration */: if (token.parent.name === token) { return 13 /* interfaceName */; } return; - case 248 /* EnumDeclaration */: + case 252 /* EnumDeclaration */: if (token.parent.name === token) { return 12 /* enumName */; } return; - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: if (token.parent.name === token) { return 14 /* moduleName */; } return; - case 156 /* Parameter */: + case 159 /* Parameter */: if (token.parent.name === token) { return ts.isThisIdentifier(token) ? 3 /* keyword */ : 17 /* parameterName */; } @@ -112057,11 +115034,11 @@ var ts; function getStringLiteralCompletionEntries(sourceFile, node, position, typeChecker, compilerOptions, host) { var parent = node.parent; switch (parent.kind) { - case 187 /* LiteralType */: + case 190 /* LiteralType */: switch (parent.parent.kind) { - case 169 /* TypeReference */: + case 172 /* TypeReference */: return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(parent)), isNewIdentifier: false }; - case 185 /* IndexedAccessType */: + case 188 /* IndexedAccessType */: // Get all apparent property names // i.e. interface Foo { // foo: string; @@ -112069,9 +115046,9 @@ var ts; // } // let x: Foo["/*completion position*/"] return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(parent.parent.objectType)); - case 188 /* ImportType */: + case 192 /* ImportType */: return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) }; - case 178 /* UnionType */: { + case 181 /* UnionType */: { if (!ts.isTypeReferenceNode(parent.parent.parent)) return undefined; var alreadyUsedTypes_1 = getAlreadyUsedTypesInStringLiteralUnion(parent.parent, parent); @@ -112081,7 +115058,7 @@ var ts; default: return undefined; } - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: if (ts.isObjectLiteralExpression(parent.parent) && parent.name === node) { // Get quoted name of properties of the object literal expression // i.e. interface ConfigFiles { @@ -112098,7 +115075,7 @@ var ts; return stringLiteralCompletionsFromProperties(typeChecker.getContextualType(parent.parent)); } return fromContextualType(); - case 195 /* ElementAccessExpression */: { + case 199 /* ElementAccessExpression */: { var _a = parent, expression = _a.expression, argumentExpression = _a.argumentExpression; if (node === argumentExpression) { // Get all names of properties on the expression @@ -112111,8 +115088,8 @@ var ts; } return undefined; } - case 196 /* CallExpression */: - case 197 /* NewExpression */: + case 200 /* CallExpression */: + case 201 /* NewExpression */: if (!ts.isRequireCall(parent, /*checkArgumentIsStringLiteralLike*/ false) && !ts.isImportCall(parent)) { var argumentInfo = ts.SignatureHelp.getArgumentInfoForCompletions(node, position, sourceFile); // Get string literal completions from specialized signatures of the target @@ -112121,9 +115098,9 @@ var ts; return argumentInfo ? getStringLiteralCompletionsFromSignature(argumentInfo, typeChecker) : fromContextualType(); } // falls through (is `require("")` or `import("")`) - case 254 /* ImportDeclaration */: - case 260 /* ExportDeclaration */: - case 265 /* ExternalModuleReference */: + case 258 /* ImportDeclaration */: + case 264 /* ExportDeclaration */: + case 269 /* ExternalModuleReference */: // Get all known external module names or complete a path to a module // i.e. import * as ns from "/*completion position*/"; // var y = import("/*completion position*/"); @@ -112147,7 +115124,7 @@ var ts; } function getStringLiteralCompletionsFromSignature(argumentInfo, checker) { var isNewIdentifier = false; - var uniques = ts.createMap(); + var uniques = new ts.Map(); var candidates = []; checker.getResolvedSignature(argumentInfo.invocation, candidates, argumentInfo.argumentCount); var types = ts.flatMap(candidates, function (candidate) { @@ -112162,14 +115139,12 @@ var ts; function stringLiteralCompletionsFromProperties(type) { return type && { kind: 1 /* Properties */, - symbols: type.getApparentProperties().filter(function (prop) { - return !ts.isPrivateIdentifierPropertyDeclaration(ts.isTransientSymbol(prop) && prop.syntheticOrigin ? prop.syntheticOrigin.valueDeclaration : prop.valueDeclaration); - }), + symbols: ts.filter(type.getApparentProperties(), function (prop) { return !(prop.valueDeclaration && ts.isPrivateIdentifierPropertyDeclaration(prop.valueDeclaration)); }), hasIndexSignature: ts.hasIndexSignature(type) }; } function getStringLiteralTypes(type, uniques) { - if (uniques === void 0) { uniques = ts.createMap(); } + if (uniques === void 0) { uniques = new ts.Map(); } if (!type) return ts.emptyArray; type = ts.skipConstraint(type); @@ -112275,7 +115250,7 @@ var ts; * * both foo.ts and foo.tsx become foo */ - var foundFiles = ts.createMap(); // maps file to its extension + var foundFiles = new ts.Map(); // maps file to its extension for (var _i = 0, files_1 = files; _i < files_1.length; _i++) { var filePath = files_1[_i]; filePath = ts.normalizePath(filePath); @@ -112485,7 +115460,7 @@ var ts; function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) { if (result === void 0) { result = []; } // Check for typings specified in compiler options - var seen = ts.createMap(); + var seen = new ts.Map(); var typeRoots = ts.tryAndIgnoreErrors(function () { return ts.getEffectiveTypeRoots(options, host); }) || ts.emptyArray; for (var _i = 0, typeRoots_1 = typeRoots; _i < typeRoots_1.length; _i++) { var root = typeRoots_1[_i]; @@ -112631,6 +115606,9 @@ var ts; function originIsExport(origin) { return !!(origin && origin.kind & 4 /* Export */); } + function originIsPackageJsonImport(origin) { + return originIsExport(origin) && !!origin.isFromPackageJson; + } function originIsPromise(origin) { return !!(origin.kind & 8 /* Promise */); } @@ -112712,7 +115690,7 @@ var ts; return stringCompletions; } if (contextToken && ts.isBreakOrContinueStatement(contextToken.parent) - && (contextToken.kind === 77 /* BreakKeyword */ || contextToken.kind === 82 /* ContinueKeyword */ || contextToken.kind === 75 /* Identifier */)) { + && (contextToken.kind === 80 /* BreakKeyword */ || contextToken.kind === 85 /* ContinueKeyword */ || contextToken.kind === 78 /* Identifier */)) { return getLabelCompletionAtPosition(contextToken.parent); } var completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, preferences, /*detailsEntryId*/ undefined, host); @@ -112771,7 +115749,7 @@ var ts; /* contextToken */ undefined, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, completionData.isJsxIdentifierExpected, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap); } if (keywordFilters !== 0 /* None */) { - var entryNames = ts.arrayToSet(entries, function (e) { return e.name; }); + var entryNames = new ts.Set(entries.map(function (e) { return e.name; })); for (var _i = 0, _a = getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && ts.isSourceFileJS(sourceFile)); _i < _a.length; _i++) { var keywordEntry = _a[_i]; if (!entryNames.has(keywordEntry.name)) { @@ -112890,6 +115868,7 @@ var ts; isRecommended: isRecommendedCompletionMatch(symbol, recommendedCompletion, typeChecker) || undefined, insertText: insertText, replacementSpan: replacementSpan, + isPackageJsonImport: originIsPackageJsonImport(origin) || undefined, }; } function quotePropertyName(name, preferences) { @@ -112916,7 +115895,7 @@ var ts; // Value is set to false for global variables or completions from external module exports, because we can have multiple of those; // true otherwise. Based on the order we add things we will always see locals first, then globals, then module exports. // So adding a completion for a local will prevent us from adding completions for external module exports sharing the same name. - var uniques = ts.createMap(); + var uniques = new ts.Map(); for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) { var symbol = symbols_1[_i]; var origin = symbolToOriginInfoMap ? symbolToOriginInfoMap[ts.getSymbolId(symbol)] : undefined; @@ -112955,7 +115934,7 @@ var ts; } function getLabelStatementCompletions(node) { var entries = []; - var uniques = ts.createMap(); + var uniques = new ts.Map(); var current = node; while (current) { if (ts.isFunctionLike(current)) { @@ -113101,25 +116080,25 @@ var ts; function getContextualType(previousToken, position, sourceFile, checker) { var parent = previousToken.parent; switch (previousToken.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return ts.getContextualTypeFromParent(previousToken, checker); case 62 /* EqualsToken */: switch (parent.kind) { - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return checker.getContextualType(parent.initializer); // TODO: GH#18217 - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return checker.getTypeAtLocation(parent.left); - case 273 /* JsxAttribute */: + case 277 /* JsxAttribute */: return checker.getContextualTypeForJsxAttribute(parent); default: return undefined; } - case 99 /* NewKeyword */: + case 102 /* NewKeyword */: return checker.getContextualType(parent); - case 78 /* CaseKeyword */: + case 81 /* CaseKeyword */: return ts.getSwitchedType(ts.cast(parent, ts.isCaseClause), checker); case 18 /* OpenBraceToken */: - return ts.isJsxExpression(parent) && parent.parent.kind !== 266 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined; + return ts.isJsxExpression(parent) && parent.parent.kind !== 270 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined; default: var argInfo = ts.SignatureHelp.getArgumentInfoForCompletions(previousToken, position, sourceFile); return argInfo ? @@ -113138,7 +116117,7 @@ var ts; return symbol.parent && (isModuleSymbol(symbol.parent) ? symbol : getFirstSymbolInChain(symbol.parent, enclosingDeclaration, checker)); } function isModuleSymbol(symbol) { - return symbol.declarations.some(function (d) { return d.kind === 290 /* SourceFile */; }); + return symbol.declarations.some(function (d) { return d.kind === 294 /* SourceFile */; }); } function getCompletionData(program, log, sourceFile, isUncheckedFile, position, preferences, detailsEntryId, host) { var typeChecker = program.getTypeChecker(); @@ -113176,7 +116155,7 @@ var ts; // * |c| // */ var lineStart = ts.getLineStartPositionForPosition(position, sourceFile); - if (!(sourceFile.text.substring(lineStart, position).match(/[^\*|\s|(/\*\*)]/))) { + if (!/[^\*|\s(/)]/.test(sourceFile.text.substring(lineStart, position))) { return { kind: 2 /* JsDocTag */ }; } } @@ -113189,11 +116168,11 @@ var ts; if (tag.tagName.pos <= position && position <= tag.tagName.end) { return { kind: 1 /* JsDocTagName */ }; } - if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 294 /* JSDocTypeExpression */) { + if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 298 /* JSDocTypeExpression */) { currentToken = ts.getTokenAtPosition(sourceFile, position); if (!currentToken || (!ts.isDeclarationName(currentToken) && - (currentToken.parent.kind !== 323 /* JSDocPropertyTag */ || + (currentToken.parent.kind !== 328 /* JSDocPropertyTag */ || currentToken.parent.name !== currentToken))) { // Use as type location if inside tag's type expression insideJsDocTagTypeExpression = isCurrentlyEditingNode(tag.typeExpression); @@ -113246,26 +116225,27 @@ var ts; isRightOfDot = contextToken.kind === 24 /* DotToken */; isRightOfQuestionDot = contextToken.kind === 28 /* QuestionDotToken */; switch (parent.kind) { - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: propertyAccessToConvert = parent; node = propertyAccessToConvert.expression; - if (node.end === contextToken.pos && - ts.isCallExpression(node) && + if ((ts.isCallExpression(node) || ts.isFunctionLike(node)) && + node.end === contextToken.pos && node.getChildCount(sourceFile) && ts.last(node.getChildren(sourceFile)).kind !== 21 /* CloseParenToken */) { - // This is likely dot from incorrectly parsed call expression and user is starting to write spread + // This is likely dot from incorrectly parsed expression and user is starting to write spread // eg: Math.min(./**/) + // const x = function (./**/) {} return undefined; } break; - case 153 /* QualifiedName */: + case 156 /* QualifiedName */: node = parent.left; break; - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: node = parent.name; break; - case 188 /* ImportType */: - case 219 /* MetaProperty */: + case 192 /* ImportType */: + case 223 /* MetaProperty */: node = parent; break; default: @@ -113278,7 +116258,7 @@ var ts; // // If the tagname is a property access expression, we will then walk up to the top most of property access expression. // Then, try to get a JSX container and its associated attributes type. - if (parent && parent.kind === 194 /* PropertyAccessExpression */) { + if (parent && parent.kind === 198 /* PropertyAccessExpression */) { contextToken = parent; parent = parent.parent; } @@ -113286,44 +116266,44 @@ var ts; if (currentToken.parent === location) { switch (currentToken.kind) { case 31 /* GreaterThanToken */: - if (currentToken.parent.kind === 266 /* JsxElement */ || currentToken.parent.kind === 268 /* JsxOpeningElement */) { + if (currentToken.parent.kind === 270 /* JsxElement */ || currentToken.parent.kind === 272 /* JsxOpeningElement */) { location = currentToken; } break; case 43 /* SlashToken */: - if (currentToken.parent.kind === 267 /* JsxSelfClosingElement */) { + if (currentToken.parent.kind === 271 /* JsxSelfClosingElement */) { location = currentToken; } break; } } switch (parent.kind) { - case 269 /* JsxClosingElement */: + case 273 /* JsxClosingElement */: if (contextToken.kind === 43 /* SlashToken */) { isStartingCloseTag = true; location = contextToken; } break; - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: if (!binaryExpressionMayBeOpenTag(parent)) { break; } // falls through - case 267 /* JsxSelfClosingElement */: - case 266 /* JsxElement */: - case 268 /* JsxOpeningElement */: + case 271 /* JsxSelfClosingElement */: + case 270 /* JsxElement */: + case 272 /* JsxOpeningElement */: isJsxIdentifierExpected = true; if (contextToken.kind === 29 /* LessThanToken */) { isRightOfOpenTag = true; location = contextToken; } break; - case 273 /* JsxAttribute */: + case 277 /* JsxAttribute */: switch (previousToken.kind) { case 62 /* EqualsToken */: isJsxInitializer = true; break; - case 75 /* Identifier */: + case 78 /* Identifier */: isJsxIdentifierExpected = true; // For `
` we don't want to treat this as a jsx inializer, instead it's the attribute name. @@ -113400,11 +116380,11 @@ var ts; }; function isTagWithTypeExpression(tag) { switch (tag.kind) { - case 317 /* JSDocParameterTag */: - case 323 /* JSDocPropertyTag */: - case 318 /* JSDocReturnTag */: - case 320 /* JSDocTypeTag */: - case 322 /* JSDocTypedefTag */: + case 322 /* JSDocParameterTag */: + case 328 /* JSDocPropertyTag */: + case 323 /* JSDocReturnTag */: + case 325 /* JSDocTypeTag */: + case 327 /* JSDocTypedefTag */: return true; default: return false; @@ -113449,7 +116429,7 @@ var ts; // If the module is merged with a value, we must get the type of the class and add its propertes (for inherited static methods). if (!isTypeLocation && symbol.declarations && - symbol.declarations.some(function (d) { return d.kind !== 290 /* SourceFile */ && d.kind !== 249 /* ModuleDeclaration */ && d.kind !== 248 /* EnumDeclaration */; })) { + symbol.declarations.some(function (d) { return d.kind !== 294 /* SourceFile */ && d.kind !== 253 /* ModuleDeclaration */ && d.kind !== 252 /* EnumDeclaration */; })) { var type = typeChecker.getTypeOfSymbolAtLocation(symbol, node).getNonOptionalType(); var insertQuestionDot = false; if (type.isNullableType()) { @@ -113469,8 +116449,8 @@ var ts; } } } - if (ts.isMetaProperty(node) && (node.keywordToken === 99 /* NewKeyword */ || node.keywordToken === 96 /* ImportKeyword */) && contextToken === node.getChildAt(1)) { - var completion = (node.keywordToken === 99 /* NewKeyword */) ? "target" : "meta"; + if (ts.isMetaProperty(node) && (node.keywordToken === 102 /* NewKeyword */ || node.keywordToken === 99 /* ImportKeyword */) && contextToken === node.getChildAt(1)) { + var completion = (node.keywordToken === 102 /* NewKeyword */) ? "target" : "meta"; symbols.push(typeChecker.createSymbol(4 /* Property */, ts.escapeLeadingUnderscores(completion))); return; } @@ -113496,14 +116476,14 @@ var ts; if (isRightOfQuestionDot && ts.some(type.getCallSignatures())) { isNewIdentifierLocation = true; } - var propertyAccess = node.kind === 188 /* ImportType */ ? node : node.parent; + var propertyAccess = node.kind === 192 /* ImportType */ ? node : node.parent; if (isUncheckedFile) { // In javascript files, for union types, we don't just get the members that // the individual types have in common, we also include all the members that // each individual type has. This is because we're going to add all identifiers // anyways. So we might as well elevate the members that were at least part // of the individual types to a higher status since we know what they are. - symbols.push.apply(symbols, getPropertiesForCompletion(type, typeChecker)); + symbols.push.apply(symbols, ts.filter(getPropertiesForCompletion(type, typeChecker), function (s) { return typeChecker.isValidPropertyAccessForCompletions(propertyAccess, type, s); })); } else { for (var _i = 0, _a = type.getApparentProperties(); _i < _a.length; _i++) { @@ -113653,7 +116633,7 @@ var ts; } } // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions` - if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 290 /* SourceFile */) { + if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 294 /* SourceFile */) { var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false); if (thisType && !isProbablyGlobalType(thisType, sourceFile, typeChecker)) { for (var _a = 0, _b = getPropertiesForCompletion(thisType, typeChecker); _a < _b.length; _a++) { @@ -113703,10 +116683,10 @@ var ts; } function isSnippetScope(scopeNode) { switch (scopeNode.kind) { - case 290 /* SourceFile */: - case 211 /* TemplateExpression */: - case 276 /* JsxExpression */: - case 223 /* Block */: + case 294 /* SourceFile */: + case 215 /* TemplateExpression */: + case 280 /* JsxExpression */: + case 227 /* Block */: return true; default: return ts.isStatement(scopeNode); @@ -113715,7 +116695,7 @@ var ts; function filterGlobalCompletion(symbols) { var isTypeOnly = isTypeOnlyCompletion(); if (isTypeOnly) { - keywordFilters = isTypeAssertion() + keywordFilters = contextToken && ts.isAssertionExpression(contextToken.parent) ? 6 /* TypeAssertionKeywords */ : 7 /* TypeKeywords */; } @@ -113739,9 +116719,6 @@ var ts; return !!(ts.getCombinedLocalAndExportSymbolFlags(symbol) & 111551 /* Value */); }); } - function isTypeAssertion() { - return ts.isAssertionExpression(contextToken.parent); - } function isTypeOnlyCompletion() { return insideJsDocTagTypeExpression || !isContextTokenValueLocation(contextToken) && @@ -113751,35 +116728,35 @@ var ts; } function isContextTokenValueLocation(contextToken) { return contextToken && - contextToken.kind === 108 /* TypeOfKeyword */ && - (contextToken.parent.kind === 172 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent)); + contextToken.kind === 111 /* TypeOfKeyword */ && + (contextToken.parent.kind === 175 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent)); } function isContextTokenTypeLocation(contextToken) { if (contextToken) { var parentKind = contextToken.parent.kind; switch (contextToken.kind) { case 58 /* ColonToken */: - return parentKind === 159 /* PropertyDeclaration */ || - parentKind === 158 /* PropertySignature */ || - parentKind === 156 /* Parameter */ || - parentKind === 242 /* VariableDeclaration */ || + return parentKind === 162 /* PropertyDeclaration */ || + parentKind === 161 /* PropertySignature */ || + parentKind === 159 /* Parameter */ || + parentKind === 246 /* VariableDeclaration */ || ts.isFunctionLikeKind(parentKind); case 62 /* EqualsToken */: - return parentKind === 247 /* TypeAliasDeclaration */; - case 123 /* AsKeyword */: - return parentKind === 217 /* AsExpression */; + return parentKind === 251 /* TypeAliasDeclaration */; + case 126 /* AsKeyword */: + return parentKind === 221 /* AsExpression */; case 29 /* LessThanToken */: - return parentKind === 169 /* TypeReference */ || - parentKind === 199 /* TypeAssertionExpression */; - case 90 /* ExtendsKeyword */: - return parentKind === 155 /* TypeParameter */; + return parentKind === 172 /* TypeReference */ || + parentKind === 203 /* TypeAssertionExpression */; + case 93 /* ExtendsKeyword */: + return parentKind === 158 /* TypeParameter */; } } return false; } /** True if symbol is a type or a module containing at least one type. */ function symbolCanBeReferencedAtTypeLocation(symbol, seenModules) { - if (seenModules === void 0) { seenModules = ts.createMap(); } + if (seenModules === void 0) { seenModules = new ts.Map(); } var sym = ts.skipAlias(symbol.exportSymbol || symbol, typeChecker); return !!(sym.flags & 788968 /* Type */) || !!(sym.flags & 1536 /* Module */) && @@ -113841,21 +116818,22 @@ var ts; } var startTime = ts.timestamp(); log("getSymbolsFromOtherSourceFileExports: Recomputing list" + (detailsEntryId ? " for details entry" : "")); - var seenResolvedModules = ts.createMap(); - var seenExports = ts.createMap(); + var seenResolvedModules = new ts.Map(); + var seenExports = new ts.Map(); /** Bucket B */ - var aliasesToAlreadyIncludedSymbols = ts.createMap(); + var aliasesToAlreadyIncludedSymbols = new ts.Map(); /** Bucket C */ - var aliasesToReturnIfOriginalsAreMissing = ts.createMap(); + var aliasesToReturnIfOriginalsAreMissing = new ts.Map(); /** Bucket A */ var results = []; /** Ids present in `results` for faster lookup */ - var resultSymbolIds = ts.createMap(); - ts.codefix.forEachExternalModuleToImportFrom(program, host, sourceFile, !detailsEntryId, function (moduleSymbol) { + var resultSymbolIds = new ts.Map(); + ts.codefix.forEachExternalModuleToImportFrom(program, host, sourceFile, !detailsEntryId, /*useAutoImportProvider*/ true, function (moduleSymbol, _, program, isFromPackageJson) { // Perf -- ignore other modules if this is a request for details if (detailsEntryId && detailsEntryId.source && ts.stripQuotes(moduleSymbol.name) !== detailsEntryId.source) { return; } + var typeChecker = program.getTypeChecker(); var resolvedModuleSymbol = typeChecker.resolveExternalModuleSymbol(moduleSymbol); // resolvedModuleSymbol may be a namespace. A namespace may be `export =` by multiple module declarations, but only keep the first one. if (!ts.addToSeen(seenResolvedModules, ts.getSymbolId(resolvedModuleSymbol))) { @@ -113864,7 +116842,7 @@ var ts; // Don't add another completion for `export =` of a symbol that's already global. // So in `declare namespace foo {} declare module "foo" { export = foo; }`, there will just be the global completion for `foo`. if (resolvedModuleSymbol !== moduleSymbol && ts.every(resolvedModuleSymbol.declarations, ts.isNonGlobalDeclaration)) { - pushSymbol(resolvedModuleSymbol, moduleSymbol, /*skipFilter*/ true); + pushSymbol(resolvedModuleSymbol, moduleSymbol, isFromPackageJson, /*skipFilter*/ true); } for (var _i = 0, _a = typeChecker.getExportsAndPropertiesOfModule(moduleSymbol); _i < _a.length; _i++) { var symbol = _a[_i]; @@ -113889,7 +116867,7 @@ var ts; var nearestExportSymbolId = ts.getSymbolId(nearestExportSymbol).toString(); var symbolHasBeenSeen = resultSymbolIds.has(nearestExportSymbolId) || aliasesToAlreadyIncludedSymbols.has(nearestExportSymbolId); if (!symbolHasBeenSeen) { - aliasesToReturnIfOriginalsAreMissing.set(nearestExportSymbolId, { alias: symbol, moduleSymbol: moduleSymbol }); + aliasesToReturnIfOriginalsAreMissing.set(nearestExportSymbolId, { alias: symbol, moduleSymbol: moduleSymbol, isFromPackageJson: isFromPackageJson }); aliasesToAlreadyIncludedSymbols.set(symbolId, true); } else { @@ -113901,20 +116879,19 @@ var ts; else { // This is not a re-export, so see if we have any aliases pending and remove them (step 3 in diagrammed example) aliasesToReturnIfOriginalsAreMissing.delete(symbolId); - pushSymbol(symbol, moduleSymbol); + pushSymbol(symbol, moduleSymbol, isFromPackageJson, /*skipFilter*/ false); } } }); // By this point, any potential duplicates that were actually duplicates have been // removed, so the rest need to be added. (Step 4 in diagrammed example) aliasesToReturnIfOriginalsAreMissing.forEach(function (_a) { - var alias = _a.alias, moduleSymbol = _a.moduleSymbol; - return pushSymbol(alias, moduleSymbol); + var alias = _a.alias, moduleSymbol = _a.moduleSymbol, isFromPackageJson = _a.isFromPackageJson; + return pushSymbol(alias, moduleSymbol, isFromPackageJson, /*skipFilter*/ false); }); log("getSymbolsFromOtherSourceFileExports: " + (ts.timestamp() - startTime)); return results; - function pushSymbol(symbol, moduleSymbol, skipFilter) { - if (skipFilter === void 0) { skipFilter = false; } + function pushSymbol(symbol, moduleSymbol, isFromPackageJson, skipFilter) { var isDefaultExport = symbol.escapedName === "default" /* Default */; if (isDefaultExport) { symbol = ts.getLocalSymbolForExportDefault(symbol) || symbol; @@ -113923,7 +116900,7 @@ var ts; return; } ts.addToSeen(resultSymbolIds, ts.getSymbolId(symbol)); - var origin = { kind: 4 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: isDefaultExport }; + var origin = { kind: 4 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: isDefaultExport, isFromPackageJson: isFromPackageJson }; results.push({ symbol: symbol, symbolName: ts.getNameForExportedSymbol(symbol, target), @@ -113983,7 +116960,7 @@ var ts; return true; } if (contextToken.kind === 31 /* GreaterThanToken */ && contextToken.parent) { - if (contextToken.parent.kind === 268 /* JsxOpeningElement */) { + if (contextToken.parent.kind === 272 /* JsxOpeningElement */) { // Two possibilities: // 1.
/**/ // - contextToken: GreaterThanToken (before cursor) @@ -113993,10 +116970,10 @@ var ts; // - contextToken: GreaterThanToken (before cursor) // - location: GreaterThanToken (after cursor) // - same parent (JSXOpeningElement) - return location.parent.kind !== 268 /* JsxOpeningElement */; + return location.parent.kind !== 272 /* JsxOpeningElement */; } - if (contextToken.parent.kind === 269 /* JsxClosingElement */ || contextToken.parent.kind === 267 /* JsxSelfClosingElement */) { - return !!contextToken.parent.parent && contextToken.parent.parent.kind === 266 /* JsxElement */; + if (contextToken.parent.kind === 273 /* JsxClosingElement */ || contextToken.parent.kind === 271 /* JsxSelfClosingElement */) { + return !!contextToken.parent.parent && contextToken.parent.parent.kind === 270 /* JsxElement */; } } return false; @@ -114007,40 +116984,40 @@ var ts; // Previous token may have been a keyword that was converted to an identifier. switch (keywordForNode(previousToken)) { case 27 /* CommaToken */: - return containingNodeKind === 196 /* CallExpression */ // func( a, | - || containingNodeKind === 162 /* Constructor */ // constructor( a, | /* public, protected, private keywords are allowed here, so show completion */ - || containingNodeKind === 197 /* NewExpression */ // new C(a, | - || containingNodeKind === 192 /* ArrayLiteralExpression */ // [a, | - || containingNodeKind === 209 /* BinaryExpression */ // const x = (a, | - || containingNodeKind === 170 /* FunctionType */; // var x: (s: string, list| + return containingNodeKind === 200 /* CallExpression */ // func( a, | + || containingNodeKind === 165 /* Constructor */ // constructor( a, | /* public, protected, private keywords are allowed here, so show completion */ + || containingNodeKind === 201 /* NewExpression */ // new C(a, | + || containingNodeKind === 196 /* ArrayLiteralExpression */ // [a, | + || containingNodeKind === 213 /* BinaryExpression */ // const x = (a, | + || containingNodeKind === 173 /* FunctionType */; // var x: (s: string, list| case 20 /* OpenParenToken */: - return containingNodeKind === 196 /* CallExpression */ // func( | - || containingNodeKind === 162 /* Constructor */ // constructor( | - || containingNodeKind === 197 /* NewExpression */ // new C(a| - || containingNodeKind === 200 /* ParenthesizedExpression */ // const x = (a| - || containingNodeKind === 182 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */ + return containingNodeKind === 200 /* CallExpression */ // func( | + || containingNodeKind === 165 /* Constructor */ // constructor( | + || containingNodeKind === 201 /* NewExpression */ // new C(a| + || containingNodeKind === 204 /* ParenthesizedExpression */ // const x = (a| + || containingNodeKind === 185 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */ case 22 /* OpenBracketToken */: - return containingNodeKind === 192 /* ArrayLiteralExpression */ // [ | - || containingNodeKind === 167 /* IndexSignature */ // [ | : string ] - || containingNodeKind === 154 /* ComputedPropertyName */; // [ | /* this can become an index signature */ - case 135 /* ModuleKeyword */: // module | - case 136 /* NamespaceKeyword */: // namespace | + return containingNodeKind === 196 /* ArrayLiteralExpression */ // [ | + || containingNodeKind === 170 /* IndexSignature */ // [ | : string ] + || containingNodeKind === 157 /* ComputedPropertyName */; // [ | /* this can become an index signature */ + case 138 /* ModuleKeyword */: // module | + case 139 /* NamespaceKeyword */: // namespace | return true; case 24 /* DotToken */: - return containingNodeKind === 249 /* ModuleDeclaration */; // module A.| + return containingNodeKind === 253 /* ModuleDeclaration */; // module A.| case 18 /* OpenBraceToken */: - return containingNodeKind === 245 /* ClassDeclaration */; // class A{ | + return containingNodeKind === 249 /* ClassDeclaration */; // class A{ | case 62 /* EqualsToken */: - return containingNodeKind === 242 /* VariableDeclaration */ // const x = a| - || containingNodeKind === 209 /* BinaryExpression */; // x = a| + return containingNodeKind === 246 /* VariableDeclaration */ // const x = a| + || containingNodeKind === 213 /* BinaryExpression */; // x = a| case 15 /* TemplateHead */: - return containingNodeKind === 211 /* TemplateExpression */; // `aa ${| + return containingNodeKind === 215 /* TemplateExpression */; // `aa ${| case 16 /* TemplateMiddle */: - return containingNodeKind === 221 /* TemplateSpan */; // `aa ${10} dd ${| - case 119 /* PublicKeyword */: - case 117 /* PrivateKeyword */: - case 118 /* ProtectedKeyword */: - return containingNodeKind === 159 /* PropertyDeclaration */; // class A{ public | + return containingNodeKind === 225 /* TemplateSpan */; // `aa ${10} dd ${| + case 122 /* PublicKeyword */: + case 120 /* PrivateKeyword */: + case 121 /* ProtectedKeyword */: + return containingNodeKind === 162 /* PropertyDeclaration */; // class A{ public | } } return false; @@ -114067,7 +117044,7 @@ var ts; completionKind = 0 /* ObjectPropertyDeclaration */; var typeMembers; var existingMembers; - if (objectLikeContainer.kind === 193 /* ObjectLiteralExpression */) { + if (objectLikeContainer.kind === 197 /* ObjectLiteralExpression */) { var instantiatedType = typeChecker.getContextualType(objectLikeContainer); var completionsType = instantiatedType && typeChecker.getContextualType(objectLikeContainer, 4 /* Completions */); if (!instantiatedType || !completionsType) @@ -114077,7 +117054,7 @@ var ts; existingMembers = objectLikeContainer.properties; } else { - ts.Debug.assert(objectLikeContainer.kind === 189 /* ObjectBindingPattern */); + ts.Debug.assert(objectLikeContainer.kind === 193 /* ObjectBindingPattern */); // We are *only* completing on properties from the type being destructured. isNewIdentifierLocation = false; var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent); @@ -114088,12 +117065,12 @@ var ts; // through type declaration or inference. // Also proceed if rootDeclaration is a parameter and if its containing function expression/arrow function is contextually typed - // type of parameter will flow in from the contextual type of the function - var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 232 /* ForOfStatement */; - if (!canGetType && rootDeclaration.kind === 156 /* Parameter */) { + var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 236 /* ForOfStatement */; + if (!canGetType && rootDeclaration.kind === 159 /* Parameter */) { if (ts.isExpression(rootDeclaration.parent)) { canGetType = !!typeChecker.getContextualType(rootDeclaration.parent); } - else if (rootDeclaration.parent.kind === 161 /* MethodDeclaration */ || rootDeclaration.parent.kind === 164 /* SetAccessor */) { + else if (rootDeclaration.parent.kind === 164 /* MethodDeclaration */ || rootDeclaration.parent.kind === 167 /* SetAccessor */) { canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent); } } @@ -114140,17 +117117,17 @@ var ts; if (!namedImportsOrExports) return 0 /* Continue */; // try to show exported member for imported/re-exported module - var moduleSpecifier = (namedImportsOrExports.kind === 257 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier; + var moduleSpecifier = (namedImportsOrExports.kind === 261 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier; if (!moduleSpecifier) - return namedImportsOrExports.kind === 257 /* NamedImports */ ? 2 /* Fail */ : 0 /* Continue */; + return namedImportsOrExports.kind === 261 /* NamedImports */ ? 2 /* Fail */ : 0 /* Continue */; var moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(moduleSpecifier); // TODO: GH#18217 if (!moduleSpecifierSymbol) return 2 /* Fail */; completionKind = 3 /* MemberLike */; isNewIdentifierLocation = false; var exports = typeChecker.getExportsAndPropertiesOfModule(moduleSpecifierSymbol); - var existing = ts.arrayToSet(namedImportsOrExports.elements, function (n) { return isCurrentlyEditingNode(n) ? undefined : (n.propertyName || n.name).escapedText; }); - symbols = exports.filter(function (e) { return e.escapedName !== "default" /* Default */ && !existing.get(e.escapedName); }); + var existing = new ts.Set(namedImportsOrExports.elements.filter(function (n) { return !isCurrentlyEditingNode(n); }).map(function (n) { return (n.propertyName || n.name).escapedText; })); + symbols = exports.filter(function (e) { return e.escapedName !== "default" /* Default */ && !existing.has(e.escapedName); }); return 1 /* Success */; } /** @@ -114200,9 +117177,9 @@ var ts; if (!ts.isClassLike(decl)) return 1 /* Success */; var classElement = contextToken.kind === 26 /* SemicolonToken */ ? contextToken.parent.parent : contextToken.parent; - var classElementModifierFlags = ts.isClassElement(classElement) ? ts.getModifierFlags(classElement) : 0 /* None */; + var classElementModifierFlags = ts.isClassElement(classElement) ? ts.getEffectiveModifierFlags(classElement) : 0 /* None */; // If this is context token is not something we are editing now, consider if this would lead to be modifier - if (contextToken.kind === 75 /* Identifier */ && !isCurrentlyEditingNode(contextToken)) { + if (contextToken.kind === 78 /* Identifier */ && !isCurrentlyEditingNode(contextToken)) { switch (contextToken.getText()) { case "private": classElementModifierFlags = classElementModifierFlags | 8 /* Private */; @@ -114217,7 +117194,9 @@ var ts; // List of property symbols of base type that are not private and already implemented var baseSymbols = ts.flatMap(ts.getAllSuperTypeNodes(decl), function (baseTypeNode) { var type = typeChecker.getTypeAtLocation(baseTypeNode); - return type && typeChecker.getPropertiesOfType(classElementModifierFlags & 32 /* Static */ ? typeChecker.getTypeOfSymbolAtLocation(type.symbol, decl) : type); + return classElementModifierFlags & 32 /* Static */ ? + (type === null || type === void 0 ? void 0 : type.symbol) && typeChecker.getPropertiesOfType(typeChecker.getTypeOfSymbolAtLocation(type.symbol, decl)) : + type && typeChecker.getPropertiesOfType(type); }); symbols = filterClassMembersList(baseSymbols, decl.members, classElementModifierFlags); } @@ -114239,7 +117218,7 @@ var ts; break; case 41 /* AsteriskToken */: return ts.isMethodDeclaration(parent) ? ts.tryCast(parent.parent, ts.isObjectLiteralExpression) : undefined; - case 75 /* Identifier */: + case 78 /* Identifier */: return contextToken.text === "async" && ts.isShorthandPropertyAssignment(contextToken.parent) ? contextToken.parent.parent : undefined; } @@ -114292,12 +117271,12 @@ var ts; case 31 /* GreaterThanToken */: // End of a type argument list case 30 /* LessThanSlashToken */: case 43 /* SlashToken */: - case 75 /* Identifier */: - case 194 /* PropertyAccessExpression */: - case 274 /* JsxAttributes */: - case 273 /* JsxAttribute */: - case 275 /* JsxSpreadAttribute */: - if (parent && (parent.kind === 267 /* JsxSelfClosingElement */ || parent.kind === 268 /* JsxOpeningElement */)) { + case 78 /* Identifier */: + case 198 /* PropertyAccessExpression */: + case 278 /* JsxAttributes */: + case 277 /* JsxAttribute */: + case 279 /* JsxSpreadAttribute */: + if (parent && (parent.kind === 271 /* JsxSelfClosingElement */ || parent.kind === 272 /* JsxOpeningElement */)) { if (contextToken.kind === 31 /* GreaterThanToken */) { var precedingToken = ts.findPrecedingToken(contextToken.pos, sourceFile, /*startNode*/ undefined); if (!parent.typeArguments || (precedingToken && precedingToken.kind === 43 /* SlashToken */)) @@ -114305,7 +117284,7 @@ var ts; } return parent; } - else if (parent.kind === 273 /* JsxAttribute */) { + else if (parent.kind === 277 /* JsxAttribute */) { // Currently we parse JsxOpeningLikeElement as: // JsxOpeningLikeElement // attributes: JsxAttributes @@ -114317,7 +117296,7 @@ var ts; // its parent is a JsxExpression, whose parent is a JsxAttribute, // whose parent is a JsxOpeningLikeElement case 10 /* StringLiteral */: - if (parent && ((parent.kind === 273 /* JsxAttribute */) || (parent.kind === 275 /* JsxSpreadAttribute */))) { + if (parent && ((parent.kind === 277 /* JsxAttribute */) || (parent.kind === 279 /* JsxSpreadAttribute */))) { // Currently we parse JsxOpeningLikeElement as: // JsxOpeningLikeElement // attributes: JsxAttributes @@ -114327,8 +117306,8 @@ var ts; break; case 19 /* CloseBraceToken */: if (parent && - parent.kind === 276 /* JsxExpression */ && - parent.parent && parent.parent.kind === 273 /* JsxAttribute */) { + parent.kind === 280 /* JsxExpression */ && + parent.parent && parent.parent.kind === 277 /* JsxAttribute */) { // Currently we parse JsxOpeningLikeElement as: // JsxOpeningLikeElement // attributes: JsxAttributes @@ -114336,7 +117315,7 @@ var ts; // each JsxAttribute can have initializer as JsxExpression return parent.parent.parent.parent; } - if (parent && parent.kind === 275 /* JsxSpreadAttribute */) { + if (parent && parent.kind === 279 /* JsxSpreadAttribute */) { // Currently we parse JsxOpeningLikeElement as: // JsxOpeningLikeElement // attributes: JsxAttributes @@ -114356,61 +117335,61 @@ var ts; var containingNodeKind = parent.kind; switch (contextToken.kind) { case 27 /* CommaToken */: - return containingNodeKind === 242 /* VariableDeclaration */ || + return containingNodeKind === 246 /* VariableDeclaration */ || isVariableDeclarationListButNotTypeArgument(contextToken) || - containingNodeKind === 225 /* VariableStatement */ || - containingNodeKind === 248 /* EnumDeclaration */ || // enum a { foo, | + containingNodeKind === 229 /* VariableStatement */ || + containingNodeKind === 252 /* EnumDeclaration */ || // enum a { foo, | isFunctionLikeButNotConstructor(containingNodeKind) || - containingNodeKind === 246 /* InterfaceDeclaration */ || // interface A= contextToken.pos); case 24 /* DotToken */: - return containingNodeKind === 190 /* ArrayBindingPattern */; // var [.| + return containingNodeKind === 194 /* ArrayBindingPattern */; // var [.| case 58 /* ColonToken */: - return containingNodeKind === 191 /* BindingElement */; // var {x :html| + return containingNodeKind === 195 /* BindingElement */; // var {x :html| case 22 /* OpenBracketToken */: - return containingNodeKind === 190 /* ArrayBindingPattern */; // var [x| + return containingNodeKind === 194 /* ArrayBindingPattern */; // var [x| case 20 /* OpenParenToken */: - return containingNodeKind === 280 /* CatchClause */ || + return containingNodeKind === 284 /* CatchClause */ || isFunctionLikeButNotConstructor(containingNodeKind); case 18 /* OpenBraceToken */: - return containingNodeKind === 248 /* EnumDeclaration */; // enum a { | + return containingNodeKind === 252 /* EnumDeclaration */; // enum a { | case 29 /* LessThanToken */: - return containingNodeKind === 245 /* ClassDeclaration */ || // class A< | - containingNodeKind === 214 /* ClassExpression */ || // var C = class D< | - containingNodeKind === 246 /* InterfaceDeclaration */ || // interface A< | - containingNodeKind === 247 /* TypeAliasDeclaration */ || // type List< | + return containingNodeKind === 249 /* ClassDeclaration */ || // class A< | + containingNodeKind === 218 /* ClassExpression */ || // var C = class D< | + containingNodeKind === 250 /* InterfaceDeclaration */ || // interface A< | + containingNodeKind === 251 /* TypeAliasDeclaration */ || // type List< | ts.isFunctionLikeKind(containingNodeKind); - case 120 /* StaticKeyword */: - return containingNodeKind === 159 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent); + case 123 /* StaticKeyword */: + return containingNodeKind === 162 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent); case 25 /* DotDotDotToken */: - return containingNodeKind === 156 /* Parameter */ || - (!!parent.parent && parent.parent.kind === 190 /* ArrayBindingPattern */); // var [...z| - case 119 /* PublicKeyword */: - case 117 /* PrivateKeyword */: - case 118 /* ProtectedKeyword */: - return containingNodeKind === 156 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent); - case 123 /* AsKeyword */: - return containingNodeKind === 258 /* ImportSpecifier */ || - containingNodeKind === 263 /* ExportSpecifier */ || - containingNodeKind === 256 /* NamespaceImport */; - case 131 /* GetKeyword */: - case 142 /* SetKeyword */: + return containingNodeKind === 159 /* Parameter */ || + (!!parent.parent && parent.parent.kind === 194 /* ArrayBindingPattern */); // var [...z| + case 122 /* PublicKeyword */: + case 120 /* PrivateKeyword */: + case 121 /* ProtectedKeyword */: + return containingNodeKind === 159 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent); + case 126 /* AsKeyword */: + return containingNodeKind === 262 /* ImportSpecifier */ || + containingNodeKind === 267 /* ExportSpecifier */ || + containingNodeKind === 260 /* NamespaceImport */; + case 134 /* GetKeyword */: + case 145 /* SetKeyword */: return !isFromObjectTypeDeclaration(contextToken); - case 80 /* ClassKeyword */: - case 88 /* EnumKeyword */: - case 114 /* InterfaceKeyword */: - case 94 /* FunctionKeyword */: - case 109 /* VarKeyword */: - case 96 /* ImportKeyword */: - case 115 /* LetKeyword */: - case 81 /* ConstKeyword */: - case 145 /* TypeKeyword */: // type htm| + case 83 /* ClassKeyword */: + case 91 /* EnumKeyword */: + case 117 /* InterfaceKeyword */: + case 97 /* FunctionKeyword */: + case 112 /* VarKeyword */: + case 99 /* ImportKeyword */: + case 118 /* LetKeyword */: + case 84 /* ConstKeyword */: + case 148 /* TypeKeyword */: // type htm| return true; case 41 /* AsteriskToken */: return ts.isFunctionLike(contextToken.parent) && !ts.isMethodDeclaration(contextToken.parent); @@ -114433,21 +117412,21 @@ var ts; } // Previous token may have been a keyword that was converted to an identifier. switch (keywordForNode(contextToken)) { - case 122 /* AbstractKeyword */: - case 80 /* ClassKeyword */: - case 81 /* ConstKeyword */: - case 130 /* DeclareKeyword */: - case 88 /* EnumKeyword */: - case 94 /* FunctionKeyword */: - case 114 /* InterfaceKeyword */: - case 115 /* LetKeyword */: - case 117 /* PrivateKeyword */: - case 118 /* ProtectedKeyword */: - case 119 /* PublicKeyword */: - case 120 /* StaticKeyword */: - case 109 /* VarKeyword */: + case 125 /* AbstractKeyword */: + case 83 /* ClassKeyword */: + case 84 /* ConstKeyword */: + case 133 /* DeclareKeyword */: + case 91 /* EnumKeyword */: + case 97 /* FunctionKeyword */: + case 117 /* InterfaceKeyword */: + case 118 /* LetKeyword */: + case 120 /* PrivateKeyword */: + case 121 /* ProtectedKeyword */: + case 122 /* PublicKeyword */: + case 123 /* StaticKeyword */: + case 112 /* VarKeyword */: return true; - case 126 /* AsyncKeyword */: + case 129 /* AsyncKeyword */: return ts.isPropertyDeclaration(contextToken.parent); } return ts.isDeclarationName(contextToken) @@ -114457,7 +117436,7 @@ var ts; && !(ts.isClassLike(contextToken.parent) && (contextToken !== previousToken || position > previousToken.end)); } function isFunctionLikeButNotConstructor(kind) { - return ts.isFunctionLikeKind(kind) && kind !== 162 /* Constructor */; + return ts.isFunctionLikeKind(kind) && kind !== 165 /* Constructor */; } function isDotOfNumericLiteral(contextToken) { if (contextToken.kind === 8 /* NumericLiteral */) { @@ -114467,7 +117446,7 @@ var ts; return false; } function isVariableDeclarationListButNotTypeArgument(node) { - return node.parent.kind === 243 /* VariableDeclarationList */ + return node.parent.kind === 247 /* VariableDeclarationList */ && !ts.isPossiblyTypeArgumentPosition(node, sourceFile, typeChecker); } /** @@ -114480,18 +117459,18 @@ var ts; if (existingMembers.length === 0) { return contextualMemberSymbols; } - var membersDeclaredBySpreadAssignment = ts.createMap(); - var existingMemberNames = ts.createUnderscoreEscapedMap(); + var membersDeclaredBySpreadAssignment = new ts.Set(); + var existingMemberNames = new ts.Set(); for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) { var m = existingMembers_1[_i]; // Ignore omitted expressions for missing members - if (m.kind !== 281 /* PropertyAssignment */ && - m.kind !== 282 /* ShorthandPropertyAssignment */ && - m.kind !== 191 /* BindingElement */ && - m.kind !== 161 /* MethodDeclaration */ && - m.kind !== 163 /* GetAccessor */ && - m.kind !== 164 /* SetAccessor */ && - m.kind !== 283 /* SpreadAssignment */) { + if (m.kind !== 285 /* PropertyAssignment */ && + m.kind !== 286 /* ShorthandPropertyAssignment */ && + m.kind !== 195 /* BindingElement */ && + m.kind !== 164 /* MethodDeclaration */ && + m.kind !== 166 /* GetAccessor */ && + m.kind !== 167 /* SetAccessor */ && + m.kind !== 287 /* SpreadAssignment */) { continue; } // If this is the current item we are editing right now, do not filter it out @@ -114504,7 +117483,7 @@ var ts; } else if (ts.isBindingElement(m) && m.propertyName) { // include only identifiers in completion list - if (m.propertyName.kind === 75 /* Identifier */) { + if (m.propertyName.kind === 78 /* Identifier */) { existingName = m.propertyName.escapedText; } } @@ -114515,9 +117494,11 @@ var ts; var name = ts.getNameOfDeclaration(m); existingName = name && ts.isPropertyNameLiteral(name) ? ts.getEscapedTextOfIdentifierOrLiteral(name) : undefined; } - existingMemberNames.set(existingName, true); // TODO: GH#18217 + if (existingName !== undefined) { + existingMemberNames.add(existingName); + } } - var filteredSymbols = contextualMemberSymbols.filter(function (m) { return !existingMemberNames.get(m.escapedName); }); + var filteredSymbols = contextualMemberSymbols.filter(function (m) { return !existingMemberNames.has(m.escapedName); }); setSortTextToMemberDeclaredBySpreadAssignment(membersDeclaredBySpreadAssignment, filteredSymbols); return filteredSymbols; } @@ -114528,7 +117509,7 @@ var ts; var properties = type && type.properties; if (properties) { properties.forEach(function (property) { - membersDeclaredBySpreadAssignment.set(property.name, true); + membersDeclaredBySpreadAssignment.add(property.name); }); } } @@ -114558,14 +117539,14 @@ var ts; * @returns Symbols to be suggested in an class element depending on existing memebers and symbol flags */ function filterClassMembersList(baseSymbols, existingMembers, currentClassElementModifierFlags) { - var existingMemberNames = ts.createUnderscoreEscapedMap(); + var existingMemberNames = new ts.Set(); for (var _i = 0, existingMembers_2 = existingMembers; _i < existingMembers_2.length; _i++) { var m = existingMembers_2[_i]; // Ignore omitted expressions for missing members - if (m.kind !== 159 /* PropertyDeclaration */ && - m.kind !== 161 /* MethodDeclaration */ && - m.kind !== 163 /* GetAccessor */ && - m.kind !== 164 /* SetAccessor */) { + if (m.kind !== 162 /* PropertyDeclaration */ && + m.kind !== 164 /* MethodDeclaration */ && + m.kind !== 166 /* GetAccessor */ && + m.kind !== 167 /* SetAccessor */) { continue; } // If this is the current item we are editing right now, do not filter it out @@ -114573,23 +117554,23 @@ var ts; continue; } // Dont filter member even if the name matches if it is declared private in the list - if (ts.hasModifier(m, 8 /* Private */)) { + if (ts.hasEffectiveModifier(m, 8 /* Private */)) { continue; } // do not filter it out if the static presence doesnt match - if (ts.hasModifier(m, 32 /* Static */) !== !!(currentClassElementModifierFlags & 32 /* Static */)) { + if (ts.hasEffectiveModifier(m, 32 /* Static */) !== !!(currentClassElementModifierFlags & 32 /* Static */)) { continue; } var existingName = ts.getPropertyNameForPropertyNameNode(m.name); if (existingName) { - existingMemberNames.set(existingName, true); + existingMemberNames.add(existingName); } } return baseSymbols.filter(function (propertySymbol) { return !existingMemberNames.has(propertySymbol.escapedName) && !!propertySymbol.declarations && !(ts.getDeclarationModifierFlagsFromSymbol(propertySymbol) & 8 /* Private */) && - !ts.isPrivateIdentifierPropertyDeclaration(propertySymbol.valueDeclaration); + !(propertySymbol.valueDeclaration && ts.isPrivateIdentifierPropertyDeclaration(propertySymbol.valueDeclaration)); }); } /** @@ -114599,22 +117580,22 @@ var ts; * do not occur at the current position and have not otherwise been typed. */ function filterJsxAttributes(symbols, attributes) { - var seenNames = ts.createUnderscoreEscapedMap(); - var membersDeclaredBySpreadAssignment = ts.createMap(); + var seenNames = new ts.Set(); + var membersDeclaredBySpreadAssignment = new ts.Set(); for (var _i = 0, attributes_1 = attributes; _i < attributes_1.length; _i++) { var attr = attributes_1[_i]; // If this is the current item we are editing right now, do not filter it out if (isCurrentlyEditingNode(attr)) { continue; } - if (attr.kind === 273 /* JsxAttribute */) { - seenNames.set(attr.name.escapedText, true); + if (attr.kind === 277 /* JsxAttribute */) { + seenNames.add(attr.name.escapedText); } else if (ts.isJsxSpreadAttribute(attr)) { setMembersDeclaredBySpreadAssignment(attr, membersDeclaredBySpreadAssignment); } } - var filteredSymbols = symbols.filter(function (a) { return !seenNames.get(a.escapedName); }); + var filteredSymbols = symbols.filter(function (a) { return !seenNames.has(a.escapedName); }); setSortTextToMemberDeclaredBySpreadAssignment(membersDeclaredBySpreadAssignment, filteredSymbols); return filteredSymbols; } @@ -114657,7 +117638,7 @@ var ts; var _keywordCompletions = []; var allKeywordsCompletions = ts.memoize(function () { var res = []; - for (var i = 77 /* FirstKeyword */; i <= 152 /* LastKeyword */; i++) { + for (var i = 80 /* FirstKeyword */; i <= 155 /* LastKeyword */; i++) { res.push({ name: ts.tokenToString(i), kind: "keyword" /* keyword */, @@ -114683,12 +117664,12 @@ var ts; return false; case 1 /* All */: return isFunctionLikeBodyKeyword(kind) - || kind === 130 /* DeclareKeyword */ - || kind === 135 /* ModuleKeyword */ - || kind === 145 /* TypeKeyword */ - || kind === 136 /* NamespaceKeyword */ - || kind === 123 /* AsKeyword */ - || ts.isTypeKeyword(kind) && kind !== 146 /* UndefinedKeyword */; + || kind === 133 /* DeclareKeyword */ + || kind === 138 /* ModuleKeyword */ + || kind === 148 /* TypeKeyword */ + || kind === 139 /* NamespaceKeyword */ + || kind === 126 /* AsKeyword */ + || ts.isTypeKeyword(kind) && kind !== 149 /* UndefinedKeyword */; case 5 /* FunctionLikeBodyKeywords */: return isFunctionLikeBodyKeyword(kind); case 2 /* ClassElementKeywords */: @@ -114698,7 +117679,7 @@ var ts; case 4 /* ConstructorParameterKeywords */: return ts.isParameterPropertyModifier(kind); case 6 /* TypeAssertionKeywords */: - return ts.isTypeKeyword(kind) || kind === 81 /* ConstKeyword */; + return ts.isTypeKeyword(kind) || kind === 84 /* ConstKeyword */; case 7 /* TypeKeywords */: return ts.isTypeKeyword(kind); default: @@ -114708,56 +117689,56 @@ var ts; } function isTypeScriptOnlyKeyword(kind) { switch (kind) { - case 122 /* AbstractKeyword */: - case 125 /* AnyKeyword */: - case 151 /* BigIntKeyword */: - case 128 /* BooleanKeyword */: - case 130 /* DeclareKeyword */: - case 88 /* EnumKeyword */: - case 150 /* GlobalKeyword */: - case 113 /* ImplementsKeyword */: - case 132 /* InferKeyword */: - case 114 /* InterfaceKeyword */: - case 133 /* IsKeyword */: - case 134 /* KeyOfKeyword */: - case 135 /* ModuleKeyword */: - case 136 /* NamespaceKeyword */: - case 137 /* NeverKeyword */: - case 140 /* NumberKeyword */: - case 141 /* ObjectKeyword */: - case 117 /* PrivateKeyword */: - case 118 /* ProtectedKeyword */: - case 119 /* PublicKeyword */: - case 138 /* ReadonlyKeyword */: - case 143 /* StringKeyword */: - case 144 /* SymbolKeyword */: - case 145 /* TypeKeyword */: - case 147 /* UniqueKeyword */: - case 148 /* UnknownKeyword */: + case 125 /* AbstractKeyword */: + case 128 /* AnyKeyword */: + case 154 /* BigIntKeyword */: + case 131 /* BooleanKeyword */: + case 133 /* DeclareKeyword */: + case 91 /* EnumKeyword */: + case 153 /* GlobalKeyword */: + case 116 /* ImplementsKeyword */: + case 135 /* InferKeyword */: + case 117 /* InterfaceKeyword */: + case 136 /* IsKeyword */: + case 137 /* KeyOfKeyword */: + case 138 /* ModuleKeyword */: + case 139 /* NamespaceKeyword */: + case 140 /* NeverKeyword */: + case 143 /* NumberKeyword */: + case 144 /* ObjectKeyword */: + case 120 /* PrivateKeyword */: + case 121 /* ProtectedKeyword */: + case 122 /* PublicKeyword */: + case 141 /* ReadonlyKeyword */: + case 146 /* StringKeyword */: + case 147 /* SymbolKeyword */: + case 148 /* TypeKeyword */: + case 150 /* UniqueKeyword */: + case 151 /* UnknownKeyword */: return true; default: return false; } } function isInterfaceOrTypeLiteralCompletionKeyword(kind) { - return kind === 138 /* ReadonlyKeyword */; + return kind === 141 /* ReadonlyKeyword */; } function isClassMemberCompletionKeyword(kind) { switch (kind) { - case 122 /* AbstractKeyword */: - case 129 /* ConstructorKeyword */: - case 131 /* GetKeyword */: - case 142 /* SetKeyword */: - case 126 /* AsyncKeyword */: - case 130 /* DeclareKeyword */: + case 125 /* AbstractKeyword */: + case 132 /* ConstructorKeyword */: + case 134 /* GetKeyword */: + case 145 /* SetKeyword */: + case 129 /* AsyncKeyword */: + case 133 /* DeclareKeyword */: return true; default: return ts.isClassMemberModifier(kind); } } function isFunctionLikeBodyKeyword(kind) { - return kind === 126 /* AsyncKeyword */ - || kind === 127 /* AwaitKeyword */ + return kind === 129 /* AsyncKeyword */ + || kind === 130 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind); } function keywordForNode(node) { @@ -114808,7 +117789,7 @@ var ts; function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location, position) { // class c { method() { } | method2() { } } switch (location.kind) { - case 324 /* SyntaxList */: + case 329 /* SyntaxList */: return ts.tryCast(location.parent, ts.isObjectTypeDeclaration); case 1 /* EndOfFileToken */: var cls = ts.tryCast(ts.lastOrUndefined(ts.cast(location.parent, ts.isSourceFile).statements), ts.isObjectTypeDeclaration); @@ -114816,7 +117797,7 @@ var ts; return cls; } break; - case 75 /* Identifier */: { + case 78 /* Identifier */: { // class c { public prop = c| } if (ts.isPropertyDeclaration(location.parent) && location.parent.initializer === location) { return undefined; @@ -114940,7 +117921,7 @@ var ts; }; } function getSemanticDocumentHighlights(position, node, program, cancellationToken, sourceFilesToSearch) { - var sourceFilesSet = ts.arrayToSet(sourceFilesToSearch, function (f) { return f.fileName; }); + var sourceFilesSet = new ts.Set(sourceFilesToSearch.map(function (f) { return f.fileName; })); var referenceEntries = ts.FindAllReferences.getReferenceEntriesForNode(position, node, program, sourceFilesToSearch, cancellationToken, /*options*/ undefined, sourceFilesSet); if (!referenceEntries) return undefined; @@ -114963,44 +117944,44 @@ var ts; } function getHighlightSpans(node, sourceFile) { switch (node.kind) { - case 95 /* IfKeyword */: - case 87 /* ElseKeyword */: + case 98 /* IfKeyword */: + case 90 /* ElseKeyword */: return ts.isIfStatement(node.parent) ? getIfElseOccurrences(node.parent, sourceFile) : undefined; - case 101 /* ReturnKeyword */: + case 104 /* ReturnKeyword */: return useParent(node.parent, ts.isReturnStatement, getReturnOccurrences); - case 105 /* ThrowKeyword */: + case 108 /* ThrowKeyword */: return useParent(node.parent, ts.isThrowStatement, getThrowOccurrences); - case 107 /* TryKeyword */: - case 79 /* CatchKeyword */: - case 92 /* FinallyKeyword */: - var tryStatement = node.kind === 79 /* CatchKeyword */ ? node.parent.parent : node.parent; + case 110 /* TryKeyword */: + case 82 /* CatchKeyword */: + case 95 /* FinallyKeyword */: + var tryStatement = node.kind === 82 /* CatchKeyword */ ? node.parent.parent : node.parent; return useParent(tryStatement, ts.isTryStatement, getTryCatchFinallyOccurrences); - case 103 /* SwitchKeyword */: + case 106 /* SwitchKeyword */: return useParent(node.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences); - case 78 /* CaseKeyword */: - case 84 /* DefaultKeyword */: { + case 81 /* CaseKeyword */: + case 87 /* DefaultKeyword */: { if (ts.isDefaultClause(node.parent) || ts.isCaseClause(node.parent)) { return useParent(node.parent.parent.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences); } return undefined; } - case 77 /* BreakKeyword */: - case 82 /* ContinueKeyword */: + case 80 /* BreakKeyword */: + case 85 /* ContinueKeyword */: return useParent(node.parent, ts.isBreakOrContinueStatement, getBreakOrContinueStatementOccurrences); - case 93 /* ForKeyword */: - case 111 /* WhileKeyword */: - case 86 /* DoKeyword */: + case 96 /* ForKeyword */: + case 114 /* WhileKeyword */: + case 89 /* DoKeyword */: return useParent(node.parent, function (n) { return ts.isIterationStatement(n, /*lookInLabeledStatements*/ true); }, getLoopBreakContinueOccurrences); - case 129 /* ConstructorKeyword */: - return getFromAllDeclarations(ts.isConstructorDeclaration, [129 /* ConstructorKeyword */]); - case 131 /* GetKeyword */: - case 142 /* SetKeyword */: - return getFromAllDeclarations(ts.isAccessor, [131 /* GetKeyword */, 142 /* SetKeyword */]); - case 127 /* AwaitKeyword */: + case 132 /* ConstructorKeyword */: + return getFromAllDeclarations(ts.isConstructorDeclaration, [132 /* ConstructorKeyword */]); + case 134 /* GetKeyword */: + case 145 /* SetKeyword */: + return getFromAllDeclarations(ts.isAccessor, [134 /* GetKeyword */, 145 /* SetKeyword */]); + case 130 /* AwaitKeyword */: return useParent(node.parent, ts.isAwaitExpression, getAsyncAndAwaitOccurrences); - case 126 /* AsyncKeyword */: + case 129 /* AsyncKeyword */: return highlightSpans(getAsyncAndAwaitOccurrences(node)); - case 121 /* YieldKeyword */: + case 124 /* YieldKeyword */: return highlightSpans(getYieldOccurrences(node)); default: return ts.isModifierKind(node.kind) && (ts.isDeclaration(node.parent) || ts.isVariableStatement(node.parent)) @@ -115043,7 +118024,7 @@ var ts; var child = throwStatement; while (child.parent) { var parent = child.parent; - if (ts.isFunctionBlock(parent) || parent.kind === 290 /* SourceFile */) { + if (ts.isFunctionBlock(parent) || parent.kind === 294 /* SourceFile */) { return parent; } // A throw-statement is only owned by a try-statement if the try-statement has @@ -115075,16 +118056,16 @@ var ts; function getBreakOrContinueOwner(statement) { return ts.findAncestor(statement, function (node) { switch (node.kind) { - case 237 /* SwitchStatement */: - if (statement.kind === 233 /* ContinueStatement */) { + case 241 /* SwitchStatement */: + if (statement.kind === 237 /* ContinueStatement */) { return false; } // falls through - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - case 229 /* WhileStatement */: - case 228 /* DoStatement */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 233 /* WhileStatement */: + case 232 /* DoStatement */: return !statement.label || isLabeledBy(node, statement.label.escapedText); default: // Don't cross function boundaries. @@ -115100,11 +118081,11 @@ var ts; // Types of node whose children might have modifiers. var container = declaration.parent; switch (container.kind) { - case 250 /* ModuleBlock */: - case 290 /* SourceFile */: - case 223 /* Block */: - case 277 /* CaseClause */: - case 278 /* DefaultClause */: + case 254 /* ModuleBlock */: + case 294 /* SourceFile */: + case 227 /* Block */: + case 281 /* CaseClause */: + case 282 /* DefaultClause */: // Container is either a class declaration or the declaration is a classDeclaration if (modifierFlag & 128 /* Abstract */ && ts.isClassDeclaration(declaration)) { return __spreadArrays(declaration.members, [declaration]); @@ -115112,14 +118093,14 @@ var ts; else { return container.statements; } - case 162 /* Constructor */: - case 161 /* MethodDeclaration */: - case 244 /* FunctionDeclaration */: + case 165 /* Constructor */: + case 164 /* MethodDeclaration */: + case 248 /* FunctionDeclaration */: return __spreadArrays(container.parameters, (ts.isClassLike(container.parent) ? container.parent.members : [])); - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 246 /* InterfaceDeclaration */: - case 173 /* TypeLiteral */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 250 /* InterfaceDeclaration */: + case 176 /* TypeLiteral */: var nodes = container.members; // If we're an accessibility modifier, we're in an instance member and should search // the constructor's parameter list for instance members as well. @@ -115150,12 +118131,12 @@ var ts; } function getLoopBreakContinueOccurrences(loopNode) { var keywords = []; - if (pushKeywordIf(keywords, loopNode.getFirstToken(), 93 /* ForKeyword */, 111 /* WhileKeyword */, 86 /* DoKeyword */)) { + if (pushKeywordIf(keywords, loopNode.getFirstToken(), 96 /* ForKeyword */, 114 /* WhileKeyword */, 89 /* DoKeyword */)) { // If we succeeded and got a do-while loop, then start looking for a 'while' keyword. - if (loopNode.kind === 228 /* DoStatement */) { + if (loopNode.kind === 232 /* DoStatement */) { var loopTokens = loopNode.getChildren(); for (var i = loopTokens.length - 1; i >= 0; i--) { - if (pushKeywordIf(keywords, loopTokens[i], 111 /* WhileKeyword */)) { + if (pushKeywordIf(keywords, loopTokens[i], 114 /* WhileKeyword */)) { break; } } @@ -115163,7 +118144,7 @@ var ts; } ts.forEach(aggregateAllBreakAndContinueStatements(loopNode.statement), function (statement) { if (ownsBreakOrContinueStatement(loopNode, statement)) { - pushKeywordIf(keywords, statement.getFirstToken(), 77 /* BreakKeyword */, 82 /* ContinueKeyword */); + pushKeywordIf(keywords, statement.getFirstToken(), 80 /* BreakKeyword */, 85 /* ContinueKeyword */); } }); return keywords; @@ -115172,13 +118153,13 @@ var ts; var owner = getBreakOrContinueOwner(breakOrContinueStatement); if (owner) { switch (owner.kind) { - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - case 228 /* DoStatement */: - case 229 /* WhileStatement */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 232 /* DoStatement */: + case 233 /* WhileStatement */: return getLoopBreakContinueOccurrences(owner); - case 237 /* SwitchStatement */: + case 241 /* SwitchStatement */: return getSwitchCaseDefaultOccurrences(owner); } } @@ -115186,13 +118167,13 @@ var ts; } function getSwitchCaseDefaultOccurrences(switchStatement) { var keywords = []; - pushKeywordIf(keywords, switchStatement.getFirstToken(), 103 /* SwitchKeyword */); + pushKeywordIf(keywords, switchStatement.getFirstToken(), 106 /* SwitchKeyword */); // Go through each clause in the switch statement, collecting the 'case'/'default' keywords. ts.forEach(switchStatement.caseBlock.clauses, function (clause) { - pushKeywordIf(keywords, clause.getFirstToken(), 78 /* CaseKeyword */, 84 /* DefaultKeyword */); + pushKeywordIf(keywords, clause.getFirstToken(), 81 /* CaseKeyword */, 87 /* DefaultKeyword */); ts.forEach(aggregateAllBreakAndContinueStatements(clause), function (statement) { if (ownsBreakOrContinueStatement(switchStatement, statement)) { - pushKeywordIf(keywords, statement.getFirstToken(), 77 /* BreakKeyword */); + pushKeywordIf(keywords, statement.getFirstToken(), 80 /* BreakKeyword */); } }); }); @@ -115200,13 +118181,13 @@ var ts; } function getTryCatchFinallyOccurrences(tryStatement, sourceFile) { var keywords = []; - pushKeywordIf(keywords, tryStatement.getFirstToken(), 107 /* TryKeyword */); + pushKeywordIf(keywords, tryStatement.getFirstToken(), 110 /* TryKeyword */); if (tryStatement.catchClause) { - pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 79 /* CatchKeyword */); + pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 82 /* CatchKeyword */); } if (tryStatement.finallyBlock) { - var finallyKeyword = ts.findChildOfKind(tryStatement, 92 /* FinallyKeyword */, sourceFile); - pushKeywordIf(keywords, finallyKeyword, 92 /* FinallyKeyword */); + var finallyKeyword = ts.findChildOfKind(tryStatement, 95 /* FinallyKeyword */, sourceFile); + pushKeywordIf(keywords, finallyKeyword, 95 /* FinallyKeyword */); } return keywords; } @@ -115217,13 +118198,13 @@ var ts; } var keywords = []; ts.forEach(aggregateOwnedThrowStatements(owner), function (throwStatement) { - keywords.push(ts.findChildOfKind(throwStatement, 105 /* ThrowKeyword */, sourceFile)); + keywords.push(ts.findChildOfKind(throwStatement, 108 /* ThrowKeyword */, sourceFile)); }); // If the "owner" is a function, then we equate 'return' and 'throw' statements in their // ability to "jump out" of the function, and include occurrences for both. if (ts.isFunctionBlock(owner)) { ts.forEachReturnStatement(owner, function (returnStatement) { - keywords.push(ts.findChildOfKind(returnStatement, 101 /* ReturnKeyword */, sourceFile)); + keywords.push(ts.findChildOfKind(returnStatement, 104 /* ReturnKeyword */, sourceFile)); }); } return keywords; @@ -115235,11 +118216,11 @@ var ts; } var keywords = []; ts.forEachReturnStatement(ts.cast(func.body, ts.isBlock), function (returnStatement) { - keywords.push(ts.findChildOfKind(returnStatement, 101 /* ReturnKeyword */, sourceFile)); + keywords.push(ts.findChildOfKind(returnStatement, 104 /* ReturnKeyword */, sourceFile)); }); // Include 'throw' statements that do not occur within a try block. ts.forEach(aggregateOwnedThrowStatements(func.body), function (throwStatement) { - keywords.push(ts.findChildOfKind(throwStatement, 105 /* ThrowKeyword */, sourceFile)); + keywords.push(ts.findChildOfKind(throwStatement, 108 /* ThrowKeyword */, sourceFile)); }); return keywords; } @@ -115251,13 +118232,13 @@ var ts; var keywords = []; if (func.modifiers) { func.modifiers.forEach(function (modifier) { - pushKeywordIf(keywords, modifier, 126 /* AsyncKeyword */); + pushKeywordIf(keywords, modifier, 129 /* AsyncKeyword */); }); } ts.forEachChild(func, function (child) { traverseWithoutCrossingFunction(child, function (node) { if (ts.isAwaitExpression(node)) { - pushKeywordIf(keywords, node.getFirstToken(), 127 /* AwaitKeyword */); + pushKeywordIf(keywords, node.getFirstToken(), 130 /* AwaitKeyword */); } }); }); @@ -115272,7 +118253,7 @@ var ts; ts.forEachChild(func, function (child) { traverseWithoutCrossingFunction(child, function (node) { if (ts.isYieldExpression(node)) { - pushKeywordIf(keywords, node.getFirstToken(), 121 /* YieldKeyword */); + pushKeywordIf(keywords, node.getFirstToken(), 124 /* YieldKeyword */); } }); }); @@ -115291,7 +118272,7 @@ var ts; // We'd like to highlight else/ifs together if they are only separated by whitespace // (i.e. the keywords are separated by no comments, no newlines). for (var i = 0; i < keywords.length; i++) { - if (keywords[i].kind === 87 /* ElseKeyword */ && i < keywords.length - 1) { + if (keywords[i].kind === 90 /* ElseKeyword */ && i < keywords.length - 1) { var elseKeyword = keywords[i]; var ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword. var shouldCombineElseAndIf = true; @@ -115326,10 +118307,10 @@ var ts; // Now traverse back down through the else branches, aggregating if/else keywords of if-statements. while (true) { var children = ifStatement.getChildren(sourceFile); - pushKeywordIf(keywords, children[0], 95 /* IfKeyword */); + pushKeywordIf(keywords, children[0], 98 /* IfKeyword */); // Generally the 'else' keyword is second-to-last, so we traverse backwards. for (var i = children.length - 1; i >= 0; i--) { - if (pushKeywordIf(keywords, children[i], 87 /* ElseKeyword */)) { + if (pushKeywordIf(keywords, children[i], 90 /* ElseKeyword */)) { break; } } @@ -115360,7 +118341,7 @@ var ts; if (currentDirectory === void 0) { currentDirectory = ""; } // Maps from compiler setting target (ES3, ES5, etc.) to all the cached documents we have // for those settings. - var buckets = ts.createMap(); + var buckets = new ts.Map(); var getCanonicalFileName = ts.createGetCanonicalFileName(!!useCaseSensitiveFileNames); function reportStats() { var bucketInfoArray = ts.arrayFrom(buckets.keys()).filter(function (name) { return name && name.charAt(0) === "_"; }).map(function (name) { @@ -115397,7 +118378,7 @@ var ts; return acquireOrUpdateDocument(fileName, path, compilationSettings, key, scriptSnapshot, version, /*acquiring*/ false, scriptKind); } function acquireOrUpdateDocument(fileName, path, compilationSettings, key, scriptSnapshot, version, acquiring, scriptKind) { - var bucket = ts.getOrUpdate(buckets, key, ts.createMap); + var bucket = ts.getOrUpdate(buckets, key, function () { return new ts.Map(); }); var entry = bucket.get(path); var scriptTarget = scriptKind === 6 /* JSON */ ? 100 /* JSON */ : compilationSettings.target || 1 /* ES5 */; if (!entry && externalCache) { @@ -115545,12 +118526,12 @@ var ts; if (cancellationToken) cancellationToken.throwIfCancellationRequested(); switch (direct.kind) { - case 196 /* CallExpression */: + case 200 /* CallExpression */: if (!isAvailableThroughGlobal) { var parent = direct.parent; - if (exportKind === 2 /* ExportEquals */ && parent.kind === 242 /* VariableDeclaration */) { + if (exportKind === 2 /* ExportEquals */ && parent.kind === 246 /* VariableDeclaration */) { var name = parent.name; - if (name.kind === 75 /* Identifier */) { + if (name.kind === 78 /* Identifier */) { directImports.push(name); break; } @@ -115559,32 +118540,36 @@ var ts; addIndirectUser(direct.getSourceFile()); } break; - case 75 /* Identifier */: // for 'const x = require("y"); + case 78 /* Identifier */: // for 'const x = require("y"); break; // TODO: GH#23879 - case 253 /* ImportEqualsDeclaration */: - handleNamespaceImport(direct, direct.name, ts.hasModifier(direct, 1 /* Export */), /*alreadyAddedDirect*/ false); + case 257 /* ImportEqualsDeclaration */: + handleNamespaceImport(direct, direct.name, ts.hasSyntacticModifier(direct, 1 /* Export */), /*alreadyAddedDirect*/ false); break; - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: directImports.push(direct); var namedBindings = direct.importClause && direct.importClause.namedBindings; - if (namedBindings && namedBindings.kind === 256 /* NamespaceImport */) { + if (namedBindings && namedBindings.kind === 260 /* NamespaceImport */) { handleNamespaceImport(direct, namedBindings.name, /*isReExport*/ false, /*alreadyAddedDirect*/ true); } else if (!isAvailableThroughGlobal && ts.isDefaultImport(direct)) { addIndirectUser(getSourceFileLikeForImportDeclaration(direct)); // Add a check for indirect uses to handle synthetic default imports } break; - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: if (!direct.exportClause) { // This is `export * from "foo"`, so imports of this module may import the export too. handleDirectImports(getContainingModuleSymbol(direct, checker)); } + else if (direct.exportClause.kind === 266 /* NamespaceExport */) { + // `export * as foo from "foo"` add to indirect uses + addIndirectUsers(getSourceFileLikeForImportDeclaration(direct)); + } else { // This is `export { foo } from "foo"` and creates an alias symbol, so recursive search will get handle re-exports. directImports.push(direct); } break; - case 188 /* ImportType */: + case 192 /* ImportType */: directImports.push(direct); break; default: @@ -115601,7 +118586,7 @@ var ts; } else if (!isAvailableThroughGlobal) { var sourceFileLike = getSourceFileLikeForImportDeclaration(importDeclaration); - ts.Debug.assert(sourceFileLike.kind === 290 /* SourceFile */ || sourceFileLike.kind === 249 /* ModuleDeclaration */); + ts.Debug.assert(sourceFileLike.kind === 294 /* SourceFile */ || sourceFileLike.kind === 253 /* ModuleDeclaration */); if (isReExport || findNamespaceReExports(sourceFileLike, name, checker)) { addIndirectUsers(sourceFileLike); } @@ -115658,17 +118643,17 @@ var ts; } return { importSearches: importSearches, singleReferences: singleReferences }; function handleImport(decl) { - if (decl.kind === 253 /* ImportEqualsDeclaration */) { + if (decl.kind === 257 /* ImportEqualsDeclaration */) { if (isExternalModuleImportEquals(decl)) { handleNamespaceImportLike(decl.name); } return; } - if (decl.kind === 75 /* Identifier */) { + if (decl.kind === 78 /* Identifier */) { handleNamespaceImportLike(decl); return; } - if (decl.kind === 188 /* ImportType */) { + if (decl.kind === 192 /* ImportType */) { if (decl.qualifier) { var firstIdentifier = ts.getFirstIdentifier(decl.qualifier); if (firstIdentifier.escapedText === ts.symbolName(exportSymbol)) { @@ -115684,7 +118669,7 @@ var ts; if (decl.moduleSpecifier.kind !== 10 /* StringLiteral */) { return; } - if (decl.kind === 260 /* ExportDeclaration */) { + if (decl.kind === 264 /* ExportDeclaration */) { if (decl.exportClause && ts.isNamedExports(decl.exportClause)) { searchForNamedImport(decl.exportClause); } @@ -115693,10 +118678,10 @@ var ts; var _a = decl.importClause || { name: undefined, namedBindings: undefined }, name = _a.name, namedBindings = _a.namedBindings; if (namedBindings) { switch (namedBindings.kind) { - case 256 /* NamespaceImport */: + case 260 /* NamespaceImport */: handleNamespaceImportLike(namedBindings.name); break; - case 257 /* NamedImports */: + case 261 /* NamedImports */: // 'default' might be accessed as a named import `{ default as foo }`. if (exportKind === 0 /* Named */ || exportKind === 1 /* Default */) { searchForNamedImport(namedBindings); @@ -115746,7 +118731,7 @@ var ts; } } else { - var localSymbol = element.kind === 263 /* ExportSpecifier */ && element.propertyName + var localSymbol = element.kind === 267 /* ExportSpecifier */ && element.propertyName ? checker.getExportSpecifierLocalTargetSymbol(element) // For re-exporting under a different name, we want to get the re-exported symbol. : checker.getSymbolAtLocation(name); addSearch(name, localSymbol); @@ -115775,7 +118760,7 @@ var ts; for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) { var referencingFile = sourceFiles_1[_i]; var searchSourceFile = searchModuleSymbol.valueDeclaration; - if (searchSourceFile.kind === 290 /* SourceFile */) { + if (searchSourceFile.kind === 294 /* SourceFile */) { for (var _a = 0, _b = referencingFile.referencedFiles; _a < _b.length; _a++) { var ref = _b[_a]; if (program.getSourceFileFromReference(referencingFile, ref) === searchSourceFile) { @@ -115802,7 +118787,7 @@ var ts; FindAllReferences.findModuleReferences = findModuleReferences; /** Returns a map from a module symbol Id to all import statements that directly reference the module. */ function getDirectImportsMap(sourceFiles, checker, cancellationToken) { - var map = ts.createMap(); + var map = new ts.Map(); for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) { var sourceFile = sourceFiles_2[_i]; if (cancellationToken) @@ -115823,7 +118808,7 @@ var ts; } /** Iterates over all statements at the top level or in module declarations. Returns the first truthy result. */ function forEachPossibleImportOrExportStatement(sourceFileLike, action) { - return ts.forEach(sourceFileLike.kind === 290 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) { + return ts.forEach(sourceFileLike.kind === 294 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) { return action(statement) || (isAmbientModuleDeclaration(statement) && ts.forEach(statement.body && statement.body.statements, action)); }); } @@ -115838,15 +118823,15 @@ var ts; else { forEachPossibleImportOrExportStatement(sourceFile, function (statement) { switch (statement.kind) { - case 260 /* ExportDeclaration */: - case 254 /* ImportDeclaration */: { + case 264 /* ExportDeclaration */: + case 258 /* ImportDeclaration */: { var decl = statement; if (decl.moduleSpecifier && ts.isStringLiteral(decl.moduleSpecifier)) { action(decl, decl.moduleSpecifier); } break; } - case 253 /* ImportEqualsDeclaration */: { + case 257 /* ImportEqualsDeclaration */: { var decl = statement; if (isExternalModuleImportEquals(decl)) { action(decl, decl.moduleReference.expression); @@ -115870,7 +118855,7 @@ var ts; var parent = node.parent; var grandParent = parent.parent; if (symbol.exportSymbol) { - if (parent.kind === 194 /* PropertyAccessExpression */) { + if (parent.kind === 198 /* PropertyAccessExpression */) { // When accessing an export of a JS module, there's no alias. The symbol will still be flagged as an export even though we're at the use. // So check that we are at the declaration. return symbol.declarations.some(function (d) { return d === parent; }) && ts.isBinaryExpression(grandParent) @@ -115883,7 +118868,7 @@ var ts; } else { var exportNode = getExportNode(parent, node); - if (exportNode && ts.hasModifier(exportNode, 1 /* Export */)) { + if (exportNode && ts.hasSyntacticModifier(exportNode, 1 /* Export */)) { if (ts.isImportEqualsDeclaration(exportNode) && exportNode.moduleReference === node) { // We're at `Y` in `export import X = Y`. This is not the exported symbol, the left-hand-side is. So treat this as an import statement. if (comingFromExport) { @@ -115896,6 +118881,9 @@ var ts; return exportInfo(symbol, getExportKindForDeclaration(exportNode)); } } + else if (ts.isNamespaceExport(parent)) { + return exportInfo(symbol, 0 /* Named */); + } // If we are in `export = a;` or `export default a;`, `parent` is the export assignment. else if (ts.isExportAssignment(parent)) { return getExportAssignmentExport(parent); @@ -115965,7 +118953,7 @@ var ts; } // Not meant for use with export specifiers or export assignment. function getExportKindForDeclaration(node) { - return ts.hasModifier(node, 512 /* Default */) ? 1 /* Default */ : 0 /* Named */; + return ts.hasSyntacticModifier(node, 512 /* Default */) ? 1 /* Default */ : 0 /* Named */; } } FindAllReferences.getImportOrExportSymbol = getImportOrExportSymbol; @@ -116000,13 +118988,13 @@ var ts; function isNodeImport(node) { var parent = node.parent; switch (parent.kind) { - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return parent.name === node && isExternalModuleImportEquals(parent); - case 258 /* ImportSpecifier */: + case 262 /* ImportSpecifier */: // For a rename import `{ foo as bar }`, don't search for the imported symbol. Just find local uses of `bar`. return !parent.propertyName; - case 255 /* ImportClause */: - case 256 /* NamespaceImport */: + case 259 /* ImportClause */: + case 260 /* NamespaceImport */: ts.Debug.assert(parent.name === node); return true; default: @@ -116039,21 +119027,21 @@ var ts; return checker.getMergedSymbol(getSourceFileLikeForImportDeclaration(importer).symbol); } function getSourceFileLikeForImportDeclaration(node) { - if (node.kind === 196 /* CallExpression */) { + if (node.kind === 200 /* CallExpression */) { return node.getSourceFile(); } var parent = node.parent; - if (parent.kind === 290 /* SourceFile */) { + if (parent.kind === 294 /* SourceFile */) { return parent; } - ts.Debug.assert(parent.kind === 250 /* ModuleBlock */); + ts.Debug.assert(parent.kind === 254 /* ModuleBlock */); return ts.cast(parent.parent, isAmbientModuleDeclaration); } function isAmbientModuleDeclaration(node) { - return node.kind === 249 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */; + return node.kind === 253 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */; } function isExternalModuleImportEquals(eq) { - return eq.moduleReference.kind === 265 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */; + return eq.moduleReference.kind === 269 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */; } })(FindAllReferences = ts.FindAllReferences || (ts.FindAllReferences = {})); })(ts || (ts = {})); @@ -116146,7 +119134,7 @@ var ts; ((ts.isImportOrExportSpecifier(node.parent) || ts.isBindingElement(node.parent)) && node.parent.propertyName === node) || // Is default export - (node.kind === 84 /* DefaultKeyword */ && ts.hasModifier(node.parent, 513 /* ExportDefault */))) { + (node.kind === 87 /* DefaultKeyword */ && ts.hasSyntacticModifier(node.parent, 513 /* ExportDefault */))) { return getContextNode(node.parent); } return undefined; @@ -116155,7 +119143,7 @@ var ts; if (!node) return undefined; switch (node.kind) { - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return !ts.isVariableDeclarationList(node.parent) || node.parent.declarations.length !== 1 ? node : ts.isVariableStatement(node.parent.parent) ? @@ -116163,27 +119151,28 @@ var ts; ts.isForInOrOfStatement(node.parent.parent) ? getContextNode(node.parent.parent) : node.parent; - case 191 /* BindingElement */: + case 195 /* BindingElement */: return getContextNode(node.parent.parent); - case 258 /* ImportSpecifier */: + case 262 /* ImportSpecifier */: return node.parent.parent.parent; - case 263 /* ExportSpecifier */: - case 256 /* NamespaceImport */: + case 267 /* ExportSpecifier */: + case 260 /* NamespaceImport */: return node.parent.parent; - case 255 /* ImportClause */: + case 259 /* ImportClause */: + case 266 /* NamespaceExport */: return node.parent; - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return ts.isExpressionStatement(node.parent) ? node.parent : node; - case 232 /* ForOfStatement */: - case 231 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 235 /* ForInStatement */: return { start: node.initializer, end: node.expression }; - case 281 /* PropertyAssignment */: - case 282 /* ShorthandPropertyAssignment */: + case 285 /* PropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: return ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent) ? getContextNode(ts.findAncestor(node.parent, function (node) { return ts.isBinaryExpression(node) || ts.isForInOrOfStatement(node); @@ -116240,15 +119229,15 @@ var ts; var node = ts.getTouchingPropertyName(sourceFile, position); var referenceEntries; var entries = getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position); - if (node.parent.kind === 194 /* PropertyAccessExpression */ - || node.parent.kind === 191 /* BindingElement */ - || node.parent.kind === 195 /* ElementAccessExpression */ - || node.kind === 102 /* SuperKeyword */) { + if (node.parent.kind === 198 /* PropertyAccessExpression */ + || node.parent.kind === 195 /* BindingElement */ + || node.parent.kind === 199 /* ElementAccessExpression */ + || node.kind === 105 /* SuperKeyword */) { referenceEntries = entries && __spreadArrays(entries); } else { var queue = entries && __spreadArrays(entries); - var seenNodes = ts.createMap(); + var seenNodes = new ts.Map(); while (queue && queue.length) { var entry = queue.shift(); if (!ts.addToSeen(seenNodes, ts.getNodeId(entry.node))) { @@ -116266,18 +119255,18 @@ var ts; } FindAllReferences.getImplementationsAtPosition = getImplementationsAtPosition; function getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position) { - if (node.kind === 290 /* SourceFile */) { + if (node.kind === 294 /* SourceFile */) { return undefined; } var checker = program.getTypeChecker(); // If invoked directly on a shorthand property assignment, then return // the declaration of the symbol being assigned (not the symbol being assigned to). - if (node.parent.kind === 282 /* ShorthandPropertyAssignment */) { + if (node.parent.kind === 286 /* ShorthandPropertyAssignment */) { var result_1 = []; Core.getReferenceEntriesForShorthandPropertyAssignment(node, checker, function (node) { return result_1.push(nodeEntry(node)); }); return result_1; } - else if (node.kind === 102 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) { + else if (node.kind === 105 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) { // References to and accesses on the super keyword only have one possible implementation, so no // need to "Find all References" var symbol = checker.getSymbolAtLocation(node); @@ -116294,7 +119283,7 @@ var ts; FindAllReferences.findReferenceOrRenameEntries = findReferenceOrRenameEntries; function getReferenceEntriesForNode(position, node, program, sourceFiles, cancellationToken, options, sourceFilesSet) { if (options === void 0) { options = {}; } - if (sourceFilesSet === void 0) { sourceFilesSet = ts.arrayToSet(sourceFiles, function (f) { return f.fileName; }); } + if (sourceFilesSet === void 0) { sourceFilesSet = new ts.Set(sourceFiles.map(function (f) { return f.fileName; })); } return flattenEntries(Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken, options, sourceFilesSet)); } FindAllReferences.getReferenceEntriesForNode = getReferenceEntriesForNode; @@ -116308,7 +119297,7 @@ var ts; var symbol = def.symbol; var _a = getDefinitionKindAndDisplayParts(symbol, checker, originalNode), displayParts_1 = _a.displayParts, kind_1 = _a.kind; var name_1 = displayParts_1.map(function (p) { return p.text; }).join(""); - var declaration = symbol.declarations ? ts.first(symbol.declarations) : undefined; + var declaration = symbol.declarations && ts.firstOrUndefined(symbol.declarations); return { node: declaration ? ts.getNameOfDeclaration(declaration) || declaration : @@ -116382,23 +119371,39 @@ var ts; function getPrefixAndSuffixText(entry, originalNode, checker) { if (entry.kind !== 0 /* Span */ && ts.isIdentifier(originalNode)) { var node = entry.node, kind = entry.kind; + var parent = node.parent; var name = originalNode.text; - var isShorthandAssignment = ts.isShorthandPropertyAssignment(node.parent); - if (isShorthandAssignment || ts.isObjectBindingElementWithoutPropertyName(node.parent) && node.parent.name === node) { + var isShorthandAssignment = ts.isShorthandPropertyAssignment(parent); + if (isShorthandAssignment || (ts.isObjectBindingElementWithoutPropertyName(parent) && parent.name === node && parent.dotDotDotToken === undefined)) { var prefixColon = { prefixText: name + ": " }; var suffixColon = { suffixText: ": " + name }; - return kind === 3 /* SearchedLocalFoundProperty */ ? prefixColon - : kind === 4 /* SearchedPropertyFoundLocal */ ? suffixColon - // In `const o = { x }; o.x`, symbolAtLocation at `x` in `{ x }` is the property symbol. - // For a binding element `const { x } = o;`, symbolAtLocation at `x` is the property symbol. - : isShorthandAssignment ? suffixColon : prefixColon; + if (kind === 3 /* SearchedLocalFoundProperty */) { + return prefixColon; + } + if (kind === 4 /* SearchedPropertyFoundLocal */) { + return suffixColon; + } + // In `const o = { x }; o.x`, symbolAtLocation at `x` in `{ x }` is the property symbol. + // For a binding element `const { x } = o;`, symbolAtLocation at `x` is the property symbol. + if (isShorthandAssignment) { + var grandParent = parent.parent; + if (ts.isObjectLiteralExpression(grandParent) && + ts.isBinaryExpression(grandParent.parent) && + ts.isModuleExportsAccessExpression(grandParent.parent.left)) { + return prefixColon; + } + return suffixColon; + } + else { + return prefixColon; + } } - else if (ts.isImportSpecifier(entry.node.parent) && !entry.node.parent.propertyName) { + else if (ts.isImportSpecifier(parent) && !parent.propertyName) { // If the original symbol was using this alias, just rename the alias. var originalSymbol = ts.isExportSpecifier(originalNode.parent) ? checker.getExportSpecifierLocalTargetSymbol(originalNode.parent) : checker.getSymbolAtLocation(originalNode); - return ts.contains(originalSymbol.declarations, entry.node.parent) ? { prefixText: name + " as " } : ts.emptyOptions; + return ts.contains(originalSymbol.declarations, parent) ? { prefixText: name + " as " } : ts.emptyOptions; } - else if (ts.isExportSpecifier(entry.node.parent) && !entry.node.parent.propertyName) { + else if (ts.isExportSpecifier(parent) && !parent.propertyName) { // If the symbol for the node is same as declared node symbol use prefix text return originalNode === entry.node || checker.getSymbolAtLocation(originalNode) === checker.getSymbolAtLocation(entry.node) ? { prefixText: name + " as " } : @@ -116422,13 +119427,13 @@ var ts; if (symbol) { return getDefinitionKindAndDisplayParts(symbol, checker, node); } - else if (node.kind === 193 /* ObjectLiteralExpression */) { + else if (node.kind === 197 /* ObjectLiteralExpression */) { return { kind: "interface" /* interfaceElement */, displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("object literal"), ts.punctuationPart(21 /* CloseParenToken */)] }; } - else if (node.kind === 214 /* ClassExpression */) { + else if (node.kind === 218 /* ClassExpression */) { return { kind: "local class" /* localClassElement */, displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("anonymous local class"), ts.punctuationPart(21 /* CloseParenToken */)] @@ -116472,13 +119477,13 @@ var ts; /** A node is considered a writeAccess iff it is a name of a declaration or a target of an assignment */ function isWriteAccessForReference(node) { var decl = ts.getDeclarationFromName(node); - return !!decl && declarationIsWriteAccess(decl) || node.kind === 84 /* DefaultKeyword */ || ts.isWriteAccess(node); + return !!decl && declarationIsWriteAccess(decl) || node.kind === 87 /* DefaultKeyword */ || ts.isWriteAccess(node); } function isDefinitionForReference(node) { - return node.kind === 84 /* DefaultKeyword */ + return node.kind === 87 /* DefaultKeyword */ || !!ts.getDeclarationFromName(node) || ts.isLiteralComputedPropertyDeclarationName(node) - || (node.kind === 129 /* ConstructorKeyword */ && ts.isConstructorDeclaration(node.parent)); + || (node.kind === 132 /* ConstructorKeyword */ && ts.isConstructorDeclaration(node.parent)); } /** * True if 'decl' provides a value, as in `function f() {}`; @@ -116489,47 +119494,47 @@ var ts; if (!!(decl.flags & 8388608 /* Ambient */)) return true; switch (decl.kind) { - case 209 /* BinaryExpression */: - case 191 /* BindingElement */: - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 84 /* DefaultKeyword */: - case 248 /* EnumDeclaration */: - case 284 /* EnumMember */: - case 263 /* ExportSpecifier */: - case 255 /* ImportClause */: // default import - case 253 /* ImportEqualsDeclaration */: - case 258 /* ImportSpecifier */: - case 246 /* InterfaceDeclaration */: - case 315 /* JSDocCallbackTag */: - case 322 /* JSDocTypedefTag */: - case 273 /* JsxAttribute */: - case 249 /* ModuleDeclaration */: - case 252 /* NamespaceExportDeclaration */: - case 256 /* NamespaceImport */: - case 262 /* NamespaceExport */: - case 156 /* Parameter */: - case 282 /* ShorthandPropertyAssignment */: - case 247 /* TypeAliasDeclaration */: - case 155 /* TypeParameter */: + case 213 /* BinaryExpression */: + case 195 /* BindingElement */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 87 /* DefaultKeyword */: + case 252 /* EnumDeclaration */: + case 288 /* EnumMember */: + case 267 /* ExportSpecifier */: + case 259 /* ImportClause */: // default import + case 257 /* ImportEqualsDeclaration */: + case 262 /* ImportSpecifier */: + case 250 /* InterfaceDeclaration */: + case 320 /* JSDocCallbackTag */: + case 327 /* JSDocTypedefTag */: + case 277 /* JsxAttribute */: + case 253 /* ModuleDeclaration */: + case 256 /* NamespaceExportDeclaration */: + case 260 /* NamespaceImport */: + case 266 /* NamespaceExport */: + case 159 /* Parameter */: + case 286 /* ShorthandPropertyAssignment */: + case 251 /* TypeAliasDeclaration */: + case 158 /* TypeParameter */: return true; - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: // In `({ x: y } = 0);`, `x` is not a write access. (Won't call this function for `y`.) return !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(decl.parent); - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 162 /* Constructor */: - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 165 /* Constructor */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: return !!decl.body; - case 242 /* VariableDeclaration */: - case 159 /* PropertyDeclaration */: + case 246 /* VariableDeclaration */: + case 162 /* PropertyDeclaration */: return !!decl.initializer || ts.isCatchClause(decl.parent); - case 160 /* MethodSignature */: - case 158 /* PropertySignature */: - case 323 /* JSDocPropertyTag */: - case 317 /* JSDocParameterTag */: + case 163 /* MethodSignature */: + case 161 /* PropertySignature */: + case 328 /* JSDocPropertyTag */: + case 322 /* JSDocParameterTag */: return false; default: return ts.Debug.failBadSyntaxKind(decl); @@ -116541,7 +119546,7 @@ var ts; /** Core find-all-references algorithm. Handles special cases before delegating to `getReferencedSymbolsForSymbol`. */ function getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken, options, sourceFilesSet) { if (options === void 0) { options = {}; } - if (sourceFilesSet === void 0) { sourceFilesSet = ts.arrayToSet(sourceFiles, function (f) { return f.fileName; }); } + if (sourceFilesSet === void 0) { sourceFilesSet = new ts.Set(sourceFiles.map(function (f) { return f.fileName; })); } if (options.use === 1 /* References */) { node = ts.getAdjustedReferenceLocation(node); } @@ -116690,10 +119695,10 @@ var ts; for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) { var decl = _a[_i]; switch (decl.kind) { - case 290 /* SourceFile */: + case 294 /* SourceFile */: // Don't include the source file itself. (This may not be ideal behavior, but awkward to include an entire file as a reference.) break; - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: if (sourceFilesSet.has(decl.getSourceFile().fileName)) { references.push(nodeEntry(decl.name)); } @@ -116712,7 +119717,7 @@ var ts; if (sourceFilesSet.has(sourceFile.fileName)) { // At `module.exports = ...`, reference node is `module` var node = ts.isBinaryExpression(decl) && ts.isPropertyAccessExpression(decl.left) ? decl.left.expression : - ts.isExportAssignment(decl) ? ts.Debug.checkDefined(ts.findChildOfKind(decl, 89 /* ExportKeyword */, sourceFile)) : + ts.isExportAssignment(decl) ? ts.Debug.checkDefined(ts.findChildOfKind(decl, 92 /* ExportKeyword */, sourceFile)) : ts.getNameOfDeclaration(decl) || decl; references.push(nodeEntry(node)); } @@ -116722,25 +119727,25 @@ var ts; } /** As in a `readonly prop: any` or `constructor(readonly prop: any)`, not a `readonly any[]`. */ function isReadonlyTypeOperator(node) { - return node.kind === 138 /* ReadonlyKeyword */ + return node.kind === 141 /* ReadonlyKeyword */ && ts.isTypeOperatorNode(node.parent) - && node.parent.operator === 138 /* ReadonlyKeyword */; + && node.parent.operator === 141 /* ReadonlyKeyword */; } /** getReferencedSymbols for special node kinds. */ function getReferencedSymbolsSpecial(node, sourceFiles, cancellationToken) { if (ts.isTypeKeyword(node.kind)) { // A void expression (i.e., `void foo()`) is not special, but the `void` type is. - if (node.kind === 110 /* VoidKeyword */ && ts.isVoidExpression(node.parent)) { + if (node.kind === 113 /* VoidKeyword */ && ts.isVoidExpression(node.parent)) { return undefined; } // A modifier readonly (like on a property declaration) is not special; // a readonly type keyword (like `readonly string[]`) is. - if (node.kind === 138 /* ReadonlyKeyword */ && !isReadonlyTypeOperator(node)) { + if (node.kind === 141 /* ReadonlyKeyword */ && !isReadonlyTypeOperator(node)) { return undefined; } // Likewise, when we *are* looking for a special keyword, make sure we // *don’t* include readonly member modifiers. - return getAllReferencesForKeyword(sourceFiles, node.kind, cancellationToken, node.kind === 138 /* ReadonlyKeyword */ ? isReadonlyTypeOperator : undefined); + return getAllReferencesForKeyword(sourceFiles, node.kind, cancellationToken, node.kind === 141 /* ReadonlyKeyword */ ? isReadonlyTypeOperator : undefined); } // Labels if (ts.isJumpStatementTarget(node)) { @@ -116756,7 +119761,7 @@ var ts; if (ts.isThis(node)) { return getReferencesForThisKeyword(node, sourceFiles, cancellationToken); } - if (node.kind === 102 /* SuperKeyword */) { + if (node.kind === 105 /* SuperKeyword */) { return getReferencesForSuperKeyword(node); } return undefined; @@ -116773,7 +119778,7 @@ var ts; // When renaming at an export specifier, rename the export and not the thing being exported. getReferencesAtExportSpecifier(exportSpecifier.name, symbol, exportSpecifier, state.createSearch(node, originalSymbol, /*comingFrom*/ undefined), state, /*addReferencesHere*/ true, /*alwaysGetReferences*/ true); } - else if (node && node.kind === 84 /* DefaultKeyword */) { + else if (node && node.kind === 87 /* DefaultKeyword */) { addReference(node, symbol, state); searchForImportsOfExport(node, symbol, { exportingModuleSymbol: ts.Debug.checkDefined(symbol.parent, "Expected export symbol to have a parent"), exportKind: 1 /* Default */ }, state); } @@ -116801,9 +119806,9 @@ var ts; } function getSpecialSearchKind(node) { switch (node.kind) { - case 129 /* ConstructorKeyword */: + case 132 /* ConstructorKeyword */: return 1 /* Constructor */; - case 75 /* Identifier */: + case 78 /* Identifier */: if (ts.isClassLike(node.parent)) { ts.Debug.assert(node.parent.name === node); return 2 /* Class */; @@ -116860,7 +119865,7 @@ var ts; this.options = options; this.result = result; /** Cache for `explicitlyinheritsFrom`. */ - this.inheritsFromCache = ts.createMap(); + this.inheritsFromCache = new ts.Map(); /** * Type nodes can contain multiple references to the same type. For example: * let x: Foo & (Foo & Bar) = ... @@ -116929,11 +119934,11 @@ var ts; /** Returns `true` the first time we search for a symbol in a file and `false` afterwards. */ State.prototype.markSearchedSymbols = function (sourceFile, symbols) { var sourceId = ts.getNodeId(sourceFile); - var seenSymbols = this.sourceFileToSeenSymbols[sourceId] || (this.sourceFileToSeenSymbols[sourceId] = ts.createMap()); + var seenSymbols = this.sourceFileToSeenSymbols[sourceId] || (this.sourceFileToSeenSymbols[sourceId] = new ts.Set()); var anyNewSymbols = false; for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) { var sym = symbols_3[_i]; - anyNewSymbols = ts.addToSeen(seenSymbols, ts.getSymbolId(sym)) || anyNewSymbols; + anyNewSymbols = ts.tryAddToSet(seenSymbols, ts.getSymbolId(sym)) || anyNewSymbols; } return anyNewSymbols; }; @@ -116978,7 +119983,7 @@ var ts; } } function eachExportReference(sourceFiles, checker, cancellationToken, exportSymbol, exportingModuleSymbol, exportName, isDefaultExport, cb) { - var importTracker = FindAllReferences.createImportTracker(sourceFiles, ts.arrayToSet(sourceFiles, function (f) { return f.fileName; }), checker, cancellationToken); + var importTracker = FindAllReferences.createImportTracker(sourceFiles, new ts.Set(sourceFiles.map(function (f) { return f.fileName; })), checker, cancellationToken); var _a = importTracker(exportSymbol, { exportKind: isDefaultExport ? 1 /* Default */ : 0 /* Named */, exportingModuleSymbol: exportingModuleSymbol }, /*isForRename*/ false), importSearches = _a.importSearches, indirectUsers = _a.indirectUsers; for (var _i = 0, importSearches_2 = importSearches; _i < importSearches_2.length; _i++) { var importLocation = importSearches_2[_i][0]; @@ -117041,7 +120046,7 @@ var ts; // If this is the symbol of a named function expression or named class expression, // then named references are limited to its own scope. var declarations = symbol.declarations, flags = symbol.flags, parent = symbol.parent, valueDeclaration = symbol.valueDeclaration; - if (valueDeclaration && (valueDeclaration.kind === 201 /* FunctionExpression */ || valueDeclaration.kind === 214 /* ClassExpression */)) { + if (valueDeclaration && (valueDeclaration.kind === 205 /* FunctionExpression */ || valueDeclaration.kind === 218 /* ClassExpression */)) { return valueDeclaration; } if (!declarations) { @@ -117049,9 +120054,9 @@ var ts; } // If this is private property or method, the scope is the containing class if (flags & (4 /* Property */ | 8192 /* Method */)) { - var privateDeclaration = ts.find(declarations, function (d) { return ts.hasModifier(d, 8 /* Private */) || ts.isPrivateIdentifierPropertyDeclaration(d); }); + var privateDeclaration = ts.find(declarations, function (d) { return ts.hasEffectiveModifier(d, 8 /* Private */) || ts.isPrivateIdentifierPropertyDeclaration(d); }); if (privateDeclaration) { - return ts.getAncestor(privateDeclaration, 245 /* ClassDeclaration */); + return ts.getAncestor(privateDeclaration, 249 /* ClassDeclaration */); } // Else this is a public property and could be accessed from anywhere. return undefined; @@ -117080,7 +120085,7 @@ var ts; // Different declarations have different containers, bail out return undefined; } - if (!container || container.kind === 290 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) { + if (!container || container.kind === 294 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) { // This is a global variable and not an external module, any declaration defined // within this scope is visible outside the file return undefined; @@ -117190,8 +120195,8 @@ var ts; function isValidReferencePosition(node, searchSymbolName) { // Compare the length so we filter out strict superstrings of the symbol we are looking for switch (node.kind) { - case 76 /* PrivateIdentifier */: - case 75 /* Identifier */: + case 79 /* PrivateIdentifier */: + case 78 /* Identifier */: return node.text.length === searchSymbolName.length; case 14 /* NoSubstitutionTemplateLiteral */: case 10 /* StringLiteral */: { @@ -117201,7 +120206,7 @@ var ts; } case 8 /* NumericLiteral */: return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && node.text.length === searchSymbolName.length; - case 84 /* DefaultKeyword */: + case 87 /* DefaultKeyword */: return "default".length === searchSymbolName.length; default: return false; @@ -117267,7 +120272,7 @@ var ts; return; } if (ts.isExportSpecifier(parent)) { - ts.Debug.assert(referenceLocation.kind === 75 /* Identifier */); + ts.Debug.assert(referenceLocation.kind === 78 /* Identifier */); getReferencesAtExportSpecifier(referenceLocation, referenceSymbol, parent, search, state, addReferencesHere); return; } @@ -117323,8 +120328,8 @@ var ts; } // For `export { foo as bar }`, rename `foo`, but not `bar`. if (!isForRenameWithPrefixAndSuffixText(state.options) || alwaysGetReferences) { - var isDefaultExport = referenceLocation.originalKeywordKind === 84 /* DefaultKeyword */ - || exportSpecifier.name.originalKeywordKind === 84 /* DefaultKeyword */; + var isDefaultExport = referenceLocation.originalKeywordKind === 87 /* DefaultKeyword */ + || exportSpecifier.name.originalKeywordKind === 87 /* DefaultKeyword */; var exportKind = isDefaultExport ? 1 /* Default */ : 0 /* Named */; var exportSymbol = ts.Debug.checkDefined(exportSpecifier.symbol); var exportInfo = FindAllReferences.getExportInfo(exportSymbol, exportKind, state.checker); @@ -117405,7 +120410,7 @@ var ts; } var pusher = function () { return state.referenceAdder(search.symbol); }; if (ts.isClassLike(referenceLocation.parent)) { - ts.Debug.assert(referenceLocation.kind === 84 /* DefaultKeyword */ || referenceLocation.parent.name === referenceLocation); + ts.Debug.assert(referenceLocation.kind === 87 /* DefaultKeyword */ || referenceLocation.parent.name === referenceLocation); // This is the class declaration containing the constructor. findOwnConstructorReferences(search.symbol, sourceFile, pusher()); } @@ -117427,12 +120432,12 @@ var ts; var addRef = state.referenceAdder(search.symbol); for (var _i = 0, _a = classLike.members; _i < _a.length; _i++) { var member = _a[_i]; - if (!(ts.isMethodOrAccessor(member) && ts.hasModifier(member, 32 /* Static */))) { + if (!(ts.isMethodOrAccessor(member) && ts.hasSyntacticModifier(member, 32 /* Static */))) { continue; } if (member.body) { member.body.forEachChild(function cb(node) { - if (node.kind === 104 /* ThisKeyword */) { + if (node.kind === 107 /* ThisKeyword */) { addRef(node); } else if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) { @@ -117451,18 +120456,18 @@ var ts; if (constructorSymbol && constructorSymbol.declarations) { for (var _i = 0, _a = constructorSymbol.declarations; _i < _a.length; _i++) { var decl = _a[_i]; - var ctrKeyword = ts.findChildOfKind(decl, 129 /* ConstructorKeyword */, sourceFile); - ts.Debug.assert(decl.kind === 162 /* Constructor */ && !!ctrKeyword); + var ctrKeyword = ts.findChildOfKind(decl, 132 /* ConstructorKeyword */, sourceFile); + ts.Debug.assert(decl.kind === 165 /* Constructor */ && !!ctrKeyword); addNode(ctrKeyword); } } if (classSymbol.exports) { classSymbol.exports.forEach(function (member) { var decl = member.valueDeclaration; - if (decl && decl.kind === 161 /* MethodDeclaration */) { + if (decl && decl.kind === 164 /* MethodDeclaration */) { var body = decl.body; if (body) { - forEachDescendantOfKind(body, 104 /* ThisKeyword */, function (thisKeyword) { + forEachDescendantOfKind(body, 107 /* ThisKeyword */, function (thisKeyword) { if (ts.isNewExpressionTarget(thisKeyword)) { addNode(thisKeyword); } @@ -117483,10 +120488,10 @@ var ts; } for (var _i = 0, _a = constructor.declarations; _i < _a.length; _i++) { var decl = _a[_i]; - ts.Debug.assert(decl.kind === 162 /* Constructor */); + ts.Debug.assert(decl.kind === 165 /* Constructor */); var body = decl.body; if (body) { - forEachDescendantOfKind(body, 102 /* SuperKeyword */, function (node) { + forEachDescendantOfKind(body, 105 /* SuperKeyword */, function (node) { if (ts.isCallExpressionTarget(node)) { addNode(node); } @@ -117510,10 +120515,10 @@ var ts; addReference(refNode); return; } - if (refNode.kind !== 75 /* Identifier */) { + if (refNode.kind !== 78 /* Identifier */) { return; } - if (refNode.parent.kind === 282 /* ShorthandPropertyAssignment */) { + if (refNode.parent.kind === 286 /* ShorthandPropertyAssignment */) { // Go ahead and dereference the shorthand assignment by going to its definition getReferenceEntriesForShorthandPropertyAssignment(refNode, state.checker, addReference); } @@ -117533,7 +120538,7 @@ var ts; } else if (ts.isFunctionLike(typeHavingNode) && typeHavingNode.body) { var body = typeHavingNode.body; - if (body.kind === 223 /* Block */) { + if (body.kind === 227 /* Block */) { ts.forEachReturnStatement(body, function (returnStatement) { if (returnStatement.expression) addIfImplementation(returnStatement.expression); @@ -117561,13 +120566,13 @@ var ts; */ function isImplementationExpression(node) { switch (node.kind) { - case 200 /* ParenthesizedExpression */: + case 204 /* ParenthesizedExpression */: return isImplementationExpression(node.expression); - case 202 /* ArrowFunction */: - case 201 /* FunctionExpression */: - case 193 /* ObjectLiteralExpression */: - case 214 /* ClassExpression */: - case 192 /* ArrayLiteralExpression */: + case 206 /* ArrowFunction */: + case 205 /* FunctionExpression */: + case 197 /* ObjectLiteralExpression */: + case 218 /* ClassExpression */: + case 196 /* ArrayLiteralExpression */: return true; default: return false; @@ -117620,14 +120625,14 @@ var ts; // Whether 'super' occurs in a static context within a class. var staticFlag = 32 /* Static */; switch (searchSpaceNode.kind) { - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - staticFlag &= ts.getModifierFlags(searchSpaceNode); + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + staticFlag &= ts.getSyntacticModifierFlags(searchSpaceNode); searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class break; default: @@ -117635,53 +120640,53 @@ var ts; } var sourceFile = searchSpaceNode.getSourceFile(); var references = ts.mapDefined(getPossibleSymbolReferenceNodes(sourceFile, "super", searchSpaceNode), function (node) { - if (node.kind !== 102 /* SuperKeyword */) { + if (node.kind !== 105 /* SuperKeyword */) { return; } var container = ts.getSuperContainer(node, /*stopOnFunctions*/ false); // If we have a 'super' container, we must have an enclosing class. // Now make sure the owning class is the same as the search-space // and has the same static qualifier as the original 'super's owner. - return container && (32 /* Static */ & ts.getModifierFlags(container)) === staticFlag && container.parent.symbol === searchSpaceNode.symbol ? nodeEntry(node) : undefined; + return container && (32 /* Static */ & ts.getSyntacticModifierFlags(container)) === staticFlag && container.parent.symbol === searchSpaceNode.symbol ? nodeEntry(node) : undefined; }); return [{ definition: { type: 0 /* Symbol */, symbol: searchSpaceNode.symbol }, references: references }]; } function isParameterName(node) { - return node.kind === 75 /* Identifier */ && node.parent.kind === 156 /* Parameter */ && node.parent.name === node; + return node.kind === 78 /* Identifier */ && node.parent.kind === 159 /* Parameter */ && node.parent.name === node; } function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles, cancellationToken) { var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false); // Whether 'this' occurs in a static context within a class. var staticFlag = 32 /* Static */; switch (searchSpaceNode.kind) { - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: if (ts.isObjectLiteralMethod(searchSpaceNode)) { break; } // falls through - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - staticFlag &= ts.getModifierFlags(searchSpaceNode); + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + staticFlag &= ts.getSyntacticModifierFlags(searchSpaceNode); searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class break; - case 290 /* SourceFile */: + case 294 /* SourceFile */: if (ts.isExternalModule(searchSpaceNode) || isParameterName(thisOrSuperKeyword)) { return undefined; } // falls through - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: break; // Computed properties in classes are not handled here because references to this are illegal, // so there is no point finding references to them. default: return undefined; } - var references = ts.flatMap(searchSpaceNode.kind === 290 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) { + var references = ts.flatMap(searchSpaceNode.kind === 294 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) { cancellationToken.throwIfCancellationRequested(); return getPossibleSymbolReferenceNodes(sourceFile, "this", ts.isSourceFile(searchSpaceNode) ? sourceFile : searchSpaceNode).filter(function (node) { if (!ts.isThis(node)) { @@ -117689,19 +120694,19 @@ var ts; } var container = ts.getThisContainer(node, /* includeArrowFunctions */ false); switch (searchSpaceNode.kind) { - case 201 /* FunctionExpression */: - case 244 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 248 /* FunctionDeclaration */: return searchSpaceNode.symbol === container.symbol; - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: return ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol; - case 214 /* ClassExpression */: - case 245 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 249 /* ClassDeclaration */: // Make sure the container belongs to the same class // and has the appropriate static modifier from the original container. - return container.parent && searchSpaceNode.symbol === container.parent.symbol && (ts.getModifierFlags(container) & 32 /* Static */) === staticFlag; - case 290 /* SourceFile */: - return container.kind === 290 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node); + return container.parent && searchSpaceNode.symbol === container.parent.symbol && (ts.getSyntacticModifierFlags(container) & 32 /* Static */) === staticFlag; + case 294 /* SourceFile */: + return container.kind === 294 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node); } }); }).map(function (n) { return nodeEntry(n); }); @@ -117727,11 +120732,27 @@ var ts; // This is not needed when searching for re-exports. function populateSearchSymbolSet(symbol, location, checker, isForRename, providePrefixAndSuffixText, implementations) { var result = []; - forEachRelatedSymbol(symbol, location, checker, isForRename, !(isForRename && providePrefixAndSuffixText), function (sym, root, base) { result.push(base || root || sym); }, + forEachRelatedSymbol(symbol, location, checker, isForRename, !(isForRename && providePrefixAndSuffixText), function (sym, root, base) { + // static method/property and instance method/property might have the same name. Only include static or only include instance. + if (base) { + if (isStatic(symbol) !== isStatic(base)) { + base = undefined; + } + } + result.push(base || root || sym); + }, + // when try to find implementation, implementations is true, and not allowed to find base class /*allowBaseTypes*/ function () { return !implementations; }); return result; } - function forEachRelatedSymbol(symbol, location, checker, isForRenamePopulateSearchSymbolSet, onlyIncludeBindingElementAtReferenceLocation, cbSymbol, allowBaseTypes) { + /** + * @param allowBaseTypes return true means it would try to find in base class or interface. + */ + function forEachRelatedSymbol(symbol, location, checker, isForRenamePopulateSearchSymbolSet, onlyIncludeBindingElementAtReferenceLocation, + /** + * @param baseSymbol This symbol means one property/mehtod from base class or interface when it is not null or undefined, + */ + cbSymbol, allowBaseTypes) { var containingObjectLiteralElement = ts.getContainingObjectLiteralElement(location); if (containingObjectLiteralElement) { /* Because in short-hand property assignment, location has two meaning : property name and as value of the property @@ -117784,7 +120805,7 @@ var ts; ts.Debug.assert(paramProps.length === 2 && !!(paramProps[0].flags & 1 /* FunctionScopedVariable */) && !!(paramProps[1].flags & 4 /* Property */)); // is [parameter, property] return fromRoot(symbol.flags & 1 /* FunctionScopedVariable */ ? paramProps[1] : paramProps[0]); } - var exportSpecifier = ts.getDeclarationOfKind(symbol, 263 /* ExportSpecifier */); + var exportSpecifier = ts.getDeclarationOfKind(symbol, 267 /* ExportSpecifier */); if (!isForRenamePopulateSearchSymbolSet || exportSpecifier && !exportSpecifier.propertyName) { var localSymbol = exportSpecifier && checker.getExportSpecifierLocalTargetSymbol(exportSpecifier); if (localSymbol) { @@ -117829,19 +120850,35 @@ var ts; }); } function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol, checker) { - var bindingElement = ts.getDeclarationOfKind(symbol, 191 /* BindingElement */); + var bindingElement = ts.getDeclarationOfKind(symbol, 195 /* BindingElement */); if (bindingElement && ts.isObjectBindingElementWithoutPropertyName(bindingElement)) { return ts.getPropertySymbolFromBindingElement(checker, bindingElement); } } } + function isStatic(symbol) { + if (!symbol.valueDeclaration) { + return false; + } + var modifierFlags = ts.getEffectiveModifierFlags(symbol.valueDeclaration); + return !!(modifierFlags & 32 /* Static */); + } function getRelatedSymbol(search, referenceSymbol, referenceLocation, state) { var checker = state.checker; return forEachRelatedSymbol(referenceSymbol, referenceLocation, checker, /*isForRenamePopulateSearchSymbolSet*/ false, - /*onlyIncludeBindingElementAtReferenceLocation*/ state.options.use !== 2 /* Rename */ || !!state.options.providePrefixAndSuffixTextForRename, function (sym, rootSymbol, baseSymbol, kind) { return search.includes(baseSymbol || rootSymbol || sym) - // For a base type, use the symbol for the derived type. For a synthetic (e.g. union) property, use the union symbol. - ? { symbol: rootSymbol && !(ts.getCheckFlags(sym) & 6 /* Synthetic */) ? rootSymbol : sym, kind: kind } - : undefined; }, + /*onlyIncludeBindingElementAtReferenceLocation*/ state.options.use !== 2 /* Rename */ || !!state.options.providePrefixAndSuffixTextForRename, function (sym, rootSymbol, baseSymbol, kind) { + // check whether the symbol used to search itself is just the searched one. + if (baseSymbol) { + // static method/property and instance method/property might have the same name. Only check static or only check instance. + if (isStatic(referenceSymbol) !== isStatic(baseSymbol)) { + baseSymbol = undefined; + } + } + return search.includes(baseSymbol || rootSymbol || sym) + // For a base type, use the symbol for the derived type. For a synthetic (e.g. union) property, use the union symbol. + ? { symbol: rootSymbol && !(ts.getCheckFlags(sym) & 6 /* Synthetic */) ? rootSymbol : sym, kind: kind } + : undefined; + }, /*allowBaseTypes*/ function (rootSymbol) { return !(search.parents && !search.parents.some(function (parent) { return explicitlyInheritsFrom(rootSymbol.parent, parent, state.inheritsFromCache, checker); })); }); @@ -117991,7 +121028,7 @@ var ts; return ts.Debug.checkDefined(node.modifiers && ts.find(node.modifiers, isDefaultModifier)); } function isDefaultModifier(node) { - return node.kind === 84 /* DefaultKeyword */; + return node.kind === 87 /* DefaultKeyword */; } /** Gets the symbol for a call hierarchy declaration. */ function getSymbolOfCallHierarchyDeclaration(typeChecker, node) { @@ -118031,6 +121068,30 @@ var ts; } return { text: text, pos: declName.getStart(), end: declName.getEnd() }; } + function getCallHierarchItemContainerName(node) { + var _a, _b; + if (isConstNamedExpression(node)) { + if (ts.isModuleBlock(node.parent.parent.parent.parent) && ts.isIdentifier(node.parent.parent.parent.parent.parent.name)) { + return node.parent.parent.parent.parent.parent.name.getText(); + } + return; + } + switch (node.kind) { + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 164 /* MethodDeclaration */: + if (node.parent.kind === 197 /* ObjectLiteralExpression */) { + return (_a = ts.getAssignedName(node.parent)) === null || _a === void 0 ? void 0 : _a.getText(); + } + return (_b = ts.getNameOfDeclaration(node.parent)) === null || _b === void 0 ? void 0 : _b.getText(); + case 248 /* FunctionDeclaration */: + case 249 /* ClassDeclaration */: + case 253 /* ModuleDeclaration */: + if (ts.isModuleBlock(node.parent) && ts.isIdentifier(node.parent.parent.name)) { + return node.parent.parent.name.getText(); + } + } + } function findImplementation(typeChecker, node) { if (node.body) { return node; @@ -118119,6 +121180,10 @@ var ts; } return undefined; } + // #39453 + if (ts.isVariableDeclaration(location) && location.initializer && isConstNamedExpression(location.initializer)) { + return location.initializer; + } if (!followingSymbol) { var symbol = typeChecker.getSymbolAtLocation(location); if (symbol) { @@ -118140,10 +121205,12 @@ var ts; function createCallHierarchyItem(program, node) { var sourceFile = node.getSourceFile(); var name = getCallHierarchyItemName(program, node); + var containerName = getCallHierarchItemContainerName(node); var kind = ts.getNodeKind(node); + var kindModifiers = ts.getNodeModifiers(node); var span = ts.createTextSpanFromBounds(ts.skipTrivia(sourceFile.text, node.getFullStart(), /*stopAfterLineBreak*/ false, /*stopAtComments*/ true), node.getEnd()); var selectionSpan = ts.createTextSpanFromBounds(name.pos, name.end); - return { file: sourceFile.fileName, kind: kind, name: name.text, span: span, selectionSpan: selectionSpan }; + return { file: sourceFile.fileName, kind: kind, kindModifiers: kindModifiers, name: name.text, containerName: containerName, span: span, selectionSpan: selectionSpan }; } CallHierarchy.createCallHierarchyItem = createCallHierarchyItem; function isDefined(x) { @@ -118165,7 +121232,7 @@ var ts; } } function getCallSiteGroupKey(entry) { - return "" + ts.getNodeId(entry.declaration); + return ts.getNodeId(entry.declaration); } function createCallHierarchyIncomingCall(from, fromSpans) { return { from: from, fromSpans: fromSpans }; @@ -118224,56 +121291,56 @@ var ts; return; } switch (node.kind) { - case 75 /* Identifier */: - case 253 /* ImportEqualsDeclaration */: - case 254 /* ImportDeclaration */: - case 260 /* ExportDeclaration */: - case 246 /* InterfaceDeclaration */: - case 247 /* TypeAliasDeclaration */: + case 78 /* Identifier */: + case 257 /* ImportEqualsDeclaration */: + case 258 /* ImportDeclaration */: + case 264 /* ExportDeclaration */: + case 250 /* InterfaceDeclaration */: + case 251 /* TypeAliasDeclaration */: // do not descend into nodes that cannot contain callable nodes return; - case 199 /* TypeAssertionExpression */: - case 217 /* AsExpression */: + case 203 /* TypeAssertionExpression */: + case 221 /* AsExpression */: // do not descend into the type side of an assertion collect(node.expression); return; - case 242 /* VariableDeclaration */: - case 156 /* Parameter */: + case 246 /* VariableDeclaration */: + case 159 /* Parameter */: // do not descend into the type of a variable or parameter declaration collect(node.name); collect(node.initializer); return; - case 196 /* CallExpression */: + case 200 /* CallExpression */: // do not descend into the type arguments of a call expression recordCallSite(node); collect(node.expression); ts.forEach(node.arguments, collect); return; - case 197 /* NewExpression */: + case 201 /* NewExpression */: // do not descend into the type arguments of a new expression recordCallSite(node); collect(node.expression); ts.forEach(node.arguments, collect); return; - case 198 /* TaggedTemplateExpression */: + case 202 /* TaggedTemplateExpression */: // do not descend into the type arguments of a tagged template expression recordCallSite(node); collect(node.tag); collect(node.template); return; - case 268 /* JsxOpeningElement */: - case 267 /* JsxSelfClosingElement */: + case 272 /* JsxOpeningElement */: + case 271 /* JsxSelfClosingElement */: // do not descend into the type arguments of a JsxOpeningLikeElement recordCallSite(node); collect(node.tagName); collect(node.attributes); return; - case 157 /* Decorator */: + case 160 /* Decorator */: recordCallSite(node); collect(node.expression); return; - case 194 /* PropertyAccessExpression */: - case 195 /* ElementAccessExpression */: + case 198 /* PropertyAccessExpression */: + case 199 /* ElementAccessExpression */: recordCallSite(node); ts.forEachChild(node, collect); break; @@ -118290,7 +121357,7 @@ var ts; ts.forEach(node.statements, collect); } function collectCallSitesOfModuleDeclaration(node, collect) { - if (!ts.hasModifier(node, 2 /* Ambient */) && node.body && ts.isModuleBlock(node.body)) { + if (!ts.hasSyntacticModifier(node, 2 /* Ambient */) && node.body && ts.isModuleBlock(node.body)) { ts.forEach(node.body.statements, collect); } } @@ -118323,22 +121390,22 @@ var ts; var callSites = []; var collect = createCallSiteCollector(program, callSites); switch (node.kind) { - case 290 /* SourceFile */: + case 294 /* SourceFile */: collectCallSitesOfSourceFile(node, collect); break; - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: collectCallSitesOfModuleDeclaration(node, collect); break; - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: collectCallSitesOfFunctionLikeDeclaration(program.getTypeChecker(), node, collect); break; - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: collectCallSitesOfClassLikeDeclaration(node, collect); break; default: @@ -118419,7 +121486,7 @@ var ts; // If there isn't some include for this, add a new one. if (ts.getRegexFromPattern(ts.Debug.checkDefined(matchers.includeFilePattern), useCaseSensitiveFileNames).test(oldFileOrDirPath) && !ts.getRegexFromPattern(ts.Debug.checkDefined(matchers.includeFilePattern), useCaseSensitiveFileNames).test(newFileOrDirPath)) { - changeTracker.insertNodeAfter(configFile, ts.last(property.initializer.elements), ts.createStringLiteral(relativePath(newFileOrDirPath))); + changeTracker.insertNodeAfter(configFile, ts.last(property.initializer.elements), ts.factory.createStringLiteral(relativePath(newFileOrDirPath))); } } break; @@ -118472,8 +121539,8 @@ var ts; function updateImports(program, changeTracker, oldToNew, newToOld, host, getCanonicalFileName) { var allFiles = program.getSourceFiles(); var _loop_4 = function (sourceFile) { - var newFromOld = oldToNew(sourceFile.path); - var newImportFromPath = newFromOld !== undefined ? newFromOld : sourceFile.path; + var newFromOld = oldToNew(sourceFile.fileName); + var newImportFromPath = newFromOld !== null && newFromOld !== void 0 ? newFromOld : sourceFile.fileName; var newImportFromDirectory = ts.getDirectoryPath(newImportFromPath); var oldFromNew = newToOld(sourceFile.fileName); var oldImportFromPath = oldFromNew || sourceFile.fileName; @@ -118497,7 +121564,7 @@ var ts; : getSourceFileToImport(importedModuleSymbol, importLiteral, sourceFile, program, host, oldToNew); // Need an update if the imported file moved, or the importing file moved and was using a relative path. return toImport !== undefined && (toImport.updated || (importingSourceFileMoved && ts.pathIsRelative(importLiteral.text))) - ? ts.moduleSpecifiers.updateModuleSpecifier(program.getCompilerOptions(), newImportFromPath, toImport.newFileName, ts.createModuleSpecifierResolutionHost(program, host), importLiteral.text) + ? ts.moduleSpecifiers.updateModuleSpecifier(program.getCompilerOptions(), getCanonicalFileName(newImportFromPath), toImport.newFileName, ts.createModuleSpecifierResolutionHost(program, host), importLiteral.text) : undefined; }); }; @@ -118627,7 +121694,7 @@ var ts; else { var defs = getDefinitionFromSymbol(typeChecker, symbol, node, calledDeclaration) || ts.emptyArray; // For a 'super()' call, put the signature first, else put the variable first. - return node.kind === 102 /* SuperKeyword */ ? __spreadArrays([sigInfo], defs) : __spreadArrays(defs, [sigInfo]); + return node.kind === 105 /* SuperKeyword */ ? __spreadArrays([sigInfo], defs) : __spreadArrays(defs, [sigInfo]); } } // Because name in short-hand property assignment has two different meanings: property name and property value, @@ -118635,7 +121702,7 @@ var ts; // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition // is performed at the location of property access, we would like to go to definition of the property in the short-hand // assignment. This case and others are handled by the following code. - if (node.parent.kind === 282 /* ShorthandPropertyAssignment */) { + if (node.parent.kind === 286 /* ShorthandPropertyAssignment */) { var shorthandSymbol_1 = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration); return shorthandSymbol_1 ? shorthandSymbol_1.declarations.map(function (decl) { return createDefinitionInfo(decl, typeChecker, shorthandSymbol_1, node); }) : []; } @@ -118683,10 +121750,13 @@ var ts; /** * True if we should not add definitions for both the signature symbol and the definition symbol. * True for `const |f = |() => 0`, false for `function |f() {} const |g = f;`. + * Also true for any assignment RHS. */ function symbolMatchesSignature(s, calledDeclaration) { - return s === calledDeclaration.symbol || s === calledDeclaration.symbol.parent || - !ts.isCallLikeExpression(calledDeclaration.parent) && s === calledDeclaration.parent.symbol; + return s === calledDeclaration.symbol + || s === calledDeclaration.symbol.parent + || ts.isAssignmentExpression(calledDeclaration.parent) + || (!ts.isCallLikeExpression(calledDeclaration.parent) && s === calledDeclaration.parent.symbol); } function getReferenceAtPosition(sourceFile, position, program) { var referencePath = findReferenceInPosition(sourceFile.referencedFiles, position); @@ -118797,18 +121867,18 @@ var ts; // (2) when the aliased symbol is originating from an import. // function shouldSkipAlias(node, declaration) { - if (node.kind !== 75 /* Identifier */) { + if (node.kind !== 78 /* Identifier */) { return false; } if (node.parent === declaration) { return true; } switch (declaration.kind) { - case 255 /* ImportClause */: - case 253 /* ImportEqualsDeclaration */: + case 259 /* ImportClause */: + case 257 /* ImportEqualsDeclaration */: return true; - case 258 /* ImportSpecifier */: - return declaration.parent.kind === 257 /* NamedImports */; + case 262 /* ImportSpecifier */: + return declaration.parent.kind === 261 /* NamedImports */; default: return false; } @@ -118817,12 +121887,13 @@ var ts; // There are cases when you extend a function by adding properties to it afterwards, // we want to strip those extra properties. // For deduping purposes, we also want to exclude any declarationNodes if provided. - var filteredDeclarations = ts.filter(symbol.declarations, function (d) { return d !== declarationNode && (!ts.isAssignmentDeclaration(d) || d === symbol.valueDeclaration); }) || undefined; + var filteredDeclarations = ts.filter(symbol.declarations, function (d) { return d !== declarationNode && (!ts.isAssignmentDeclaration(d) || d === symbol.valueDeclaration); }) + || undefined; return getConstructSignatureDefinition() || getCallSignatureDefinition() || ts.map(filteredDeclarations, function (declaration) { return createDefinitionInfo(declaration, typeChecker, symbol, node); }); function getConstructSignatureDefinition() { // Applicable only if we are in a new expression, or we are on a constructor declaration // and in either case the symbol has a construct signature definition, i.e. class - if (symbol.flags & 32 /* Class */ && !(symbol.flags & (16 /* Function */ | 3 /* Variable */)) && (ts.isNewExpressionTarget(node) || node.kind === 129 /* ConstructorKeyword */)) { + if (symbol.flags & 32 /* Class */ && !(symbol.flags & (16 /* Function */ | 3 /* Variable */)) && (ts.isNewExpressionTarget(node) || node.kind === 132 /* ConstructorKeyword */)) { var cls = ts.find(filteredDeclarations, ts.isClassLike) || ts.Debug.fail("Expected declaration to have at least one class-like declaration"); return getSignatureDefinition(cls.members, /*selectConstructors*/ true); } @@ -118880,13 +121951,10 @@ var ts; } /** Returns a CallLikeExpression where `node` is the target being invoked. */ function getAncestorCallLikeExpression(node) { - var target = climbPastManyPropertyAccesses(node); - var callLike = target.parent; + var target = ts.findAncestor(node, function (n) { return !ts.isRightSideOfPropertyAccess(n); }); + var callLike = target === null || target === void 0 ? void 0 : target.parent; return callLike && ts.isCallLikeExpression(callLike) && ts.getInvokedExpression(callLike) === target ? callLike : undefined; } - function climbPastManyPropertyAccesses(node) { - return ts.isRightSideOfPropertyAccess(node) ? climbPastManyPropertyAccesses(node.parent) : node; - } function tryGetSignatureDeclaration(typeChecker, node) { var callLike = getAncestorCallLikeExpression(node); var signature = callLike && typeChecker.getResolvedSignature(callLike); @@ -118895,9 +121963,9 @@ var ts; } function isConstructorLike(node) { switch (node.kind) { - case 162 /* Constructor */: - case 171 /* ConstructorType */: - case 166 /* ConstructSignature */: + case 165 /* Constructor */: + case 174 /* ConstructorType */: + case 169 /* ConstructSignature */: return true; default: return false; @@ -119004,22 +122072,19 @@ var ts; var comment = _a[_i].comment; if (comment === undefined) continue; - if (documentationComment.length) { - documentationComment.push(ts.lineBreakPart()); - } - documentationComment.push(ts.textPart(comment)); + ts.pushIfUnique(documentationComment, comment); } }); - return documentationComment; + return ts.intersperse(ts.map(documentationComment, ts.textPart), ts.lineBreakPart()); } JsDoc.getJsDocCommentsFromDeclarations = getJsDocCommentsFromDeclarations; function getCommentHavingNodes(declaration) { switch (declaration.kind) { - case 317 /* JSDocParameterTag */: - case 323 /* JSDocPropertyTag */: + case 322 /* JSDocParameterTag */: + case 328 /* JSDocPropertyTag */: return [declaration]; - case 315 /* JSDocCallbackTag */: - case 322 /* JSDocTypedefTag */: + case 320 /* JSDocCallbackTag */: + case 327 /* JSDocTypedefTag */: return [declaration, declaration.parent]; default: return ts.getJSDocCommentsAndTags(declaration); @@ -119040,18 +122105,18 @@ var ts; function getCommentText(tag) { var comment = tag.comment; switch (tag.kind) { - case 308 /* JSDocImplementsTag */: + case 312 /* JSDocImplementsTag */: return withNode(tag.class); - case 307 /* JSDocAugmentsTag */: + case 311 /* JSDocAugmentsTag */: return withNode(tag.class); - case 321 /* JSDocTemplateTag */: + case 326 /* JSDocTemplateTag */: return withList(tag.typeParameters); - case 320 /* JSDocTypeTag */: + case 325 /* JSDocTypeTag */: return withNode(tag.typeExpression); - case 322 /* JSDocTypedefTag */: - case 315 /* JSDocCallbackTag */: - case 323 /* JSDocPropertyTag */: - case 317 /* JSDocParameterTag */: + case 327 /* JSDocTypedefTag */: + case 320 /* JSDocCallbackTag */: + case 328 /* JSDocPropertyTag */: + case 322 /* JSDocParameterTag */: var name = tag.name; return name ? withNode(name) : comment; default: @@ -119210,7 +122275,7 @@ var ts; function parameterDocComments(parameters, isJavaScriptFile, indentationStr, newLine) { return parameters.map(function (_a, i) { var name = _a.name, dotDotDotToken = _a.dotDotDotToken; - var paramName = name.kind === 75 /* Identifier */ ? name.text : "param" + i; + var paramName = name.kind === 78 /* Identifier */ ? name.text : "param" + i; var type = isJavaScriptFile ? (dotDotDotToken ? "{...any} " : "{any} ") : ""; return indentationStr + " * @param " + type + paramName + newLine; }).join(""); @@ -119220,23 +122285,23 @@ var ts; } function getCommentOwnerInfoWorker(commentOwner) { switch (commentOwner.kind) { - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 161 /* MethodDeclaration */: - case 162 /* Constructor */: - case 160 /* MethodSignature */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 164 /* MethodDeclaration */: + case 165 /* Constructor */: + case 163 /* MethodSignature */: var parameters = commentOwner.parameters; return { commentOwner: commentOwner, parameters: parameters }; - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: return getCommentOwnerInfoWorker(commentOwner.initializer); - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: - case 158 /* PropertySignature */: - case 248 /* EnumDeclaration */: - case 284 /* EnumMember */: - case 247 /* TypeAliasDeclaration */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: + case 161 /* PropertySignature */: + case 252 /* EnumDeclaration */: + case 288 /* EnumMember */: + case 251 /* TypeAliasDeclaration */: return { commentOwner: commentOwner }; - case 225 /* VariableStatement */: { + case 229 /* VariableStatement */: { var varStatement = commentOwner; var varDeclarations = varStatement.declarationList.declarations; var parameters_1 = varDeclarations.length === 1 && varDeclarations[0].initializer @@ -119244,16 +122309,16 @@ var ts; : undefined; return { commentOwner: commentOwner, parameters: parameters_1 }; } - case 290 /* SourceFile */: + case 294 /* SourceFile */: return "quit"; - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: // If in walking up the tree, we hit a a nested namespace declaration, // then we must be somewhere within a dotted namespace name; however we don't // want to give back a JSDoc template for the 'b' or 'c' in 'namespace a.b.c { }'. - return commentOwner.parent.kind === 249 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner }; - case 226 /* ExpressionStatement */: + return commentOwner.parent.kind === 253 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner }; + case 230 /* ExpressionStatement */: return getCommentOwnerInfoWorker(commentOwner.expression); - case 209 /* BinaryExpression */: { + case 213 /* BinaryExpression */: { var be = commentOwner; if (ts.getAssignmentDeclarationKind(be) === 0 /* None */) { return "quit"; @@ -119261,7 +122326,7 @@ var ts; var parameters_2 = ts.isFunctionLike(be.right) ? be.right.parameters : ts.emptyArray; return { commentOwner: commentOwner, parameters: parameters_2 }; } - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: var init = commentOwner.initializer; if (init && (ts.isFunctionExpression(init) || ts.isArrowFunction(init))) { return { commentOwner: commentOwner, parameters: init.parameters }; @@ -119277,14 +122342,14 @@ var ts; * @returns the parameters of a signature found on the RHS if one exists; otherwise 'emptyArray'. */ function getParametersFromRightHandSideOfAssignment(rightHandSide) { - while (rightHandSide.kind === 200 /* ParenthesizedExpression */) { + while (rightHandSide.kind === 204 /* ParenthesizedExpression */) { rightHandSide = rightHandSide.expression; } switch (rightHandSide.kind) { - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: return rightHandSide.parameters; - case 214 /* ClassExpression */: { + case 218 /* ClassExpression */: { var ctr = ts.find(rightHandSide.members, ts.isConstructorDeclaration); return ctr ? ctr.parameters : ts.emptyArray; } @@ -119346,9 +122411,9 @@ var ts; } function shouldKeepItem(declaration, checker) { switch (declaration.kind) { - case 255 /* ImportClause */: - case 258 /* ImportSpecifier */: - case 253 /* ImportEqualsDeclaration */: + case 259 /* ImportClause */: + case 262 /* ImportSpecifier */: + case 257 /* ImportEqualsDeclaration */: var importer = checker.getSymbolAtLocation(declaration.name); // TODO: GH#18217 var imported = checker.getAliasedSymbol(importer); return importer.escapedName !== imported.escapedName; @@ -119358,7 +122423,7 @@ var ts; } function tryAddSingleDeclarationName(declaration, containers) { var name = ts.getNameOfDeclaration(declaration); - return !!name && (pushLiteral(name, containers) || name.kind === 154 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers)); + return !!name && (pushLiteral(name, containers) || name.kind === 157 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers)); } // Only added the names of computed properties if they're simple dotted expressions, like: // @@ -119375,7 +122440,7 @@ var ts; // First, if we started with a computed property name, then add all but the last // portion into the container array. var name = ts.getNameOfDeclaration(declaration); - if (name && name.kind === 154 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) { + if (name && name.kind === 157 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) { return ts.emptyArray; } // Don't include the last portion. @@ -119523,7 +122588,7 @@ var ts; } function addTrackedEs5Class(name) { if (!trackedEs5Classes) { - trackedEs5Classes = ts.createMap(); + trackedEs5Classes = new ts.Map(); } trackedEs5Classes.set(name, true); } @@ -119558,6 +122623,7 @@ var ts; // Save the old parent parentsStack.push(parent); trackedEs5ClassesStack.push(trackedEs5Classes); + trackedEs5Classes = undefined; parent = navNode; } /** Call after calling `startNode` and adding children to it. */ @@ -119582,7 +122648,7 @@ var ts; return; } switch (node.kind) { - case 162 /* Constructor */: + case 165 /* Constructor */: // Get parameter properties, and treat them as being on the *same* level as the constructor, not under it. var ctr = node; addNodeWithRecursiveChild(ctr, ctr.body); @@ -119594,21 +122660,21 @@ var ts; } } break; - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 160 /* MethodSignature */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 163 /* MethodSignature */: if (!ts.hasDynamicName(node)) { addNodeWithRecursiveChild(node, node.body); } break; - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: if (!ts.hasDynamicName(node)) { addLeafNode(node); } break; - case 255 /* ImportClause */: + case 259 /* ImportClause */: var importClause = node; // Handle default import case e.g.: // import d from "mod"; @@ -119620,7 +122686,7 @@ var ts; // import {a, b as B} from "mod"; var namedBindings = importClause.namedBindings; if (namedBindings) { - if (namedBindings.kind === 256 /* NamespaceImport */) { + if (namedBindings.kind === 260 /* NamespaceImport */) { addLeafNode(namedBindings); } else { @@ -119631,17 +122697,17 @@ var ts; } } break; - case 282 /* ShorthandPropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: addNodeWithRecursiveChild(node, node.name); break; - case 283 /* SpreadAssignment */: + case 287 /* SpreadAssignment */: var expression = node.expression; // Use the expression as the name of the SpreadAssignment, otherwise show as . ts.isIdentifier(expression) ? addLeafNode(node, expression) : addLeafNode(node); break; - case 191 /* BindingElement */: - case 281 /* PropertyAssignment */: - case 242 /* VariableDeclaration */: + case 195 /* BindingElement */: + case 285 /* PropertyAssignment */: + case 246 /* VariableDeclaration */: var _e = node, name = _e.name, initializer = _e.initializer; if (ts.isBindingPattern(name)) { addChildrenRecursively(name); @@ -119656,7 +122722,7 @@ var ts; addNodeWithRecursiveChild(node, initializer); } break; - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: var nameNode = node.name; // If we see a function declaration track as a possible ES5 class if (nameNode && ts.isIdentifier(nameNode)) { @@ -119664,11 +122730,11 @@ var ts; } addNodeWithRecursiveChild(node, node.body); break; - case 202 /* ArrowFunction */: - case 201 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 205 /* FunctionExpression */: addNodeWithRecursiveChild(node, node.body); break; - case 248 /* EnumDeclaration */: + case 252 /* EnumDeclaration */: startNode(node); for (var _f = 0, _g = node.members; _f < _g.length; _f++) { var member = _g[_f]; @@ -119678,9 +122744,9 @@ var ts; } endNode(); break; - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 246 /* InterfaceDeclaration */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 250 /* InterfaceDeclaration */: startNode(node); for (var _h = 0, _j = node.members; _h < _j.length; _h++) { var member = _j[_h]; @@ -119688,20 +122754,33 @@ var ts; } endNode(); break; - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: addNodeWithRecursiveChild(node, getInteriorModule(node).body); break; - case 259 /* ExportAssignment */: - case 263 /* ExportSpecifier */: - case 253 /* ImportEqualsDeclaration */: - case 167 /* IndexSignature */: - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 247 /* TypeAliasDeclaration */: + case 263 /* ExportAssignment */: { + var expression_1 = node.expression; + var child = ts.isObjectLiteralExpression(expression_1) ? expression_1 : + ts.isArrowFunction(expression_1) || ts.isFunctionExpression(expression_1) ? expression_1.body : undefined; + if (child) { + startNode(node); + addChildrenRecursively(child); + endNode(); + } + else { + addLeafNode(node); + } + break; + } + case 267 /* ExportSpecifier */: + case 257 /* ImportEqualsDeclaration */: + case 170 /* IndexSignature */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 251 /* TypeAliasDeclaration */: addLeafNode(node); break; - case 196 /* CallExpression */: - case 209 /* BinaryExpression */: { + case 200 /* CallExpression */: + case 213 /* BinaryExpression */: { var special = ts.getAssignmentDeclarationKind(node); switch (special) { case 1 /* ExportsProperty */: @@ -119755,7 +122834,7 @@ var ts; var memberName = defineCall.arguments[1]; var _k = startNestedNodes(node, className), depth = _k[0], classNameIdentifier = _k[1]; startNode(node, classNameIdentifier); - startNode(node, ts.setTextRange(ts.createIdentifier(memberName.text), memberName)); + startNode(node, ts.setTextRange(ts.factory.createIdentifier(memberName.text), memberName)); addChildrenRecursively(node.arguments[2]); endNode(); endNode(); @@ -119804,7 +122883,7 @@ var ts; } /** Merge declarations of the same kind. */ function mergeChildren(children, node) { - var nameToItems = ts.createMap(); + var nameToItems = new ts.Map(); ts.filterMutate(children, function (child, index) { var declName = child.name || ts.getNameOfDeclaration(child.node); var name = declName && nodeText(declName); @@ -119876,7 +122955,7 @@ var ts; isPossibleConstructor(b.node) ? b.node : undefined; if (ctorFunction !== undefined) { - var ctorNode = ts.setTextRange(ts.createConstructor(/* decorators */ undefined, /* modifiers */ undefined, [], /* body */ undefined), ctorFunction); + var ctorNode = ts.setTextRange(ts.factory.createConstructorDeclaration(/* decorators */ undefined, /* modifiers */ undefined, [], /* body */ undefined), ctorFunction); var ctor = emptyNavigationBarNode(ctorNode); ctor.indent = a.indent + 1; ctor.children = a.node === ctorFunction ? a.children : b.children; @@ -119891,9 +122970,9 @@ var ts; } } } - lastANode = a.node = ts.setTextRange(ts.createClassDeclaration( + lastANode = a.node = ts.setTextRange(ts.factory.createClassDeclaration( /* decorators */ undefined, - /* modifiers */ undefined, a.name || ts.createIdentifier("__class__"), + /* modifiers */ undefined, a.name || ts.factory.createIdentifier("__class__"), /* typeParameters */ undefined, /* heritageClauses */ undefined, []), a.node); } @@ -119916,9 +122995,9 @@ var ts; else { if (!a.additionalNodes) a.additionalNodes = []; - a.additionalNodes.push(ts.setTextRange(ts.createClassDeclaration( + a.additionalNodes.push(ts.setTextRange(ts.factory.createClassDeclaration( /* decorators */ undefined, - /* modifiers */ undefined, a.name || ts.createIdentifier("__class__"), + /* modifiers */ undefined, a.name || ts.factory.createIdentifier("__class__"), /* typeParameters */ undefined, /* heritageClauses */ undefined, []), b.node)); } @@ -119943,12 +123022,12 @@ var ts; return false; } switch (a.kind) { - case 159 /* PropertyDeclaration */: - case 161 /* MethodDeclaration */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - return ts.hasModifier(a, 32 /* Static */) === ts.hasModifier(b, 32 /* Static */); - case 249 /* ModuleDeclaration */: + case 162 /* PropertyDeclaration */: + case 164 /* MethodDeclaration */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + return ts.hasSyntacticModifier(a, 32 /* Static */) === ts.hasSyntacticModifier(b, 32 /* Static */); + case 253 /* ModuleDeclaration */: return areSameModule(a, b); default: return true; @@ -119964,7 +123043,7 @@ var ts; // Only merge module nodes that have the same chain. Don't merge 'A.B.C' with 'A'! function areSameModule(a, b) { // TODO: GH#18217 - return a.body.kind === b.body.kind && (a.body.kind !== 249 /* ModuleDeclaration */ || areSameModule(a.body, b.body)); + return a.body.kind === b.body.kind && (a.body.kind !== 253 /* ModuleDeclaration */ || areSameModule(a.body, b.body)); } /** Merge source into target. Source should be thrown away after this is called. */ function merge(target, source) { @@ -119994,7 +123073,7 @@ var ts; * So `new()` can still come before an `aardvark` method. */ function tryGetName(node) { - if (node.kind === 249 /* ModuleDeclaration */) { + if (node.kind === 253 /* ModuleDeclaration */) { return getModuleName(node); } var declName = ts.getNameOfDeclaration(node); @@ -120003,16 +123082,16 @@ var ts; return propertyName && ts.unescapeLeadingUnderscores(propertyName); } switch (node.kind) { - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: - case 214 /* ClassExpression */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 218 /* ClassExpression */: return getFunctionOrClassName(node); default: return undefined; } } function getItemName(node, name) { - if (node.kind === 249 /* ModuleDeclaration */) { + if (node.kind === 253 /* ModuleDeclaration */) { return cleanText(getModuleName(node)); } if (name) { @@ -120024,32 +123103,32 @@ var ts; } } switch (node.kind) { - case 290 /* SourceFile */: + case 294 /* SourceFile */: var sourceFile = node; return ts.isExternalModule(sourceFile) ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\"" : ""; - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: return ts.isExportAssignment(node) && node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */; - case 202 /* ArrowFunction */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - if (ts.getModifierFlags(node) & 512 /* Default */) { + case 206 /* ArrowFunction */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + if (ts.getSyntacticModifierFlags(node) & 512 /* Default */) { return "default"; } // We may get a string with newlines or other whitespace in the case of an object dereference // (eg: "app\n.onactivated"), so we should remove the whitespace for readabiltiy in the // navigation bar. return getFunctionOrClassName(node); - case 162 /* Constructor */: + case 165 /* Constructor */: return "constructor"; - case 166 /* ConstructSignature */: + case 169 /* ConstructSignature */: return "new()"; - case 165 /* CallSignature */: + case 168 /* CallSignature */: return "()"; - case 167 /* IndexSignature */: + case 170 /* IndexSignature */: return "[]"; default: return ""; @@ -120082,19 +123161,19 @@ var ts; } // Some nodes are otherwise important enough to always include in the primary navigation menu. switch (navigationBarNodeKind(item)) { - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 248 /* EnumDeclaration */: - case 246 /* InterfaceDeclaration */: - case 249 /* ModuleDeclaration */: - case 290 /* SourceFile */: - case 247 /* TypeAliasDeclaration */: - case 322 /* JSDocTypedefTag */: - case 315 /* JSDocCallbackTag */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 252 /* EnumDeclaration */: + case 250 /* InterfaceDeclaration */: + case 253 /* ModuleDeclaration */: + case 294 /* SourceFile */: + case 251 /* TypeAliasDeclaration */: + case 327 /* JSDocTypedefTag */: + case 320 /* JSDocCallbackTag */: return true; - case 202 /* ArrowFunction */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: return isTopLevelFunctionDeclaration(item); default: return false; @@ -120104,10 +123183,10 @@ var ts; return false; } switch (navigationBarNodeKind(item.parent)) { - case 250 /* ModuleBlock */: - case 290 /* SourceFile */: - case 161 /* MethodDeclaration */: - case 162 /* Constructor */: + case 254 /* ModuleBlock */: + case 294 /* SourceFile */: + case 164 /* MethodDeclaration */: + case 165 /* Constructor */: return true; default: return false; @@ -120167,7 +123246,7 @@ var ts; // Otherwise, we need to aggregate each identifier to build up the qualified name. var result = []; result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name)); - while (moduleDeclaration.body && moduleDeclaration.body.kind === 249 /* ModuleDeclaration */) { + while (moduleDeclaration.body && moduleDeclaration.body.kind === 253 /* ModuleDeclaration */) { moduleDeclaration = moduleDeclaration.body; result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name)); } @@ -120181,13 +123260,13 @@ var ts; return decl.body && ts.isModuleDeclaration(decl.body) ? getInteriorModule(decl.body) : decl; } function isComputedProperty(member) { - return !member.name || member.name.kind === 154 /* ComputedPropertyName */; + return !member.name || member.name.kind === 157 /* ComputedPropertyName */; } function getNodeSpan(node) { - return node.kind === 290 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile); + return node.kind === 294 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile); } function getModifiers(node) { - if (node.parent && node.parent.kind === 242 /* VariableDeclaration */) { + if (node.parent && node.parent.kind === 246 /* VariableDeclaration */) { node = node.parent; } return ts.getNodeModifiers(node); @@ -120210,7 +123289,7 @@ var ts; return nodeText(parent.name); } // Default exports are named "default" - else if (ts.getModifierFlags(node) & 512 /* Default */) { + else if (ts.getSyntacticModifierFlags(node) & 512 /* Default */) { return "default"; } else if (ts.isClassLike(node)) { @@ -120245,9 +123324,9 @@ var ts; } function isFunctionOrClassExpression(node) { switch (node.kind) { - case 202 /* ArrowFunction */: - case 201 /* FunctionExpression */: - case 214 /* ClassExpression */: + case 206 /* ArrowFunction */: + case 205 /* FunctionExpression */: + case 218 /* ClassExpression */: return true; default: return false; @@ -120278,7 +123357,7 @@ var ts; */ function organizeImports(sourceFile, formatContext, host, program, preferences) { var changeTracker = ts.textChanges.ChangeTracker.fromContext({ host: host, formatContext: formatContext, preferences: preferences }); - var coalesceAndOrganizeImports = function (importGroup) { return coalesceImports(removeUnusedImports(importGroup, sourceFile, program)); }; + var coalesceAndOrganizeImports = function (importGroup) { return ts.stableSort(coalesceImports(removeUnusedImports(importGroup, sourceFile, program)), function (s1, s2) { return compareImportsOrRequireStatements(s1, s2); }); }; // All of the old ImportDeclarations in the file, in syntactic order. var topLevelImportDecls = sourceFile.statements.filter(ts.isImportDeclaration); organizeImportsWorker(topLevelImportDecls, coalesceAndOrganizeImports); @@ -120362,7 +123441,7 @@ var ts; var newElements = namedBindings.elements.filter(function (e) { return isDeclarationUsed(e.name); }); if (newElements.length < namedBindings.elements.length) { namedBindings = newElements.length - ? ts.updateNamedImports(namedBindings, newElements) + ? ts.factory.updateNamedImports(namedBindings, newElements) : undefined; } } @@ -120374,7 +123453,7 @@ var ts; else if (hasModuleDeclarationMatchingSpecifier(sourceFile, moduleSpecifier)) { // If we’re in a declaration file, it’s safe to remove the import clause from it if (sourceFile.isDeclarationFile) { - usedImports.push(ts.createImportDeclaration(importDecl.decorators, importDecl.modifiers, + usedImports.push(ts.factory.createImportDeclaration(importDecl.decorators, importDecl.modifiers, /*importClause*/ undefined, moduleSpecifier)); } // If we’re not in a declaration file, we can’t remove the import clause even though @@ -120448,7 +123527,7 @@ var ts; else { for (var _e = 0, defaultImports_1 = defaultImports; _e < defaultImports_1.length; _e++) { var defaultImport = defaultImports_1[_e]; - newImportSpecifiers.push(ts.createImportSpecifier(ts.createIdentifier("default"), defaultImport.importClause.name)); // TODO: GH#18217 + newImportSpecifiers.push(ts.factory.createImportSpecifier(ts.factory.createIdentifier("default"), defaultImport.importClause.name)); // TODO: GH#18217 } } newImportSpecifiers.push.apply(newImportSpecifiers, ts.flatMap(namedImports, function (i) { return i.importClause.namedBindings.elements; })); // TODO: GH#18217 @@ -120459,10 +123538,10 @@ var ts; var newNamedImports = sortedImportSpecifiers.length === 0 ? newDefaultImport ? undefined - : ts.createNamedImports(ts.emptyArray) + : ts.factory.createNamedImports(ts.emptyArray) : namedImports.length === 0 - ? ts.createNamedImports(sortedImportSpecifiers) - : ts.updateNamedImports(namedImports[0].importClause.namedBindings, sortedImportSpecifiers); // TODO: GH#18217 + ? ts.factory.createNamedImports(sortedImportSpecifiers) + : ts.factory.updateNamedImports(namedImports[0].importClause.namedBindings, sortedImportSpecifiers); // TODO: GH#18217 // Type-only imports are not allowed to mix default, namespace, and named imports in any combination. // We could rewrite a default import as a named import (`import { default as name }`), but we currently // choose not to as a stylistic preference. @@ -120538,9 +123617,9 @@ var ts; newExportSpecifiers.push.apply(newExportSpecifiers, ts.flatMap(exportGroup_1, function (i) { return i.exportClause && ts.isNamedExports(i.exportClause) ? i.exportClause.elements : ts.emptyArray; })); var sortedExportSpecifiers = sortSpecifiers(newExportSpecifiers); var exportDecl = exportGroup_1[0]; - coalescedExports.push(ts.updateExportDeclaration(exportDecl, exportDecl.decorators, exportDecl.modifiers, exportDecl.exportClause && (ts.isNamedExports(exportDecl.exportClause) ? - ts.updateNamedExports(exportDecl.exportClause, sortedExportSpecifiers) : - ts.updateNamespaceExport(exportDecl.exportClause, exportDecl.exportClause.name)), exportDecl.moduleSpecifier, exportDecl.isTypeOnly)); + coalescedExports.push(ts.factory.updateExportDeclaration(exportDecl, exportDecl.decorators, exportDecl.modifiers, exportDecl.isTypeOnly, exportDecl.exportClause && (ts.isNamedExports(exportDecl.exportClause) ? + ts.factory.updateNamedExports(exportDecl.exportClause, sortedExportSpecifiers) : + ts.factory.updateNamespaceExport(exportDecl.exportClause, exportDecl.exportClause.name)), exportDecl.moduleSpecifier)); } return coalescedExports; /* @@ -120575,19 +123654,21 @@ var ts; } OrganizeImports.coalesceExports = coalesceExports; function updateImportDeclarationAndClause(importDeclaration, name, namedBindings) { - return ts.updateImportDeclaration(importDeclaration, importDeclaration.decorators, importDeclaration.modifiers, ts.updateImportClause(importDeclaration.importClause, name, namedBindings, importDeclaration.importClause.isTypeOnly), // TODO: GH#18217 + return ts.factory.updateImportDeclaration(importDeclaration, importDeclaration.decorators, importDeclaration.modifiers, ts.factory.updateImportClause(importDeclaration.importClause, importDeclaration.importClause.isTypeOnly, name, namedBindings), // TODO: GH#18217 importDeclaration.moduleSpecifier); } function sortSpecifiers(specifiers) { - return ts.stableSort(specifiers, function (s1, s2) { - return compareIdentifiers(s1.propertyName || s1.name, s2.propertyName || s2.name) || - compareIdentifiers(s1.name, s2.name); - }); + return ts.stableSort(specifiers, compareImportOrExportSpecifiers); } + function compareImportOrExportSpecifiers(s1, s2) { + return compareIdentifiers(s1.propertyName || s1.name, s2.propertyName || s2.name) + || compareIdentifiers(s1.name, s2.name); + } + OrganizeImports.compareImportOrExportSpecifiers = compareImportOrExportSpecifiers; /* internal */ // Exported for testing function compareModuleSpecifiers(m1, m2) { - var name1 = getExternalModuleName(m1); - var name2 = getExternalModuleName(m2); + var name1 = m1 === undefined ? undefined : getExternalModuleName(m1); + var name2 = m2 === undefined ? undefined : getExternalModuleName(m2); return ts.compareBooleans(name1 === undefined, name2 === undefined) || ts.compareBooleans(ts.isExternalModuleNameRelative(name1), ts.isExternalModuleNameRelative(name2)) || ts.compareStringsCaseInsensitive(name1, name2); @@ -120596,6 +123677,68 @@ var ts; function compareIdentifiers(s1, s2) { return ts.compareStringsCaseInsensitive(s1.text, s2.text); } + function getModuleSpecifierExpression(declaration) { + var _a; + switch (declaration.kind) { + case 257 /* ImportEqualsDeclaration */: + return (_a = ts.tryCast(declaration.moduleReference, ts.isExternalModuleReference)) === null || _a === void 0 ? void 0 : _a.expression; + case 258 /* ImportDeclaration */: + return declaration.moduleSpecifier; + case 229 /* VariableStatement */: + return declaration.declarationList.declarations[0].initializer.arguments[0]; + } + } + function importsAreSorted(imports) { + return ts.arrayIsSorted(imports, compareImportsOrRequireStatements); + } + OrganizeImports.importsAreSorted = importsAreSorted; + function importSpecifiersAreSorted(imports) { + return ts.arrayIsSorted(imports, compareImportOrExportSpecifiers); + } + OrganizeImports.importSpecifiersAreSorted = importSpecifiersAreSorted; + function getImportDeclarationInsertionIndex(sortedImports, newImport) { + var index = ts.binarySearch(sortedImports, newImport, ts.identity, compareImportsOrRequireStatements); + return index < 0 ? ~index : index; + } + OrganizeImports.getImportDeclarationInsertionIndex = getImportDeclarationInsertionIndex; + function getImportSpecifierInsertionIndex(sortedImports, newImport) { + var index = ts.binarySearch(sortedImports, newImport, ts.identity, compareImportOrExportSpecifiers); + return index < 0 ? ~index : index; + } + OrganizeImports.getImportSpecifierInsertionIndex = getImportSpecifierInsertionIndex; + function compareImportsOrRequireStatements(s1, s2) { + return compareModuleSpecifiers(getModuleSpecifierExpression(s1), getModuleSpecifierExpression(s2)) || compareImportKind(s1, s2); + } + OrganizeImports.compareImportsOrRequireStatements = compareImportsOrRequireStatements; + function compareImportKind(s1, s2) { + return ts.compareValues(getImportKindOrder(s1), getImportKindOrder(s2)); + } + // 1. Side-effect imports + // 2. Type-only imports + // 3. Namespace imports + // 4. Default imports + // 5. Named imports + // 6. ImportEqualsDeclarations + // 7. Require variable statements + function getImportKindOrder(s1) { + var _a; + switch (s1.kind) { + case 258 /* ImportDeclaration */: + if (!s1.importClause) + return 0; + if (s1.importClause.isTypeOnly) + return 1; + if (((_a = s1.importClause.namedBindings) === null || _a === void 0 ? void 0 : _a.kind) === 260 /* NamespaceImport */) + return 2; + if (s1.importClause.name) + return 3; + return 4; + case 257 /* ImportEqualsDeclaration */: + return 5; + case 229 /* VariableStatement */: + return 6; + } + } })(OrganizeImports = ts.OrganizeImports || (ts.OrganizeImports = {})); })(ts || (ts = {})); /* @internal */ @@ -120630,7 +123773,7 @@ var ts; } var lastImport = current - 1; if (lastImport !== firstImport) { - out.push(createOutliningSpanFromBounds(ts.findChildOfKind(statements[firstImport], 96 /* ImportKeyword */, sourceFile).getStart(sourceFile), statements[lastImport].getEnd(), "imports" /* Imports */)); + out.push(createOutliningSpanFromBounds(ts.findChildOfKind(statements[firstImport], 99 /* ImportKeyword */, sourceFile).getStart(sourceFile), statements[lastImport].getEnd(), "imports" /* Imports */)); } } function visitNonImportNode(n) { @@ -120644,6 +123787,9 @@ var ts; if (isFunctionExpressionAssignedToVariable(n)) { addOutliningForLeadingCommentsForNode(n.parent.parent.parent, sourceFile, cancellationToken, out); } + if (ts.isFunctionLike(n) && ts.isBinaryExpression(n.parent) && ts.isPropertyAccessExpression(n.parent.left)) { + addOutliningForLeadingCommentsForNode(n.parent.left, sourceFile, cancellationToken, out); + } var span = getOutliningSpanForNode(n, sourceFile); if (span) out.push(span); @@ -120755,7 +123901,7 @@ var ts; } function getOutliningSpanForNode(n, sourceFile) { switch (n.kind) { - case 223 /* Block */: + case 227 /* Block */: if (ts.isFunctionLike(n.parent)) { return functionSpan(n.parent, n, sourceFile); } @@ -120763,23 +123909,23 @@ var ts; // If the latter, we want to collapse the block, but consider its hint span // to be the entire span of the parent. switch (n.parent.kind) { - case 228 /* DoStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - case 230 /* ForStatement */: - case 227 /* IfStatement */: - case 229 /* WhileStatement */: - case 236 /* WithStatement */: - case 280 /* CatchClause */: + case 232 /* DoStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 234 /* ForStatement */: + case 231 /* IfStatement */: + case 233 /* WhileStatement */: + case 240 /* WithStatement */: + case 284 /* CatchClause */: return spanForNode(n.parent); - case 240 /* TryStatement */: + case 244 /* TryStatement */: // Could be the try-block, or the finally-block. var tryStatement = n.parent; if (tryStatement.tryBlock === n) { return spanForNode(n.parent); } else if (tryStatement.finallyBlock === n) { - var node = ts.findChildOfKind(tryStatement, 92 /* FinallyKeyword */, sourceFile); + var node = ts.findChildOfKind(tryStatement, 95 /* FinallyKeyword */, sourceFile); if (node) return spanForNode(node); } @@ -120789,32 +123935,59 @@ var ts; // the span of the block, independent of any parent span. return createOutliningSpan(ts.createTextSpanFromNode(n, sourceFile), "code" /* Code */); } - case 250 /* ModuleBlock */: + case 254 /* ModuleBlock */: return spanForNode(n.parent); - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 246 /* InterfaceDeclaration */: - case 248 /* EnumDeclaration */: - case 251 /* CaseBlock */: - case 173 /* TypeLiteral */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 250 /* InterfaceDeclaration */: + case 252 /* EnumDeclaration */: + case 255 /* CaseBlock */: + case 176 /* TypeLiteral */: + case 193 /* ObjectBindingPattern */: return spanForNode(n); - case 277 /* CaseClause */: - case 278 /* DefaultClause */: + case 178 /* TupleType */: + return spanForNode(n, /*autoCollapse*/ false, /*useFullStart*/ !ts.isTupleTypeNode(n.parent), 22 /* OpenBracketToken */); + case 281 /* CaseClause */: + case 282 /* DefaultClause */: return spanForNodeArray(n.statements); - case 193 /* ObjectLiteralExpression */: + case 197 /* ObjectLiteralExpression */: return spanForObjectOrArrayLiteral(n); - case 192 /* ArrayLiteralExpression */: + case 196 /* ArrayLiteralExpression */: return spanForObjectOrArrayLiteral(n, 22 /* OpenBracketToken */); - case 266 /* JsxElement */: + case 270 /* JsxElement */: return spanForJSXElement(n); - case 270 /* JsxFragment */: + case 274 /* JsxFragment */: return spanForJSXFragment(n); - case 267 /* JsxSelfClosingElement */: - case 268 /* JsxOpeningElement */: + case 271 /* JsxSelfClosingElement */: + case 272 /* JsxOpeningElement */: return spanForJSXAttributes(n.attributes); - case 211 /* TemplateExpression */: + case 215 /* TemplateExpression */: case 14 /* NoSubstitutionTemplateLiteral */: return spanForTemplateLiteral(n); + case 194 /* ArrayBindingPattern */: + return spanForNode(n, /*autoCollapse*/ false, /*useFullStart*/ !ts.isBindingElement(n.parent), 22 /* OpenBracketToken */); + case 206 /* ArrowFunction */: + return spanForArrowFunction(n); + case 200 /* CallExpression */: + return spanForCallExpression(n); + } + function spanForCallExpression(node) { + if (!node.arguments.length) { + return undefined; + } + var openToken = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile); + var closeToken = ts.findChildOfKind(node, 21 /* CloseParenToken */, sourceFile); + if (!openToken || !closeToken || ts.positionsAreOnSameLine(openToken.pos, closeToken.pos, sourceFile)) { + return undefined; + } + return spanBetweenTokens(openToken, closeToken, node, sourceFile, /*autoCollapse*/ false, /*useFullStart*/ true); + } + function spanForArrowFunction(node) { + if (ts.isBlock(node.body) || ts.positionsAreOnSameLine(node.body.getFullStart(), node.body.getEnd(), sourceFile)) { + return undefined; + } + var textSpan = ts.createTextSpanFromBounds(node.body.getFullStart(), node.body.getEnd()); + return createOutliningSpan(textSpan, "code" /* Code */, ts.createTextSpanFromNode(node)); } function spanForJSXElement(node) { var textSpan = ts.createTextSpanFromBounds(node.openingElement.getStart(sourceFile), node.closingElement.getEnd()); @@ -120860,11 +124033,9 @@ var ts; } } function functionSpan(node, body, sourceFile) { - var openToken = ts.isNodeArrayMultiLine(node.parameters, sourceFile) - ? ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile) - : ts.findChildOfKind(body, 18 /* OpenBraceToken */, sourceFile); + var openToken = tryGetFunctionOpenToken(node, body, sourceFile); var closeToken = ts.findChildOfKind(body, 19 /* CloseBraceToken */, sourceFile); - return openToken && closeToken && spanBetweenTokens(openToken, closeToken, node, sourceFile, /*autoCollapse*/ node.kind !== 202 /* ArrowFunction */); + return openToken && closeToken && spanBetweenTokens(openToken, closeToken, node, sourceFile, /*autoCollapse*/ node.kind !== 206 /* ArrowFunction */); } function spanBetweenTokens(openToken, closeToken, hintSpanNode, sourceFile, autoCollapse, useFullStart) { if (autoCollapse === void 0) { autoCollapse = false; } @@ -120878,6 +124049,15 @@ var ts; if (bannerText === void 0) { bannerText = "..."; } return { textSpan: textSpan, kind: kind, hintSpan: hintSpan, bannerText: bannerText, autoCollapse: autoCollapse }; } + function tryGetFunctionOpenToken(node, body, sourceFile) { + if (ts.isNodeArrayMultiLine(node.parameters, sourceFile)) { + var openParenToken = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile); + if (openParenToken) { + return openParenToken; + } + } + return ts.findChildOfKind(body, 18 /* OpenBraceToken */, sourceFile); + } })(OutliningElementsCollector = ts.OutliningElementsCollector || (ts.OutliningElementsCollector = {})); })(ts || (ts = {})); /* @internal */ @@ -120902,7 +124082,7 @@ var ts; // we see the name of a module that is used everywhere, or the name of an overload). As // such, we cache the information we compute about the candidate for the life of this // pattern matcher so we don't have to compute it multiple times. - var stringToWordSpans = ts.createMap(); + var stringToWordSpans = new ts.Map(); var dotSeparatedSegments = pattern.trim().split(".").map(function (p) { return createSegment(p.trim()); }); // A segment is considered invalid if we couldn't find any words in it. if (dotSeparatedSegments.some(function (segment) { return !segment.subWordTextChunks.length; })) @@ -121399,10 +124579,10 @@ var ts; */ function tryConsumeDeclare() { var token = ts.scanner.getToken(); - if (token === 130 /* DeclareKeyword */) { + if (token === 133 /* DeclareKeyword */) { // declare module "mod" token = nextToken(); - if (token === 135 /* ModuleKeyword */) { + if (token === 138 /* ModuleKeyword */) { token = nextToken(); if (token === 10 /* StringLiteral */) { recordAmbientExternalModule(); @@ -121420,7 +124600,7 @@ var ts; return false; } var token = ts.scanner.getToken(); - if (token === 96 /* ImportKeyword */) { + if (token === 99 /* ImportKeyword */) { token = nextToken(); if (token === 20 /* OpenParenToken */) { token = nextToken(); @@ -121436,21 +124616,21 @@ var ts; return true; } else { - if (token === 145 /* TypeKeyword */) { + if (token === 148 /* TypeKeyword */) { var skipTypeKeyword = ts.scanner.lookAhead(function () { var token = ts.scanner.scan(); - return token !== 149 /* FromKeyword */ && (token === 41 /* AsteriskToken */ || + return token !== 152 /* FromKeyword */ && (token === 41 /* AsteriskToken */ || token === 18 /* OpenBraceToken */ || - token === 75 /* Identifier */ || + token === 78 /* Identifier */ || ts.isKeyword(token)); }); if (skipTypeKeyword) { token = nextToken(); } } - if (token === 75 /* Identifier */ || ts.isKeyword(token)) { + if (token === 78 /* Identifier */ || ts.isKeyword(token)) { token = nextToken(); - if (token === 149 /* FromKeyword */) { + if (token === 152 /* FromKeyword */) { token = nextToken(); if (token === 10 /* StringLiteral */) { // import d from "mod"; @@ -121481,7 +124661,7 @@ var ts; } if (token === 19 /* CloseBraceToken */) { token = nextToken(); - if (token === 149 /* FromKeyword */) { + if (token === 152 /* FromKeyword */) { token = nextToken(); if (token === 10 /* StringLiteral */) { // import {a as A} from "mod"; @@ -121493,11 +124673,11 @@ var ts; } else if (token === 41 /* AsteriskToken */) { token = nextToken(); - if (token === 123 /* AsKeyword */) { + if (token === 126 /* AsKeyword */) { token = nextToken(); - if (token === 75 /* Identifier */ || ts.isKeyword(token)) { + if (token === 78 /* Identifier */ || ts.isKeyword(token)) { token = nextToken(); - if (token === 149 /* FromKeyword */) { + if (token === 152 /* FromKeyword */) { token = nextToken(); if (token === 10 /* StringLiteral */) { // import * as NS from "mod" @@ -121515,10 +124695,10 @@ var ts; } function tryConsumeExport() { var token = ts.scanner.getToken(); - if (token === 89 /* ExportKeyword */) { + if (token === 92 /* ExportKeyword */) { markAsExternalModuleIfTopLevel(); token = nextToken(); - if (token === 145 /* TypeKeyword */) { + if (token === 148 /* TypeKeyword */) { var skipTypeKeyword = ts.scanner.lookAhead(function () { var token = ts.scanner.scan(); return token === 41 /* AsteriskToken */ || @@ -121537,7 +124717,7 @@ var ts; } if (token === 19 /* CloseBraceToken */) { token = nextToken(); - if (token === 149 /* FromKeyword */) { + if (token === 152 /* FromKeyword */) { token = nextToken(); if (token === 10 /* StringLiteral */) { // export {a as A} from "mod"; @@ -121549,7 +124729,7 @@ var ts; } else if (token === 41 /* AsteriskToken */) { token = nextToken(); - if (token === 149 /* FromKeyword */) { + if (token === 152 /* FromKeyword */) { token = nextToken(); if (token === 10 /* StringLiteral */) { // export * from "mod" @@ -121557,19 +124737,19 @@ var ts; } } } - else if (token === 96 /* ImportKeyword */) { + else if (token === 99 /* ImportKeyword */) { token = nextToken(); - if (token === 145 /* TypeKeyword */) { + if (token === 148 /* TypeKeyword */) { var skipTypeKeyword = ts.scanner.lookAhead(function () { var token = ts.scanner.scan(); - return token === 75 /* Identifier */ || + return token === 78 /* Identifier */ || ts.isKeyword(token); }); if (skipTypeKeyword) { token = nextToken(); } } - if (token === 75 /* Identifier */ || ts.isKeyword(token)) { + if (token === 78 /* Identifier */ || ts.isKeyword(token)) { token = nextToken(); if (token === 62 /* EqualsToken */) { if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) { @@ -121585,7 +124765,7 @@ var ts; function tryConsumeRequireCall(skipCurrentToken, allowTemplateLiterals) { if (allowTemplateLiterals === void 0) { allowTemplateLiterals = false; } var token = skipCurrentToken ? nextToken() : ts.scanner.getToken(); - if (token === 139 /* RequireKeyword */) { + if (token === 142 /* RequireKeyword */) { token = nextToken(); if (token === 20 /* OpenParenToken */) { token = nextToken(); @@ -121601,7 +124781,7 @@ var ts; } function tryConsumeDefine() { var token = ts.scanner.getToken(); - if (token === 75 /* Identifier */ && ts.scanner.getTokenValue() === "define") { + if (token === 78 /* Identifier */ && ts.scanner.getTokenValue() === "define") { token = nextToken(); if (token !== 20 /* OpenParenToken */) { return true; @@ -121739,14 +124919,14 @@ var ts; return getRenameInfoError(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library); } // Cannot rename `default` as in `import { default as foo } from "./someModule"; - if (ts.isIdentifier(node) && node.originalKeywordKind === 84 /* DefaultKeyword */ && symbol.parent && symbol.parent.flags & 1536 /* Module */) { + if (ts.isIdentifier(node) && node.originalKeywordKind === 87 /* DefaultKeyword */ && symbol.parent && symbol.parent.flags & 1536 /* Module */) { return undefined; } if (ts.isStringLiteralLike(node) && ts.tryGetImportFromModuleSpecifier(node)) { return options && options.allowRenameOfImportPath ? getRenameInfoForModule(node, sourceFile, symbol) : undefined; } var kind = ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, node); - var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 154 /* ComputedPropertyName */) + var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 157 /* ComputedPropertyName */) ? ts.stripQuotes(ts.getTextOfIdentifierOrLiteral(node)) : undefined; var displayName = specifierName || typeChecker.symbolToString(symbol); @@ -121802,11 +124982,11 @@ var ts; } function nodeIsEligibleForRename(node) { switch (node.kind) { - case 75 /* Identifier */: - case 76 /* PrivateIdentifier */: + case 78 /* Identifier */: + case 79 /* PrivateIdentifier */: case 10 /* StringLiteral */: case 14 /* NoSubstitutionTemplateLiteral */: - case 104 /* ThisKeyword */: + case 107 /* ThisKeyword */: return true; case 8 /* NumericLiteral */: return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node); @@ -121958,14 +125138,14 @@ var ts; ts.Debug.assertEqual(closeBraceToken.kind, 19 /* CloseBraceToken */); // Group `-/+readonly` and `-/+?` var groupedWithPlusMinusTokens = groupChildren(children, function (child) { - return child === node.readonlyToken || child.kind === 138 /* ReadonlyKeyword */ || + return child === node.readonlyToken || child.kind === 141 /* ReadonlyKeyword */ || child === node.questionToken || child.kind === 57 /* QuestionToken */; }); // Group type parameter with surrounding brackets var groupedWithBrackets = groupChildren(groupedWithPlusMinusTokens, function (_a) { var kind = _a.kind; return kind === 22 /* OpenBracketToken */ || - kind === 155 /* TypeParameter */ || + kind === 158 /* TypeParameter */ || kind === 23 /* CloseBracketToken */; }); return [ @@ -122072,23 +125252,21 @@ var ts; } function createSyntaxList(children) { ts.Debug.assertGreaterThanOrEqual(children.length, 1); - var syntaxList = ts.createNode(324 /* SyntaxList */, children[0].pos, ts.last(children).end); - syntaxList._children = children; - return syntaxList; + return ts.setTextRangePosEnd(ts.parseNodeFactory.createSyntaxList(children), children[0].pos, ts.last(children).end); } function isListOpener(token) { var kind = token && token.kind; return kind === 18 /* OpenBraceToken */ || kind === 22 /* OpenBracketToken */ || kind === 20 /* OpenParenToken */ - || kind === 268 /* JsxOpeningElement */; + || kind === 272 /* JsxOpeningElement */; } function isListCloser(token) { var kind = token && token.kind; return kind === 19 /* CloseBraceToken */ || kind === 23 /* CloseBracketToken */ || kind === 21 /* CloseParenToken */ - || kind === 269 /* JsxClosingElement */; + || kind === 273 /* JsxClosingElement */; } })(SmartSelectionRange = ts.SmartSelectionRange || (ts.SmartSelectionRange = {})); })(ts || (ts = {})); @@ -122192,14 +125370,15 @@ var ts; return undefined; // See if we can find some symbol with the call expression name that has call signatures. var expression = getExpressionFromInvocation(argumentInfo.invocation); - var name = ts.isIdentifier(expression) ? expression.text : ts.isPropertyAccessExpression(expression) ? expression.name.text : undefined; + var name = ts.isPropertyAccessExpression(expression) ? expression.name.text : undefined; var typeChecker = program.getTypeChecker(); return name === undefined ? undefined : ts.firstDefined(program.getSourceFiles(), function (sourceFile) { return ts.firstDefined(sourceFile.getNamedDeclarations().get(name), function (declaration) { var type = declaration.symbol && typeChecker.getTypeOfSymbolAtLocation(declaration.symbol, declaration); var callSignatures = type && type.getCallSignatures(); if (callSignatures && callSignatures.length) { - return typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return createSignatureHelpItems(callSignatures, callSignatures[0], argumentInfo, sourceFile, typeChecker); }); + return typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return createSignatureHelpItems(callSignatures, callSignatures[0], argumentInfo, sourceFile, typeChecker, + /*useFullPrefix*/ true); }); } }); }); @@ -122293,10 +125472,10 @@ var ts; } return undefined; } - else if (ts.isTemplateHead(node) && parent.parent.kind === 198 /* TaggedTemplateExpression */) { + else if (ts.isTemplateHead(node) && parent.parent.kind === 202 /* TaggedTemplateExpression */) { var templateExpression = parent; var tagExpression = templateExpression.parent; - ts.Debug.assert(templateExpression.kind === 211 /* TemplateExpression */); + ts.Debug.assert(templateExpression.kind === 215 /* TemplateExpression */); var argumentIndex = ts.isInsideTemplateLiteral(node, position, sourceFile) ? 0 : 1; return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile); } @@ -122352,10 +125531,12 @@ var ts; if (!info) return undefined; var contextualType = info.contextualType, argumentIndex = info.argumentIndex, argumentCount = info.argumentCount, argumentsSpan = info.argumentsSpan; - var signatures = contextualType.getCallSignatures(); + // for optional function condition. + var nonNullableContextualType = contextualType.getNonNullableType(); + var signatures = nonNullableContextualType.getCallSignatures(); if (signatures.length !== 1) return undefined; - var invocation = { kind: 2 /* Contextual */, signature: ts.first(signatures), node: startingToken, symbol: chooseBetterSymbol(contextualType.symbol) }; + var invocation = { kind: 2 /* Contextual */, signature: ts.first(signatures), node: startingToken, symbol: chooseBetterSymbol(nonNullableContextualType.symbol) }; return { isTypeParameterList: false, invocation: invocation, argumentsSpan: argumentsSpan, argumentIndex: argumentIndex, argumentCount: argumentCount }; } function getContextualSignatureLocationInfo(startingToken, sourceFile, checker) { @@ -122363,17 +125544,17 @@ var ts; return undefined; var parent = startingToken.parent; switch (parent.kind) { - case 200 /* ParenthesizedExpression */: - case 161 /* MethodDeclaration */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 204 /* ParenthesizedExpression */: + case 164 /* MethodDeclaration */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: var info = getArgumentOrParameterListInfo(startingToken, sourceFile); if (!info) return undefined; var argumentIndex = info.argumentIndex, argumentCount = info.argumentCount, argumentsSpan = info.argumentsSpan; var contextualType = ts.isMethodDeclaration(parent) ? checker.getContextualTypeForObjectLiteralElement(parent) : checker.getContextualType(parent); return contextualType && { contextualType: contextualType, argumentIndex: argumentIndex, argumentCount: argumentCount, argumentsSpan: argumentsSpan }; - case 209 /* BinaryExpression */: { + case 213 /* BinaryExpression */: { var highestBinary = getHighestBinary(parent); var contextualType_1 = checker.getContextualType(highestBinary); var argumentIndex_1 = startingToken.kind === 20 /* OpenParenToken */ ? 0 : countBinaryExpressionParameters(parent) - 1; @@ -122497,7 +125678,7 @@ var ts; // | | // This is because a Missing node has no width. However, what we actually want is to include trivia // leading up to the next token in case the user is about to type in a TemplateMiddle or TemplateTail. - if (template.kind === 211 /* TemplateExpression */) { + if (template.kind === 215 /* TemplateExpression */) { var lastSpan = ts.last(template.templateSpans); if (lastSpan.literal.getFullWidth() === 0) { applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false); @@ -122535,18 +125716,40 @@ var ts; return invocation.kind === 0 /* Call */ ? invocation.node : invocation.kind === 1 /* TypeArgs */ ? invocation.called : invocation.node; } var signatureHelpNodeBuilderFlags = 8192 /* OmitParameterModifiers */ | 70221824 /* IgnoreErrors */ | 16384 /* UseAliasDefinedOutsideCurrentScope */; - function createSignatureHelpItems(candidates, resolvedSignature, _a, sourceFile, typeChecker) { + function createSignatureHelpItems(candidates, resolvedSignature, _a, sourceFile, typeChecker, useFullPrefix) { + var _b; var isTypeParameterList = _a.isTypeParameterList, argumentCount = _a.argumentCount, applicableSpan = _a.argumentsSpan, invocation = _a.invocation, argumentIndex = _a.argumentIndex; var enclosingDeclaration = getEnclosingDeclarationFromInvocation(invocation); - var callTargetSymbol = invocation.kind === 2 /* Contextual */ ? invocation.symbol : typeChecker.getSymbolAtLocation(getExpressionFromInvocation(invocation)); - var callTargetDisplayParts = callTargetSymbol ? ts.symbolToDisplayParts(typeChecker, callTargetSymbol, /*enclosingDeclaration*/ undefined, /*meaning*/ undefined) : ts.emptyArray; - var items = candidates.map(function (candidateSignature) { return getSignatureHelpItem(candidateSignature, callTargetDisplayParts, isTypeParameterList, typeChecker, enclosingDeclaration, sourceFile); }); + var callTargetSymbol = invocation.kind === 2 /* Contextual */ ? invocation.symbol : (typeChecker.getSymbolAtLocation(getExpressionFromInvocation(invocation)) || useFullPrefix && ((_b = resolvedSignature.declaration) === null || _b === void 0 ? void 0 : _b.symbol)); + var callTargetDisplayParts = callTargetSymbol ? ts.symbolToDisplayParts(typeChecker, callTargetSymbol, useFullPrefix ? sourceFile : undefined, /*meaning*/ undefined) : ts.emptyArray; + var items = ts.map(candidates, function (candidateSignature) { return getSignatureHelpItem(candidateSignature, callTargetDisplayParts, isTypeParameterList, typeChecker, enclosingDeclaration, sourceFile); }); if (argumentIndex !== 0) { ts.Debug.assertLessThan(argumentIndex, argumentCount); } - var selectedItemIndex = candidates.indexOf(resolvedSignature); + var selectedItemIndex = 0; + var itemsSeen = 0; + for (var i = 0; i < items.length; i++) { + var item = items[i]; + if (candidates[i] === resolvedSignature) { + selectedItemIndex = itemsSeen; + if (item.length > 1) { + // check to see if any items in the list better match than the first one, as the checker isn't filtering the nested lists + // (those come from tuple parameter expansion) + var count = 0; + for (var _i = 0, item_1 = item; _i < item_1.length; _i++) { + var i_1 = item_1[_i]; + if (i_1.isVariadic || i_1.parameters.length >= argumentCount) { + selectedItemIndex = itemsSeen + count; + break; + } + count++; + } + } + } + itemsSeen += item.length; + } ts.Debug.assert(selectedItemIndex !== -1); // If candidates is non-empty it should always include bestSignature. We check for an empty candidates before calling this function. - return { items: items, applicableSpan: applicableSpan, selectedItemIndex: selectedItemIndex, argumentIndex: argumentIndex, argumentCount: argumentCount }; + return { items: ts.flatMapToMutable(items, ts.identity), applicableSpan: applicableSpan, selectedItemIndex: selectedItemIndex, argumentIndex: argumentIndex, argumentCount: argumentCount }; } function createTypeHelpItems(symbol, _a, sourceFile, checker) { var argumentCount = _a.argumentCount, applicableSpan = _a.argumentsSpan, invocation = _a.invocation, argumentIndex = _a.argumentIndex; @@ -122567,12 +125770,15 @@ var ts; } var separatorDisplayParts = [ts.punctuationPart(27 /* CommaToken */), ts.spacePart()]; function getSignatureHelpItem(candidateSignature, callTargetDisplayParts, isTypeParameterList, checker, enclosingDeclaration, sourceFile) { - var _a = (isTypeParameterList ? itemInfoForTypeParameters : itemInfoForParameters)(candidateSignature, checker, enclosingDeclaration, sourceFile), isVariadic = _a.isVariadic, parameters = _a.parameters, prefix = _a.prefix, suffix = _a.suffix; - var prefixDisplayParts = __spreadArrays(callTargetDisplayParts, prefix); - var suffixDisplayParts = __spreadArrays(suffix, returnTypeToDisplayParts(candidateSignature, enclosingDeclaration, checker)); - var documentation = candidateSignature.getDocumentationComment(checker); - var tags = candidateSignature.getJsDocTags(); - return { isVariadic: isVariadic, prefixDisplayParts: prefixDisplayParts, suffixDisplayParts: suffixDisplayParts, separatorDisplayParts: separatorDisplayParts, parameters: parameters, documentation: documentation, tags: tags }; + var infos = (isTypeParameterList ? itemInfoForTypeParameters : itemInfoForParameters)(candidateSignature, checker, enclosingDeclaration, sourceFile); + return ts.map(infos, function (_a) { + var isVariadic = _a.isVariadic, parameters = _a.parameters, prefix = _a.prefix, suffix = _a.suffix; + var prefixDisplayParts = __spreadArrays(callTargetDisplayParts, prefix); + var suffixDisplayParts = __spreadArrays(suffix, returnTypeToDisplayParts(candidateSignature, enclosingDeclaration, checker)); + var documentation = candidateSignature.getDocumentationComment(checker); + var tags = candidateSignature.getJsDocTags(); + return { isVariadic: isVariadic, prefixDisplayParts: prefixDisplayParts, suffixDisplayParts: suffixDisplayParts, separatorDisplayParts: separatorDisplayParts, parameters: parameters, documentation: documentation, tags: tags }; + }); } function returnTypeToDisplayParts(candidateSignature, enclosingDeclaration, checker) { return ts.mapToDisplayParts(function (writer) { @@ -122591,24 +125797,33 @@ var ts; var typeParameters = (candidateSignature.target || candidateSignature).typeParameters; var printer = ts.createPrinter({ removeComments: true }); var parameters = (typeParameters || ts.emptyArray).map(function (t) { return createSignatureHelpParameterForTypeParameter(t, checker, enclosingDeclaration, sourceFile, printer); }); - var parameterParts = ts.mapToDisplayParts(function (writer) { - var thisParameter = candidateSignature.thisParameter ? [checker.symbolToParameterDeclaration(candidateSignature.thisParameter, enclosingDeclaration, signatureHelpNodeBuilderFlags)] : []; - var params = ts.createNodeArray(__spreadArrays(thisParameter, checker.getExpandedParameters(candidateSignature).map(function (param) { return checker.symbolToParameterDeclaration(param, enclosingDeclaration, signatureHelpNodeBuilderFlags); }))); - printer.writeList(2576 /* CallExpressionArguments */, params, sourceFile, writer); + var thisParameter = candidateSignature.thisParameter ? [checker.symbolToParameterDeclaration(candidateSignature.thisParameter, enclosingDeclaration, signatureHelpNodeBuilderFlags)] : []; + return checker.getExpandedParameters(candidateSignature).map(function (paramList) { + var params = ts.factory.createNodeArray(__spreadArrays(thisParameter, ts.map(paramList, function (param) { return checker.symbolToParameterDeclaration(param, enclosingDeclaration, signatureHelpNodeBuilderFlags); }))); + var parameterParts = ts.mapToDisplayParts(function (writer) { + printer.writeList(2576 /* CallExpressionArguments */, params, sourceFile, writer); + }); + return { isVariadic: false, parameters: parameters, prefix: [ts.punctuationPart(29 /* LessThanToken */)], suffix: __spreadArrays([ts.punctuationPart(31 /* GreaterThanToken */)], parameterParts) }; }); - return { isVariadic: false, parameters: parameters, prefix: [ts.punctuationPart(29 /* LessThanToken */)], suffix: __spreadArrays([ts.punctuationPart(31 /* GreaterThanToken */)], parameterParts) }; } function itemInfoForParameters(candidateSignature, checker, enclosingDeclaration, sourceFile) { var isVariadic = checker.hasEffectiveRestParameter(candidateSignature); var printer = ts.createPrinter({ removeComments: true }); var typeParameterParts = ts.mapToDisplayParts(function (writer) { if (candidateSignature.typeParameters && candidateSignature.typeParameters.length) { - var args = ts.createNodeArray(candidateSignature.typeParameters.map(function (p) { return checker.typeParameterToDeclaration(p, enclosingDeclaration, signatureHelpNodeBuilderFlags); })); + var args = ts.factory.createNodeArray(candidateSignature.typeParameters.map(function (p) { return checker.typeParameterToDeclaration(p, enclosingDeclaration, signatureHelpNodeBuilderFlags); })); printer.writeList(53776 /* TypeParameters */, args, sourceFile, writer); } }); - var parameters = checker.getExpandedParameters(candidateSignature).map(function (p) { return createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer); }); - return { isVariadic: isVariadic, parameters: parameters, prefix: __spreadArrays(typeParameterParts, [ts.punctuationPart(20 /* OpenParenToken */)]), suffix: [ts.punctuationPart(21 /* CloseParenToken */)] }; + var lists = checker.getExpandedParameters(candidateSignature); + return lists.map(function (parameterList) { + return { + isVariadic: isVariadic && (lists.length === 1 || !!(parameterList[parameterList.length - 1].checkFlags & 32768 /* RestParameter */)), + parameters: parameterList.map(function (p) { return createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer); }), + prefix: __spreadArrays(typeParameterParts, [ts.punctuationPart(20 /* OpenParenToken */)]), + suffix: [ts.punctuationPart(21 /* CloseParenToken */)] + }; + }); } function createSignatureHelpParameterForParameter(parameter, checker, enclosingDeclaration, sourceFile, printer) { var displayParts = ts.mapToDisplayParts(function (writer) { @@ -122634,8 +125849,8 @@ var ts; function getSourceMapper(host) { var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames()); var currentDirectory = host.getCurrentDirectory(); - var sourceFileLike = ts.createMap(); - var documentPositionMappers = ts.createMap(); + var sourceFileLike = new ts.Map(); + var documentPositionMappers = new ts.Map(); return { tryGetSourcePosition: tryGetSourcePosition, tryGetGeneratedPosition: tryGetGeneratedPosition, toLineColumnOffset: toLineColumnOffset, clearCache: clearCache }; function toPath(fileName) { return ts.toPath(fileName, currentDirectory, getCanonicalFileName); @@ -122677,7 +125892,7 @@ var ts; return undefined; } var options = program.getCompilerOptions(); - var outPath = options.outFile || options.out; + var outPath = ts.outFile(options); var declarationPath = outPath ? ts.removeFileExtension(outPath) + ".d.ts" /* Dts */ : ts.getDeclarationEmitOutputFilePathWorker(info.fileName, program.getCompilerOptions(), currentDirectory, program.getCommonSourceDirectory(), getCanonicalFileName); @@ -122783,7 +125998,7 @@ var ts; /* @internal */ var ts; (function (ts) { - var visitedNestedConvertibleFunctions = ts.createMap(); + var visitedNestedConvertibleFunctions = new ts.Map(); function computeSuggestionDiagnostics(sourceFile, program, cancellationToken) { program.getSemanticDiagnostics(sourceFile, cancellationToken); var diags = []; @@ -122844,11 +126059,11 @@ var ts; function containsTopLevelCommonjs(sourceFile) { return sourceFile.statements.some(function (statement) { switch (statement.kind) { - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: return statement.declarationList.declarations.some(function (decl) { return !!decl.initializer && ts.isRequireCall(propertyAccessLeftHandSide(decl.initializer), /*checkArgumentIsStringLiteralLike*/ true); }); - case 226 /* ExpressionStatement */: { + case 230 /* ExpressionStatement */: { var expression = statement.expression; if (!ts.isBinaryExpression(expression)) return ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true); @@ -122865,12 +126080,12 @@ var ts; } function importNameForConvertToDefaultImport(node) { switch (node.kind) { - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: var importClause = node.importClause, moduleSpecifier = node.moduleSpecifier; - return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 256 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier) + return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 260 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier) ? importClause.namedBindings.name : undefined; - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return node.name; default: return undefined; @@ -122932,20 +126147,20 @@ var ts; if (node.arguments.length < 2) return true; return ts.some(node.arguments, function (arg) { - return arg.kind === 100 /* NullKeyword */ || + return arg.kind === 103 /* NullKeyword */ || ts.isIdentifier(arg) && arg.text === "undefined"; }); } // should be kept up to date with getTransformationBody in convertToAsyncFunction.ts function isFixablePromiseArgument(arg) { switch (arg.kind) { - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: visitedNestedConvertibleFunctions.set(getKeyFromNode(arg), true); // falls through - case 100 /* NullKeyword */: - case 75 /* Identifier */: // identifier includes undefined + case 103 /* NullKeyword */: + case 78 /* Identifier */: // identifier includes undefined return true; default: return false; @@ -122956,7 +126171,7 @@ var ts; } function canBeConvertedToClass(node) { var _a, _b, _c, _d; - if (node.kind === 201 /* FunctionExpression */) { + if (node.kind === 205 /* FunctionExpression */) { if (ts.isVariableDeclaration(node.parent) && ((_a = node.symbol.members) === null || _a === void 0 ? void 0 : _a.size)) { return true; } @@ -122964,7 +126179,7 @@ var ts; var symbol = decl === null || decl === void 0 ? void 0 : decl.symbol; return !!(symbol && (((_b = symbol.exports) === null || _b === void 0 ? void 0 : _b.size) || ((_c = symbol.members) === null || _c === void 0 ? void 0 : _c.size))); } - if (node.kind === 244 /* FunctionDeclaration */) { + if (node.kind === 248 /* FunctionDeclaration */) { return !!((_d = node.symbol.members) === null || _d === void 0 ? void 0 : _d.size); } return false; @@ -122984,7 +126199,7 @@ var ts; } var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol); if (flags & 32 /* Class */) { - return ts.getDeclarationOfKind(symbol, 214 /* ClassExpression */) ? + return ts.getDeclarationOfKind(symbol, 218 /* ClassExpression */) ? "local class" /* localClassElement */ : "class" /* classElement */; } if (flags & 384 /* Enum */) @@ -123019,7 +126234,7 @@ var ts; if (typeChecker.isArgumentsSymbol(symbol)) { return "local var" /* localVariableElement */; } - if (location.kind === 104 /* ThisKeyword */ && ts.isExpression(location)) { + if (location.kind === 107 /* ThisKeyword */ && ts.isExpression(location)) { return "parameter" /* parameterElement */; } var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol); @@ -123070,11 +126285,11 @@ var ts; // If we requested completions after `x.` at the top-level, we may be at a source file location. switch (location.parent && location.parent.kind) { // If we've typed a character of the attribute name, will be 'JsxAttribute', else will be 'JsxOpeningElement'. - case 268 /* JsxOpeningElement */: - case 266 /* JsxElement */: - case 267 /* JsxSelfClosingElement */: - return location.kind === 75 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */; - case 273 /* JsxAttribute */: + case 272 /* JsxOpeningElement */: + case 270 /* JsxElement */: + case 271 /* JsxSelfClosingElement */: + return location.kind === 78 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */; + case 277 /* JsxAttribute */: return "JSX attribute" /* jsxAttribute */; default: return "property" /* memberVariableElement */; @@ -123101,14 +126316,14 @@ var ts; var symbolFlags = ts.getCombinedLocalAndExportSymbolFlags(symbol); var symbolKind = semanticMeaning & 1 /* Value */ ? getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location) : "" /* unknown */; var hasAddedSymbolInfo = false; - var isThisExpression = location.kind === 104 /* ThisKeyword */ && ts.isInExpressionContext(location); + var isThisExpression = location.kind === 107 /* ThisKeyword */ && ts.isInExpressionContext(location); var type; var printer; var documentationFromAlias; var tagsFromAlias; var hasMultipleSignatures = false; - if (location.kind === 104 /* ThisKeyword */ && !isThisExpression) { - return { displayParts: [ts.keywordPart(104 /* ThisKeyword */)], documentation: [], symbolKind: "primitive type" /* primitiveType */, tags: undefined }; + if (location.kind === 107 /* ThisKeyword */ && !isThisExpression) { + return { displayParts: [ts.keywordPart(107 /* ThisKeyword */)], documentation: [], symbolKind: "primitive type" /* primitiveType */, tags: undefined }; } // Class at constructor site need to be shown as constructor apart from property,method, vars if (symbolKind !== "" /* unknown */ || symbolFlags & 32 /* Class */ || symbolFlags & 2097152 /* Alias */) { @@ -123118,7 +126333,7 @@ var ts; } var signature = void 0; type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol.exportSymbol || symbol, location); - if (location.parent && location.parent.kind === 194 /* PropertyAccessExpression */) { + if (location.parent && location.parent.kind === 198 /* PropertyAccessExpression */) { var right = location.parent.name; // Either the location is on the right of a property access, or on the left and the right is missing if (right === location || (right && right.getFullWidth() === 0)) { @@ -123133,12 +126348,12 @@ var ts; else if (ts.isCallExpressionTarget(location) || ts.isNewExpressionTarget(location)) { callExpressionLike = location.parent; } - else if (location.parent && ts.isJsxOpeningLikeElement(location.parent) && ts.isFunctionLike(symbol.valueDeclaration)) { + else if (location.parent && (ts.isJsxOpeningLikeElement(location.parent) || ts.isTaggedTemplateExpression(location.parent)) && ts.isFunctionLike(symbol.valueDeclaration)) { callExpressionLike = location.parent; } if (callExpressionLike) { signature = typeChecker.getResolvedSignature(callExpressionLike); // TODO: GH#18217 - var useConstructSignatures = callExpressionLike.kind === 197 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 102 /* SuperKeyword */); + var useConstructSignatures = callExpressionLike.kind === 201 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 105 /* SuperKeyword */); var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures(); if (!ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) { // Get the first signature if there is one -- allSignatures may contain @@ -123156,7 +126371,7 @@ var ts; pushSymbolKind(symbolKind); displayParts.push(ts.spacePart()); if (useConstructSignatures) { - displayParts.push(ts.keywordPart(99 /* NewKeyword */)); + displayParts.push(ts.keywordPart(102 /* NewKeyword */)); displayParts.push(ts.spacePart()); } addFullSymbolName(symbol); @@ -123180,7 +126395,7 @@ var ts; displayParts.push(ts.lineBreakPart()); } if (useConstructSignatures) { - displayParts.push(ts.keywordPart(99 /* NewKeyword */)); + displayParts.push(ts.keywordPart(102 /* NewKeyword */)); displayParts.push(ts.spacePart()); } addSignatureDisplayParts(signature, allSignatures, 262144 /* WriteArrowStyleSignature */); @@ -123194,29 +126409,29 @@ var ts; } } else if ((ts.isNameOfFunctionDeclaration(location) && !(symbolFlags & 98304 /* Accessor */)) || // name of function declaration - (location.kind === 129 /* ConstructorKeyword */ && location.parent.kind === 162 /* Constructor */)) { // At constructor keyword of constructor declaration + (location.kind === 132 /* ConstructorKeyword */ && location.parent.kind === 165 /* Constructor */)) { // At constructor keyword of constructor declaration // get the signature from the declaration and write it var functionDeclaration_1 = location.parent; // Use function declaration to write the signatures only if the symbol corresponding to this declaration var locationIsSymbolDeclaration = symbol.declarations && ts.find(symbol.declarations, function (declaration) { - return declaration === (location.kind === 129 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1); + return declaration === (location.kind === 132 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1); }); if (locationIsSymbolDeclaration) { - var allSignatures = functionDeclaration_1.kind === 162 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures(); + var allSignatures = functionDeclaration_1.kind === 165 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures(); if (!typeChecker.isImplementationOfOverload(functionDeclaration_1)) { signature = typeChecker.getSignatureFromDeclaration(functionDeclaration_1); // TODO: GH#18217 } else { signature = allSignatures[0]; } - if (functionDeclaration_1.kind === 162 /* Constructor */) { + if (functionDeclaration_1.kind === 165 /* Constructor */) { // show (constructor) Type(...) signature symbolKind = "constructor" /* constructorImplementationElement */; addPrefixForAnyFunctionOrVar(type.symbol, symbolKind); } else { // (function/method) symbol(..signature) - addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 165 /* CallSignature */ && + addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 168 /* CallSignature */ && !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind); } addSignatureDisplayParts(signature, allSignatures); @@ -123227,7 +126442,7 @@ var ts; } if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) { addAliasPrefixIfNecessary(); - if (ts.getDeclarationOfKind(symbol, 214 /* ClassExpression */)) { + if (ts.getDeclarationOfKind(symbol, 218 /* ClassExpression */)) { // Special case for class expressions because we would like to indicate that // the class name is local to the class body (similar to function expression) // (local class) class @@ -123235,7 +126450,7 @@ var ts; } else { // Class declaration has name which is not local. - displayParts.push(ts.keywordPart(80 /* ClassKeyword */)); + displayParts.push(ts.keywordPart(83 /* ClassKeyword */)); } displayParts.push(ts.spacePart()); addFullSymbolName(symbol); @@ -123243,14 +126458,14 @@ var ts; } if ((symbolFlags & 64 /* Interface */) && (semanticMeaning & 2 /* Type */)) { prefixNextMeaning(); - displayParts.push(ts.keywordPart(114 /* InterfaceKeyword */)); + displayParts.push(ts.keywordPart(117 /* InterfaceKeyword */)); displayParts.push(ts.spacePart()); addFullSymbolName(symbol); writeTypeParametersOfSymbol(symbol, sourceFile); } if ((symbolFlags & 524288 /* TypeAlias */) && (semanticMeaning & 2 /* Type */)) { prefixNextMeaning(); - displayParts.push(ts.keywordPart(145 /* TypeKeyword */)); + displayParts.push(ts.keywordPart(148 /* TypeKeyword */)); displayParts.push(ts.spacePart()); addFullSymbolName(symbol); writeTypeParametersOfSymbol(symbol, sourceFile); @@ -123262,18 +126477,18 @@ var ts; if (symbolFlags & 384 /* Enum */) { prefixNextMeaning(); if (ts.some(symbol.declarations, function (d) { return ts.isEnumDeclaration(d) && ts.isEnumConst(d); })) { - displayParts.push(ts.keywordPart(81 /* ConstKeyword */)); + displayParts.push(ts.keywordPart(84 /* ConstKeyword */)); displayParts.push(ts.spacePart()); } - displayParts.push(ts.keywordPart(88 /* EnumKeyword */)); + displayParts.push(ts.keywordPart(91 /* EnumKeyword */)); displayParts.push(ts.spacePart()); addFullSymbolName(symbol); } if (symbolFlags & 1536 /* Module */ && !isThisExpression) { prefixNextMeaning(); - var declaration = ts.getDeclarationOfKind(symbol, 249 /* ModuleDeclaration */); - var isNamespace = declaration && declaration.name && declaration.name.kind === 75 /* Identifier */; - displayParts.push(ts.keywordPart(isNamespace ? 136 /* NamespaceKeyword */ : 135 /* ModuleKeyword */)); + var declaration = ts.getDeclarationOfKind(symbol, 253 /* ModuleDeclaration */); + var isNamespace = declaration && declaration.name && declaration.name.kind === 78 /* Identifier */; + displayParts.push(ts.keywordPart(isNamespace ? 139 /* NamespaceKeyword */ : 138 /* ModuleKeyword */)); displayParts.push(ts.spacePart()); addFullSymbolName(symbol); } @@ -123292,7 +126507,7 @@ var ts; } else { // Method/function type parameter - var decl = ts.getDeclarationOfKind(symbol, 155 /* TypeParameter */); + var decl = ts.getDeclarationOfKind(symbol, 158 /* TypeParameter */); if (decl === undefined) return ts.Debug.fail(); var declaration = decl.parent; @@ -123300,21 +126515,21 @@ var ts; if (ts.isFunctionLikeKind(declaration.kind)) { addInPrefix(); var signature = typeChecker.getSignatureFromDeclaration(declaration); // TODO: GH#18217 - if (declaration.kind === 166 /* ConstructSignature */) { - displayParts.push(ts.keywordPart(99 /* NewKeyword */)); + if (declaration.kind === 169 /* ConstructSignature */) { + displayParts.push(ts.keywordPart(102 /* NewKeyword */)); displayParts.push(ts.spacePart()); } - else if (declaration.kind !== 165 /* CallSignature */ && declaration.name) { + else if (declaration.kind !== 168 /* CallSignature */ && declaration.name) { addFullSymbolName(declaration.symbol); } ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */)); } - else if (declaration.kind === 247 /* TypeAliasDeclaration */) { + else if (declaration.kind === 251 /* TypeAliasDeclaration */) { // Type alias type parameter // For example // type list = T[]; // Both T will go through same code path addInPrefix(); - displayParts.push(ts.keywordPart(145 /* TypeKeyword */)); + displayParts.push(ts.keywordPart(148 /* TypeKeyword */)); displayParts.push(ts.spacePart()); addFullSymbolName(declaration.symbol); writeTypeParametersOfSymbol(declaration.symbol, sourceFile); @@ -123326,7 +126541,7 @@ var ts; symbolKind = "enum member" /* enumMemberElement */; addPrefixForAnyFunctionOrVar(symbol, "enum member"); var declaration = symbol.declarations[0]; - if (declaration.kind === 284 /* EnumMember */) { + if (declaration.kind === 288 /* EnumMember */) { var constantValue = typeChecker.getConstantValue(declaration); if (constantValue !== undefined) { displayParts.push(ts.spacePart()); @@ -123336,7 +126551,8 @@ var ts; } } } - if (symbolFlags & 2097152 /* Alias */) { + // don't use symbolFlags since getAliasedSymbol requires the flag on the symbol itself + if (symbol.flags & 2097152 /* Alias */) { prefixNextMeaning(); if (!hasAddedSymbolInfo) { var resolvedSymbol = typeChecker.getAliasedSymbol(symbol); @@ -123345,7 +126561,7 @@ var ts; var declarationName = ts.getNameOfDeclaration(resolvedNode); if (declarationName) { var isExternalModuleDeclaration = ts.isModuleWithStringLiteralName(resolvedNode) && - ts.hasModifier(resolvedNode, 2 /* Ambient */); + ts.hasSyntacticModifier(resolvedNode, 2 /* Ambient */); var shouldUseAliasName = symbol.name !== "default" && !isExternalModuleDeclaration; var resolvedInfo = getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, resolvedSymbol, ts.getSourceFileOfNode(resolvedNode), resolvedNode, declarationName, semanticMeaning, shouldUseAliasName ? symbol : resolvedSymbol); displayParts.push.apply(displayParts, resolvedInfo.displayParts); @@ -123356,32 +126572,32 @@ var ts; } } switch (symbol.declarations[0].kind) { - case 252 /* NamespaceExportDeclaration */: - displayParts.push(ts.keywordPart(89 /* ExportKeyword */)); + case 256 /* NamespaceExportDeclaration */: + displayParts.push(ts.keywordPart(92 /* ExportKeyword */)); displayParts.push(ts.spacePart()); - displayParts.push(ts.keywordPart(136 /* NamespaceKeyword */)); + displayParts.push(ts.keywordPart(139 /* NamespaceKeyword */)); break; - case 259 /* ExportAssignment */: - displayParts.push(ts.keywordPart(89 /* ExportKeyword */)); + case 263 /* ExportAssignment */: + displayParts.push(ts.keywordPart(92 /* ExportKeyword */)); displayParts.push(ts.spacePart()); - displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 62 /* EqualsToken */ : 84 /* DefaultKeyword */)); + displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 62 /* EqualsToken */ : 87 /* DefaultKeyword */)); break; - case 263 /* ExportSpecifier */: - displayParts.push(ts.keywordPart(89 /* ExportKeyword */)); + case 267 /* ExportSpecifier */: + displayParts.push(ts.keywordPart(92 /* ExportKeyword */)); break; default: - displayParts.push(ts.keywordPart(96 /* ImportKeyword */)); + displayParts.push(ts.keywordPart(99 /* ImportKeyword */)); } displayParts.push(ts.spacePart()); addFullSymbolName(symbol); ts.forEach(symbol.declarations, function (declaration) { - if (declaration.kind === 253 /* ImportEqualsDeclaration */) { + if (declaration.kind === 257 /* ImportEqualsDeclaration */) { var importEqualsDeclaration = declaration; if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) { displayParts.push(ts.spacePart()); displayParts.push(ts.operatorPart(62 /* EqualsToken */)); displayParts.push(ts.spacePart()); - displayParts.push(ts.keywordPart(139 /* RequireKeyword */)); + displayParts.push(ts.keywordPart(142 /* RequireKeyword */)); displayParts.push(ts.punctuationPart(20 /* OpenParenToken */)); displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), ts.SymbolDisplayPartKind.stringLiteral)); displayParts.push(ts.punctuationPart(21 /* CloseParenToken */)); @@ -123404,7 +126620,7 @@ var ts; if (type) { if (isThisExpression) { prefixNextMeaning(); - displayParts.push(ts.keywordPart(104 /* ThisKeyword */)); + displayParts.push(ts.keywordPart(107 /* ThisKeyword */)); } else { addPrefixForAnyFunctionOrVar(symbol, symbolKind); @@ -123428,6 +126644,14 @@ var ts; else { ts.addRange(displayParts, ts.typeToDisplayParts(typeChecker, type, enclosingDeclaration)); } + if (symbol.target && symbol.target.tupleLabelDeclaration) { + var labelDecl = symbol.target.tupleLabelDeclaration; + ts.Debug.assertNode(labelDecl.name, ts.isIdentifier); + displayParts.push(ts.spacePart()); + displayParts.push(ts.punctuationPart(20 /* OpenParenToken */)); + displayParts.push(ts.textPart(ts.idText(labelDecl.name))); + displayParts.push(ts.punctuationPart(21 /* CloseParenToken */)); + } } else if (symbolFlags & 16 /* Function */ || symbolFlags & 8192 /* Method */ || @@ -123448,16 +126672,16 @@ var ts; } } if (documentation.length === 0 && !hasMultipleSignatures) { - documentation = symbol.getDocumentationComment(typeChecker); + documentation = symbol.getContextualDocumentationComment(enclosingDeclaration, typeChecker); } if (documentation.length === 0 && symbolFlags & 4 /* Property */) { // For some special property access expressions like `exports.foo = foo` or `module.exports.foo = foo` // there documentation comments might be attached to the right hand side symbol of their declarations. // The pattern of such special property access is that the parent symbol is the symbol of the file. - if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 290 /* SourceFile */; })) { + if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 294 /* SourceFile */; })) { for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) { var declaration = _a[_i]; - if (!declaration.parent || declaration.parent.kind !== 209 /* BinaryExpression */) { + if (!declaration.parent || declaration.parent.kind !== 213 /* BinaryExpression */) { continue; } var rhsSymbol = typeChecker.getSymbolAtLocation(declaration.parent.right); @@ -123502,7 +126726,7 @@ var ts; } function addInPrefix() { displayParts.push(ts.spacePart()); - displayParts.push(ts.keywordPart(97 /* InKeyword */)); + displayParts.push(ts.keywordPart(100 /* InKeyword */)); displayParts.push(ts.spacePart()); } function addFullSymbolName(symbolToDisplay, enclosingDeclaration) { @@ -123575,16 +126799,16 @@ var ts; } return ts.forEach(symbol.declarations, function (declaration) { // Function expressions are local - if (declaration.kind === 201 /* FunctionExpression */) { + if (declaration.kind === 205 /* FunctionExpression */) { return true; } - if (declaration.kind !== 242 /* VariableDeclaration */ && declaration.kind !== 244 /* FunctionDeclaration */) { + if (declaration.kind !== 246 /* VariableDeclaration */ && declaration.kind !== 248 /* FunctionDeclaration */) { return false; } // If the parent is not sourceFile or module block it is local variable for (var parent = declaration.parent; !ts.isFunctionBlock(parent); parent = parent.parent) { // Reached source file or module block - if (parent.kind === 290 /* SourceFile */ || parent.kind === 250 /* ModuleBlock */) { + if (parent.kind === 294 /* SourceFile */ || parent.kind === 254 /* ModuleBlock */) { return false; } } @@ -123630,7 +126854,7 @@ var ts; sourceFile.moduleName = transpileOptions.moduleName; } if (transpileOptions.renamedDependencies) { - sourceFile.renamedDependencies = ts.createMapFromTemplate(transpileOptions.renamedDependencies); + sourceFile.renamedDependencies = new ts.Map(ts.getEntries(transpileOptions.renamedDependencies)); } var newLine = ts.getNewLineCharacter(options); // Output @@ -123836,6 +127060,7 @@ var ts; getCurrentLeadingTrivia: function () { return leadingTrivia; }, lastTrailingTriviaWasNewLine: function () { return wasNewLine; }, skipToEndOf: skipToEndOf, + skipToStartOf: skipToStartOf, }); lastTokenInfo = undefined; scanner.setText(undefined); @@ -123884,12 +127109,12 @@ var ts; function shouldRescanJsxIdentifier(node) { if (node.parent) { switch (node.parent.kind) { - case 273 /* JsxAttribute */: - case 268 /* JsxOpeningElement */: - case 269 /* JsxClosingElement */: - case 267 /* JsxSelfClosingElement */: + case 277 /* JsxAttribute */: + case 272 /* JsxOpeningElement */: + case 273 /* JsxClosingElement */: + case 271 /* JsxSelfClosingElement */: // May parse an identifier like `module-layout`; that will be scanned as a keyword at first, but we should parse the whole thing to get an identifier. - return ts.isKeyword(node.kind) || node.kind === 75 /* Identifier */; + return ts.isKeyword(node.kind) || node.kind === 78 /* Identifier */; } } return false; @@ -124042,6 +127267,15 @@ var ts; leadingTrivia = undefined; trailingTrivia = undefined; } + function skipToStartOf(node) { + scanner.setTextPos(node.pos); + savedPos = scanner.getStartPos(); + lastScanAction = undefined; + lastTokenInfo = undefined; + wasNewLine = false; + leadingTrivia = undefined; + trailingTrivia = undefined; + } } formatting.getFormattingScanner = getFormattingScanner; })(formatting = ts.formatting || (ts.formatting = {})); @@ -124079,7 +127313,7 @@ var ts; (function (formatting) { function getAllRules() { var allTokens = []; - for (var token = 0 /* FirstToken */; token <= 152 /* LastToken */; token++) { + for (var token = 0 /* FirstToken */; token <= 155 /* LastToken */; token++) { if (token !== 1 /* EndOfFileToken */) { allTokens.push(token); } @@ -124094,27 +127328,27 @@ var ts; var anyToken = { tokens: allTokens, isSpecific: false }; var anyTokenIncludingMultilineComments = tokenRangeFrom(__spreadArrays(allTokens, [3 /* MultiLineCommentTrivia */])); var anyTokenIncludingEOF = tokenRangeFrom(__spreadArrays(allTokens, [1 /* EndOfFileToken */])); - var keywords = tokenRangeFromRange(77 /* FirstKeyword */, 152 /* LastKeyword */); - var binaryOperators = tokenRangeFromRange(29 /* FirstBinaryOperator */, 74 /* LastBinaryOperator */); - var binaryKeywordOperators = [97 /* InKeyword */, 98 /* InstanceOfKeyword */, 152 /* OfKeyword */, 123 /* AsKeyword */, 133 /* IsKeyword */]; + var keywords = tokenRangeFromRange(80 /* FirstKeyword */, 155 /* LastKeyword */); + var binaryOperators = tokenRangeFromRange(29 /* FirstBinaryOperator */, 77 /* LastBinaryOperator */); + var binaryKeywordOperators = [100 /* InKeyword */, 101 /* InstanceOfKeyword */, 155 /* OfKeyword */, 126 /* AsKeyword */, 136 /* IsKeyword */]; var unaryPrefixOperators = [45 /* PlusPlusToken */, 46 /* MinusMinusToken */, 54 /* TildeToken */, 53 /* ExclamationToken */]; var unaryPrefixExpressions = [ - 8 /* NumericLiteral */, 9 /* BigIntLiteral */, 75 /* Identifier */, 20 /* OpenParenToken */, - 22 /* OpenBracketToken */, 18 /* OpenBraceToken */, 104 /* ThisKeyword */, 99 /* NewKeyword */ + 8 /* NumericLiteral */, 9 /* BigIntLiteral */, 78 /* Identifier */, 20 /* OpenParenToken */, + 22 /* OpenBracketToken */, 18 /* OpenBraceToken */, 107 /* ThisKeyword */, 102 /* NewKeyword */ ]; - var unaryPreincrementExpressions = [75 /* Identifier */, 20 /* OpenParenToken */, 104 /* ThisKeyword */, 99 /* NewKeyword */]; - var unaryPostincrementExpressions = [75 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 99 /* NewKeyword */]; - var unaryPredecrementExpressions = [75 /* Identifier */, 20 /* OpenParenToken */, 104 /* ThisKeyword */, 99 /* NewKeyword */]; - var unaryPostdecrementExpressions = [75 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 99 /* NewKeyword */]; + var unaryPreincrementExpressions = [78 /* Identifier */, 20 /* OpenParenToken */, 107 /* ThisKeyword */, 102 /* NewKeyword */]; + var unaryPostincrementExpressions = [78 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 102 /* NewKeyword */]; + var unaryPredecrementExpressions = [78 /* Identifier */, 20 /* OpenParenToken */, 107 /* ThisKeyword */, 102 /* NewKeyword */]; + var unaryPostdecrementExpressions = [78 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 102 /* NewKeyword */]; var comments = [2 /* SingleLineCommentTrivia */, 3 /* MultiLineCommentTrivia */]; - var typeNames = __spreadArrays([75 /* Identifier */], ts.typeKeywords); + var typeNames = __spreadArrays([78 /* Identifier */], ts.typeKeywords); // Place a space before open brace in a function declaration // TypeScript: Function can have return types, which can be made of tons of different token kinds var functionOpenBraceLeftTokenRange = anyTokenIncludingMultilineComments; // Place a space before open brace in a TypeScript declaration that has braces as children (class, module, enum, etc) - var typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([75 /* Identifier */, 3 /* MultiLineCommentTrivia */, 80 /* ClassKeyword */, 89 /* ExportKeyword */, 96 /* ImportKeyword */]); + var typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([78 /* Identifier */, 3 /* MultiLineCommentTrivia */, 83 /* ClassKeyword */, 92 /* ExportKeyword */, 99 /* ImportKeyword */]); // Place a space before open brace in a control flow construct - var controlOpenBraceLeftTokenRange = tokenRangeFrom([21 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 86 /* DoKeyword */, 107 /* TryKeyword */, 92 /* FinallyKeyword */, 87 /* ElseKeyword */]); + var controlOpenBraceLeftTokenRange = tokenRangeFrom([21 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 89 /* DoKeyword */, 110 /* TryKeyword */, 95 /* FinallyKeyword */, 90 /* ElseKeyword */]); // These rules are higher in priority than user-configurable var highPriorityCommonRules = [ // Leave comments alone @@ -124122,14 +127356,14 @@ var ts; rule("IgnoreAfterLineComment", 2 /* SingleLineCommentTrivia */, anyToken, formatting.anyContext, 1 /* StopProcessingSpaceActions */), rule("NotSpaceBeforeColon", anyToken, 58 /* ColonToken */, [isNonJsxSameLineTokenContext, isNotBinaryOpContext, isNotTypeAnnotationContext], 16 /* DeleteSpace */), rule("SpaceAfterColon", 58 /* ColonToken */, anyToken, [isNonJsxSameLineTokenContext, isNotBinaryOpContext], 4 /* InsertSpace */), - rule("NoSpaceBeforeQuestionMark", anyToken, 57 /* QuestionToken */, [isNonJsxSameLineTokenContext, isNotBinaryOpContext], 16 /* DeleteSpace */), + rule("NoSpaceBeforeQuestionMark", anyToken, 57 /* QuestionToken */, [isNonJsxSameLineTokenContext, isNotBinaryOpContext, isNotTypeAnnotationContext], 16 /* DeleteSpace */), // insert space after '?' only when it is used in conditional operator rule("SpaceAfterQuestionMarkInConditionalOperator", 57 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext, isConditionalOperatorContext], 4 /* InsertSpace */), // in other cases there should be no space between '?' and next token rule("NoSpaceAfterQuestionMark", 57 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), rule("NoSpaceBeforeDot", anyToken, [24 /* DotToken */, 28 /* QuestionDotToken */], [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), rule("NoSpaceAfterDot", [24 /* DotToken */, 28 /* QuestionDotToken */], anyToken, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), - rule("NoSpaceBetweenImportParenInImportType", 96 /* ImportKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 16 /* DeleteSpace */), + rule("NoSpaceBetweenImportParenInImportType", 99 /* ImportKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 16 /* DeleteSpace */), // Special handling of unary operators. // Prefix operators generally shouldn't have a space between // them and their target unary expression. @@ -124156,79 +127390,79 @@ var ts; rule("SpaceAfterCloseBrace", 19 /* CloseBraceToken */, anyTokenExcept(21 /* CloseParenToken */), [isNonJsxSameLineTokenContext, isAfterCodeBlockContext], 4 /* InsertSpace */), // Special case for (}, else) and (}, while) since else & while tokens are not part of the tree which makes SpaceAfterCloseBrace rule not applied // Also should not apply to }) - rule("SpaceBetweenCloseBraceAndElse", 19 /* CloseBraceToken */, 87 /* ElseKeyword */, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), - rule("SpaceBetweenCloseBraceAndWhile", 19 /* CloseBraceToken */, 111 /* WhileKeyword */, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), + rule("SpaceBetweenCloseBraceAndElse", 19 /* CloseBraceToken */, 90 /* ElseKeyword */, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), + rule("SpaceBetweenCloseBraceAndWhile", 19 /* CloseBraceToken */, 114 /* WhileKeyword */, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), rule("NoSpaceBetweenEmptyBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectContext], 16 /* DeleteSpace */), // Add a space after control dec context if the next character is an open bracket ex: 'if (false)[a, b] = [1, 2];' -> 'if (false) [a, b] = [1, 2];' rule("SpaceAfterConditionalClosingParen", 21 /* CloseParenToken */, 22 /* OpenBracketToken */, [isControlDeclContext], 4 /* InsertSpace */), - rule("NoSpaceBetweenFunctionKeywordAndStar", 94 /* FunctionKeyword */, 41 /* AsteriskToken */, [isFunctionDeclarationOrFunctionExpressionContext], 16 /* DeleteSpace */), - rule("SpaceAfterStarInGeneratorDeclaration", 41 /* AsteriskToken */, 75 /* Identifier */, [isFunctionDeclarationOrFunctionExpressionContext], 4 /* InsertSpace */), - rule("SpaceAfterFunctionInFuncDecl", 94 /* FunctionKeyword */, anyToken, [isFunctionDeclContext], 4 /* InsertSpace */), + rule("NoSpaceBetweenFunctionKeywordAndStar", 97 /* FunctionKeyword */, 41 /* AsteriskToken */, [isFunctionDeclarationOrFunctionExpressionContext], 16 /* DeleteSpace */), + rule("SpaceAfterStarInGeneratorDeclaration", 41 /* AsteriskToken */, 78 /* Identifier */, [isFunctionDeclarationOrFunctionExpressionContext], 4 /* InsertSpace */), + rule("SpaceAfterFunctionInFuncDecl", 97 /* FunctionKeyword */, anyToken, [isFunctionDeclContext], 4 /* InsertSpace */), // Insert new line after { and before } in multi-line contexts. rule("NewLineAfterOpenBraceInBlockContext", 18 /* OpenBraceToken */, anyToken, [isMultilineBlockContext], 8 /* InsertNewLine */), // For get/set members, we check for (identifier,identifier) since get/set don't have tokens and they are represented as just an identifier token. // Though, we do extra check on the context to make sure we are dealing with get/set node. Example: // get x() {} // set x(val) {} - rule("SpaceAfterGetSetInMember", [131 /* GetKeyword */, 142 /* SetKeyword */], 75 /* Identifier */, [isFunctionDeclContext], 4 /* InsertSpace */), - rule("NoSpaceBetweenYieldKeywordAndStar", 121 /* YieldKeyword */, 41 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 16 /* DeleteSpace */), - rule("SpaceBetweenYieldOrYieldStarAndOperand", [121 /* YieldKeyword */, 41 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 4 /* InsertSpace */), - rule("NoSpaceBetweenReturnAndSemicolon", 101 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), - rule("SpaceAfterCertainKeywords", [109 /* VarKeyword */, 105 /* ThrowKeyword */, 99 /* NewKeyword */, 85 /* DeleteKeyword */, 101 /* ReturnKeyword */, 108 /* TypeOfKeyword */, 127 /* AwaitKeyword */], anyToken, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), - rule("SpaceAfterLetConstInVariableDeclaration", [115 /* LetKeyword */, 81 /* ConstKeyword */], anyToken, [isNonJsxSameLineTokenContext, isStartOfVariableDeclarationList], 4 /* InsertSpace */), + rule("SpaceAfterGetSetInMember", [134 /* GetKeyword */, 145 /* SetKeyword */], 78 /* Identifier */, [isFunctionDeclContext], 4 /* InsertSpace */), + rule("NoSpaceBetweenYieldKeywordAndStar", 124 /* YieldKeyword */, 41 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 16 /* DeleteSpace */), + rule("SpaceBetweenYieldOrYieldStarAndOperand", [124 /* YieldKeyword */, 41 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 4 /* InsertSpace */), + rule("NoSpaceBetweenReturnAndSemicolon", 104 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), + rule("SpaceAfterCertainKeywords", [112 /* VarKeyword */, 108 /* ThrowKeyword */, 102 /* NewKeyword */, 88 /* DeleteKeyword */, 104 /* ReturnKeyword */, 111 /* TypeOfKeyword */, 130 /* AwaitKeyword */], anyToken, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), + rule("SpaceAfterLetConstInVariableDeclaration", [118 /* LetKeyword */, 84 /* ConstKeyword */], anyToken, [isNonJsxSameLineTokenContext, isStartOfVariableDeclarationList], 4 /* InsertSpace */), rule("NoSpaceBeforeOpenParenInFuncCall", anyToken, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isFunctionCallOrNewContext, isPreviousTokenNotComma], 16 /* DeleteSpace */), // Special case for binary operators (that are keywords). For these we have to add a space and shouldn't follow any user options. rule("SpaceBeforeBinaryKeywordOperator", anyToken, binaryKeywordOperators, [isNonJsxSameLineTokenContext, isBinaryOpContext], 4 /* InsertSpace */), rule("SpaceAfterBinaryKeywordOperator", binaryKeywordOperators, anyToken, [isNonJsxSameLineTokenContext, isBinaryOpContext], 4 /* InsertSpace */), - rule("SpaceAfterVoidOperator", 110 /* VoidKeyword */, anyToken, [isNonJsxSameLineTokenContext, isVoidOpContext], 4 /* InsertSpace */), + rule("SpaceAfterVoidOperator", 113 /* VoidKeyword */, anyToken, [isNonJsxSameLineTokenContext, isVoidOpContext], 4 /* InsertSpace */), // Async-await - rule("SpaceBetweenAsyncAndOpenParen", 126 /* AsyncKeyword */, 20 /* OpenParenToken */, [isArrowFunctionContext, isNonJsxSameLineTokenContext], 4 /* InsertSpace */), - rule("SpaceBetweenAsyncAndFunctionKeyword", 126 /* AsyncKeyword */, [94 /* FunctionKeyword */, 75 /* Identifier */], [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), + rule("SpaceBetweenAsyncAndOpenParen", 129 /* AsyncKeyword */, 20 /* OpenParenToken */, [isArrowFunctionContext, isNonJsxSameLineTokenContext], 4 /* InsertSpace */), + rule("SpaceBetweenAsyncAndFunctionKeyword", 129 /* AsyncKeyword */, [97 /* FunctionKeyword */, 78 /* Identifier */], [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), // Template string - rule("NoSpaceBetweenTagAndTemplateString", [75 /* Identifier */, 21 /* CloseParenToken */], [14 /* NoSubstitutionTemplateLiteral */, 15 /* TemplateHead */], [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), + rule("NoSpaceBetweenTagAndTemplateString", [78 /* Identifier */, 21 /* CloseParenToken */], [14 /* NoSubstitutionTemplateLiteral */, 15 /* TemplateHead */], [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), // JSX opening elements - rule("SpaceBeforeJsxAttribute", anyToken, 75 /* Identifier */, [isNextTokenParentJsxAttribute, isNonJsxSameLineTokenContext], 4 /* InsertSpace */), + rule("SpaceBeforeJsxAttribute", anyToken, 78 /* Identifier */, [isNextTokenParentJsxAttribute, isNonJsxSameLineTokenContext], 4 /* InsertSpace */), rule("SpaceBeforeSlashInJsxOpeningElement", anyToken, 43 /* SlashToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 4 /* InsertSpace */), rule("NoSpaceBeforeGreaterThanTokenInJsxOpeningElement", 43 /* SlashToken */, 31 /* GreaterThanToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), rule("NoSpaceBeforeEqualInJsxAttribute", anyToken, 62 /* EqualsToken */, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), rule("NoSpaceAfterEqualInJsxAttribute", 62 /* EqualsToken */, anyToken, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), // TypeScript-specific rules // Use of module as a function call. e.g.: import m2 = module("m2"); - rule("NoSpaceAfterModuleImport", [135 /* ModuleKeyword */, 139 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), + rule("NoSpaceAfterModuleImport", [138 /* ModuleKeyword */, 142 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), // Add a space around certain TypeScript keywords rule("SpaceAfterCertainTypeScriptKeywords", [ - 122 /* AbstractKeyword */, - 80 /* ClassKeyword */, - 130 /* DeclareKeyword */, - 84 /* DefaultKeyword */, - 88 /* EnumKeyword */, - 89 /* ExportKeyword */, - 90 /* ExtendsKeyword */, - 131 /* GetKeyword */, - 113 /* ImplementsKeyword */, - 96 /* ImportKeyword */, - 114 /* InterfaceKeyword */, - 135 /* ModuleKeyword */, - 136 /* NamespaceKeyword */, - 117 /* PrivateKeyword */, - 119 /* PublicKeyword */, - 118 /* ProtectedKeyword */, - 138 /* ReadonlyKeyword */, - 142 /* SetKeyword */, - 120 /* StaticKeyword */, - 145 /* TypeKeyword */, - 149 /* FromKeyword */, - 134 /* KeyOfKeyword */, - 132 /* InferKeyword */, + 125 /* AbstractKeyword */, + 83 /* ClassKeyword */, + 133 /* DeclareKeyword */, + 87 /* DefaultKeyword */, + 91 /* EnumKeyword */, + 92 /* ExportKeyword */, + 93 /* ExtendsKeyword */, + 134 /* GetKeyword */, + 116 /* ImplementsKeyword */, + 99 /* ImportKeyword */, + 117 /* InterfaceKeyword */, + 138 /* ModuleKeyword */, + 139 /* NamespaceKeyword */, + 120 /* PrivateKeyword */, + 122 /* PublicKeyword */, + 121 /* ProtectedKeyword */, + 141 /* ReadonlyKeyword */, + 145 /* SetKeyword */, + 123 /* StaticKeyword */, + 148 /* TypeKeyword */, + 152 /* FromKeyword */, + 137 /* KeyOfKeyword */, + 135 /* InferKeyword */, ], anyToken, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), - rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [90 /* ExtendsKeyword */, 113 /* ImplementsKeyword */, 149 /* FromKeyword */], [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), + rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [93 /* ExtendsKeyword */, 116 /* ImplementsKeyword */, 152 /* FromKeyword */], [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), // Treat string literals in module names as identifiers, and add a space between the literal and the opening Brace braces, e.g.: module "m2" { rule("SpaceAfterModuleName", 10 /* StringLiteral */, 18 /* OpenBraceToken */, [isModuleDeclContext], 4 /* InsertSpace */), // Lambda expressions rule("SpaceBeforeArrow", anyToken, 38 /* EqualsGreaterThanToken */, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), rule("SpaceAfterArrow", 38 /* EqualsGreaterThanToken */, anyToken, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), // Optional parameters and let args - rule("NoSpaceAfterEllipsis", 25 /* DotDotDotToken */, 75 /* Identifier */, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), + rule("NoSpaceAfterEllipsis", 25 /* DotDotDotToken */, 78 /* Identifier */, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), rule("NoSpaceAfterOptionalParameters", 57 /* QuestionToken */, [21 /* CloseParenToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isNotBinaryOpContext], 16 /* DeleteSpace */), // Remove spaces in empty interface literals. e.g.: x: {} rule("NoSpaceBetweenEmptyInterfaceBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectTypeContext], 16 /* DeleteSpace */), @@ -124239,38 +127473,38 @@ var ts; rule("NoSpaceBeforeCloseAngularBracket", anyToken, 31 /* GreaterThanToken */, [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext], 16 /* DeleteSpace */), rule("NoSpaceAfterCloseAngularBracket", 31 /* GreaterThanToken */, [20 /* OpenParenToken */, 22 /* OpenBracketToken */, 31 /* GreaterThanToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext, isNotFunctionDeclContext /*To prevent an interference with the SpaceBeforeOpenParenInFuncDecl rule*/], 16 /* DeleteSpace */), // decorators - rule("SpaceBeforeAt", [21 /* CloseParenToken */, 75 /* Identifier */], 59 /* AtToken */, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), + rule("SpaceBeforeAt", [21 /* CloseParenToken */, 78 /* Identifier */], 59 /* AtToken */, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), rule("NoSpaceAfterAt", 59 /* AtToken */, anyToken, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), // Insert space after @ in decorator rule("SpaceAfterDecorator", anyToken, [ - 122 /* AbstractKeyword */, - 75 /* Identifier */, - 89 /* ExportKeyword */, - 84 /* DefaultKeyword */, - 80 /* ClassKeyword */, - 120 /* StaticKeyword */, - 119 /* PublicKeyword */, - 117 /* PrivateKeyword */, - 118 /* ProtectedKeyword */, - 131 /* GetKeyword */, - 142 /* SetKeyword */, + 125 /* AbstractKeyword */, + 78 /* Identifier */, + 92 /* ExportKeyword */, + 87 /* DefaultKeyword */, + 83 /* ClassKeyword */, + 123 /* StaticKeyword */, + 122 /* PublicKeyword */, + 120 /* PrivateKeyword */, + 121 /* ProtectedKeyword */, + 134 /* GetKeyword */, + 145 /* SetKeyword */, 22 /* OpenBracketToken */, 41 /* AsteriskToken */, ], [isEndOfDecoratorContextOnSameLine], 4 /* InsertSpace */), rule("NoSpaceBeforeNonNullAssertionOperator", anyToken, 53 /* ExclamationToken */, [isNonJsxSameLineTokenContext, isNonNullAssertionContext], 16 /* DeleteSpace */), - rule("NoSpaceAfterNewKeywordOnConstructorSignature", 99 /* NewKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], 16 /* DeleteSpace */), + rule("NoSpaceAfterNewKeywordOnConstructorSignature", 102 /* NewKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], 16 /* DeleteSpace */), rule("SpaceLessThanAndNonJSXTypeAnnotation", 29 /* LessThanToken */, 29 /* LessThanToken */, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), ]; // These rules are applied after high priority var userConfigurableRules = [ // Treat constructor as an identifier in a function declaration, and remove spaces between constructor and following left parentheses - rule("SpaceAfterConstructor", 129 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 4 /* InsertSpace */), - rule("NoSpaceAfterConstructor", 129 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), + rule("SpaceAfterConstructor", 132 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 4 /* InsertSpace */), + rule("NoSpaceAfterConstructor", 132 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), rule("SpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionEnabled("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNextTokenNotCloseBracket, isNextTokenNotCloseParen], 4 /* InsertSpace */), rule("NoSpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext], 16 /* DeleteSpace */), // Insert space after function keyword for anonymous functions - rule("SpaceAfterAnonymousFunctionKeyword", [94 /* FunctionKeyword */, 41 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 4 /* InsertSpace */), - rule("NoSpaceAfterAnonymousFunctionKeyword", [94 /* FunctionKeyword */, 41 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 16 /* DeleteSpace */), + rule("SpaceAfterAnonymousFunctionKeyword", [97 /* FunctionKeyword */, 41 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 4 /* InsertSpace */), + rule("NoSpaceAfterAnonymousFunctionKeyword", [97 /* FunctionKeyword */, 41 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 16 /* DeleteSpace */), // Insert space after keywords in control flow statements rule("SpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 4 /* InsertSpace */), rule("NoSpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 16 /* DeleteSpace */), @@ -124297,9 +127531,9 @@ var ts; rule("SpaceBetweenEmptyBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingEmptyBraces")], 4 /* InsertSpace */), rule("NoSpaceBetweenEmptyBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isOptionDisabled("insertSpaceAfterOpeningAndBeforeClosingEmptyBraces"), isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), // Insert space after opening and before closing template string braces - rule("SpaceAfterTemplateHeadAndMiddle", [15 /* TemplateHead */, 16 /* TemplateMiddle */], anyToken, [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces"), isNonJsxSameLineTokenContext], 4 /* InsertSpace */), + rule("SpaceAfterTemplateHeadAndMiddle", [15 /* TemplateHead */, 16 /* TemplateMiddle */], anyToken, [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces"), isNonJsxTextContext], 4 /* InsertSpace */, 1 /* CanDeleteNewLines */), rule("SpaceBeforeTemplateMiddleAndTail", anyToken, [16 /* TemplateMiddle */, 17 /* TemplateTail */], [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces"), isNonJsxSameLineTokenContext], 4 /* InsertSpace */), - rule("NoSpaceAfterTemplateHeadAndMiddle", [15 /* TemplateHead */, 16 /* TemplateMiddle */], anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces"), isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), + rule("NoSpaceAfterTemplateHeadAndMiddle", [15 /* TemplateHead */, 16 /* TemplateMiddle */], anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces"), isNonJsxTextContext], 16 /* DeleteSpace */, 1 /* CanDeleteNewLines */), rule("NoSpaceBeforeTemplateMiddleAndTail", anyToken, [16 /* TemplateMiddle */, 17 /* TemplateTail */], [isOptionDisabledOrUndefined("insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces"), isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), // No space after { and before } in JSX expression rule("SpaceAfterOpenBraceInJsxExpression", 18 /* OpenBraceToken */, anyToken, [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces"), isNonJsxSameLineTokenContext, isJsxExpressionContext], 4 /* InsertSpace */), @@ -124325,8 +127559,8 @@ var ts; rule("NewLineBeforeOpenBraceInTypeScriptDeclWithBlock", typeScriptOpenBraceLeftTokenRange, 18 /* OpenBraceToken */, [isOptionEnabled("placeOpenBraceOnNewLineForFunctions"), isTypeScriptDeclWithBlockContext, isBeforeMultilineBlockContext], 8 /* InsertNewLine */, 1 /* CanDeleteNewLines */), rule("SpaceAfterTypeAssertion", 31 /* GreaterThanToken */, anyToken, [isOptionEnabled("insertSpaceAfterTypeAssertion"), isNonJsxSameLineTokenContext, isTypeAssertionContext], 4 /* InsertSpace */), rule("NoSpaceAfterTypeAssertion", 31 /* GreaterThanToken */, anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterTypeAssertion"), isNonJsxSameLineTokenContext, isTypeAssertionContext], 16 /* DeleteSpace */), - rule("SpaceBeforeTypeAnnotation", anyToken, 58 /* ColonToken */, [isOptionEnabled("insertSpaceBeforeTypeAnnotation"), isNonJsxSameLineTokenContext, isTypeAnnotationContext], 4 /* InsertSpace */), - rule("NoSpaceBeforeTypeAnnotation", anyToken, 58 /* ColonToken */, [isOptionDisabledOrUndefined("insertSpaceBeforeTypeAnnotation"), isNonJsxSameLineTokenContext, isTypeAnnotationContext], 16 /* DeleteSpace */), + rule("SpaceBeforeTypeAnnotation", anyToken, [57 /* QuestionToken */, 58 /* ColonToken */], [isOptionEnabled("insertSpaceBeforeTypeAnnotation"), isNonJsxSameLineTokenContext, isTypeAnnotationContext], 4 /* InsertSpace */), + rule("NoSpaceBeforeTypeAnnotation", anyToken, [57 /* QuestionToken */, 58 /* ColonToken */], [isOptionDisabledOrUndefined("insertSpaceBeforeTypeAnnotation"), isNonJsxSameLineTokenContext, isTypeAnnotationContext], 16 /* DeleteSpace */), rule("NoOptionalSemicolon", 26 /* SemicolonToken */, anyTokenIncludingEOF, [optionEquals("semicolons", ts.SemicolonPreference.Remove), isSemicolonDeletionContext], 32 /* DeleteToken */), rule("OptionalSemicolon", anyToken, anyTokenIncludingEOF, [optionEquals("semicolons", ts.SemicolonPreference.Insert), isSemicolonInsertionContext], 64 /* InsertTrailingSemicolon */), ]; @@ -124339,16 +127573,16 @@ var ts; rule("SpaceBeforeOpenBraceInTypeScriptDeclWithBlock", typeScriptOpenBraceLeftTokenRange, 18 /* OpenBraceToken */, [isOptionDisabledOrUndefinedOrTokensOnSameLine("placeOpenBraceOnNewLineForFunctions"), isTypeScriptDeclWithBlockContext, isNotFormatOnEnter, isSameLineTokenOrBeforeBlockContext], 4 /* InsertSpace */, 1 /* CanDeleteNewLines */), rule("NoSpaceBeforeComma", anyToken, 27 /* CommaToken */, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), // No space before and after indexer `x[]` - rule("NoSpaceBeforeOpenBracket", anyTokenExcept(126 /* AsyncKeyword */, 78 /* CaseKeyword */), 22 /* OpenBracketToken */, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), + rule("NoSpaceBeforeOpenBracket", anyTokenExcept(129 /* AsyncKeyword */, 81 /* CaseKeyword */), 22 /* OpenBracketToken */, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */), rule("NoSpaceAfterCloseBracket", 23 /* CloseBracketToken */, anyToken, [isNonJsxSameLineTokenContext, isNotBeforeBlockInFunctionDeclarationContext], 16 /* DeleteSpace */), rule("SpaceAfterSemicolon", 26 /* SemicolonToken */, anyToken, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), // Remove extra space between for and await - rule("SpaceBetweenForAndAwaitKeyword", 93 /* ForKeyword */, 127 /* AwaitKeyword */, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), + rule("SpaceBetweenForAndAwaitKeyword", 96 /* ForKeyword */, 130 /* AwaitKeyword */, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), // Add a space between statements. All keywords except (do,else,case) has open/close parens after them. // So, we have a rule to add a space for [),Any], [do,Any], [else,Any], and [case,Any] - rule("SpaceBetweenStatements", [21 /* CloseParenToken */, 86 /* DoKeyword */, 87 /* ElseKeyword */, 78 /* CaseKeyword */], anyToken, [isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNotForContext], 4 /* InsertSpace */), - // This low-pri rule takes care of "try {" and "finally {" in case the rule SpaceBeforeOpenBraceInControl didn't execute on FormatOnEnter. - rule("SpaceAfterTryFinally", [107 /* TryKeyword */, 92 /* FinallyKeyword */], 18 /* OpenBraceToken */, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), + rule("SpaceBetweenStatements", [21 /* CloseParenToken */, 89 /* DoKeyword */, 90 /* ElseKeyword */, 81 /* CaseKeyword */], anyToken, [isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNotForContext], 4 /* InsertSpace */), + // This low-pri rule takes care of "try {", "catch {" and "finally {" in case the rule SpaceBeforeOpenBraceInControl didn't execute on FormatOnEnter. + rule("SpaceAfterTryCatchFinally", [110 /* TryKeyword */, 82 /* CatchKeyword */, 95 /* FinallyKeyword */], 18 /* OpenBraceToken */, [isNonJsxSameLineTokenContext], 4 /* InsertSpace */), ]; return __spreadArrays(highPriorityCommonRules, userConfigurableRules, lowPriorityCommonRules); } @@ -124407,51 +127641,51 @@ var ts; return function (context) { return !context.options || !context.options.hasOwnProperty(optionName) || !!context.options[optionName]; }; } function isForContext(context) { - return context.contextNode.kind === 230 /* ForStatement */; + return context.contextNode.kind === 234 /* ForStatement */; } function isNotForContext(context) { return !isForContext(context); } function isBinaryOpContext(context) { switch (context.contextNode.kind) { - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: return context.contextNode.operatorToken.kind !== 27 /* CommaToken */; - case 210 /* ConditionalExpression */: - case 180 /* ConditionalType */: - case 217 /* AsExpression */: - case 263 /* ExportSpecifier */: - case 258 /* ImportSpecifier */: - case 168 /* TypePredicate */: - case 178 /* UnionType */: - case 179 /* IntersectionType */: + case 214 /* ConditionalExpression */: + case 183 /* ConditionalType */: + case 221 /* AsExpression */: + case 267 /* ExportSpecifier */: + case 262 /* ImportSpecifier */: + case 171 /* TypePredicate */: + case 181 /* UnionType */: + case 182 /* IntersectionType */: return true; // equals in binding elements: function foo([[x, y] = [1, 2]]) - case 191 /* BindingElement */: + case 195 /* BindingElement */: // equals in type X = ... // falls through - case 247 /* TypeAliasDeclaration */: + case 251 /* TypeAliasDeclaration */: // equal in import a = module('a'); // falls through - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: // equal in let a = 0 // falls through - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: // equal in p = 0 // falls through - case 156 /* Parameter */: - case 284 /* EnumMember */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: + case 159 /* Parameter */: + case 288 /* EnumMember */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: return context.currentTokenSpan.kind === 62 /* EqualsToken */ || context.nextTokenSpan.kind === 62 /* EqualsToken */; // "in" keyword in for (let x in []) { } - case 231 /* ForInStatement */: + case 235 /* ForInStatement */: // "in" keyword in [P in keyof T]: T[P] // falls through - case 155 /* TypeParameter */: - return context.currentTokenSpan.kind === 97 /* InKeyword */ || context.nextTokenSpan.kind === 97 /* InKeyword */ || context.currentTokenSpan.kind === 62 /* EqualsToken */ || context.nextTokenSpan.kind === 62 /* EqualsToken */; + case 158 /* TypeParameter */: + return context.currentTokenSpan.kind === 100 /* InKeyword */ || context.nextTokenSpan.kind === 100 /* InKeyword */ || context.currentTokenSpan.kind === 62 /* EqualsToken */ || context.nextTokenSpan.kind === 62 /* EqualsToken */; // Technically, "of" is not a binary operator, but format it the same way as "in" - case 232 /* ForOfStatement */: - return context.currentTokenSpan.kind === 152 /* OfKeyword */ || context.nextTokenSpan.kind === 152 /* OfKeyword */; + case 236 /* ForOfStatement */: + return context.currentTokenSpan.kind === 155 /* OfKeyword */ || context.nextTokenSpan.kind === 155 /* OfKeyword */; } return false; } @@ -124463,22 +127697,22 @@ var ts; } function isTypeAnnotationContext(context) { var contextKind = context.contextNode.kind; - return contextKind === 159 /* PropertyDeclaration */ || - contextKind === 158 /* PropertySignature */ || - contextKind === 156 /* Parameter */ || - contextKind === 242 /* VariableDeclaration */ || + return contextKind === 162 /* PropertyDeclaration */ || + contextKind === 161 /* PropertySignature */ || + contextKind === 159 /* Parameter */ || + contextKind === 246 /* VariableDeclaration */ || ts.isFunctionLikeKind(contextKind); } function isConditionalOperatorContext(context) { - return context.contextNode.kind === 210 /* ConditionalExpression */ || - context.contextNode.kind === 180 /* ConditionalType */; + return context.contextNode.kind === 214 /* ConditionalExpression */ || + context.contextNode.kind === 183 /* ConditionalType */; } function isSameLineTokenOrBeforeBlockContext(context) { return context.TokensAreOnSameLine() || isBeforeBlockContext(context); } function isBraceWrappedContext(context) { - return context.contextNode.kind === 189 /* ObjectBindingPattern */ || - context.contextNode.kind === 186 /* MappedType */ || + return context.contextNode.kind === 193 /* ObjectBindingPattern */ || + context.contextNode.kind === 189 /* MappedType */ || isSingleLineBlockContext(context); } // This check is done before an open brace in a control construct, a function, or a typescript block declaration @@ -124504,34 +127738,34 @@ var ts; return true; } switch (node.kind) { - case 223 /* Block */: - case 251 /* CaseBlock */: - case 193 /* ObjectLiteralExpression */: - case 250 /* ModuleBlock */: + case 227 /* Block */: + case 255 /* CaseBlock */: + case 197 /* ObjectLiteralExpression */: + case 254 /* ModuleBlock */: return true; } return false; } function isFunctionDeclContext(context) { switch (context.contextNode.kind) { - case 244 /* FunctionDeclaration */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: + case 248 /* FunctionDeclaration */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: // case SyntaxKind.MemberFunctionDeclaration: // falls through - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: // case SyntaxKind.MethodSignature: // falls through - case 165 /* CallSignature */: - case 201 /* FunctionExpression */: - case 162 /* Constructor */: - case 202 /* ArrowFunction */: + case 168 /* CallSignature */: + case 205 /* FunctionExpression */: + case 165 /* Constructor */: + case 206 /* ArrowFunction */: // case SyntaxKind.ConstructorDeclaration: // case SyntaxKind.SimpleArrowFunctionExpression: // case SyntaxKind.ParenthesizedArrowFunctionExpression: // falls through - case 246 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one + case 250 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one return true; } return false; @@ -124540,40 +127774,40 @@ var ts; return !isFunctionDeclContext(context); } function isFunctionDeclarationOrFunctionExpressionContext(context) { - return context.contextNode.kind === 244 /* FunctionDeclaration */ || context.contextNode.kind === 201 /* FunctionExpression */; + return context.contextNode.kind === 248 /* FunctionDeclaration */ || context.contextNode.kind === 205 /* FunctionExpression */; } function isTypeScriptDeclWithBlockContext(context) { return nodeIsTypeScriptDeclWithBlockContext(context.contextNode); } function nodeIsTypeScriptDeclWithBlockContext(node) { switch (node.kind) { - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 246 /* InterfaceDeclaration */: - case 248 /* EnumDeclaration */: - case 173 /* TypeLiteral */: - case 249 /* ModuleDeclaration */: - case 260 /* ExportDeclaration */: - case 261 /* NamedExports */: - case 254 /* ImportDeclaration */: - case 257 /* NamedImports */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 250 /* InterfaceDeclaration */: + case 252 /* EnumDeclaration */: + case 176 /* TypeLiteral */: + case 253 /* ModuleDeclaration */: + case 264 /* ExportDeclaration */: + case 265 /* NamedExports */: + case 258 /* ImportDeclaration */: + case 261 /* NamedImports */: return true; } return false; } function isAfterCodeBlockContext(context) { switch (context.currentTokenParent.kind) { - case 245 /* ClassDeclaration */: - case 249 /* ModuleDeclaration */: - case 248 /* EnumDeclaration */: - case 280 /* CatchClause */: - case 250 /* ModuleBlock */: - case 237 /* SwitchStatement */: + case 249 /* ClassDeclaration */: + case 253 /* ModuleDeclaration */: + case 252 /* EnumDeclaration */: + case 284 /* CatchClause */: + case 254 /* ModuleBlock */: + case 241 /* SwitchStatement */: return true; - case 223 /* Block */: { + case 227 /* Block */: { var blockParent = context.currentTokenParent.parent; // In a codefix scenario, we can't rely on parents being set. So just always return true. - if (!blockParent || blockParent.kind !== 202 /* ArrowFunction */ && blockParent.kind !== 201 /* FunctionExpression */) { + if (!blockParent || blockParent.kind !== 206 /* ArrowFunction */ && blockParent.kind !== 205 /* FunctionExpression */) { return true; } } @@ -124582,32 +127816,32 @@ var ts; } function isControlDeclContext(context) { switch (context.contextNode.kind) { - case 227 /* IfStatement */: - case 237 /* SwitchStatement */: - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - case 229 /* WhileStatement */: - case 240 /* TryStatement */: - case 228 /* DoStatement */: - case 236 /* WithStatement */: + case 231 /* IfStatement */: + case 241 /* SwitchStatement */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 233 /* WhileStatement */: + case 244 /* TryStatement */: + case 232 /* DoStatement */: + case 240 /* WithStatement */: // TODO // case SyntaxKind.ElseClause: // falls through - case 280 /* CatchClause */: + case 284 /* CatchClause */: return true; default: return false; } } function isObjectContext(context) { - return context.contextNode.kind === 193 /* ObjectLiteralExpression */; + return context.contextNode.kind === 197 /* ObjectLiteralExpression */; } function isFunctionCallContext(context) { - return context.contextNode.kind === 196 /* CallExpression */; + return context.contextNode.kind === 200 /* CallExpression */; } function isNewContext(context) { - return context.contextNode.kind === 197 /* NewExpression */; + return context.contextNode.kind === 201 /* NewExpression */; } function isFunctionCallOrNewContext(context) { return isFunctionCallContext(context) || isNewContext(context); @@ -124622,28 +127856,31 @@ var ts; return context.nextTokenSpan.kind !== 21 /* CloseParenToken */; } function isArrowFunctionContext(context) { - return context.contextNode.kind === 202 /* ArrowFunction */; + return context.contextNode.kind === 206 /* ArrowFunction */; } function isImportTypeContext(context) { - return context.contextNode.kind === 188 /* ImportType */; + return context.contextNode.kind === 192 /* ImportType */; } function isNonJsxSameLineTokenContext(context) { return context.TokensAreOnSameLine() && context.contextNode.kind !== 11 /* JsxText */; } + function isNonJsxTextContext(context) { + return context.contextNode.kind !== 11 /* JsxText */; + } function isNonJsxElementOrFragmentContext(context) { - return context.contextNode.kind !== 266 /* JsxElement */ && context.contextNode.kind !== 270 /* JsxFragment */; + return context.contextNode.kind !== 270 /* JsxElement */ && context.contextNode.kind !== 274 /* JsxFragment */; } function isJsxExpressionContext(context) { - return context.contextNode.kind === 276 /* JsxExpression */ || context.contextNode.kind === 275 /* JsxSpreadAttribute */; + return context.contextNode.kind === 280 /* JsxExpression */ || context.contextNode.kind === 279 /* JsxSpreadAttribute */; } function isNextTokenParentJsxAttribute(context) { - return context.nextTokenParent.kind === 273 /* JsxAttribute */; + return context.nextTokenParent.kind === 277 /* JsxAttribute */; } function isJsxAttributeContext(context) { - return context.contextNode.kind === 273 /* JsxAttribute */; + return context.contextNode.kind === 277 /* JsxAttribute */; } function isJsxSelfClosingElementContext(context) { - return context.contextNode.kind === 267 /* JsxSelfClosingElement */; + return context.contextNode.kind === 271 /* JsxSelfClosingElement */; } function isNotBeforeBlockInFunctionDeclarationContext(context) { return !isFunctionDeclContext(context) && !isBeforeBlockContext(context); @@ -124658,45 +127895,45 @@ var ts; while (ts.isExpressionNode(node)) { node = node.parent; } - return node.kind === 157 /* Decorator */; + return node.kind === 160 /* Decorator */; } function isStartOfVariableDeclarationList(context) { - return context.currentTokenParent.kind === 243 /* VariableDeclarationList */ && + return context.currentTokenParent.kind === 247 /* VariableDeclarationList */ && context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos; } function isNotFormatOnEnter(context) { return context.formattingRequestKind !== 2 /* FormatOnEnter */; } function isModuleDeclContext(context) { - return context.contextNode.kind === 249 /* ModuleDeclaration */; + return context.contextNode.kind === 253 /* ModuleDeclaration */; } function isObjectTypeContext(context) { - return context.contextNode.kind === 173 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration; + return context.contextNode.kind === 176 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration; } function isConstructorSignatureContext(context) { - return context.contextNode.kind === 166 /* ConstructSignature */; + return context.contextNode.kind === 169 /* ConstructSignature */; } function isTypeArgumentOrParameterOrAssertion(token, parent) { if (token.kind !== 29 /* LessThanToken */ && token.kind !== 31 /* GreaterThanToken */) { return false; } switch (parent.kind) { - case 169 /* TypeReference */: - case 199 /* TypeAssertionExpression */: - case 247 /* TypeAliasDeclaration */: - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 246 /* InterfaceDeclaration */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 196 /* CallExpression */: - case 197 /* NewExpression */: - case 216 /* ExpressionWithTypeArguments */: + case 172 /* TypeReference */: + case 203 /* TypeAssertionExpression */: + case 251 /* TypeAliasDeclaration */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 250 /* InterfaceDeclaration */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 200 /* CallExpression */: + case 201 /* NewExpression */: + case 220 /* ExpressionWithTypeArguments */: return true; default: return false; @@ -124707,28 +127944,28 @@ var ts; isTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent); } function isTypeAssertionContext(context) { - return context.contextNode.kind === 199 /* TypeAssertionExpression */; + return context.contextNode.kind === 203 /* TypeAssertionExpression */; } function isVoidOpContext(context) { - return context.currentTokenSpan.kind === 110 /* VoidKeyword */ && context.currentTokenParent.kind === 205 /* VoidExpression */; + return context.currentTokenSpan.kind === 113 /* VoidKeyword */ && context.currentTokenParent.kind === 209 /* VoidExpression */; } function isYieldOrYieldStarWithOperand(context) { - return context.contextNode.kind === 212 /* YieldExpression */ && context.contextNode.expression !== undefined; + return context.contextNode.kind === 216 /* YieldExpression */ && context.contextNode.expression !== undefined; } function isNonNullAssertionContext(context) { - return context.contextNode.kind === 218 /* NonNullExpression */; + return context.contextNode.kind === 222 /* NonNullExpression */; } function isNotStatementConditionContext(context) { return !isStatementConditionContext(context); } function isStatementConditionContext(context) { switch (context.contextNode.kind) { - case 227 /* IfStatement */: - case 230 /* ForStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - case 228 /* DoStatement */: - case 229 /* WhileStatement */: + case 231 /* IfStatement */: + case 234 /* ForStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 232 /* DoStatement */: + case 233 /* WhileStatement */: return true; default: return false; @@ -124753,12 +127990,12 @@ var ts; return nextTokenKind === 19 /* CloseBraceToken */ || nextTokenKind === 1 /* EndOfFileToken */; } - if (nextTokenKind === 222 /* SemicolonClassElement */ || + if (nextTokenKind === 226 /* SemicolonClassElement */ || nextTokenKind === 26 /* SemicolonToken */) { return false; } - if (context.contextNode.kind === 246 /* InterfaceDeclaration */ || - context.contextNode.kind === 247 /* TypeAliasDeclaration */) { + if (context.contextNode.kind === 250 /* InterfaceDeclaration */ || + context.contextNode.kind === 251 /* TypeAliasDeclaration */) { // Can’t remove semicolon after `foo`; it would parse as a method declaration: // // interface I { @@ -124772,9 +128009,9 @@ var ts; if (ts.isPropertyDeclaration(context.currentTokenParent)) { return !context.currentTokenParent.initializer; } - return context.currentTokenParent.kind !== 230 /* ForStatement */ - && context.currentTokenParent.kind !== 224 /* EmptyStatement */ - && context.currentTokenParent.kind !== 222 /* SemicolonClassElement */ + return context.currentTokenParent.kind !== 234 /* ForStatement */ + && context.currentTokenParent.kind !== 228 /* EmptyStatement */ + && context.currentTokenParent.kind !== 226 /* SemicolonClassElement */ && nextTokenKind !== 22 /* OpenBracketToken */ && nextTokenKind !== 20 /* OpenParenToken */ && nextTokenKind !== 39 /* PlusToken */ @@ -124782,7 +128019,7 @@ var ts; && nextTokenKind !== 43 /* SlashToken */ && nextTokenKind !== 13 /* RegularExpressionLiteral */ && nextTokenKind !== 27 /* CommaToken */ - && nextTokenKind !== 211 /* TemplateExpression */ + && nextTokenKind !== 215 /* TemplateExpression */ && nextTokenKind !== 15 /* TemplateHead */ && nextTokenKind !== 14 /* NoSubstitutionTemplateLiteral */ && nextTokenKind !== 24 /* DotToken */; @@ -124873,12 +128110,12 @@ var ts; return map; } function getRuleBucketIndex(row, column) { - ts.Debug.assert(row <= 152 /* LastKeyword */ && column <= 152 /* LastKeyword */, "Must compute formatting context from tokens"); + ts.Debug.assert(row <= 155 /* LastKeyword */ && column <= 155 /* LastKeyword */, "Must compute formatting context from tokens"); return (row * mapRowLength) + column; } var maskBitSize = 5; var mask = 31; // MaskBitSize bits - var mapRowLength = 152 /* LastToken */ + 1; + var mapRowLength = 155 /* LastToken */ + 1; var RulesPosition; (function (RulesPosition) { RulesPosition[RulesPosition["StopRulesSpecific"] = 0] = "StopRulesSpecific"; @@ -125066,17 +128303,17 @@ var ts; // i.e. parent is class declaration with the list of members and node is one of members. function isListElement(parent, node) { switch (parent.kind) { - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: return ts.rangeContainsRange(parent.members, node); - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: var body = parent.body; - return !!body && body.kind === 250 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node); - case 290 /* SourceFile */: - case 223 /* Block */: - case 250 /* ModuleBlock */: + return !!body && body.kind === 254 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node); + case 294 /* SourceFile */: + case 227 /* Block */: + case 254 /* ModuleBlock */: return ts.rangeContainsRange(parent.statements, node); - case 280 /* CatchClause */: + case 284 /* CatchClause */: return ts.rangeContainsRange(parent.block.statements, node); } return false; @@ -125303,19 +128540,19 @@ var ts; return node.modifiers[0].kind; } switch (node.kind) { - case 245 /* ClassDeclaration */: return 80 /* ClassKeyword */; - case 246 /* InterfaceDeclaration */: return 114 /* InterfaceKeyword */; - case 244 /* FunctionDeclaration */: return 94 /* FunctionKeyword */; - case 248 /* EnumDeclaration */: return 248 /* EnumDeclaration */; - case 163 /* GetAccessor */: return 131 /* GetKeyword */; - case 164 /* SetAccessor */: return 142 /* SetKeyword */; - case 161 /* MethodDeclaration */: + case 249 /* ClassDeclaration */: return 83 /* ClassKeyword */; + case 250 /* InterfaceDeclaration */: return 117 /* InterfaceKeyword */; + case 248 /* FunctionDeclaration */: return 97 /* FunctionKeyword */; + case 252 /* EnumDeclaration */: return 252 /* EnumDeclaration */; + case 166 /* GetAccessor */: return 134 /* GetKeyword */; + case 167 /* SetAccessor */: return 145 /* SetKeyword */; + case 164 /* MethodDeclaration */: if (node.asteriskToken) { return 41 /* AsteriskToken */; } // falls through - case 159 /* PropertyDeclaration */: - case 156 /* Parameter */: + case 162 /* PropertyDeclaration */: + case 159 /* Parameter */: var name = ts.getNameOfDeclaration(node); if (name) { return name.kind; @@ -125365,22 +128602,22 @@ var ts; case 18 /* OpenBraceToken */: case 19 /* CloseBraceToken */: case 21 /* CloseParenToken */: - case 87 /* ElseKeyword */: - case 111 /* WhileKeyword */: + case 90 /* ElseKeyword */: + case 114 /* WhileKeyword */: case 59 /* AtToken */: return false; case 43 /* SlashToken */: case 31 /* GreaterThanToken */: switch (container.kind) { - case 268 /* JsxOpeningElement */: - case 269 /* JsxClosingElement */: - case 267 /* JsxSelfClosingElement */: + case 272 /* JsxOpeningElement */: + case 273 /* JsxClosingElement */: + case 271 /* JsxSelfClosingElement */: return false; } break; case 22 /* OpenBracketToken */: case 23 /* CloseBracketToken */: - if (container.kind !== 186 /* MappedType */) { + if (container.kind !== 189 /* MappedType */) { return false; } break; @@ -125467,6 +128704,9 @@ var ts; // proceed any parent tokens that are located prior to child.getStart() var tokenInfo = formattingScanner.readTokenInfo(node); if (tokenInfo.token.end > childStartPos) { + if (tokenInfo.token.pos > childStartPos) { + formattingScanner.skipToStartOf(child); + } // stop when formatting scanner advances past the beginning of the child break; } @@ -125475,15 +128715,17 @@ var ts; if (!formattingScanner.isOnToken()) { return inheritedIndentation; } - // JSX text shouldn't affect indenting - if (ts.isToken(child) && child.kind !== 11 /* JsxText */) { + if (ts.isToken(child)) { // if child node is a token, it does not impact indentation, proceed it using parent indentation scope rules var tokenInfo = formattingScanner.readTokenInfo(child); - ts.Debug.assert(tokenInfo.token.end === child.end, "Token end is child end"); - consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child); - return inheritedIndentation; + // JSX text shouldn't affect indenting + if (child.kind !== 11 /* JsxText */) { + ts.Debug.assert(tokenInfo.token.end === child.end, "Token end is child end"); + consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child); + return inheritedIndentation; + } } - var effectiveParentStartLine = child.kind === 157 /* Decorator */ ? childStartLine : undecoratedParentStartLine; + var effectiveParentStartLine = child.kind === 160 /* Decorator */ ? childStartLine : undecoratedParentStartLine; var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine); processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta); if (child.kind === 11 /* JsxText */) { @@ -125503,7 +128745,7 @@ var ts; } } childContextNode = node; - if (isFirstListItem && parent.kind === 192 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) { + if (isFirstListItem && parent.kind === 196 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) { inheritedIndentation = childIndentation.indentation; } return inheritedIndentation; @@ -125770,9 +129012,6 @@ var ts; return; var startLinePos = ts.getStartPositionOfLine(startLine, sourceFile); var nonWhitespaceColumnInFirstPart = formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(startLinePos, parts[0].pos, sourceFile, options); - if (indentation === nonWhitespaceColumnInFirstPart.column && !jsxTextStyleIndent) { - return; - } var startIndex = 0; if (firstLineIsIndented) { startIndex = 1; @@ -125946,12 +129185,12 @@ var ts; formatting.getRangeOfEnclosingComment = getRangeOfEnclosingComment; function getOpenTokenForList(node, list) { switch (node.kind) { - case 162 /* Constructor */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 202 /* ArrowFunction */: + case 165 /* Constructor */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 206 /* ArrowFunction */: if (node.typeParameters === list) { return 29 /* LessThanToken */; } @@ -125959,8 +129198,8 @@ var ts; return 20 /* OpenParenToken */; } break; - case 196 /* CallExpression */: - case 197 /* NewExpression */: + case 200 /* CallExpression */: + case 201 /* NewExpression */: if (node.typeArguments === list) { return 29 /* LessThanToken */; } @@ -125968,12 +129207,12 @@ var ts; return 20 /* OpenParenToken */; } break; - case 169 /* TypeReference */: + case 172 /* TypeReference */: if (node.typeArguments === list) { return 29 /* LessThanToken */; } break; - case 173 /* TypeLiteral */: + case 176 /* TypeLiteral */: return 18 /* OpenBraceToken */; } return 0 /* Unknown */; @@ -126091,7 +129330,7 @@ var ts; if (options.indentStyle === ts.IndentStyle.Block) { return getBlockIndent(sourceFile, position, options); } - if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 209 /* BinaryExpression */) { + if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 213 /* BinaryExpression */) { // previous token is comma that separates items in list - find the previous item and try to derive indentation from it var actualIndentation = getActualIndentationForListItemBeforeComma(precedingToken, sourceFile, options); if (actualIndentation !== -1 /* Unknown */) { @@ -126245,7 +129484,7 @@ var ts; // - parent is SourceFile - by default immediate children of SourceFile are not indented except when user indents them manually // - parent and child are not on the same line var useActualIndentation = (ts.isDeclaration(current) || ts.isStatementButNotDeclaration(current)) && - (parent.kind === 290 /* SourceFile */ || !parentAndChildShareLine); + (parent.kind === 294 /* SourceFile */ || !parentAndChildShareLine); if (!useActualIndentation) { return -1 /* Unknown */; } @@ -126293,8 +129532,8 @@ var ts; } SmartIndenter.isArgumentAndStartLineOverlapsExpressionBeingCalled = isArgumentAndStartLineOverlapsExpressionBeingCalled; function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) { - if (parent.kind === 227 /* IfStatement */ && parent.elseStatement === child) { - var elseKeyword = ts.findChildOfKind(parent, 87 /* ElseKeyword */, sourceFile); + if (parent.kind === 231 /* IfStatement */ && parent.elseStatement === child) { + var elseKeyword = ts.findChildOfKind(parent, 90 /* ElseKeyword */, sourceFile); ts.Debug.assert(elseKeyword !== undefined); var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line; return elseKeywordStartLine === childStartLine; @@ -126331,40 +129570,40 @@ var ts; } function getListByRange(start, end, node, sourceFile) { switch (node.kind) { - case 169 /* TypeReference */: + case 172 /* TypeReference */: return getList(node.typeArguments); - case 193 /* ObjectLiteralExpression */: + case 197 /* ObjectLiteralExpression */: return getList(node.properties); - case 192 /* ArrayLiteralExpression */: + case 196 /* ArrayLiteralExpression */: return getList(node.elements); - case 173 /* TypeLiteral */: + case 176 /* TypeLiteral */: return getList(node.members); - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 165 /* CallSignature */: - case 162 /* Constructor */: - case 171 /* ConstructorType */: - case 166 /* ConstructSignature */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 168 /* CallSignature */: + case 165 /* Constructor */: + case 174 /* ConstructorType */: + case 169 /* ConstructSignature */: return getList(node.typeParameters) || getList(node.parameters); - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 246 /* InterfaceDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 321 /* JSDocTemplateTag */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 250 /* InterfaceDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 326 /* JSDocTemplateTag */: return getList(node.typeParameters); - case 197 /* NewExpression */: - case 196 /* CallExpression */: + case 201 /* NewExpression */: + case 200 /* CallExpression */: return getList(node.typeArguments) || getList(node.arguments); - case 243 /* VariableDeclarationList */: + case 247 /* VariableDeclarationList */: return getList(node.declarations); - case 257 /* NamedImports */: - case 261 /* NamedExports */: + case 261 /* NamedImports */: + case 265 /* NamedExports */: return getList(node.elements); - case 189 /* ObjectBindingPattern */: - case 190 /* ArrayBindingPattern */: + case 193 /* ObjectBindingPattern */: + case 194 /* ArrayBindingPattern */: return getList(node.elements); } function getList(list) { @@ -126387,7 +129626,7 @@ var ts; return findColumnForFirstNonWhitespaceCharacterInLine(sourceFile.getLineAndCharacterOfPosition(list.pos), sourceFile, options); } function getActualIndentationForListItem(node, sourceFile, options, listIndentsChild) { - if (node.parent && node.parent.kind === 243 /* VariableDeclarationList */) { + if (node.parent && node.parent.kind === 247 /* VariableDeclarationList */) { // VariableDeclarationList has no wrapping tokens return -1 /* Unknown */; } @@ -126460,87 +129699,87 @@ var ts; function nodeWillIndentChild(settings, parent, child, sourceFile, indentByDefault) { var childKind = child ? child.kind : 0 /* Unknown */; switch (parent.kind) { - case 226 /* ExpressionStatement */: - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 246 /* InterfaceDeclaration */: - case 248 /* EnumDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 192 /* ArrayLiteralExpression */: - case 223 /* Block */: - case 250 /* ModuleBlock */: - case 193 /* ObjectLiteralExpression */: - case 173 /* TypeLiteral */: - case 186 /* MappedType */: - case 175 /* TupleType */: - case 251 /* CaseBlock */: - case 278 /* DefaultClause */: - case 277 /* CaseClause */: - case 200 /* ParenthesizedExpression */: - case 194 /* PropertyAccessExpression */: - case 196 /* CallExpression */: - case 197 /* NewExpression */: - case 225 /* VariableStatement */: - case 259 /* ExportAssignment */: - case 235 /* ReturnStatement */: - case 210 /* ConditionalExpression */: - case 190 /* ArrayBindingPattern */: - case 189 /* ObjectBindingPattern */: - case 268 /* JsxOpeningElement */: - case 271 /* JsxOpeningFragment */: - case 267 /* JsxSelfClosingElement */: - case 276 /* JsxExpression */: - case 160 /* MethodSignature */: - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 156 /* Parameter */: - case 170 /* FunctionType */: - case 171 /* ConstructorType */: - case 182 /* ParenthesizedType */: - case 198 /* TaggedTemplateExpression */: - case 206 /* AwaitExpression */: - case 261 /* NamedExports */: - case 257 /* NamedImports */: - case 263 /* ExportSpecifier */: - case 258 /* ImportSpecifier */: - case 159 /* PropertyDeclaration */: + case 230 /* ExpressionStatement */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 250 /* InterfaceDeclaration */: + case 252 /* EnumDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 196 /* ArrayLiteralExpression */: + case 227 /* Block */: + case 254 /* ModuleBlock */: + case 197 /* ObjectLiteralExpression */: + case 176 /* TypeLiteral */: + case 189 /* MappedType */: + case 178 /* TupleType */: + case 255 /* CaseBlock */: + case 282 /* DefaultClause */: + case 281 /* CaseClause */: + case 204 /* ParenthesizedExpression */: + case 198 /* PropertyAccessExpression */: + case 200 /* CallExpression */: + case 201 /* NewExpression */: + case 229 /* VariableStatement */: + case 263 /* ExportAssignment */: + case 239 /* ReturnStatement */: + case 214 /* ConditionalExpression */: + case 194 /* ArrayBindingPattern */: + case 193 /* ObjectBindingPattern */: + case 272 /* JsxOpeningElement */: + case 275 /* JsxOpeningFragment */: + case 271 /* JsxSelfClosingElement */: + case 280 /* JsxExpression */: + case 163 /* MethodSignature */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 159 /* Parameter */: + case 173 /* FunctionType */: + case 174 /* ConstructorType */: + case 185 /* ParenthesizedType */: + case 202 /* TaggedTemplateExpression */: + case 210 /* AwaitExpression */: + case 265 /* NamedExports */: + case 261 /* NamedImports */: + case 267 /* ExportSpecifier */: + case 262 /* ImportSpecifier */: + case 162 /* PropertyDeclaration */: return true; - case 242 /* VariableDeclaration */: - case 281 /* PropertyAssignment */: - case 209 /* BinaryExpression */: - if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 193 /* ObjectLiteralExpression */) { // TODO: GH#18217 + case 246 /* VariableDeclaration */: + case 285 /* PropertyAssignment */: + case 213 /* BinaryExpression */: + if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 197 /* ObjectLiteralExpression */) { // TODO: GH#18217 return rangeIsOnOneLine(sourceFile, child); } - if (parent.kind !== 209 /* BinaryExpression */) { + if (parent.kind !== 213 /* BinaryExpression */) { return true; } break; - case 228 /* DoStatement */: - case 229 /* WhileStatement */: - case 231 /* ForInStatement */: - case 232 /* ForOfStatement */: - case 230 /* ForStatement */: - case 227 /* IfStatement */: - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 161 /* MethodDeclaration */: - case 202 /* ArrowFunction */: - case 162 /* Constructor */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - return childKind !== 223 /* Block */; - case 260 /* ExportDeclaration */: - return childKind !== 261 /* NamedExports */; - case 254 /* ImportDeclaration */: - return childKind !== 255 /* ImportClause */ || - (!!child.namedBindings && child.namedBindings.kind !== 257 /* NamedImports */); - case 266 /* JsxElement */: - return childKind !== 269 /* JsxClosingElement */; - case 270 /* JsxFragment */: - return childKind !== 272 /* JsxClosingFragment */; - case 179 /* IntersectionType */: - case 178 /* UnionType */: - if (childKind === 173 /* TypeLiteral */) { + case 232 /* DoStatement */: + case 233 /* WhileStatement */: + case 235 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 234 /* ForStatement */: + case 231 /* IfStatement */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 164 /* MethodDeclaration */: + case 206 /* ArrowFunction */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + return childKind !== 227 /* Block */; + case 264 /* ExportDeclaration */: + return childKind !== 265 /* NamedExports */; + case 258 /* ImportDeclaration */: + return childKind !== 259 /* ImportClause */ || + (!!child.namedBindings && child.namedBindings.kind !== 261 /* NamedImports */); + case 270 /* JsxElement */: + return childKind !== 273 /* JsxClosingElement */; + case 274 /* JsxFragment */: + return childKind !== 276 /* JsxClosingFragment */; + case 182 /* IntersectionType */: + case 181 /* UnionType */: + if (childKind === 176 /* TypeLiteral */ || childKind === 178 /* TupleType */) { return false; } // falls through @@ -126551,11 +129790,11 @@ var ts; SmartIndenter.nodeWillIndentChild = nodeWillIndentChild; function isControlFlowEndingStatement(kind, parent) { switch (kind) { - case 235 /* ReturnStatement */: - case 239 /* ThrowStatement */: - case 233 /* ContinueStatement */: - case 234 /* BreakStatement */: - return parent.kind !== 223 /* Block */; + case 239 /* ReturnStatement */: + case 243 /* ThrowStatement */: + case 237 /* ContinueStatement */: + case 238 /* BreakStatement */: + return parent.kind !== 227 /* Block */; default: return false; } @@ -126715,7 +129954,7 @@ var ts; * Checks if 'candidate' argument is a legal separator in the list that contains 'node' as an element */ function isSeparator(node, candidate) { - return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 193 /* ObjectLiteralExpression */)); + return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 197 /* ObjectLiteralExpression */)); } function spaces(count) { var s = ""; @@ -126735,7 +129974,7 @@ var ts; this.formatContext = formatContext; this.changes = []; this.newFiles = []; - this.classesWithNodesInsertedAtStart = ts.createMap(); // Set implemented as Map + this.classesWithNodesInsertedAtStart = new ts.Map(); // Set implemented as Map this.deletedNodes = []; } ChangeTracker.fromContext = function (context) { @@ -126860,7 +130099,7 @@ var ts; }; ChangeTracker.prototype.insertModifierBefore = function (sourceFile, modifier, before) { var pos = before.getStart(sourceFile); - this.insertNodeAt(sourceFile, pos, ts.createToken(modifier), { suffix: " " }); + this.insertNodeAt(sourceFile, pos, ts.factory.createToken(modifier), { suffix: " " }); }; ChangeTracker.prototype.insertLastModifierBefore = function (sourceFile, modifier, before) { if (!before.modifiers) { @@ -126868,7 +130107,7 @@ var ts; return; } var pos = before.modifiers.end; - this.insertNodeAt(sourceFile, pos, ts.createToken(modifier), { prefix: " " }); + this.insertNodeAt(sourceFile, pos, ts.factory.createToken(modifier), { prefix: " " }); }; ChangeTracker.prototype.insertCommentBeforeLine = function (sourceFile, lineNumber, position, commentText) { var lineStartPosition = ts.getStartPositionOfLine(lineNumber, sourceFile); @@ -126918,7 +130157,7 @@ var ts; } } else { - endNode = (_a = (node.kind === 242 /* VariableDeclaration */ ? node.exclamationToken : node.questionToken)) !== null && _a !== void 0 ? _a : node.name; + endNode = (_a = (node.kind === 246 /* VariableDeclaration */ ? node.exclamationToken : node.questionToken)) !== null && _a !== void 0 ? _a : node.name; } this.insertNodeAt(sourceFile, endNode.end, type, { prefix: ": " }); return true; @@ -126931,11 +130170,11 @@ var ts; ChangeTracker.prototype.insertTypeParameters = function (sourceFile, node, typeParameters) { // If no `(`, is an arrow function `x => x`, so use the pos of the first parameter var start = (ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile) || ts.first(node.parameters)).getStart(sourceFile); - this.insertNodesAt(sourceFile, start, typeParameters, { prefix: "<", suffix: ">" }); + this.insertNodesAt(sourceFile, start, typeParameters, { prefix: "<", suffix: ">", joiner: ", " }); }; - ChangeTracker.prototype.getOptionsForInsertNodeBefore = function (before, inserted, doubleNewlines) { + ChangeTracker.prototype.getOptionsForInsertNodeBefore = function (before, inserted, blankLineBetween) { if (ts.isStatement(before) || ts.isClassElement(before)) { - return { suffix: doubleNewlines ? this.newLineCharacter + this.newLineCharacter : this.newLineCharacter }; + return { suffix: blankLineBetween ? this.newLineCharacter + this.newLineCharacter : this.newLineCharacter }; } else if (ts.isVariableDeclaration(before)) { // insert `x = 1, ` into `const x = 1, y = 2; return { suffix: ", " }; @@ -126946,6 +130185,9 @@ var ts; else if (ts.isStringLiteral(before) && ts.isImportDeclaration(before.parent) || ts.isNamedImports(before)) { return { suffix: ", " }; } + else if (ts.isImportSpecifier(before)) { + return { suffix: "," + (blankLineBetween ? this.newLineCharacter : " ") }; + } return ts.Debug.failBadSyntaxKind(before); // We haven't handled this kind of node yet -- add it }; ChangeTracker.prototype.insertNodeAtConstructorStart = function (sourceFile, ctr, newStatement) { @@ -126967,7 +130209,7 @@ var ts; } }; ChangeTracker.prototype.replaceConstructorBody = function (sourceFile, ctr, statements) { - this.replaceNode(sourceFile, ctr.body, ts.createBlock(statements, /*multiLine*/ true)); + this.replaceNode(sourceFile, ctr.body, ts.factory.createBlock(statements, /*multiLine*/ true)); }; ChangeTracker.prototype.insertNodeAtEndOfScope = function (sourceFile, scope, newNode) { var pos = getAdjustedStartPosition(sourceFile, scope.getLastToken(), {}); @@ -127060,7 +130302,7 @@ var ts; // check if previous statement ends with semicolon // if not - insert semicolon to preserve the code from changing the meaning due to ASI if (sourceFile.text.charCodeAt(after.end - 1) !== 59 /* semicolon */) { - this.replaceRange(sourceFile, ts.createRange(after.end), ts.createToken(26 /* SemicolonToken */)); + this.replaceRange(sourceFile, ts.createRange(after.end), ts.factory.createToken(26 /* SemicolonToken */)); } } var endPosition = getAdjustedEndPosition(sourceFile, after, {}); @@ -127072,18 +130314,18 @@ var ts; }; ChangeTracker.prototype.getInsertNodeAfterOptionsWorker = function (node) { switch (node.kind) { - case 245 /* ClassDeclaration */: - case 249 /* ModuleDeclaration */: + case 249 /* ClassDeclaration */: + case 253 /* ModuleDeclaration */: return { prefix: this.newLineCharacter, suffix: this.newLineCharacter }; - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: case 10 /* StringLiteral */: - case 75 /* Identifier */: + case 78 /* Identifier */: return { prefix: ", " }; - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: return { suffix: "," + this.newLineCharacter }; - case 89 /* ExportKeyword */: + case 92 /* ExportKeyword */: return { prefix: " " }; - case 156 /* Parameter */: + case 159 /* Parameter */: return {}; default: ts.Debug.assert(ts.isStatement(node) || ts.isClassOrTypeElement(node)); // Else we haven't handled this kind of node yet -- add it @@ -127092,29 +130334,29 @@ var ts; }; ChangeTracker.prototype.insertName = function (sourceFile, node, name) { ts.Debug.assert(!node.name); - if (node.kind === 202 /* ArrowFunction */) { + if (node.kind === 206 /* ArrowFunction */) { var arrow = ts.findChildOfKind(node, 38 /* EqualsGreaterThanToken */, sourceFile); var lparen = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile); if (lparen) { // `() => {}` --> `function f() {}` - this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [ts.createToken(94 /* FunctionKeyword */), ts.createIdentifier(name)], { joiner: " " }); + this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [ts.factory.createToken(97 /* FunctionKeyword */), ts.factory.createIdentifier(name)], { joiner: " " }); deleteNode(this, sourceFile, arrow); } else { // `x => {}` -> `function f(x) {}` this.insertText(sourceFile, ts.first(node.parameters).getStart(sourceFile), "function " + name + "("); // Replacing full range of arrow to get rid of the leading space -- replace ` =>` with `)` - this.replaceRange(sourceFile, arrow, ts.createToken(21 /* CloseParenToken */)); + this.replaceRange(sourceFile, arrow, ts.factory.createToken(21 /* CloseParenToken */)); } - if (node.body.kind !== 223 /* Block */) { + if (node.body.kind !== 227 /* Block */) { // `() => 0` => `function f() { return 0; }` - this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.createToken(18 /* OpenBraceToken */), ts.createToken(101 /* ReturnKeyword */)], { joiner: " ", suffix: " " }); - this.insertNodesAt(sourceFile, node.body.end, [ts.createToken(26 /* SemicolonToken */), ts.createToken(19 /* CloseBraceToken */)], { joiner: " " }); + this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.factory.createToken(18 /* OpenBraceToken */), ts.factory.createToken(104 /* ReturnKeyword */)], { joiner: " ", suffix: " " }); + this.insertNodesAt(sourceFile, node.body.end, [ts.factory.createToken(26 /* SemicolonToken */), ts.factory.createToken(19 /* CloseBraceToken */)], { joiner: " " }); } } else { - var pos = ts.findChildOfKind(node, node.kind === 201 /* FunctionExpression */ ? 94 /* FunctionKeyword */ : 80 /* ClassKeyword */, sourceFile).end; - this.insertNodeAt(sourceFile, pos, ts.createIdentifier(name), { prefix: " " }); + var pos = ts.findChildOfKind(node, node.kind === 205 /* FunctionExpression */ ? 97 /* FunctionKeyword */ : 83 /* ClassKeyword */, sourceFile).end; + this.insertNodeAt(sourceFile, pos, ts.factory.createIdentifier(name), { prefix: " " }); } }; ChangeTracker.prototype.insertExportModifier = function (sourceFile, node) { @@ -127217,12 +130459,13 @@ var ts; } if (multilineList) { // insert separator immediately following the 'after' node to preserve comments in trailing trivia - this.replaceRange(sourceFile, ts.createRange(end), ts.createToken(separator)); + this.replaceRange(sourceFile, ts.createRange(end), ts.factory.createToken(separator)); // use the same indentation as 'after' item var indentation = ts.formatting.SmartIndenter.findFirstNonWhitespaceColumn(afterStartLinePosition, afterStart, sourceFile, this.formatContext.options); // insert element before the line break on the line that contains 'after' element var insertPos = ts.skipTrivia(sourceFile.text, end, /*stopAfterLineBreak*/ true, /*stopAtComments*/ false); - if (insertPos !== end && ts.isLineBreak(sourceFile.text.charCodeAt(insertPos - 1))) { + // find position before "\n" or "\r\n" + while (insertPos !== end && ts.isLineBreak(sourceFile.text.charCodeAt(insertPos - 1))) { insertPos--; } this.replaceRange(sourceFile, ts.createRange(insertPos), newNode, { indentation: indentation, prefix: this.newLineCharacter }); @@ -127233,7 +130476,7 @@ var ts; } }; ChangeTracker.prototype.parenthesizeExpression = function (sourceFile, expression) { - this.replaceRange(sourceFile, ts.rangeOfNode(expression), ts.createParen(expression)); + this.replaceRange(sourceFile, ts.rangeOfNode(expression), ts.factory.createParenthesizedExpression(expression)); }; ChangeTracker.prototype.finishClassesWithNodesInsertedAtStart = function () { var _this = this; @@ -127255,7 +130498,7 @@ var ts; }; ChangeTracker.prototype.finishDeleteDeclarations = function () { var _this = this; - var deletedNodesInLists = new ts.NodeSet(); // Stores nodes in lists that we already deleted. Used to avoid deleting `, ` twice in `a, b`. + var deletedNodesInLists = new ts.Set(); // Stores nodes in lists that we already deleted. Used to avoid deleting `, ` twice in `a, b`. var _loop_9 = function (sourceFile, node) { if (!this_1.deletedNodes.some(function (d) { return d.sourceFile === sourceFile && ts.rangeContainsRangeExclusive(d.node, node); })) { if (ts.isArray(node)) { @@ -127357,7 +130600,7 @@ var ts; changesToText.newFileChanges = newFileChanges; function newFileChangesWorker(oldFile, scriptKind, statements, newLineCharacter, formatContext) { // TODO: this emits the file, parses it back, then formats it that -- may be a less roundabout way to do this - var nonFormattedText = statements.map(function (s) { return getNonformattedText(s, oldFile, newLineCharacter).text; }).join(newLineCharacter); + var nonFormattedText = statements.map(function (s) { return s === 4 /* NewLineTrivia */ ? "" : getNonformattedText(s, oldFile, newLineCharacter).text; }).join(newLineCharacter); var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 99 /* ESNext */, /*setParentNodes*/ true, scriptKind); var changes = ts.formatting.formatDocument(sourceFile, formatContext); return applyChanges(nonFormattedText, changes) + newLineCharacter; @@ -127428,8 +130671,7 @@ var ts; var visited = ts.visitEachChild(node, assignPositionsToNode, ts.nullTransformationContext, assignPositionsToNodeArray, assignPositionsToNode); // TODO: GH#18217 // create proxy node for non synthesized nodes var newNode = ts.nodeIsSynthesized(visited) ? visited : Object.create(visited); - newNode.pos = getPos(node); - newNode.end = getEnd(node); + ts.setTextRangePosEnd(newNode, getPos(node), getEnd(node)); return newNode; } function assignPositionsToNodeArray(nodes, visitor, test, start, count) { @@ -127438,9 +130680,8 @@ var ts; return visited; } // clone nodearray if necessary - var nodeArray = visited === nodes ? ts.createNodeArray(visited.slice(0)) : visited; - nodeArray.pos = getPos(nodes); - nodeArray.end = getEnd(nodes); + var nodeArray = visited === nodes ? ts.factory.createNodeArray(visited.slice(0)) : visited; + ts.setTextRangePosEnd(nodeArray, getPos(nodes), getEnd(nodes)); return nodeArray; } function createWriter(newLine) { @@ -127684,14 +130925,14 @@ var ts; } textChanges_3.isValidLocationToAddComment = isValidLocationToAddComment; function needSemicolonBetween(a, b) { - return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 154 /* ComputedPropertyName */ + return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 157 /* ComputedPropertyName */ || ts.isStatementButNotDeclaration(a) && ts.isStatementButNotDeclaration(b); // TODO: only if b would start with a `(` or `[` } var deleteDeclaration; (function (deleteDeclaration_1) { function deleteDeclaration(changes, deletedNodesInLists, sourceFile, node) { switch (node.kind) { - case 156 /* Parameter */: { + case 159 /* Parameter */: { var oldFunction = node.parent; if (ts.isArrowFunction(oldFunction) && oldFunction.parameters.length === 1 && @@ -127706,15 +130947,15 @@ var ts; } break; } - case 254 /* ImportDeclaration */: - case 253 /* ImportEqualsDeclaration */: + case 258 /* ImportDeclaration */: + case 257 /* ImportEqualsDeclaration */: var isFirstImport = sourceFile.imports.length && node === ts.first(sourceFile.imports).parent || node === ts.find(sourceFile.statements, ts.isAnyImportSyntax); // For first import, leave header comment in place, otherwise only delete JSDoc comments deleteNode(changes, sourceFile, node, { leadingTriviaOption: isFirstImport ? LeadingTriviaOption.Exclude : ts.hasJSDocNodes(node) ? LeadingTriviaOption.JSDoc : LeadingTriviaOption.StartLine }); break; - case 191 /* BindingElement */: + case 195 /* BindingElement */: var pattern = node.parent; - var preserveComma = pattern.kind === 190 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements); + var preserveComma = pattern.kind === 194 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements); if (preserveComma) { deleteNode(changes, sourceFile, node); } @@ -127722,13 +130963,13 @@ var ts; deleteNodeInList(changes, deletedNodesInLists, sourceFile, node); } break; - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node); break; - case 155 /* TypeParameter */: + case 158 /* TypeParameter */: deleteNodeInList(changes, deletedNodesInLists, sourceFile, node); break; - case 258 /* ImportSpecifier */: + case 262 /* ImportSpecifier */: var namedImports = node.parent; if (namedImports.elements.length === 1) { deleteImportBinding(changes, sourceFile, namedImports); @@ -127737,17 +130978,17 @@ var ts; deleteNodeInList(changes, deletedNodesInLists, sourceFile, node); } break; - case 256 /* NamespaceImport */: + case 260 /* NamespaceImport */: deleteImportBinding(changes, sourceFile, node); break; case 26 /* SemicolonToken */: deleteNode(changes, sourceFile, node, { trailingTriviaOption: TrailingTriviaOption.Exclude }); break; - case 94 /* FunctionKeyword */: + case 97 /* FunctionKeyword */: deleteNode(changes, sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.Exclude }); break; - case 245 /* ClassDeclaration */: - case 244 /* FunctionDeclaration */: + case 249 /* ClassDeclaration */: + case 248 /* FunctionDeclaration */: deleteNode(changes, sourceFile, node, { leadingTriviaOption: ts.hasJSDocNodes(node) ? LeadingTriviaOption.JSDoc : LeadingTriviaOption.StartLine }); break; default: @@ -127794,13 +131035,13 @@ var ts; // Delete the entire import declaration // |import * as ns from './file'| // |import { a } from './file'| - var importDecl = ts.getAncestor(node, 254 /* ImportDeclaration */); + var importDecl = ts.getAncestor(node, 258 /* ImportDeclaration */); deleteNode(changes, sourceFile, importDecl); } } function deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node) { var parent = node.parent; - if (parent.kind === 280 /* CatchClause */) { + if (parent.kind === 284 /* CatchClause */) { // TODO: There's currently no unused diagnostic for this, could be a suggestion changes.deleteNodeRange(sourceFile, ts.findChildOfKind(parent, 20 /* OpenParenToken */, sourceFile), ts.findChildOfKind(parent, 21 /* CloseParenToken */, sourceFile)); return; @@ -127811,14 +131052,14 @@ var ts; } var gp = parent.parent; switch (gp.kind) { - case 232 /* ForOfStatement */: - case 231 /* ForInStatement */: - changes.replaceNode(sourceFile, node, ts.createObjectLiteral()); + case 236 /* ForOfStatement */: + case 235 /* ForInStatement */: + changes.replaceNode(sourceFile, node, ts.factory.createObjectLiteralExpression()); break; - case 230 /* ForStatement */: + case 234 /* ForStatement */: deleteNode(changes, sourceFile, parent); break; - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: deleteNode(changes, sourceFile, gp, { leadingTriviaOption: ts.hasJSDocNodes(gp) ? LeadingTriviaOption.JSDoc : LeadingTriviaOption.StartLine }); break; default: @@ -127860,7 +131101,7 @@ var ts; var codefix; (function (codefix) { var errorCodeToFixes = ts.createMultiMap(); - var fixIdToRegistration = ts.createMap(); + var fixIdToRegistration = new ts.Map(); function diagnosticToString(diag) { return ts.isArray(diag) ? ts.formatStringFromArgs(ts.getLocaleSpecificMessage(diag[0]), diag.slice(1)) @@ -127958,7 +131199,7 @@ var ts; (function (refactor_1) { // A map with the refactor code as key, the refactor itself as value // e.g. nonSuggestableRefactors[refactorCode] -> the refactor you want - var refactors = ts.createMap(); + var refactors = new ts.Map(); /** @param name An unique code associated with each refactor. Does not have to be human-readable. */ function registerRefactor(name, refactor) { refactors.set(name, refactor); @@ -127995,10 +131236,10 @@ var ts; }); function makeChange(changeTracker, sourceFile, pos) { var token = ts.getTokenAtPosition(sourceFile, pos); - var assertion = ts.Debug.checkDefined(ts.findAncestor(token, function (n) { return ts.isAsExpression(n) || ts.isTypeAssertion(n); }), "Expected to find an assertion expression"); + var assertion = ts.Debug.checkDefined(ts.findAncestor(token, function (n) { return ts.isAsExpression(n) || ts.isTypeAssertionExpression(n); }), "Expected to find an assertion expression"); var replacement = ts.isAsExpression(assertion) - ? ts.createAsExpression(assertion.expression, ts.createKeywordTypeNode(148 /* UnknownKeyword */)) - : ts.createTypeAssertion(ts.createKeywordTypeNode(148 /* UnknownKeyword */), assertion.expression); + ? ts.factory.createAsExpression(assertion.expression, ts.factory.createKeywordTypeNode(151 /* UnknownKeyword */)) + : ts.factory.createTypeAssertion(ts.factory.createKeywordTypeNode(151 /* UnknownKeyword */), assertion.expression); changeTracker.replaceNode(sourceFile, assertion.expression, replacement); } })(codefix = ts.codefix || (ts.codefix = {})); @@ -128013,11 +131254,11 @@ var ts; getCodeActions: function (context) { var sourceFile = context.sourceFile; var changes = ts.textChanges.ChangeTracker.with(context, function (changes) { - var exportDeclaration = ts.createExportDeclaration( + var exportDeclaration = ts.factory.createExportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createNamedExports([]), - /*moduleSpecifier*/ undefined, - /*isTypeOnly*/ false); + /*modifiers*/ undefined, + /*isTypeOnly*/ false, ts.factory.createNamedExports([]), + /*moduleSpecifier*/ undefined); changes.insertNodeAtEndOfScope(sourceFile, sourceFile, exportDeclaration); }); return [codefix.createCodeFixActionWithoutFixAll("addEmptyExportDeclaration", changes, ts.Diagnostics.Add_export_to_make_this_file_into_a_module)]; @@ -128052,7 +131293,7 @@ var ts; }, getAllCodeActions: function (context) { var sourceFile = context.sourceFile; - var fixedDeclarations = ts.createMap(); + var fixedDeclarations = new ts.Set(); return codefix.codeFixAll(context, errorCodes, function (t, diagnostic) { var span = diagnostic.relatedInformation && ts.find(diagnostic.relatedInformation, function (r) { return r.code === ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async.code; }); var decl = getFixableErrorSpanDeclaration(sourceFile, span); @@ -128070,14 +131311,12 @@ var ts; } function makeChange(changeTracker, sourceFile, insertionSite, fixedDeclarations) { if (fixedDeclarations) { - if (fixedDeclarations.has(ts.getNodeId(insertionSite).toString())) { + if (fixedDeclarations.has(ts.getNodeId(insertionSite))) { return; } } - fixedDeclarations === null || fixedDeclarations === void 0 ? void 0 : fixedDeclarations.set(ts.getNodeId(insertionSite).toString(), true); - var cloneWithModifier = ts.getSynthesizedDeepClone(insertionSite, /*includeTrivia*/ true); - cloneWithModifier.modifiers = ts.createNodeArray(ts.createModifiersFromModifierFlags(ts.getModifierFlags(insertionSite) | 256 /* Async */)); - cloneWithModifier.modifierFlagsCache = 0; + fixedDeclarations === null || fixedDeclarations === void 0 ? void 0 : fixedDeclarations.add(ts.getNodeId(insertionSite)); + var cloneWithModifier = ts.factory.updateModifiers(ts.getSynthesizedDeepClone(insertionSite, /*includeTrivia*/ true), ts.factory.createNodeArray(ts.factory.createModifiersFromModifierFlags(ts.getSyntacticModifierFlags(insertionSite) | 256 /* Async */))); changeTracker.replaceNode(sourceFile, insertionSite, cloneWithModifier); } function getFixableErrorSpanDeclaration(sourceFile, span) { @@ -128153,7 +131392,7 @@ var ts; getAllCodeActions: function (context) { var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken; var checker = context.program.getTypeChecker(); - var fixedDeclarations = ts.createMap(); + var fixedDeclarations = new ts.Set(); return codefix.codeFixAll(context, errorCodes, function (t, diagnostic) { var expression = getFixableErrorSpanExpression(sourceFile, diagnostic.code, diagnostic, cancellationToken, program); if (!expression) { @@ -128229,12 +131468,12 @@ var ts; } var declaration = ts.tryCast(symbol.valueDeclaration, ts.isVariableDeclaration); var variableName = declaration && ts.tryCast(declaration.name, ts.isIdentifier); - var variableStatement = ts.getAncestor(declaration, 225 /* VariableStatement */); + var variableStatement = ts.getAncestor(declaration, 229 /* VariableStatement */); if (!declaration || !variableStatement || declaration.type || !declaration.initializer || variableStatement.getSourceFile() !== sourceFile || - ts.hasModifier(variableStatement, 1 /* Export */) || + ts.hasSyntacticModifier(variableStatement, 1 /* Export */) || !variableName || !isInsideAwaitableBody(declaration.initializer)) { isCompleteFix = false; @@ -128307,10 +131546,10 @@ var ts; function isInsideAwaitableBody(node) { return node.kind & 32768 /* AwaitContext */ || !!ts.findAncestor(node, function (ancestor) { return ancestor.parent && ts.isArrowFunction(ancestor.parent) && ancestor.parent.body === ancestor || - ts.isBlock(ancestor) && (ancestor.parent.kind === 244 /* FunctionDeclaration */ || - ancestor.parent.kind === 201 /* FunctionExpression */ || - ancestor.parent.kind === 202 /* ArrowFunction */ || - ancestor.parent.kind === 161 /* MethodDeclaration */); + ts.isBlock(ancestor) && (ancestor.parent.kind === 248 /* FunctionDeclaration */ || + ancestor.parent.kind === 205 /* FunctionExpression */ || + ancestor.parent.kind === 206 /* ArrowFunction */ || + ancestor.parent.kind === 164 /* MethodDeclaration */); }); } function makeChange(changeTracker, errorCode, sourceFile, checker, insertionSite, fixedDeclarations) { @@ -128319,43 +131558,43 @@ var ts; var side = _a[_i]; if (fixedDeclarations && ts.isIdentifier(side)) { var symbol = checker.getSymbolAtLocation(side); - if (symbol && fixedDeclarations.has(ts.getSymbolId(symbol).toString())) { + if (symbol && fixedDeclarations.has(ts.getSymbolId(symbol))) { continue; } } var type = checker.getTypeAtLocation(side); - var newNode = checker.getPromisedTypeOfPromise(type) ? ts.createAwait(side) : side; + var newNode = checker.getPromisedTypeOfPromise(type) ? ts.factory.createAwaitExpression(side) : side; changeTracker.replaceNode(sourceFile, side, newNode); } } else if (errorCode === propertyAccessCode && ts.isPropertyAccessExpression(insertionSite.parent)) { if (fixedDeclarations && ts.isIdentifier(insertionSite.parent.expression)) { var symbol = checker.getSymbolAtLocation(insertionSite.parent.expression); - if (symbol && fixedDeclarations.has(ts.getSymbolId(symbol).toString())) { + if (symbol && fixedDeclarations.has(ts.getSymbolId(symbol))) { return; } } - changeTracker.replaceNode(sourceFile, insertionSite.parent.expression, ts.createParen(ts.createAwait(insertionSite.parent.expression))); + changeTracker.replaceNode(sourceFile, insertionSite.parent.expression, ts.factory.createParenthesizedExpression(ts.factory.createAwaitExpression(insertionSite.parent.expression))); insertLeadingSemicolonIfNeeded(changeTracker, insertionSite.parent.expression, sourceFile); } else if (ts.contains(callableConstructableErrorCodes, errorCode) && ts.isCallOrNewExpression(insertionSite.parent)) { if (fixedDeclarations && ts.isIdentifier(insertionSite)) { var symbol = checker.getSymbolAtLocation(insertionSite); - if (symbol && fixedDeclarations.has(ts.getSymbolId(symbol).toString())) { + if (symbol && fixedDeclarations.has(ts.getSymbolId(symbol))) { return; } } - changeTracker.replaceNode(sourceFile, insertionSite, ts.createParen(ts.createAwait(insertionSite))); + changeTracker.replaceNode(sourceFile, insertionSite, ts.factory.createParenthesizedExpression(ts.factory.createAwaitExpression(insertionSite))); insertLeadingSemicolonIfNeeded(changeTracker, insertionSite, sourceFile); } else { if (fixedDeclarations && ts.isVariableDeclaration(insertionSite.parent) && ts.isIdentifier(insertionSite.parent.name)) { var symbol = checker.getSymbolAtLocation(insertionSite.parent.name); - if (symbol && !ts.addToSeen(fixedDeclarations, ts.getSymbolId(symbol))) { + if (symbol && !ts.tryAddToSet(fixedDeclarations, ts.getSymbolId(symbol))) { return; } } - changeTracker.replaceNode(sourceFile, insertionSite, ts.createAwait(insertionSite)); + changeTracker.replaceNode(sourceFile, insertionSite, ts.factory.createAwaitExpression(insertionSite)); } } function insertLeadingSemicolonIfNeeded(changeTracker, beforeNode, sourceFile) { @@ -128386,7 +131625,7 @@ var ts; }, fixIds: [fixId], getAllCodeActions: function (context) { - var fixedNodes = new ts.NodeSet(); + var fixedNodes = new ts.Set(); return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag.start, context.program, fixedNodes); }); }, }); @@ -128422,17 +131661,17 @@ var ts; } } function applyChange(changeTracker, initializer, sourceFile, fixedNodes) { - if (!fixedNodes || fixedNodes.tryAdd(initializer)) { - changeTracker.insertModifierBefore(sourceFile, 81 /* ConstKeyword */, initializer); + if (!fixedNodes || ts.tryAddToSet(fixedNodes, initializer)) { + changeTracker.insertModifierBefore(sourceFile, 84 /* ConstKeyword */, initializer); } } function isPossiblyPartOfDestructuring(node) { switch (node.kind) { - case 75 /* Identifier */: - case 192 /* ArrayLiteralExpression */: - case 193 /* ObjectLiteralExpression */: - case 281 /* PropertyAssignment */: - case 282 /* ShorthandPropertyAssignment */: + case 78 /* Identifier */: + case 196 /* ArrayLiteralExpression */: + case 197 /* ObjectLiteralExpression */: + case 285 /* PropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: return true; default: return false; @@ -128446,8 +131685,8 @@ var ts; } function isPossiblyPartOfCommaSeperatedInitializer(node) { switch (node.kind) { - case 75 /* Identifier */: - case 209 /* BinaryExpression */: + case 78 /* Identifier */: + case 213 /* BinaryExpression */: case 27 /* CommaToken */: return true; default: @@ -128486,7 +131725,7 @@ var ts; }, fixIds: [fixId], getAllCodeActions: function (context) { - var fixedNodes = new ts.NodeSet(); + var fixedNodes = new ts.Set(); return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag.start, fixedNodes); }); }, }); @@ -128496,9 +131735,9 @@ var ts; return; } var declaration = token.parent; - if (declaration.kind === 159 /* PropertyDeclaration */ && - (!fixedNodes || fixedNodes.tryAdd(declaration))) { - changeTracker.insertModifierBefore(sourceFile, 130 /* DeclareKeyword */, declaration); + if (declaration.kind === 162 /* PropertyDeclaration */ && + (!fixedNodes || ts.tryAddToSet(fixedNodes, declaration))) { + changeTracker.insertModifierBefore(sourceFile, 133 /* DeclareKeyword */, declaration); } } })(codefix = ts.codefix || (ts.codefix = {})); @@ -128523,7 +131762,7 @@ var ts; var token = ts.getTokenAtPosition(sourceFile, pos); var decorator = ts.findAncestor(token, ts.isDecorator); ts.Debug.assert(!!decorator, "Expected position to be owned by a decorator."); - var replacement = ts.createCall(decorator.expression, /*typeArguments*/ undefined, /*argumentsArray*/ undefined); + var replacement = ts.factory.createCallExpression(decorator.expression, /*typeArguments*/ undefined, /*argumentsArray*/ undefined); changeTracker.replaceNode(sourceFile, decorator.expression, replacement); } })(codefix = ts.codefix || (ts.codefix = {})); @@ -128556,8 +131795,8 @@ var ts; var i = param.parent.parameters.indexOf(param); ts.Debug.assert(!param.type, "Tried to add a parameter name to a parameter that already had one."); ts.Debug.assert(i > -1, "Parameter not found in parent parameter list."); - var replacement = ts.createParameter( - /*decorators*/ undefined, param.modifiers, param.dotDotDotToken, "arg" + i, param.questionToken, ts.createTypeReferenceNode(token, /*typeArguments*/ undefined), param.initializer); + var replacement = ts.factory.createParameterDeclaration( + /*decorators*/ undefined, param.modifiers, param.dotDotDotToken, "arg" + i, param.questionToken, ts.factory.createTypeReferenceNode(token, /*typeArguments*/ undefined), param.initializer); changeTracker.replaceNode(sourceFile, token, replacement); } })(codefix = ts.codefix || (ts.codefix = {})); @@ -128608,7 +131847,7 @@ var ts; } var needParens = ts.isArrowFunction(decl) && !ts.findChildOfKind(decl, 20 /* OpenParenToken */, sourceFile); if (needParens) - changes.insertNodeBefore(sourceFile, ts.first(decl.parameters), ts.createToken(20 /* OpenParenToken */)); + changes.insertNodeBefore(sourceFile, ts.first(decl.parameters), ts.factory.createToken(20 /* OpenParenToken */)); for (var _i = 0, _a = decl.parameters; _i < _a.length; _i++) { var param = _a[_i]; if (!param.type) { @@ -128618,7 +131857,7 @@ var ts; } } if (needParens) - changes.insertNodeAfter(sourceFile, ts.last(decl.parameters), ts.createToken(21 /* CloseParenToken */)); + changes.insertNodeAfter(sourceFile, ts.last(decl.parameters), ts.factory.createToken(21 /* CloseParenToken */)); if (!decl.type) { var returnType = ts.getJSDocReturnType(decl); if (returnType) @@ -128633,51 +131872,54 @@ var ts; } function isDeclarationWithType(node) { return ts.isFunctionLikeDeclaration(node) || - node.kind === 242 /* VariableDeclaration */ || - node.kind === 158 /* PropertySignature */ || - node.kind === 159 /* PropertyDeclaration */; + node.kind === 246 /* VariableDeclaration */ || + node.kind === 161 /* PropertySignature */ || + node.kind === 162 /* PropertyDeclaration */; } function transformJSDocType(node) { switch (node.kind) { - case 295 /* JSDocAllType */: - case 296 /* JSDocUnknownType */: - return ts.createTypeReferenceNode("any", ts.emptyArray); - case 299 /* JSDocOptionalType */: + case 299 /* JSDocAllType */: + case 300 /* JSDocUnknownType */: + return ts.factory.createTypeReferenceNode("any", ts.emptyArray); + case 303 /* JSDocOptionalType */: return transformJSDocOptionalType(node); - case 298 /* JSDocNonNullableType */: + case 302 /* JSDocNonNullableType */: return transformJSDocType(node.type); - case 297 /* JSDocNullableType */: + case 301 /* JSDocNullableType */: return transformJSDocNullableType(node); - case 301 /* JSDocVariadicType */: + case 305 /* JSDocVariadicType */: return transformJSDocVariadicType(node); - case 300 /* JSDocFunctionType */: + case 304 /* JSDocFunctionType */: return transformJSDocFunctionType(node); - case 169 /* TypeReference */: + case 172 /* TypeReference */: return transformJSDocTypeReference(node); default: - var visited = ts.visitEachChild(node, transformJSDocType, /*context*/ undefined); // TODO: GH#18217 + var visited = ts.visitEachChild(node, transformJSDocType, ts.nullTransformationContext); ts.setEmitFlags(visited, 1 /* SingleLine */); return visited; } } function transformJSDocOptionalType(node) { - return ts.createUnionTypeNode([ts.visitNode(node.type, transformJSDocType), ts.createTypeReferenceNode("undefined", ts.emptyArray)]); + return ts.factory.createUnionTypeNode([ts.visitNode(node.type, transformJSDocType), ts.factory.createTypeReferenceNode("undefined", ts.emptyArray)]); } function transformJSDocNullableType(node) { - return ts.createUnionTypeNode([ts.visitNode(node.type, transformJSDocType), ts.createTypeReferenceNode("null", ts.emptyArray)]); + return ts.factory.createUnionTypeNode([ts.visitNode(node.type, transformJSDocType), ts.factory.createTypeReferenceNode("null", ts.emptyArray)]); } function transformJSDocVariadicType(node) { - return ts.createArrayTypeNode(ts.visitNode(node.type, transformJSDocType)); + return ts.factory.createArrayTypeNode(ts.visitNode(node.type, transformJSDocType)); } function transformJSDocFunctionType(node) { - return ts.createFunctionTypeNode(ts.emptyArray, node.parameters.map(transformJSDocParameter), node.type); + var _a; + // TODO: This does not properly handle `function(new:C, string)` per https://github.com/google/closure-compiler/wiki/Types-in-the-Closure-Type-System#the-javascript-type-language + // however we do handle it correctly in `serializeTypeForDeclaration` in checker.ts + return ts.factory.createFunctionTypeNode(ts.emptyArray, node.parameters.map(transformJSDocParameter), (_a = node.type) !== null && _a !== void 0 ? _a : ts.factory.createKeywordTypeNode(128 /* AnyKeyword */)); } function transformJSDocParameter(node) { var index = node.parent.parameters.indexOf(node); - var isRest = node.type.kind === 301 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217 + var isRest = node.type.kind === 305 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217 var name = node.name || (isRest ? "rest" : "arg" + index); - var dotdotdot = isRest ? ts.createToken(25 /* DotDotDotToken */) : node.dotDotDotToken; - return ts.createParameter(node.decorators, node.modifiers, dotdotdot, name, node.questionToken, ts.visitNode(node.type, transformJSDocType), node.initializer); + var dotdotdot = isRest ? ts.factory.createToken(25 /* DotDotDotToken */) : node.dotDotDotToken; + return ts.factory.createParameterDeclaration(node.decorators, node.modifiers, dotdotdot, name, node.questionToken, ts.visitNode(node.type, transformJSDocType), node.initializer); } function transformJSDocTypeReference(node) { var name = node.typeName; @@ -128700,24 +131942,24 @@ var ts; text = text[0].toUpperCase() + text.slice(1); break; } - name = ts.createIdentifier(text); + name = ts.factory.createIdentifier(text); if ((text === "Array" || text === "Promise") && !node.typeArguments) { - args = ts.createNodeArray([ts.createTypeReferenceNode("any", ts.emptyArray)]); + args = ts.factory.createNodeArray([ts.factory.createTypeReferenceNode("any", ts.emptyArray)]); } else { args = ts.visitNodes(node.typeArguments, transformJSDocType); } } - return ts.createTypeReferenceNode(name, args); + return ts.factory.createTypeReferenceNode(name, args); } function transformJSDocIndexSignature(node) { - var index = ts.createParameter( + var index = ts.factory.createParameterDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, - /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 140 /* NumberKeyword */ ? "n" : "s", - /*questionToken*/ undefined, ts.createTypeReferenceNode(node.typeArguments[0].kind === 140 /* NumberKeyword */ ? "number" : "string", []), + /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 143 /* NumberKeyword */ ? "n" : "s", + /*questionToken*/ undefined, ts.factory.createTypeReferenceNode(node.typeArguments[0].kind === 143 /* NumberKeyword */ ? "number" : "string", []), /*initializer*/ undefined); - var indexSignature = ts.createTypeLiteralNode([ts.createIndexSignature(/*decorators*/ undefined, /*modifiers*/ undefined, [index], node.typeArguments[1])]); + var indexSignature = ts.factory.createTypeLiteralNode([ts.factory.createIndexSignature(/*decorators*/ undefined, /*modifiers*/ undefined, [index], node.typeArguments[1])]); ts.setEmitFlags(indexSignature, 1 /* SingleLine */); return indexSignature; } @@ -128746,133 +131988,186 @@ var ts; return undefined; } var ctorDeclaration = ctorSymbol.valueDeclaration; - var precedingNode; - var newClassDeclaration; - switch (ctorDeclaration.kind) { - case 244 /* FunctionDeclaration */: - precedingNode = ctorDeclaration; + if (ts.isFunctionDeclaration(ctorDeclaration)) { + changes.replaceNode(sourceFile, ctorDeclaration, createClassFromFunctionDeclaration(ctorDeclaration)); + } + else if (ts.isVariableDeclaration(ctorDeclaration)) { + var classDeclaration = createClassFromVariableDeclaration(ctorDeclaration); + if (!classDeclaration) { + return undefined; + } + var ancestor = ctorDeclaration.parent.parent; + if (ts.isVariableDeclarationList(ctorDeclaration.parent) && ctorDeclaration.parent.declarations.length > 1) { changes.delete(sourceFile, ctorDeclaration); - newClassDeclaration = createClassFromFunctionDeclaration(ctorDeclaration); - break; - case 242 /* VariableDeclaration */: - precedingNode = ctorDeclaration.parent.parent; - newClassDeclaration = createClassFromVariableDeclaration(ctorDeclaration); - if (ctorDeclaration.parent.declarations.length === 1) { - ts.copyLeadingComments(precedingNode, newClassDeclaration, sourceFile); // TODO: GH#18217 - changes.delete(sourceFile, precedingNode); - } - else { - changes.delete(sourceFile, ctorDeclaration); - } - break; + changes.insertNodeAfter(sourceFile, ancestor, classDeclaration); + } + else { + changes.replaceNode(sourceFile, ancestor, classDeclaration); + } } - if (!newClassDeclaration) { - return undefined; - } - // Deleting a declaration only deletes JSDoc style comments, so only copy those to the new node. - if (ts.hasJSDocNodes(ctorDeclaration)) { - ts.copyLeadingComments(ctorDeclaration, newClassDeclaration, sourceFile); - } - // Because the preceding node could be touched, we need to insert nodes before delete nodes. - changes.insertNodeAfter(sourceFile, precedingNode, newClassDeclaration); function createClassElementsFromSymbol(symbol) { var memberElements = []; // all instance members are stored in the "member" array of symbol if (symbol.members) { - symbol.members.forEach(function (member) { + symbol.members.forEach(function (member, key) { + if (key === "constructor") { + // fn.prototype.constructor = fn + changes.delete(sourceFile, member.valueDeclaration.parent); + return; + } var memberElement = createClassElement(member, /*modifiers*/ undefined); if (memberElement) { - memberElements.push(memberElement); + memberElements.push.apply(memberElements, memberElement); } }); } // all static members are stored in the "exports" array of symbol if (symbol.exports) { symbol.exports.forEach(function (member) { - var memberElement = createClassElement(member, [ts.createToken(120 /* StaticKeyword */)]); - if (memberElement) { - memberElements.push(memberElement); + if (member.name === "prototype") { + var firstDeclaration = member.declarations[0]; + // only one "x.prototype = { ... }" will pass + if (member.declarations.length === 1 && + ts.isPropertyAccessExpression(firstDeclaration) && + ts.isBinaryExpression(firstDeclaration.parent) && + firstDeclaration.parent.operatorToken.kind === 62 /* EqualsToken */ && + ts.isObjectLiteralExpression(firstDeclaration.parent.right)) { + var prototypes = firstDeclaration.parent.right; + var memberElement = createClassElement(prototypes.symbol, /** modifiers */ undefined); + if (memberElement) { + memberElements.push.apply(memberElements, memberElement); + } + } + } + else { + var memberElement = createClassElement(member, [ts.factory.createToken(123 /* StaticKeyword */)]); + if (memberElement) { + memberElements.push.apply(memberElements, memberElement); + } } }); } return memberElements; function shouldConvertDeclaration(_target, source) { - // Right now the only thing we can convert are function expressions - other values shouldn't get - // transformed. We can update this once ES public class properties are available. - return ts.isFunctionLike(source); + // Right now the only thing we can convert are function expressions, get/set accessors and methods + // other values like normal value fields ({a: 1}) shouldn't get transformed. + // We can update this once ES public class properties are available. + if (ts.isPropertyAccessExpression(_target)) { + if (isConstructorAssignment(_target)) + return true; + return ts.isFunctionLike(source); + } + else { + return ts.every(_target.properties, function (property) { + // a() {} + if (ts.isMethodDeclaration(property) || ts.isGetOrSetAccessorDeclaration(property)) + return true; + // a: function() {} + if (ts.isPropertyAssignment(property) && ts.isFunctionExpression(property.initializer) && !!property.name) + return true; + // x.prototype.constructor = fn + if (isConstructorAssignment(property)) + return true; + return false; + }); + } } function createClassElement(symbol, modifiers) { // Right now the only thing we can convert are function expressions, which are marked as methods - if (!(symbol.flags & 8192 /* Method */)) { - return; + // or { x: y } type prototype assignments, which are marked as ObjectLiteral + var members = []; + if (!(symbol.flags & 8192 /* Method */) && !(symbol.flags & 4096 /* ObjectLiteral */)) { + return members; } var memberDeclaration = symbol.valueDeclaration; var assignmentBinaryExpression = memberDeclaration.parent; - if (!shouldConvertDeclaration(memberDeclaration, assignmentBinaryExpression.right)) { - return; + var assignmentExpr = assignmentBinaryExpression.right; + if (!shouldConvertDeclaration(memberDeclaration, assignmentExpr)) { + return members; } // delete the entire statement if this expression is the sole expression to take care of the semicolon at the end - var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 226 /* ExpressionStatement */ + var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 230 /* ExpressionStatement */ ? assignmentBinaryExpression.parent : assignmentBinaryExpression; changes.delete(sourceFile, nodeToDelete); - if (!assignmentBinaryExpression.right) { - return ts.createProperty([], modifiers, symbol.name, /*questionToken*/ undefined, - /*type*/ undefined, /*initializer*/ undefined); + if (!assignmentExpr) { + members.push(ts.factory.createPropertyDeclaration([], modifiers, symbol.name, /*questionToken*/ undefined, + /*type*/ undefined, /*initializer*/ undefined)); + return members; } - switch (assignmentBinaryExpression.right.kind) { - case 201 /* FunctionExpression */: { - var functionExpression = assignmentBinaryExpression.right; - var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 126 /* AsyncKeyword */)); - var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, - /*typeParameters*/ undefined, functionExpression.parameters, /*type*/ undefined, functionExpression.body); - ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile); - return method; - } - case 202 /* ArrowFunction */: { - var arrowFunction = assignmentBinaryExpression.right; - var arrowFunctionBody = arrowFunction.body; - var bodyBlock = void 0; - // case 1: () => { return [1,2,3] } - if (arrowFunctionBody.kind === 223 /* Block */) { - bodyBlock = arrowFunctionBody; + // f.x = expr + if (ts.isPropertyAccessExpression(memberDeclaration) && (ts.isFunctionExpression(assignmentExpr) || ts.isArrowFunction(assignmentExpr))) { + return createFunctionLikeExpressionMember(members, assignmentExpr, memberDeclaration.name); + } + // f.prototype = { ... } + else if (ts.isObjectLiteralExpression(assignmentExpr)) { + return ts.flatMap(assignmentExpr.properties, function (property) { + if (ts.isMethodDeclaration(property) || ts.isGetOrSetAccessorDeclaration(property)) { + // MethodDeclaration and AccessorDeclaration can appear in a class directly + return members.concat(property); } - // case 2: () => [1,2,3] - else { - bodyBlock = ts.createBlock([ts.createReturn(arrowFunctionBody)]); + if (ts.isPropertyAssignment(property) && ts.isFunctionExpression(property.initializer)) { + return createFunctionLikeExpressionMember(members, property.initializer, property.name); } - var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 126 /* AsyncKeyword */)); - var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, - /*typeParameters*/ undefined, arrowFunction.parameters, /*type*/ undefined, bodyBlock); - ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile); - return method; + // Drop constructor assignments + if (isConstructorAssignment(property)) + return members; + return []; + }); + } + else { + // Don't try to declare members in JavaScript files + if (ts.isSourceFileJS(sourceFile)) + return members; + if (!ts.isPropertyAccessExpression(memberDeclaration)) + return members; + var prop = ts.factory.createPropertyDeclaration(/*decorators*/ undefined, modifiers, memberDeclaration.name, /*questionToken*/ undefined, /*type*/ undefined, assignmentExpr); + ts.copyLeadingComments(assignmentBinaryExpression.parent, prop, sourceFile); + members.push(prop); + return members; + } + function createFunctionLikeExpressionMember(members, expression, name) { + if (ts.isFunctionExpression(expression)) + return createFunctionExpressionMember(members, expression, name); + else + return createArrowFunctionExpressionMember(members, expression, name); + } + function createFunctionExpressionMember(members, functionExpression, name) { + var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 129 /* AsyncKeyword */)); + var method = ts.factory.createMethodDeclaration(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, name, /*questionToken*/ undefined, + /*typeParameters*/ undefined, functionExpression.parameters, /*type*/ undefined, functionExpression.body); + ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile); + return members.concat(method); + } + function createArrowFunctionExpressionMember(members, arrowFunction, name) { + var arrowFunctionBody = arrowFunction.body; + var bodyBlock; + // case 1: () => { return [1,2,3] } + if (arrowFunctionBody.kind === 227 /* Block */) { + bodyBlock = arrowFunctionBody; } - default: { - // Don't try to declare members in JavaScript files - if (ts.isSourceFileJS(sourceFile)) { - return; - } - var prop = ts.createProperty(/*decorators*/ undefined, modifiers, memberDeclaration.name, /*questionToken*/ undefined, - /*type*/ undefined, assignmentBinaryExpression.right); - ts.copyLeadingComments(assignmentBinaryExpression.parent, prop, sourceFile); - return prop; + // case 2: () => [1,2,3] + else { + bodyBlock = ts.factory.createBlock([ts.factory.createReturnStatement(arrowFunctionBody)]); } + var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 129 /* AsyncKeyword */)); + var method = ts.factory.createMethodDeclaration(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, name, /*questionToken*/ undefined, + /*typeParameters*/ undefined, arrowFunction.parameters, /*type*/ undefined, bodyBlock); + ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile); + return members.concat(method); } } } function createClassFromVariableDeclaration(node) { var initializer = node.initializer; - if (!initializer || initializer.kind !== 201 /* FunctionExpression */) { - return undefined; - } - if (node.name.kind !== 75 /* Identifier */) { + if (!initializer || !ts.isFunctionExpression(initializer) || !ts.isIdentifier(node.name)) { return undefined; } var memberElements = createClassElementsFromSymbol(node.symbol); if (initializer.body) { - memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, initializer.parameters, initializer.body)); + memberElements.unshift(ts.factory.createConstructorDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, initializer.parameters, initializer.body)); } - var modifiers = getModifierKindFromSource(precedingNode, 89 /* ExportKeyword */); - var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, + var modifiers = getModifierKindFromSource(node.parent.parent, 92 /* ExportKeyword */); + var cls = ts.factory.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements); // Don't call copyComments here because we'll already leave them in place return cls; @@ -128880,10 +132175,10 @@ var ts; function createClassFromFunctionDeclaration(node) { var memberElements = createClassElementsFromSymbol(ctorSymbol); if (node.body) { - memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, node.parameters, node.body)); + memberElements.unshift(ts.factory.createConstructorDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, node.parameters, node.body)); } - var modifiers = getModifierKindFromSource(node, 89 /* ExportKeyword */); - var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, + var modifiers = getModifierKindFromSource(node, 92 /* ExportKeyword */); + var cls = ts.factory.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements); // Don't call copyComments here because we'll already leave them in place return cls; @@ -128892,6 +132187,13 @@ var ts; function getModifierKindFromSource(source, kind) { return ts.filter(source.modifiers, function (modifier) { return modifier.kind === kind; }); } + function isConstructorAssignment(x) { + if (!x.name) + return false; + if (ts.isIdentifier(x.name) && x.name.text === "constructor") + return true; + return false; + } })(codefix = ts.codefix || (ts.codefix = {})); })(ts || (ts = {})); /* @internal */ @@ -128932,7 +132234,7 @@ var ts; if (!functionToConvert) { return; } - var synthNamesMap = ts.createMap(); + var synthNamesMap = new ts.Map(); var isInJavascript = ts.isInJSFile(functionToConvert); var setOfExpressionsToReturn = getAllPromiseExpressionsToReturn(functionToConvert, checker); var functionToConvertRenamed = renameCollidingVarNames(functionToConvert, checker, synthNamesMap, context.sourceFile); @@ -128942,7 +132244,7 @@ var ts; return; } // add the async keyword - changes.insertLastModifierBefore(sourceFile, 126 /* AsyncKeyword */, functionToConvert); + changes.insertLastModifierBefore(sourceFile, 129 /* AsyncKeyword */, functionToConvert); var _loop_12 = function (returnStatement) { ts.forEachChild(returnStatement, function visit(node) { if (ts.isCallExpression(node)) { @@ -128972,21 +132274,21 @@ var ts; */ function getAllPromiseExpressionsToReturn(func, checker) { if (!func.body) { - return ts.createMap(); + return new ts.Set(); } - var setOfExpressionsToReturn = ts.createMap(); + var setOfExpressionsToReturn = new ts.Set(); ts.forEachChild(func.body, function visit(node) { if (isPromiseReturningCallExpression(node, checker, "then")) { - setOfExpressionsToReturn.set(ts.getNodeId(node).toString(), true); + setOfExpressionsToReturn.add(ts.getNodeId(node)); ts.forEach(node.arguments, visit); } else if (isPromiseReturningCallExpression(node, checker, "catch")) { - setOfExpressionsToReturn.set(ts.getNodeId(node).toString(), true); + setOfExpressionsToReturn.add(ts.getNodeId(node)); // if .catch() is the last call in the chain, move leftward in the chain until we hit something else that should be returned ts.forEachChild(node, visit); } else if (isPromiseTypedExpression(node, checker)) { - setOfExpressionsToReturn.set(ts.getNodeId(node).toString(), true); + setOfExpressionsToReturn.add(ts.getNodeId(node)); // don't recurse here, since we won't refactor any children or arguments of the expression } else { @@ -129016,7 +132318,7 @@ var ts; It then checks for any collisions and renames them through getSynthesizedDeepClone */ function renameCollidingVarNames(nodeToRename, checker, synthNamesMap, sourceFile) { - var identsToRenameMap = ts.createMap(); // key is the symbol id + var identsToRenameMap = new ts.Map(); // key is the symbol id var collidingSymbolMap = ts.createMultiMap(); ts.forEachChild(nodeToRename, function visit(node) { if (!ts.isIdentifier(node)) { @@ -129037,7 +132339,7 @@ var ts; // so we push an entry for 'response'. if (lastCallSignature && !ts.isFunctionLikeDeclaration(node.parent) && !synthNamesMap.has(symbolIdString)) { var firstParameter = ts.firstOrUndefined(lastCallSignature.parameters); - var ident = firstParameter && ts.isParameter(firstParameter.valueDeclaration) && ts.tryCast(firstParameter.valueDeclaration.name, ts.isIdentifier) || ts.createOptimisticUniqueName("result"); + var ident = firstParameter && ts.isParameter(firstParameter.valueDeclaration) && ts.tryCast(firstParameter.valueDeclaration.name, ts.isIdentifier) || ts.factory.createUniqueName("result", 16 /* Optimistic */); var synthName = getNewNameIfConflict(ident, collidingSymbolMap); synthNamesMap.set(symbolIdString, synthName); collidingSymbolMap.add(ident.text, symbol); @@ -129065,7 +132367,7 @@ var ts; } function getNewNameIfConflict(name, originalNames) { var numVarsSameName = (originalNames.get(name.text) || ts.emptyArray).length; - var identifier = numVarsSameName === 0 ? name : ts.createIdentifier(name.text + "_" + numVarsSameName); + var identifier = numVarsSameName === 0 ? name : ts.factory.createIdentifier(name.text + "_" + numVarsSameName); return createSynthIdentifier(identifier); } function silentFail() { @@ -129115,18 +132417,18 @@ var ts; }); } else { - possibleNameForVarDecl = createSynthIdentifier(ts.createOptimisticUniqueName("result"), prevArgName.types); + possibleNameForVarDecl = createSynthIdentifier(ts.factory.createUniqueName("result", 16 /* Optimistic */), prevArgName.types); } // We are about to write a 'let' variable declaration, but `transformExpression` for both // the try block and catch block will assign to this name. Setting this flag indicates // that future assignments should be written as `name = value` instead of `const name = value`. possibleNameForVarDecl.hasBeenDeclared = true; } - var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, possibleNameForVarDecl)); + var tryBlock = ts.factory.createBlock(transformExpression(node.expression, transformer, possibleNameForVarDecl)); var transformationBody = getTransformationBody(func, possibleNameForVarDecl, argName, node, transformer); var catchArg = argName ? isSynthIdentifier(argName) ? argName.identifier.text : argName.bindingPattern : "e"; - var catchVariableDeclaration = ts.createVariableDeclaration(catchArg); - var catchClause = ts.createCatchClause(catchVariableDeclaration, ts.createBlock(transformationBody)); + var catchVariableDeclaration = ts.factory.createVariableDeclaration(catchArg); + var catchClause = ts.factory.createCatchClause(catchVariableDeclaration, ts.factory.createBlock(transformationBody)); /* In order to avoid an implicit any, we will synthesize a type for the declaration using the unions of the types of both paths (try block and catch block) */ @@ -129137,16 +132439,16 @@ var ts; var typeArray = possibleNameForVarDecl.types; var unionType = transformer.checker.getUnionType(typeArray, 2 /* Subtype */); var unionTypeNode = transformer.isInJSFile ? undefined : transformer.checker.typeToTypeNode(unionType, /*enclosingDeclaration*/ undefined, /*flags*/ undefined); - var varDecl = [ts.createVariableDeclaration(varDeclIdentifier, unionTypeNode)]; - varDeclList = ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList(varDecl, 1 /* Let */)); + var varDecl = [ts.factory.createVariableDeclaration(varDeclIdentifier, /*exclamationToken*/ undefined, unionTypeNode)]; + varDeclList = ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList(varDecl, 1 /* Let */)); } - var tryStatement = ts.createTry(tryBlock, catchClause, /*finallyBlock*/ undefined); + var tryStatement = ts.factory.createTryStatement(tryBlock, catchClause, /*finallyBlock*/ undefined); var destructuredResult = prevArgName && varDeclIdentifier && isSynthBindingPattern(prevArgName) - && ts.createVariableStatement(/* modifiers */ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepCloneWithRenames(prevArgName.bindingPattern), /* type */ undefined, varDeclIdentifier)], 2 /* Const */)); + && ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(ts.getSynthesizedDeepCloneWithRenames(prevArgName.bindingPattern), /*exclamationToken*/ undefined, /*type*/ undefined, varDeclIdentifier)], 2 /* Const */)); return ts.compact([varDeclList, tryStatement, destructuredResult]); } function createUniqueSynthName(prevArgName) { - var renamedPrevArg = ts.createOptimisticUniqueName(prevArgName.identifier.text); + var renamedPrevArg = ts.factory.createUniqueName(prevArgName.identifier.text, 16 /* Optimistic */); return createSynthIdentifier(renamedPrevArg); } function transformThen(node, transformer, prevArgName) { @@ -129155,12 +132457,12 @@ var ts; var transformationBody = getTransformationBody(onFulfilled, prevArgName, onFulfilledArgumentName, node, transformer); if (onRejected) { var onRejectedArgumentName = getArgBindingName(onRejected, transformer); - var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, onFulfilledArgumentName).concat(transformationBody)); + var tryBlock = ts.factory.createBlock(transformExpression(node.expression, transformer, onFulfilledArgumentName).concat(transformationBody)); var transformationBody2 = getTransformationBody(onRejected, prevArgName, onRejectedArgumentName, node, transformer); var catchArg = onRejectedArgumentName ? isSynthIdentifier(onRejectedArgumentName) ? onRejectedArgumentName.identifier.text : onRejectedArgumentName.bindingPattern : "e"; - var catchVariableDeclaration = ts.createVariableDeclaration(catchArg); - var catchClause = ts.createCatchClause(catchVariableDeclaration, ts.createBlock(transformationBody2)); - return [ts.createTry(tryBlock, catchClause, /* finallyBlock */ undefined)]; + var catchVariableDeclaration = ts.factory.createVariableDeclaration(catchArg); + var catchClause = ts.factory.createCatchClause(catchVariableDeclaration, ts.factory.createBlock(transformationBody2)); + return [ts.factory.createTryStatement(tryBlock, catchClause, /* finallyBlock */ undefined)]; } return transformExpression(node.expression, transformer, onFulfilledArgumentName).concat(transformationBody); } @@ -129169,48 +132471,49 @@ var ts; */ function transformPromiseExpressionOfPropertyAccess(node, transformer, prevArgName) { if (shouldReturn(node, transformer)) { - return [ts.createReturn(ts.getSynthesizedDeepClone(node))]; + return [ts.factory.createReturnStatement(ts.getSynthesizedDeepClone(node))]; } - return createVariableOrAssignmentOrExpressionStatement(prevArgName, ts.createAwait(node), /*typeAnnotation*/ undefined); + return createVariableOrAssignmentOrExpressionStatement(prevArgName, ts.factory.createAwaitExpression(node), /*typeAnnotation*/ undefined); } function createVariableOrAssignmentOrExpressionStatement(variableName, rightHandSide, typeAnnotation) { if (!variableName || isEmptyBindingName(variableName)) { // if there's no argName to assign to, there still might be side effects - return [ts.createExpressionStatement(rightHandSide)]; + return [ts.factory.createExpressionStatement(rightHandSide)]; } if (isSynthIdentifier(variableName) && variableName.hasBeenDeclared) { // if the variable has already been declared, we don't need "let" or "const" - return [ts.createExpressionStatement(ts.createAssignment(ts.getSynthesizedDeepClone(variableName.identifier), rightHandSide))]; + return [ts.factory.createExpressionStatement(ts.factory.createAssignment(ts.getSynthesizedDeepClone(variableName.identifier), rightHandSide))]; } return [ - ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(ts.getSynthesizedDeepClone(getNode(variableName)), typeAnnotation, rightHandSide) + ts.factory.createVariableStatement( + /*modifiers*/ undefined, ts.factory.createVariableDeclarationList([ + ts.factory.createVariableDeclaration(ts.getSynthesizedDeepClone(getNode(variableName)), + /*exclamationToken*/ undefined, typeAnnotation, rightHandSide) ], 2 /* Const */)) ]; } function maybeAnnotateAndReturn(expressionToReturn, typeAnnotation) { if (typeAnnotation && expressionToReturn) { - var name = ts.createOptimisticUniqueName("result"); + var name = ts.factory.createUniqueName("result", 16 /* Optimistic */); return __spreadArrays(createVariableOrAssignmentOrExpressionStatement(createSynthIdentifier(name), expressionToReturn, typeAnnotation), [ - ts.createReturn(name) + ts.factory.createReturnStatement(name) ]); } - return [ts.createReturn(expressionToReturn)]; + return [ts.factory.createReturnStatement(expressionToReturn)]; } // should be kept up to date with isFixablePromiseArgument in suggestionDiagnostics.ts function getTransformationBody(func, prevArgName, argName, parent, transformer) { var _a, _b, _c, _d; switch (func.kind) { - case 100 /* NullKeyword */: + case 103 /* NullKeyword */: // do not produce a transformed statement for a null argument break; - case 75 /* Identifier */: // identifier includes undefined + case 78 /* Identifier */: // identifier includes undefined if (!argName) { // undefined was argument passed to promise handler break; } - var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, isSynthIdentifier(argName) ? [argName.identifier] : []); + var synthCall = ts.factory.createCallExpression(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, isSynthIdentifier(argName) ? [argName.identifier] : []); if (shouldReturn(parent, transformer)) { return maybeAnnotateAndReturn(synthCall, (_a = parent.typeArguments) === null || _a === void 0 ? void 0 : _a[0]); } @@ -129221,13 +132524,13 @@ var ts; return silentFail(); } var returnType = callSignatures[0].getReturnType(); - var varDeclOrAssignment = createVariableOrAssignmentOrExpressionStatement(prevArgName, ts.createAwait(synthCall), (_b = parent.typeArguments) === null || _b === void 0 ? void 0 : _b[0]); + var varDeclOrAssignment = createVariableOrAssignmentOrExpressionStatement(prevArgName, ts.factory.createAwaitExpression(synthCall), (_b = parent.typeArguments) === null || _b === void 0 ? void 0 : _b[0]); if (prevArgName) { prevArgName.types.push(returnType); } return varDeclOrAssignment; - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: { + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: { var funcBody = func.body; // Arrow functions with block bodies { } will enter this control flow if (ts.isBlock(funcBody)) { @@ -129253,7 +132556,7 @@ var ts; : removeReturns(refactoredStmts, prevArgName, transformer, seenReturnStatement); } else { - var innerRetStmts = ts.isFixablePromiseHandler(funcBody) ? [ts.createReturn(funcBody)] : ts.emptyArray; + var innerRetStmts = ts.isFixablePromiseHandler(funcBody) ? [ts.factory.createReturnStatement(funcBody)] : ts.emptyArray; var innerCbBody = getInnerTransformationBody(transformer, innerRetStmts, prevArgName); if (innerCbBody.length > 0) { return innerCbBody; @@ -129261,7 +132564,7 @@ var ts; var type_1 = transformer.checker.getTypeAtLocation(func); var returnType_1 = getLastCallSignature(type_1, transformer.checker).getReturnType(); var rightHandSide = ts.getSynthesizedDeepClone(funcBody); - var possiblyAwaitedRightHandSide = !!transformer.checker.getPromisedTypeOfPromise(returnType_1) ? ts.createAwait(rightHandSide) : rightHandSide; + var possiblyAwaitedRightHandSide = !!transformer.checker.getPromisedTypeOfPromise(returnType_1) ? ts.factory.createAwaitExpression(rightHandSide) : rightHandSide; if (!shouldReturn(parent, transformer)) { var transformedStatement = createVariableOrAssignmentOrExpressionStatement(prevArgName, possiblyAwaitedRightHandSide, /*typeAnnotation*/ undefined); if (prevArgName) { @@ -129290,12 +132593,12 @@ var ts; var stmt = stmts_1[_i]; if (ts.isReturnStatement(stmt)) { if (stmt.expression) { - var possiblyAwaitedExpression = isPromiseTypedExpression(stmt.expression, transformer.checker) ? ts.createAwait(stmt.expression) : stmt.expression; + var possiblyAwaitedExpression = isPromiseTypedExpression(stmt.expression, transformer.checker) ? ts.factory.createAwaitExpression(stmt.expression) : stmt.expression; if (prevArgName === undefined) { - ret.push(ts.createExpressionStatement(possiblyAwaitedExpression)); + ret.push(ts.factory.createExpressionStatement(possiblyAwaitedExpression)); } else { - ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(getNode(prevArgName), /*type*/ undefined, possiblyAwaitedExpression)], 2 /* Const */)))); + ret.push(ts.factory.createVariableStatement(/*modifiers*/ undefined, (ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(getNode(prevArgName), /*exclamationToken*/ undefined, /*type*/ undefined, possiblyAwaitedExpression)], 2 /* Const */)))); } } } @@ -129305,7 +132608,7 @@ var ts; } // if block has no return statement, need to define prevArgName as undefined to prevent undeclared variables if (!seenReturnStatement && prevArgName !== undefined) { - ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(getNode(prevArgName), /*type*/ undefined, ts.createIdentifier("undefined"))], 2 /* Const */)))); + ret.push(ts.factory.createVariableStatement(/*modifiers*/ undefined, (ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(getNode(prevArgName), /*exclamationToken*/ undefined, /*type*/ undefined, ts.factory.createIdentifier("undefined"))], 2 /* Const */)))); } return ret; } @@ -129400,7 +132703,7 @@ var ts; return bindingName.kind === 1 /* BindingPattern */; } function shouldReturn(expression, transformer) { - return !!expression.original && transformer.setOfExpressionsToReturn.has(ts.getNodeId(expression.original).toString()); + return !!expression.original && transformer.setOfExpressionsToReturn.has(ts.getNodeId(expression.original)); } })(codefix = ts.codefix || (ts.codefix = {})); })(ts || (ts = {})); @@ -129435,12 +132738,12 @@ var ts; } var importNode = ts.importFromModuleSpecifier(moduleSpecifier); switch (importNode.kind) { - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: changes.replaceNode(importingFile, importNode, ts.makeImport(importNode.name, /*namedImports*/ undefined, moduleSpecifier, quotePreference)); break; - case 196 /* CallExpression */: + case 200 /* CallExpression */: if (ts.isRequireCall(importNode, /*checkArgumentIsStringLiteralLike*/ false)) { - changes.replaceNode(importingFile, importNode, ts.createPropertyAccess(ts.getSynthesizedDeepClone(importNode), "default")); + changes.replaceNode(importingFile, importNode, ts.factory.createPropertyAccessExpression(ts.getSynthesizedDeepClone(importNode), "default")); } break; } @@ -129448,7 +132751,7 @@ var ts; } /** @returns Whether we converted a `module.exports =` to a default export. */ function convertFileToEs6Module(sourceFile, checker, changes, target, quotePreference) { - var identifiers = { original: collectFreeIdentifiers(sourceFile), additional: ts.createMap() }; + var identifiers = { original: collectFreeIdentifiers(sourceFile), additional: new ts.Set() }; var exports = collectExportRenames(sourceFile, checker, identifiers); convertExportsAccesses(sourceFile, exports, changes); var moduleExportsChangedToDefault = false; @@ -129460,7 +132763,7 @@ var ts; return moduleExportsChangedToDefault; } function collectExportRenames(sourceFile, checker, identifiers) { - var res = ts.createMap(); + var res = new ts.Map(); forEachExportReference(sourceFile, function (node) { var _a = node.name, text = _a.text, originalKeywordKind = _a.originalKeywordKind; if (!res.has(text) && (originalKeywordKind !== undefined && ts.isNonContextualKeyword(originalKeywordKind) @@ -129477,7 +132780,7 @@ var ts; return; } var text = node.name.text; - changes.replaceNode(sourceFile, node, ts.createIdentifier(exports.get(text) || text)); + changes.replaceNode(sourceFile, node, ts.factory.createIdentifier(exports.get(text) || text)); }); } function forEachExportReference(sourceFile, cb) { @@ -129491,20 +132794,20 @@ var ts; } function convertStatement(sourceFile, statement, checker, changes, identifiers, target, exports, quotePreference) { switch (statement.kind) { - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: convertVariableStatement(sourceFile, statement, changes, checker, identifiers, target, quotePreference); return false; - case 226 /* ExpressionStatement */: { + case 230 /* ExpressionStatement */: { var expression = statement.expression; switch (expression.kind) { - case 196 /* CallExpression */: { + case 200 /* CallExpression */: { if (ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true)) { // For side-effecting require() call, just make a side-effecting import. changes.replaceNode(sourceFile, statement, ts.makeImport(/*name*/ undefined, /*namedImports*/ undefined, expression.arguments[0], quotePreference)); } return false; } - case 209 /* BinaryExpression */: { + case 213 /* BinaryExpression */: { var operatorToken = expression.operatorToken; return operatorToken.kind === 62 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports); } @@ -129536,7 +132839,7 @@ var ts; } } // Move it out to its own variable statement. (This will not be used if `!foundImport`) - return ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([decl], declarationList.flags)); + return ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([decl], declarationList.flags)); }); if (foundImport) { // useNonAdjustedEndPosition to ensure we don't eat the newline after the statement. @@ -129546,16 +132849,16 @@ var ts; /** Converts `const name = require("moduleSpecifier").propertyName` */ function convertPropertyAccessImport(name, propertyName, moduleSpecifier, identifiers, quotePreference) { switch (name.kind) { - case 189 /* ObjectBindingPattern */: - case 190 /* ArrayBindingPattern */: { + case 193 /* ObjectBindingPattern */: + case 194 /* ArrayBindingPattern */: { // `const [a, b] = require("c").d` --> `import { d } from "c"; const [a, b] = d;` var tmp = makeUniqueName(propertyName, identifiers); return [ makeSingleImport(tmp, propertyName, moduleSpecifier, quotePreference), - makeConst(/*modifiers*/ undefined, name, ts.createIdentifier(tmp)), + makeConst(/*modifiers*/ undefined, name, ts.factory.createIdentifier(tmp)), ]; } - case 75 /* Identifier */: + case 78 /* Identifier */: // `const a = require("b").c` --> `import { c as a } from "./b"; return [makeSingleImport(name.text, propertyName, moduleSpecifier, quotePreference)]; default: @@ -129598,17 +132901,17 @@ var ts; function tryChangeModuleExportsObject(object) { var statements = ts.mapAllOrFail(object.properties, function (prop) { switch (prop.kind) { - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: // TODO: Maybe we should handle this? See fourslash test `refactorConvertToEs6Module_export_object_shorthand.ts`. // falls through - case 282 /* ShorthandPropertyAssignment */: - case 283 /* SpreadAssignment */: + case 286 /* ShorthandPropertyAssignment */: + case 287 /* SpreadAssignment */: return undefined; - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: return !ts.isIdentifier(prop.name) ? undefined : convertExportsDotXEquals_replaceNode(prop.name.text, prop.initializer); - case 161 /* MethodDeclaration */: - return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.createToken(89 /* ExportKeyword */)], prop); + case 164 /* MethodDeclaration */: + return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.factory.createToken(92 /* ExportKeyword */)], prop); default: ts.Debug.assertNever(prop, "Convert to ES6 got invalid prop kind " + prop.kind); } @@ -129626,7 +132929,7 @@ var ts; */ var newNodes = [ makeConst(/*modifiers*/ undefined, rename, assignment.right), - makeExportDeclaration([ts.createExportSpecifier(rename, text)]), + makeExportDeclaration([ts.factory.createExportSpecifier(rename, text)]), ]; changes.replaceNodeWithNodes(sourceFile, assignment.parent, newNodes); } @@ -129638,9 +132941,9 @@ var ts; // `module.exports = require("x");` ==> `export * from "x"; export { default } from "x";` var moduleSpecifier = reExported.text; var moduleSymbol = checker.getSymbolAtLocation(reExported); - var exports = moduleSymbol ? moduleSymbol.exports : ts.emptyUnderscoreEscapedMap; - return exports.has("export=") ? [[reExportDefault(moduleSpecifier)], true] : - !exports.has("default") ? [[reExportStar(moduleSpecifier)], false] : + var exports = moduleSymbol ? moduleSymbol.exports : ts.emptyMap; + return exports.has("export=" /* ExportEquals */) ? [[reExportDefault(moduleSpecifier)], true] : + !exports.has("default" /* Default */) ? [[reExportStar(moduleSpecifier)], false] : // If there's some non-default export, must include both `export *` and `export default`. exports.size > 1 ? [[reExportStar(moduleSpecifier), reExportDefault(moduleSpecifier)], true] : [[reExportDefault(moduleSpecifier)], true]; } @@ -129648,14 +132951,14 @@ var ts; return makeExportDeclaration(/*exportClause*/ undefined, moduleSpecifier); } function reExportDefault(moduleSpecifier) { - return makeExportDeclaration([ts.createExportSpecifier(/*propertyName*/ undefined, "default")], moduleSpecifier); + return makeExportDeclaration([ts.factory.createExportSpecifier(/*propertyName*/ undefined, "default")], moduleSpecifier); } function convertExportsPropertyAssignment(_a, sourceFile, changes) { var left = _a.left, right = _a.right, parent = _a.parent; var name = left.name.text; if ((ts.isFunctionExpression(right) || ts.isArrowFunction(right) || ts.isClassExpression(right)) && (!right.name || right.name.text === name)) { // `exports.f = function() {}` -> `export function f() {}` -- Replace `exports.f = ` with `export `, and insert the name after `function`. - changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, ts.createToken(89 /* ExportKeyword */), { suffix: " " }); + changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, ts.factory.createToken(92 /* ExportKeyword */), { suffix: " " }); if (!right.name) changes.insertName(sourceFile, right, name); var semi = ts.findChildOfKind(parent, 26 /* SemicolonToken */, sourceFile); @@ -129664,14 +132967,14 @@ var ts; } else { // `exports.f = function g() {}` -> `export const f = function g() {}` -- just replace `exports.` with `export const ` - changes.replaceNodeRangeWithNodes(sourceFile, left.expression, ts.findChildOfKind(left, 24 /* DotToken */, sourceFile), [ts.createToken(89 /* ExportKeyword */), ts.createToken(81 /* ConstKeyword */)], { joiner: " ", suffix: " " }); + changes.replaceNodeRangeWithNodes(sourceFile, left.expression, ts.findChildOfKind(left, 24 /* DotToken */, sourceFile), [ts.factory.createToken(92 /* ExportKeyword */), ts.factory.createToken(84 /* ConstKeyword */)], { joiner: " ", suffix: " " }); } } // TODO: GH#22492 this will cause an error if a change has been made inside the body of the node. function convertExportsDotXEquals_replaceNode(name, exported) { - var modifiers = [ts.createToken(89 /* ExportKeyword */)]; + var modifiers = [ts.factory.createToken(92 /* ExportKeyword */)]; switch (exported.kind) { - case 201 /* FunctionExpression */: { + case 205 /* FunctionExpression */: { var expressionName = exported.name; if (expressionName && expressionName.text !== name) { // `exports.f = function g() {}` -> `export const f = function g() {}` @@ -129679,10 +132982,10 @@ var ts; } } // falls through - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: // `exports.f = function() {}` --> `export function f() {}` return functionExpressionToDeclaration(name, modifiers, exported); - case 214 /* ClassExpression */: + case 218 /* ClassExpression */: // `exports.C = class {}` --> `export class C {}` return classExpressionToDeclaration(name, modifiers, exported); default: @@ -129690,7 +132993,7 @@ var ts; } function exportConst() { // `exports.x = 0;` --> `export const x = 0;` - return makeConst(modifiers, ts.createIdentifier(name), exported); // TODO: GH#18217 + return makeConst(modifiers, ts.factory.createIdentifier(name), exported); // TODO: GH#18217 } } /** @@ -129700,7 +133003,7 @@ var ts; */ function convertSingleImport(file, name, moduleSpecifier, changes, checker, identifiers, target, quotePreference) { switch (name.kind) { - case 189 /* ObjectBindingPattern */: { + case 193 /* ObjectBindingPattern */: { var importSpecifiers = ts.mapAllOrFail(name.elements, function (e) { return e.dotDotDotToken || e.initializer || e.propertyName && !ts.isIdentifier(e.propertyName) || !ts.isIdentifier(e.name) ? undefined @@ -129713,18 +133016,18 @@ var ts; } } // falls through -- object destructuring has an interesting pattern and must be a variable declaration - case 190 /* ArrayBindingPattern */: { + case 194 /* ArrayBindingPattern */: { /* import x from "x"; const [a, b, c] = x; */ var tmp = makeUniqueName(codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, target), identifiers); return [ - ts.makeImport(ts.createIdentifier(tmp), /*namedImports*/ undefined, moduleSpecifier, quotePreference), - makeConst(/*modifiers*/ undefined, ts.getSynthesizedDeepClone(name), ts.createIdentifier(tmp)), + ts.makeImport(ts.factory.createIdentifier(tmp), /*namedImports*/ undefined, moduleSpecifier, quotePreference), + makeConst(/*modifiers*/ undefined, ts.getSynthesizedDeepClone(name), ts.factory.createIdentifier(tmp)), ]; } - case 75 /* Identifier */: + case 78 /* Identifier */: return convertSingleIdentifierImport(file, name, moduleSpecifier, changes, checker, identifiers, quotePreference); default: return ts.Debug.assertNever(name, "Convert to ES6 module got invalid name kind " + name.kind); @@ -129737,7 +133040,7 @@ var ts; function convertSingleIdentifierImport(file, name, moduleSpecifier, changes, checker, identifiers, quotePreference) { var nameSymbol = checker.getSymbolAtLocation(name); // Maps from module property name to name actually used. (The same if there isn't shadowing.) - var namedBindingsNames = ts.createMap(); + var namedBindingsNames = new ts.Map(); // True if there is some non-property use like `x()` or `f(x)`. var needDefaultImport = false; for (var _i = 0, _a = identifiers.original.get(name.text); _i < _a.length; _i++) { @@ -129755,7 +133058,7 @@ var ts; idName = makeUniqueName(propertyName, identifiers); namedBindingsNames.set(propertyName, idName); } - changes.replaceNode(file, parent, ts.createIdentifier(idName)); + changes.replaceNode(file, parent, ts.factory.createIdentifier(idName)); } else { needDefaultImport = true; @@ -129763,7 +133066,7 @@ var ts; } var namedBindings = namedBindingsNames.size === 0 ? undefined : ts.arrayFrom(ts.mapIterator(namedBindingsNames.entries(), function (_a) { var propertyName = _a[0], idName = _a[1]; - return ts.createImportSpecifier(propertyName === idName ? undefined : ts.createIdentifier(propertyName), ts.createIdentifier(idName)); + return ts.factory.createImportSpecifier(propertyName === idName ? undefined : ts.factory.createIdentifier(propertyName), ts.factory.createIdentifier(idName)); })); if (!namedBindings) { // If it was unused, ensure that we at least import *something*. @@ -129776,7 +133079,7 @@ var ts; while (identifiers.original.has(name) || identifiers.additional.has(name)) { name = "_" + name; } - identifiers.additional.set(name, true); + identifiers.additional.add(name); return name; } function collectFreeIdentifiers(file) { @@ -129796,11 +133099,11 @@ var ts; function isFreeIdentifier(node) { var parent = node.parent; switch (parent.kind) { - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: return parent.name !== node; - case 191 /* BindingElement */: + case 195 /* BindingElement */: return parent.propertyName !== node; - case 258 /* ImportSpecifier */: + case 262 /* ImportSpecifier */: return parent.propertyName !== node; default: return true; @@ -129808,28 +133111,29 @@ var ts; } // Node helpers function functionExpressionToDeclaration(name, additionalModifiers, fn) { - return ts.createFunctionDeclaration(ts.getSynthesizedDeepClones(fn.decorators), // TODO: GH#19915 Don't think this is even legal. - ts.concatenate(additionalModifiers, ts.getSynthesizedDeepClones(fn.modifiers)), ts.getSynthesizedDeepClone(fn.asteriskToken), name, ts.getSynthesizedDeepClones(fn.typeParameters), ts.getSynthesizedDeepClones(fn.parameters), ts.getSynthesizedDeepClone(fn.type), ts.convertToFunctionBody(ts.getSynthesizedDeepClone(fn.body))); + return ts.factory.createFunctionDeclaration(ts.getSynthesizedDeepClones(fn.decorators), // TODO: GH#19915 Don't think this is even legal. + ts.concatenate(additionalModifiers, ts.getSynthesizedDeepClones(fn.modifiers)), ts.getSynthesizedDeepClone(fn.asteriskToken), name, ts.getSynthesizedDeepClones(fn.typeParameters), ts.getSynthesizedDeepClones(fn.parameters), ts.getSynthesizedDeepClone(fn.type), ts.factory.converters.convertToFunctionBlock(ts.getSynthesizedDeepClone(fn.body))); } function classExpressionToDeclaration(name, additionalModifiers, cls) { - return ts.createClassDeclaration(ts.getSynthesizedDeepClones(cls.decorators), // TODO: GH#19915 Don't think this is even legal. + return ts.factory.createClassDeclaration(ts.getSynthesizedDeepClones(cls.decorators), // TODO: GH#19915 Don't think this is even legal. ts.concatenate(additionalModifiers, ts.getSynthesizedDeepClones(cls.modifiers)), name, ts.getSynthesizedDeepClones(cls.typeParameters), ts.getSynthesizedDeepClones(cls.heritageClauses), ts.getSynthesizedDeepClones(cls.members)); } function makeSingleImport(localName, propertyName, moduleSpecifier, quotePreference) { return propertyName === "default" - ? ts.makeImport(ts.createIdentifier(localName), /*namedImports*/ undefined, moduleSpecifier, quotePreference) + ? ts.makeImport(ts.factory.createIdentifier(localName), /*namedImports*/ undefined, moduleSpecifier, quotePreference) : ts.makeImport(/*name*/ undefined, [makeImportSpecifier(propertyName, localName)], moduleSpecifier, quotePreference); } function makeImportSpecifier(propertyName, name) { - return ts.createImportSpecifier(propertyName !== undefined && propertyName !== name ? ts.createIdentifier(propertyName) : undefined, ts.createIdentifier(name)); + return ts.factory.createImportSpecifier(propertyName !== undefined && propertyName !== name ? ts.factory.createIdentifier(propertyName) : undefined, ts.factory.createIdentifier(name)); } function makeConst(modifiers, name, init) { - return ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([ts.createVariableDeclaration(name, /*type*/ undefined, init)], 2 /* Const */)); + return ts.factory.createVariableStatement(modifiers, ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(name, /*exclamationToken*/ undefined, /*type*/ undefined, init)], 2 /* Const */)); } function makeExportDeclaration(exportSpecifiers, moduleSpecifier) { - return ts.createExportDeclaration( + return ts.factory.createExportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, exportSpecifiers && ts.createNamedExports(exportSpecifiers), moduleSpecifier === undefined ? undefined : ts.createLiteral(moduleSpecifier)); + /*modifiers*/ undefined, + /*isTypeOnly*/ false, exportSpecifiers && ts.factory.createNamedExports(exportSpecifiers), moduleSpecifier === undefined ? undefined : ts.factory.createStringLiteral(moduleSpecifier)); } })(codefix = ts.codefix || (ts.codefix = {})); })(ts || (ts = {})); @@ -129865,7 +133169,7 @@ var ts; } function doChange(changeTracker, sourceFile, qualifiedName) { var rightText = qualifiedName.right.text; - var replacement = ts.createIndexedAccessTypeNode(ts.createTypeReferenceNode(qualifiedName.left, /*typeArguments*/ undefined), ts.createLiteralTypeNode(ts.createLiteral(rightText))); + var replacement = ts.factory.createIndexedAccessTypeNode(ts.factory.createTypeReferenceNode(qualifiedName.left, /*typeArguments*/ undefined), ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(rightText))); changeTracker.replaceNode(sourceFile, qualifiedName, replacement); } })(codefix = ts.codefix || (ts.codefix = {})); @@ -129887,7 +133191,7 @@ var ts; }, fixIds: [fixId], getAllCodeActions: function (context) { - var fixedExportDeclarations = ts.createMap(); + var fixedExportDeclarations = new ts.Map(); return codefix.codeFixAll(context, errorCodes, function (changes, diag) { var exportSpecifier = getExportSpecifierForDiagnosticSpan(diag, context.sourceFile); if (exportSpecifier && !ts.addToSeen(fixedExportDeclarations, ts.getNodeId(exportSpecifier.parent.parent))) { @@ -129907,16 +133211,16 @@ var ts; var exportDeclaration = exportClause.parent; var typeExportSpecifiers = getTypeExportSpecifiers(exportSpecifier, context); if (typeExportSpecifiers.length === exportClause.elements.length) { - changes.replaceNode(context.sourceFile, exportDeclaration, ts.updateExportDeclaration(exportDeclaration, exportDeclaration.decorators, exportDeclaration.modifiers, exportClause, exportDeclaration.moduleSpecifier, - /*isTypeOnly*/ true)); + changes.replaceNode(context.sourceFile, exportDeclaration, ts.factory.updateExportDeclaration(exportDeclaration, exportDeclaration.decorators, exportDeclaration.modifiers, + /*isTypeOnly*/ true, exportClause, exportDeclaration.moduleSpecifier)); } else { - var valueExportDeclaration = ts.updateExportDeclaration(exportDeclaration, exportDeclaration.decorators, exportDeclaration.modifiers, ts.updateNamedExports(exportClause, ts.filter(exportClause.elements, function (e) { return !ts.contains(typeExportSpecifiers, e); })), exportDeclaration.moduleSpecifier, - /*isTypeOnly*/ false); - var typeExportDeclaration = ts.createExportDeclaration( + var valueExportDeclaration = ts.factory.updateExportDeclaration(exportDeclaration, exportDeclaration.decorators, exportDeclaration.modifiers, + /*isTypeOnly*/ false, ts.factory.updateNamedExports(exportClause, ts.filter(exportClause.elements, function (e) { return !ts.contains(typeExportSpecifiers, e); })), exportDeclaration.moduleSpecifier); + var typeExportDeclaration = ts.factory.createExportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createNamedExports(typeExportSpecifiers), exportDeclaration.moduleSpecifier, - /*isTypeOnly*/ true); + /*modifiers*/ undefined, + /*isTypeOnly*/ true, ts.factory.createNamedExports(typeExportSpecifiers), exportDeclaration.moduleSpecifier); changes.replaceNode(context.sourceFile, exportDeclaration, valueExportDeclaration); changes.insertNodeAfter(context.sourceFile, exportDeclaration, typeExportDeclaration); } @@ -129973,11 +133277,11 @@ var ts; // `import type foo, { Bar }` is not allowed, so move `foo` to new declaration if (importClause.name && importClause.namedBindings) { changes.deleteNodeRangeExcludingEnd(context.sourceFile, importClause.name, importDeclaration.importClause.namedBindings); - changes.insertNodeBefore(context.sourceFile, importDeclaration, ts.updateImportDeclaration(importDeclaration, + changes.insertNodeBefore(context.sourceFile, importDeclaration, ts.factory.updateImportDeclaration(importDeclaration, /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createImportClause(importClause.name, - /*namedBindings*/ undefined, - /*isTypeOnly*/ true), importDeclaration.moduleSpecifier)); + /*modifiers*/ undefined, ts.factory.createImportClause( + /*isTypeOnly*/ true, importClause.name, + /*namedBindings*/ undefined), importDeclaration.moduleSpecifier)); } } })(codefix = ts.codefix || (ts.codefix = {})); @@ -130004,7 +133308,7 @@ var ts; }, fixIds: [fixId], getAllCodeActions: function (context) { - var seenClassDeclarations = ts.createMap(); + var seenClassDeclarations = new ts.Map(); return codefix.codeFixAll(context, errorCodes, function (changes, diag) { var classDeclaration = getClass(diag.file, diag.start); if (ts.addToSeen(seenClassDeclarations, ts.getNodeId(classDeclaration))) { @@ -130020,7 +133324,7 @@ var ts; return ts.Debug.checkDefined(ts.getContainingClass(ts.getTokenAtPosition(sourceFile, pos)), "There should be a containing class"); } function symbolPointsToNonPrivateMember(symbol) { - return !symbol.valueDeclaration || !(ts.getModifierFlags(symbol.valueDeclaration) & 8 /* Private */); + return !symbol.valueDeclaration || !(ts.getEffectiveModifierFlags(symbol.valueDeclaration) & 8 /* Private */); } function addMissingDeclarations(context, implementedTypeNode, sourceFile, classDeclaration, changeTracker, preferences) { var checker = context.program.getTypeChecker(); @@ -130039,7 +133343,7 @@ var ts; createMissingIndexSignatureDeclaration(implementedType, 0 /* String */); } var importAdder = codefix.createImportAdder(sourceFile, context.program, preferences, context.host); - codefix.createMissingMemberNodes(classDeclaration, nonPrivateAndNotExistedInHeritageClauseMembers, context, preferences, importAdder, function (member) { return insertInterfaceMemberNode(sourceFile, classDeclaration, member); }); + codefix.createMissingMemberNodes(classDeclaration, nonPrivateAndNotExistedInHeritageClauseMembers, sourceFile, context, preferences, importAdder, function (member) { return insertInterfaceMemberNode(sourceFile, classDeclaration, member); }); importAdder.writeFixes(changeTracker); function createMissingIndexSignatureDeclaration(type, kind) { var indexInfoOfKind = checker.getIndexInfoOfType(type, kind); @@ -130087,7 +133391,7 @@ var ts; errorCodes: errorCodes, getCodeActions: function (context) { var errorCode = context.errorCode, preferences = context.preferences, sourceFile = context.sourceFile, span = context.span; - var info = getFixesInfo(context, errorCode, span.start); + var info = getFixesInfo(context, errorCode, span.start, /*useAutoImportProvider*/ true); if (!info) return undefined; var fixes = info.fixes, symbolName = info.symbolName; @@ -130097,22 +133401,26 @@ var ts; fixIds: [importFixId], getAllCodeActions: function (context) { var sourceFile = context.sourceFile, program = context.program, preferences = context.preferences, host = context.host; - var importAdder = createImportAdder(sourceFile, program, preferences, host); + var importAdder = createImportAdderWorker(sourceFile, program, /*useAutoImportProvider*/ true, preferences, host); codefix.eachDiagnostic(context, errorCodes, function (diag) { return importAdder.addImportFromDiagnostic(diag, context); }); return codefix.createCombinedCodeActions(ts.textChanges.ChangeTracker.with(context, importAdder.writeFixes)); }, }); function createImportAdder(sourceFile, program, preferences, host) { + return createImportAdderWorker(sourceFile, program, /*useAutoImportProvider*/ false, preferences, host); + } + codefix.createImportAdder = createImportAdder; + function createImportAdderWorker(sourceFile, program, useAutoImportProvider, preferences, host) { var compilerOptions = program.getCompilerOptions(); // Namespace fixes don't conflict, so just build a list. var addToNamespace = []; var importType = []; // Keys are import clause node IDs. - var addToExisting = ts.createMap(); - var newImports = ts.createMap(); + var addToExisting = new ts.Map(); + var newImports = new ts.Map(); return { addImportFromDiagnostic: addImportFromDiagnostic, addImportFromExportedSymbol: addImportFromExportedSymbol, writeFixes: writeFixes }; function addImportFromDiagnostic(diagnostic, context) { - var info = getFixesInfo(context, diagnostic.code, diagnostic.start); + var info = getFixesInfo(context, diagnostic.code, diagnostic.start, useAutoImportProvider); if (!info || !info.fixes.length) return; addImport(info); @@ -130122,7 +133430,7 @@ var ts; var symbolName = ts.getNameForExportedSymbol(exportedSymbol, ts.getEmitScriptTarget(compilerOptions)); var checker = program.getTypeChecker(); var symbol = checker.getMergedSymbol(ts.skipAlias(exportedSymbol, checker)); - var exportInfos = getAllReExportingModules(sourceFile, symbol, moduleSymbol, symbolName, sourceFile, compilerOptions, checker, program.getSourceFiles()); + var exportInfos = getAllReExportingModules(sourceFile, symbol, moduleSymbol, symbolName, host, program, useAutoImportProvider); var preferTypeOnlyImport = !!usageIsTypeOnly && compilerOptions.importsNotUsedAsValues === 2 /* Error */; var useRequire = shouldUseRequire(sourceFile, compilerOptions); var fix = getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, /*position*/ undefined, preferTypeOnlyImport, useRequire, host, preferences); @@ -130209,7 +133517,6 @@ var ts; } } } - codefix.createImportAdder = createImportAdder; // Sorted with the preferred fix coming first. var ImportFixKind; (function (ImportFixKind) { @@ -130227,7 +133534,7 @@ var ts; })(ImportKind || (ImportKind = {})); function getImportCompletionAction(exportedSymbol, moduleSymbol, sourceFile, symbolName, host, program, formatContext, position, preferences) { var compilerOptions = program.getCompilerOptions(); - var exportInfos = getAllReExportingModules(sourceFile, exportedSymbol, moduleSymbol, symbolName, sourceFile, compilerOptions, program.getTypeChecker(), program.getSourceFiles()); + var exportInfos = getAllReExportingModules(sourceFile, exportedSymbol, moduleSymbol, symbolName, host, program, /*useAutoImportProvider*/ true); var useRequire = shouldUseRequire(sourceFile, compilerOptions); var preferTypeOnlyImport = compilerOptions.importsNotUsedAsValues === 2 /* Error */ && !ts.isSourceFileJS(sourceFile) && ts.isValidTypeOnlyAliasUseSite(ts.getTokenAtPosition(sourceFile, position)); var moduleSpecifier = ts.first(getNewImportInfos(program, sourceFile, position, preferTypeOnlyImport, useRequire, exportInfos, host, preferences)).moduleSpecifier; @@ -130244,11 +133551,13 @@ var ts; var description = _a.description, changes = _a.changes, commands = _a.commands; return { description: description, changes: changes, commands: commands }; } - function getAllReExportingModules(importingFile, exportedSymbol, exportingModuleSymbol, symbolName, sourceFile, compilerOptions, checker, allSourceFiles) { + function getAllReExportingModules(importingFile, exportedSymbol, exportingModuleSymbol, symbolName, host, program, useAutoImportProvider) { var result = []; - forEachExternalModule(checker, allSourceFiles, function (moduleSymbol, moduleFile) { + var compilerOptions = program.getCompilerOptions(); + forEachExternalModuleToImportFrom(program, host, importingFile, /*filterByPackageJson*/ false, useAutoImportProvider, function (moduleSymbol, moduleFile, program) { + var checker = program.getTypeChecker(); // Don't import from a re-export when looking "up" like to `./index` or `../index`. - if (moduleFile && moduleSymbol !== exportingModuleSymbol && ts.startsWith(sourceFile.fileName, ts.getDirectoryPath(moduleFile.fileName))) { + if (moduleFile && moduleSymbol !== exportingModuleSymbol && ts.startsWith(importingFile.fileName, ts.getDirectoryPath(moduleFile.fileName))) { return; } var defaultInfo = getDefaultLikeExportInfo(importingFile, moduleSymbol, checker, compilerOptions); @@ -130308,11 +133617,11 @@ var ts; function getTargetModuleFromNamespaceLikeImport(declaration, checker) { var _a; switch (declaration.kind) { - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return checker.resolveExternalModuleName(declaration.initializer.arguments[0]); - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return checker.getAliasedSymbol(declaration.symbol); - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: var namespaceImport = ts.tryCast((_a = declaration.importClause) === null || _a === void 0 ? void 0 : _a.namedBindings, ts.isNamespaceImport); return namespaceImport && checker.getAliasedSymbol(namespaceImport.symbol); default: @@ -130322,11 +133631,11 @@ var ts; function getNamespaceLikeImportText(declaration) { var _a, _b, _c; switch (declaration.kind) { - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return (_a = ts.tryCast(declaration.name, ts.isIdentifier)) === null || _a === void 0 ? void 0 : _a.text; - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return declaration.name.text; - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: return (_c = ts.tryCast((_b = declaration.importClause) === null || _b === void 0 ? void 0 : _b.namedBindings, ts.isNamespaceImport)) === null || _c === void 0 ? void 0 : _c.name.text; default: return ts.Debug.assertNever(declaration); @@ -130335,10 +133644,10 @@ var ts; function tryAddToExistingImport(existingImports, canUseTypeOnlyImport) { return ts.firstDefined(existingImports, function (_a) { var declaration = _a.declaration, importKind = _a.importKind; - if (declaration.kind === 253 /* ImportEqualsDeclaration */) + if (declaration.kind === 257 /* ImportEqualsDeclaration */) return undefined; - if (declaration.kind === 242 /* VariableDeclaration */) { - return (importKind === 0 /* Named */ || importKind === 1 /* Default */) && declaration.name.kind === 189 /* ObjectBindingPattern */ + if (declaration.kind === 246 /* VariableDeclaration */) { + return (importKind === 0 /* Named */ || importKind === 1 /* Default */) && declaration.name.kind === 193 /* ObjectBindingPattern */ ? { kind: 2 /* AddToExisting */, importClauseOrBindingPattern: declaration.name, importKind: importKind, moduleSpecifier: declaration.initializer.arguments[0].text, canUseTypeOnlyImport: false } : undefined; } @@ -130346,7 +133655,7 @@ var ts; if (!importClause) return undefined; var name = importClause.name, namedBindings = importClause.namedBindings; - return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 257 /* NamedImports */) + return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 261 /* NamedImports */) ? { kind: 2 /* AddToExisting */, importClauseOrBindingPattern: importClause, importKind: importKind, moduleSpecifier: declaration.moduleSpecifier.getText(), canUseTypeOnlyImport: canUseTypeOnlyImport } : undefined; }); @@ -130359,7 +133668,7 @@ var ts; if (ts.isRequireVariableDeclaration(i.parent, /*requireStringLiteralLikeArgument*/ true)) { return checker.resolveExternalModuleName(moduleSpecifier) === moduleSymbol ? { declaration: i.parent, importKind: importKind } : undefined; } - if (i.kind === 254 /* ImportDeclaration */ || i.kind === 253 /* ImportEqualsDeclaration */) { + if (i.kind === 258 /* ImportDeclaration */ || i.kind === 257 /* ImportEqualsDeclaration */) { return checker.getSymbolAtLocation(moduleSpecifier) === moduleSymbol ? { declaration: i, importKind: importKind } : undefined; } }); @@ -130402,19 +133711,19 @@ var ts; } function newImportInfoFromExistingSpecifier(_a, preferTypeOnlyImport, useRequire) { var declaration = _a.declaration, importKind = _a.importKind; - var moduleSpecifier = declaration.kind === 254 /* ImportDeclaration */ ? declaration.moduleSpecifier : - declaration.kind === 242 /* VariableDeclaration */ ? declaration.initializer.arguments[0] : - declaration.moduleReference.kind === 265 /* ExternalModuleReference */ ? declaration.moduleReference.expression : + var moduleSpecifier = declaration.kind === 258 /* ImportDeclaration */ ? declaration.moduleSpecifier : + declaration.kind === 246 /* VariableDeclaration */ ? declaration.initializer.arguments[0] : + declaration.moduleReference.kind === 269 /* ExternalModuleReference */ ? declaration.moduleReference.expression : undefined; return moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? { kind: 3 /* AddNew */, moduleSpecifier: moduleSpecifier.text, importKind: importKind, typeOnly: preferTypeOnlyImport, useRequire: useRequire } : undefined; } - function getFixesInfo(context, errorCode, pos) { + function getFixesInfo(context, errorCode, pos, useAutoImportProvider) { var symbolToken = ts.getTokenAtPosition(context.sourceFile, pos); var info = errorCode === ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code ? getFixesInfoForUMDImport(context, symbolToken) - : ts.isIdentifier(symbolToken) ? getFixesInfoForNonUMDImport(context, symbolToken) : undefined; + : ts.isIdentifier(symbolToken) ? getFixesInfoForNonUMDImport(context, symbolToken, useAutoImportProvider) : undefined; return info && __assign(__assign({}, info), { fixes: ts.sort(info.fixes, function (a, b) { return a.kind - b.kind; }) }); } function getFixesInfoForUMDImport(_a, token) { @@ -130467,36 +133776,41 @@ var ts; return ts.Debug.assertNever(moduleKind, "Unexpected moduleKind " + moduleKind); } } - function getFixesInfoForNonUMDImport(_a, symbolToken) { + function getFixesInfoForNonUMDImport(_a, symbolToken, useAutoImportProvider) { var sourceFile = _a.sourceFile, program = _a.program, cancellationToken = _a.cancellationToken, host = _a.host, preferences = _a.preferences; var checker = program.getTypeChecker(); - // If we're at ``, we must check if `Foo` is already in scope, and if so, get an import for `React` instead. - var symbolName = ts.isJsxOpeningLikeElement(symbolToken.parent) - && symbolToken.parent.tagName === symbolToken - && (ts.isIntrinsicJsxName(symbolToken.text) || checker.resolveName(symbolToken.text, symbolToken, 67108863 /* All */, /*excludeGlobals*/ false)) - ? checker.getJsxNamespace(sourceFile) - : symbolToken.text; + var symbolName = getSymbolName(sourceFile, checker, symbolToken); // "default" is a keyword and not a legal identifier for the import, so we don't expect it here ts.Debug.assert(symbolName !== "default" /* Default */, "'default' isn't a legal identifier and couldn't occur here"); var compilerOptions = program.getCompilerOptions(); var preferTypeOnlyImport = compilerOptions.importsNotUsedAsValues === 2 /* Error */ && ts.isValidTypeOnlyAliasUseSite(symbolToken); var useRequire = shouldUseRequire(sourceFile, compilerOptions); - var exportInfos = getExportInfos(symbolName, ts.getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, checker, program, host); + var exportInfos = getExportInfos(symbolName, ts.getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, checker, program, useAutoImportProvider, host); var fixes = ts.arrayFrom(ts.flatMapIterator(exportInfos.entries(), function (_a) { var _ = _a[0], exportInfos = _a[1]; return getFixForImport(exportInfos, symbolName, symbolToken.getStart(sourceFile), preferTypeOnlyImport, useRequire, program, sourceFile, host, preferences); })); return { fixes: fixes, symbolName: symbolName }; } + function getSymbolName(sourceFile, checker, symbolToken) { + var parent = symbolToken.parent; + if ((ts.isJsxOpeningLikeElement(parent) || ts.isJsxClosingElement(parent)) && parent.tagName === symbolToken) { + var jsxNamespace = checker.getJsxNamespace(sourceFile); + if (ts.isIntrinsicJsxName(symbolToken.text) || !checker.resolveName(jsxNamespace, parent, 111551 /* Value */, /*excludeGlobals*/ true)) { + return jsxNamespace; + } + } + return symbolToken.text; + } // Returns a map from an exported symbol's ID to a list of every way it's (re-)exported. - function getExportInfos(symbolName, currentTokenMeaning, cancellationToken, sourceFile, checker, program, host) { + function getExportInfos(symbolName, currentTokenMeaning, cancellationToken, sourceFile, checker, program, useAutoImportProvider, host) { // For each original symbol, keep all re-exports of that symbol together so we can call `getCodeActionsForImport` on the whole group at once. // Maps symbol id to info for modules providing that symbol (original export + re-exports). var originalSymbolToExportInfos = ts.createMultiMap(); function addSymbol(moduleSymbol, exportedSymbol, importKind) { originalSymbolToExportInfos.add(ts.getUniqueSymbolId(exportedSymbol, checker).toString(), { moduleSymbol: moduleSymbol, importKind: importKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exportedSymbol, checker) }); } - forEachExternalModuleToImportFrom(program, host, sourceFile, /*filterByPackageJson*/ true, function (moduleSymbol) { + forEachExternalModuleToImportFrom(program, host, sourceFile, /*filterByPackageJson*/ true, useAutoImportProvider, function (moduleSymbol) { cancellationToken.throwIfCancellationRequested(); var defaultInfo = getDefaultLikeExportInfo(sourceFile, moduleSymbol, checker, program.getCompilerOptions()); if (defaultInfo && defaultInfo.name === symbolName && symbolHasMeaning(defaultInfo.symbolForMeaning, currentTokenMeaning)) { @@ -130615,7 +133929,7 @@ var ts; } } function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports, canUseTypeOnlyImport) { - if (clause.kind === 189 /* ObjectBindingPattern */) { + if (clause.kind === 193 /* ObjectBindingPattern */) { if (defaultImport) { addElementToBindingPattern(clause, defaultImport, "default"); } @@ -130628,19 +133942,33 @@ var ts; var convertTypeOnlyToRegular = !canUseTypeOnlyImport && clause.isTypeOnly; if (defaultImport) { ts.Debug.assert(!clause.name, "Cannot add a default import to an import clause that already has one"); - changes.insertNodeAt(sourceFile, clause.getStart(sourceFile), ts.createIdentifier(defaultImport), { suffix: ", " }); + changes.insertNodeAt(sourceFile, clause.getStart(sourceFile), ts.factory.createIdentifier(defaultImport), { suffix: ", " }); } if (namedImports.length) { - var specifiers = namedImports.map(function (name) { return ts.createImportSpecifier(/*propertyName*/ undefined, ts.createIdentifier(name)); }); - if (clause.namedBindings && ts.cast(clause.namedBindings, ts.isNamedImports).elements.length) { - for (var _a = 0, specifiers_1 = specifiers; _a < specifiers_1.length; _a++) { - var spec = specifiers_1[_a]; - changes.insertNodeInListAfter(sourceFile, ts.last(ts.cast(clause.namedBindings, ts.isNamedImports).elements), spec); + var existingSpecifiers = clause.namedBindings && ts.cast(clause.namedBindings, ts.isNamedImports).elements; + var newSpecifiers = ts.stableSort(namedImports.map(function (name) { return ts.factory.createImportSpecifier(/*propertyName*/ undefined, ts.factory.createIdentifier(name)); }), ts.OrganizeImports.compareImportOrExportSpecifiers); + if ((existingSpecifiers === null || existingSpecifiers === void 0 ? void 0 : existingSpecifiers.length) && ts.OrganizeImports.importSpecifiersAreSorted(existingSpecifiers)) { + for (var _a = 0, newSpecifiers_1 = newSpecifiers; _a < newSpecifiers_1.length; _a++) { + var spec = newSpecifiers_1[_a]; + var insertionIndex = ts.OrganizeImports.getImportSpecifierInsertionIndex(existingSpecifiers, spec); + var prevSpecifier = clause.namedBindings.elements[insertionIndex - 1]; + if (prevSpecifier) { + changes.insertNodeInListAfter(sourceFile, prevSpecifier, spec); + } + else { + changes.insertNodeBefore(sourceFile, existingSpecifiers[0], spec, !ts.positionsAreOnSameLine(existingSpecifiers[0].getStart(), clause.parent.getStart(), sourceFile)); + } + } + } + else if (existingSpecifiers === null || existingSpecifiers === void 0 ? void 0 : existingSpecifiers.length) { + for (var _b = 0, newSpecifiers_2 = newSpecifiers; _b < newSpecifiers_2.length; _b++) { + var spec = newSpecifiers_2[_b]; + changes.insertNodeAtEndOfList(sourceFile, existingSpecifiers, spec); } } else { - if (specifiers.length) { - var namedImports_2 = ts.createNamedImports(specifiers); + if (newSpecifiers.length) { + var namedImports_2 = ts.factory.createNamedImports(newSpecifiers); if (clause.namedBindings) { changes.replaceNode(sourceFile, clause.namedBindings, namedImports_2); } @@ -130654,12 +133982,12 @@ var ts; changes.delete(sourceFile, ts.getTypeKeywordOfTypeOnlyImport(clause, sourceFile)); } function addElementToBindingPattern(bindingPattern, name, propertyName) { - var element = ts.createBindingElement(/*dotDotDotToken*/ undefined, propertyName, name); + var element = ts.factory.createBindingElement(/*dotDotDotToken*/ undefined, propertyName, name); if (bindingPattern.elements.length) { changes.insertNodeInListAfter(sourceFile, ts.last(bindingPattern.elements), element); } else { - changes.replaceNode(sourceFile, bindingPattern, ts.createObjectBindingPattern([element])); + changes.replaceNode(sourceFile, bindingPattern, ts.factory.createObjectBindingPattern([element])); } } } @@ -130680,18 +134008,18 @@ var ts; var quotedModuleSpecifier = ts.makeStringLiteral(moduleSpecifier, quotePreference); var statements; if (imports.defaultImport !== undefined || ((_a = imports.namedImports) === null || _a === void 0 ? void 0 : _a.length)) { - statements = ts.combine(statements, ts.makeImport(imports.defaultImport === undefined ? undefined : ts.createIdentifier(imports.defaultImport), (_b = imports.namedImports) === null || _b === void 0 ? void 0 : _b.map(function (n) { return ts.createImportSpecifier(/*propertyName*/ undefined, ts.createIdentifier(n)); }), moduleSpecifier, quotePreference, imports.typeOnly)); + statements = ts.combine(statements, ts.makeImport(imports.defaultImport === undefined ? undefined : ts.factory.createIdentifier(imports.defaultImport), (_b = imports.namedImports) === null || _b === void 0 ? void 0 : _b.map(function (n) { return ts.factory.createImportSpecifier(/*propertyName*/ undefined, ts.factory.createIdentifier(n)); }), moduleSpecifier, quotePreference, imports.typeOnly)); } var namespaceLikeImport = imports.namespaceLikeImport, typeOnly = imports.typeOnly; if (namespaceLikeImport) { var declaration = namespaceLikeImport.importKind === 3 /* CommonJS */ - ? ts.createImportEqualsDeclaration( + ? ts.factory.createImportEqualsDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createIdentifier(namespaceLikeImport.name), ts.createExternalModuleReference(quotedModuleSpecifier)) - : ts.createImportDeclaration( + /*modifiers*/ undefined, ts.factory.createIdentifier(namespaceLikeImport.name), ts.factory.createExternalModuleReference(quotedModuleSpecifier)) + : ts.factory.createImportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createImportClause( - /*name*/ undefined, ts.createNamespaceImport(ts.createIdentifier(namespaceLikeImport.name)), typeOnly), quotedModuleSpecifier); + /*modifiers*/ undefined, ts.factory.createImportClause(typeOnly, + /*name*/ undefined, ts.factory.createNamespaceImport(ts.factory.createIdentifier(namespaceLikeImport.name))), quotedModuleSpecifier); statements = ts.combine(statements, declaration); } return ts.Debug.checkDefined(statements); @@ -130702,11 +134030,11 @@ var ts; var statements; // const { default: foo, bar, etc } = require('./mod'); if (imports.defaultImport || ((_a = imports.namedImports) === null || _a === void 0 ? void 0 : _a.length)) { - var bindingElements = ((_b = imports.namedImports) === null || _b === void 0 ? void 0 : _b.map(function (name) { return ts.createBindingElement(/*dotDotDotToken*/ undefined, /*propertyName*/ undefined, name); })) || []; + var bindingElements = ((_b = imports.namedImports) === null || _b === void 0 ? void 0 : _b.map(function (name) { return ts.factory.createBindingElement(/*dotDotDotToken*/ undefined, /*propertyName*/ undefined, name); })) || []; if (imports.defaultImport) { - bindingElements.unshift(ts.createBindingElement(/*dotDotDotToken*/ undefined, "default", imports.defaultImport)); + bindingElements.unshift(ts.factory.createBindingElement(/*dotDotDotToken*/ undefined, "default", imports.defaultImport)); } - var declaration = createConstEqualsRequireDeclaration(ts.createObjectBindingPattern(bindingElements), quotedModuleSpecifier); + var declaration = createConstEqualsRequireDeclaration(ts.factory.createObjectBindingPattern(bindingElements), quotedModuleSpecifier); statements = ts.combine(statements, declaration); } // const foo = require('./mod'); @@ -130717,24 +134045,37 @@ var ts; return ts.Debug.checkDefined(statements); } function createConstEqualsRequireDeclaration(name, quotedModuleSpecifier) { - return ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ - ts.createVariableDeclaration(typeof name === "string" ? ts.createIdentifier(name) : name, - /*type*/ undefined, ts.createCall(ts.createIdentifier("require"), /*typeArguments*/ undefined, [quotedModuleSpecifier])) + return ts.factory.createVariableStatement( + /*modifiers*/ undefined, ts.factory.createVariableDeclarationList([ + ts.factory.createVariableDeclaration(typeof name === "string" ? ts.factory.createIdentifier(name) : name, + /*exclamationToken*/ undefined, + /*type*/ undefined, ts.factory.createCallExpression(ts.factory.createIdentifier("require"), /*typeArguments*/ undefined, [quotedModuleSpecifier])) ], 2 /* Const */)); } function symbolHasMeaning(_a, meaning) { var declarations = _a.declarations; return ts.some(declarations, function (decl) { return !!(ts.getMeaningFromDeclaration(decl) & meaning); }); } - function forEachExternalModuleToImportFrom(program, host, from, filterByPackageJson, cb) { + function forEachExternalModuleToImportFrom(program, host, from, filterByPackageJson, useAutoImportProvider, cb) { + var _a, _b; + forEachExternalModuleToImportFromInProgram(program, host, from, filterByPackageJson, function (module, file) { return cb(module, file, program, /*isFromPackageJson*/ false); }); + var autoImportProvider = useAutoImportProvider && ((_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host)); + if (autoImportProvider) { + var start = ts.timestamp(); + forEachExternalModuleToImportFromInProgram(autoImportProvider, host, from, filterByPackageJson, function (module, file) { return cb(module, file, autoImportProvider, /*isFromPackageJson*/ true); }); + (_b = host.log) === null || _b === void 0 ? void 0 : _b.call(host, "forEachExternalModuleToImportFrom autoImportProvider: " + (ts.timestamp() - start)); + } + } + codefix.forEachExternalModuleToImportFrom = forEachExternalModuleToImportFrom; + function forEachExternalModuleToImportFromInProgram(program, host, from, filterByPackageJson, cb) { + var _a; var filteredCount = 0; var moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host); var packageJson = filterByPackageJson && createAutoImportFilter(from, program, host, moduleSpecifierResolutionHost); forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), function (module, sourceFile) { if (sourceFile === undefined) { if (!packageJson || packageJson.allowsImportingAmbientModule(module)) { - cb(module); + cb(module, sourceFile); } else if (packageJson) { filteredCount++; @@ -130744,18 +134085,15 @@ var ts; sourceFile !== from && isImportableFile(program, from, sourceFile, moduleSpecifierResolutionHost)) { if (!packageJson || packageJson.allowsImportingSourceFile(sourceFile)) { - cb(module); + cb(module, sourceFile); } else if (packageJson) { filteredCount++; } } }); - if (host.log) { - host.log("forEachExternalModuleToImportFrom: filtered out " + filteredCount + " modules by package.json contents"); - } + (_a = host.log) === null || _a === void 0 ? void 0 : _a.call(host, "forEachExternalModuleToImportFrom: filtered out " + filteredCount + " modules by package.json contents"); } - codefix.forEachExternalModuleToImportFrom = forEachExternalModuleToImportFrom; function forEachExternalModule(checker, allSourceFiles, cb) { for (var _i = 0, _a = checker.getAmbientModules(); _i < _a.length; _i++) { var ambient = _a[_i]; @@ -130826,15 +134164,14 @@ var ts; codefix.moduleSpecifierToValidIdentifier = moduleSpecifierToValidIdentifier; function createAutoImportFilter(fromFile, program, host, moduleSpecifierResolutionHost) { if (moduleSpecifierResolutionHost === void 0) { moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host); } - var packageJsons = host.getPackageJsonsVisibleToFile && host.getPackageJsonsVisibleToFile(fromFile.fileName) || ts.getPackageJsonsVisibleToFile(fromFile.fileName, host); - var dependencyGroups = 1 /* Dependencies */ | 2 /* DevDependencies */ | 8 /* OptionalDependencies */; + var packageJsons = ((host.getPackageJsonsVisibleToFile && host.getPackageJsonsVisibleToFile(fromFile.fileName)) || ts.getPackageJsonsVisibleToFile(fromFile.fileName, host)).filter(function (p) { return p.parseable; }); var usesNodeCoreModules; return { allowsImportingAmbientModule: allowsImportingAmbientModule, allowsImportingSourceFile: allowsImportingSourceFile, allowsImportingSpecifier: allowsImportingSpecifier, moduleSpecifierResolutionHost: moduleSpecifierResolutionHost }; function moduleSpecifierIsCoveredByPackageJson(specifier) { var packageName = getNodeModuleRootSpecifier(specifier); for (var _i = 0, packageJsons_1 = packageJsons; _i < packageJsons_1.length; _i++) { var packageJson = packageJsons_1[_i]; - if (packageJson.has(packageName, dependencyGroups) || packageJson.has(ts.getTypesPackageName(packageName), dependencyGroups)) { + if (packageJson.has(packageName) || packageJson.has(ts.getTypesPackageName(packageName))) { return true; } } @@ -130944,12 +134281,12 @@ var ts; }); function doChange(changes, sourceFile, pos, checker) { var token = ts.getTokenAtPosition(sourceFile, pos); - ts.Debug.assert(token.kind === 104 /* ThisKeyword */); + ts.Debug.assert(token.kind === 107 /* ThisKeyword */); var fn = ts.getThisContainer(token, /*includeArrowFunctions*/ false); if (!ts.isFunctionDeclaration(fn) && !ts.isFunctionExpression(fn)) return undefined; if (!ts.isSourceFile(ts.getThisContainer(fn, /*includeArrowFunctions*/ false))) { // 'this' is defined outside, convert to arrow function - var fnKeyword = ts.Debug.assertDefined(ts.findChildOfKind(fn, 94 /* FunctionKeyword */, sourceFile)); + var fnKeyword = ts.Debug.assertDefined(ts.findChildOfKind(fn, 97 /* FunctionKeyword */, sourceFile)); var name = fn.name; var body = ts.Debug.assertDefined(fn.body); // Should be defined because the function contained a 'this' expression if (ts.isFunctionExpression(fn)) { @@ -130968,17 +134305,60 @@ var ts; else { // `function f() {}` => `const f = () => {}` // `name` should be defined because we only do this in inner contexts, and name is only undefined for `export default function() {}`. - changes.replaceNode(sourceFile, fnKeyword, ts.createToken(81 /* ConstKeyword */)); + changes.replaceNode(sourceFile, fnKeyword, ts.factory.createToken(84 /* ConstKeyword */)); changes.insertText(sourceFile, name.end, " = "); changes.insertText(sourceFile, body.pos, " =>"); return [ts.Diagnostics.Convert_function_declaration_0_to_arrow_function, name.text]; } } - // No outer 'this', add a @class tag if in a JS constructor function - else if (ts.isSourceFileJS(sourceFile) && ts.isPropertyAccessExpression(token.parent) && ts.isAssignmentExpression(token.parent.parent)) { - codefix.addJSDocTags(changes, sourceFile, fn, [ts.createJSDocClassTag()]); - return ts.Diagnostics.Add_class_tag; + } + })(codefix = ts.codefix || (ts.codefix = {})); +})(ts || (ts = {})); +/* @internal */ +var ts; +(function (ts) { + var codefix; + (function (codefix) { + var fixId = "fixIncorrectNamedTupleSyntax"; + var errorCodes = [ + ts.Diagnostics.A_labeled_tuple_element_is_declared_as_optional_with_a_question_mark_after_the_name_and_before_the_colon_rather_than_after_the_type.code, + ts.Diagnostics.A_labeled_tuple_element_is_declared_as_rest_with_a_before_the_name_rather_than_before_the_type.code + ]; + codefix.registerCodeFix({ + errorCodes: errorCodes, + getCodeActions: function (context) { + var sourceFile = context.sourceFile, span = context.span; + var namedTupleMember = getNamedTupleMember(sourceFile, span.start); + var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, namedTupleMember); }); + return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Move_labeled_tuple_element_modifiers_to_labels, fixId, ts.Diagnostics.Move_labeled_tuple_element_modifiers_to_labels)]; + }, + fixIds: [fixId] + }); + function getNamedTupleMember(sourceFile, pos) { + var token = ts.getTokenAtPosition(sourceFile, pos); + return ts.findAncestor(token, function (t) { return t.kind === 191 /* NamedTupleMember */; }); + } + function doChange(changes, sourceFile, namedTupleMember) { + if (!namedTupleMember) { + return; } + var unwrappedType = namedTupleMember.type; + var sawOptional = false; + var sawRest = false; + while (unwrappedType.kind === 179 /* OptionalType */ || unwrappedType.kind === 180 /* RestType */ || unwrappedType.kind === 185 /* ParenthesizedType */) { + if (unwrappedType.kind === 179 /* OptionalType */) { + sawOptional = true; + } + else if (unwrappedType.kind === 180 /* RestType */) { + sawRest = true; + } + unwrappedType = unwrappedType.type; + } + var updated = ts.factory.updateNamedTupleMember(namedTupleMember, namedTupleMember.dotDotDotToken || (sawRest ? ts.factory.createToken(25 /* DotDotDotToken */) : undefined), namedTupleMember.name, namedTupleMember.questionToken || (sawOptional ? ts.factory.createToken(57 /* QuestionToken */) : undefined), unwrappedType); + if (updated === namedTupleMember) { + return; + } + changes.replaceNode(sourceFile, namedTupleMember, updated); } })(codefix = ts.codefix || (ts.codefix = {})); })(ts || (ts = {})); @@ -130994,12 +134374,16 @@ var ts; ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0.code, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0.code, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_2.code, + // for JSX class components + ts.Diagnostics.No_overload_matches_this_call.code, + // for JSX FC + ts.Diagnostics.Type_0_is_not_assignable_to_type_1.code, ]; codefix.registerCodeFix({ errorCodes: errorCodes, getCodeActions: function (context) { - var sourceFile = context.sourceFile; - var info = getInfo(sourceFile, context.span.start, context); + var sourceFile = context.sourceFile, errorCode = context.errorCode; + var info = getInfo(sourceFile, context.span.start, context, errorCode); if (!info) return undefined; var node = info.node, suggestedSymbol = info.suggestedSymbol; @@ -131009,18 +134393,23 @@ var ts; }, fixIds: [fixId], getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) { - var info = getInfo(diag.file, diag.start, context); + var info = getInfo(diag.file, diag.start, context, diag.code); var target = context.host.getCompilationSettings().target; if (info) doChange(changes, context.sourceFile, info.node, info.suggestedSymbol, target); }); }, }); - function getInfo(sourceFile, pos, context) { + function getInfo(sourceFile, pos, context, errorCode) { // This is the identifier of the misspelled word. eg: // this.speling = 1; // ^^^^^^^ var node = ts.getTokenAtPosition(sourceFile, pos); var parent = node.parent; + // Only fix spelling for No_overload_matches_this_call emitted on the React class component + if ((errorCode === ts.Diagnostics.No_overload_matches_this_call.code || + errorCode === ts.Diagnostics.Type_0_is_not_assignable_to_type_1.code) && + !ts.isJsxAttribute(parent)) + return undefined; var checker = context.program.getTypeChecker(); var suggestedSymbol; if (ts.isPropertyAccessExpression(parent) && parent.name === node) { @@ -131039,6 +134428,12 @@ var ts; suggestedSymbol = checker.getSuggestedSymbolForNonexistentModule(node, resolvedSourceFile.symbol); } } + else if (ts.isJsxAttribute(parent) && parent.name === node) { + ts.Debug.assertNode(node, ts.isIdentifier, "Expected an identifier for JSX attribute"); + var tag = ts.findAncestor(node, ts.isJsxOpeningLikeElement); + var props = checker.getContextualTypeForArgumentAtIndex(tag, 0); + suggestedSymbol = checker.getSuggestedSymbolForNonexistentJSXAttribute(node, props); + } else { var meaning = ts.getMeaningFromLocation(node); var name = ts.getTextOfNode(node); @@ -131052,14 +134447,14 @@ var ts; if (!ts.isIdentifierText(suggestion, target) && ts.isPropertyAccessExpression(node.parent)) { var valDecl = suggestedSymbol.valueDeclaration; if (ts.isNamedDeclaration(valDecl) && ts.isPrivateIdentifier(valDecl.name)) { - changes.replaceNode(sourceFile, node, ts.createIdentifier(suggestion)); + changes.replaceNode(sourceFile, node, ts.factory.createIdentifier(suggestion)); } else { - changes.replaceNode(sourceFile, node.parent, ts.createElementAccess(node.parent.expression, ts.createLiteral(suggestion))); + changes.replaceNode(sourceFile, node.parent, ts.factory.createElementAccessExpression(node.parent.expression, ts.factory.createStringLiteral(suggestion))); } } else { - changes.replaceNode(sourceFile, node, ts.createIdentifier(suggestion)); + changes.replaceNode(sourceFile, node, ts.factory.createIdentifier(suggestion)); } } function convertSemanticMeaningToSymbolFlags(meaning) { @@ -131092,7 +134487,7 @@ var ts; (function (codefix) { var fixId = "returnValueCorrect"; var fixIdAddReturnStatement = "fixAddReturnStatement"; - var fixIdRemoveBlockBodyBrace = "fixRemoveBlockBodyBrace"; + var fixRemoveBracesFromArrowFunctionBody = "fixRemoveBracesFromArrowFunctionBody"; var fixIdWrapTheBlockWithParen = "fixWrapTheBlockWithParen"; var errorCodes = [ ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value.code, @@ -131106,14 +134501,14 @@ var ts; })(ProblemKind || (ProblemKind = {})); codefix.registerCodeFix({ errorCodes: errorCodes, - fixIds: [fixIdAddReturnStatement, fixIdRemoveBlockBodyBrace, fixIdWrapTheBlockWithParen], + fixIds: [fixIdAddReturnStatement, fixRemoveBracesFromArrowFunctionBody, fixIdWrapTheBlockWithParen], getCodeActions: function (context) { var program = context.program, sourceFile = context.sourceFile, start = context.span.start, errorCode = context.errorCode; var info = getInfo(program.getTypeChecker(), sourceFile, start, errorCode); if (!info) return undefined; if (info.kind === ProblemKind.MissingReturnStatement) { - return ts.append([getActionForfixAddReturnStatement(context, info.expression, info.statement)], ts.isArrowFunction(info.declaration) ? getActionForfixRemoveBlockBodyBrace(context, info.declaration, info.expression, info.commentSource) : undefined); + return ts.append([getActionForfixAddReturnStatement(context, info.expression, info.statement)], ts.isArrowFunction(info.declaration) ? getActionForFixRemoveBracesFromArrowFunctionBody(context, info.declaration, info.expression, info.commentSource) : undefined); } else { return [getActionForfixWrapTheBlockWithParen(context, info.declaration, info.expression)]; @@ -131127,7 +134522,7 @@ var ts; case fixIdAddReturnStatement: addReturnStatement(changes, diag.file, info.expression, info.statement); break; - case fixIdRemoveBlockBodyBrace: + case fixRemoveBracesFromArrowFunctionBody: if (!ts.isArrowFunction(info.declaration)) return undefined; removeBlockBodyBrace(changes, diag.file, info.declaration, info.expression, info.commentSource, /* withParen */ false); @@ -131142,11 +134537,17 @@ var ts; } }); }, }); + function createObjectTypeFromLabeledExpression(checker, label, expression) { + var member = checker.createSymbol(4 /* Property */, label.escapedText); + member.type = checker.getTypeAtLocation(expression); + var members = ts.createSymbolTable([member]); + return checker.createAnonymousType(/*symbol*/ undefined, members, [], [], /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined); + } function getFixInfo(checker, declaration, expectType, isFunctionType) { if (!declaration.body || !ts.isBlock(declaration.body) || ts.length(declaration.body.statements) !== 1) return undefined; var firstStatement = ts.first(declaration.body.statements); - if (ts.isExpressionStatement(firstStatement) && checkFixedAssignableTo(checker, declaration, firstStatement.expression, expectType, isFunctionType)) { + if (ts.isExpressionStatement(firstStatement) && checkFixedAssignableTo(checker, declaration, checker.getTypeAtLocation(firstStatement.expression), expectType, isFunctionType)) { return { declaration: declaration, kind: ProblemKind.MissingReturnStatement, @@ -131156,8 +134557,9 @@ var ts; }; } else if (ts.isLabeledStatement(firstStatement) && ts.isExpressionStatement(firstStatement.statement)) { - var node = ts.createObjectLiteral([ts.createPropertyAssignment(firstStatement.label, firstStatement.statement.expression)]); - if (checkFixedAssignableTo(checker, declaration, node, expectType, isFunctionType)) { + var node = ts.factory.createObjectLiteralExpression([ts.factory.createPropertyAssignment(firstStatement.label, firstStatement.statement.expression)]); + var nodeType = createObjectTypeFromLabeledExpression(checker, firstStatement.label, firstStatement.statement.expression); + if (checkFixedAssignableTo(checker, declaration, nodeType, expectType, isFunctionType)) { return ts.isArrowFunction(declaration) ? { declaration: declaration, kind: ProblemKind.MissingParentheses, @@ -131176,8 +134578,9 @@ var ts; else if (ts.isBlock(firstStatement) && ts.length(firstStatement.statements) === 1) { var firstBlockStatement = ts.first(firstStatement.statements); if (ts.isLabeledStatement(firstBlockStatement) && ts.isExpressionStatement(firstBlockStatement.statement)) { - var node = ts.createObjectLiteral([ts.createPropertyAssignment(firstBlockStatement.label, firstBlockStatement.statement.expression)]); - if (checkFixedAssignableTo(checker, declaration, node, expectType, isFunctionType)) { + var node = ts.factory.createObjectLiteralExpression([ts.factory.createPropertyAssignment(firstBlockStatement.label, firstBlockStatement.statement.expression)]); + var nodeType = createObjectTypeFromLabeledExpression(checker, firstBlockStatement.label, firstBlockStatement.statement.expression); + if (checkFixedAssignableTo(checker, declaration, nodeType, expectType, isFunctionType)) { return { declaration: declaration, kind: ProblemKind.MissingReturnStatement, @@ -131190,8 +134593,25 @@ var ts; } return undefined; } - function checkFixedAssignableTo(checker, declaration, expr, type, isFunctionType) { - return checker.isTypeAssignableTo(checker.getTypeAtLocation(isFunctionType ? ts.updateFunctionLikeBody(declaration, ts.createBlock([ts.createReturn(expr)])) : expr), type); + function checkFixedAssignableTo(checker, declaration, exprType, type, isFunctionType) { + if (isFunctionType) { + var sig = checker.getSignatureFromDeclaration(declaration); + if (sig) { + if (ts.hasSyntacticModifier(declaration, 256 /* Async */)) { + exprType = checker.createPromiseType(exprType); + } + var newSig = checker.createSignature(declaration, sig.typeParameters, sig.thisParameter, sig.parameters, exprType, + /*typePredicate*/ undefined, sig.minArgumentCount, sig.flags); + exprType = checker.createAnonymousType( + /*symbol*/ undefined, ts.createSymbolTable(), [newSig], [], + /*stringIndexInfo*/ undefined, + /*numberIndexInfo*/ undefined); + } + else { + exprType = checker.getAnyType(); + } + } + return checker.isTypeAssignableTo(exprType, type); } function getInfo(checker, sourceFile, position, errorCode) { var node = ts.getTokenAtPosition(sourceFile, position); @@ -131223,47 +134643,47 @@ var ts; } function getVariableLikeInitializer(declaration) { switch (declaration.kind) { - case 242 /* VariableDeclaration */: - case 156 /* Parameter */: - case 191 /* BindingElement */: - case 159 /* PropertyDeclaration */: - case 281 /* PropertyAssignment */: + case 246 /* VariableDeclaration */: + case 159 /* Parameter */: + case 195 /* BindingElement */: + case 162 /* PropertyDeclaration */: + case 285 /* PropertyAssignment */: return declaration.initializer; - case 273 /* JsxAttribute */: + case 277 /* JsxAttribute */: return declaration.initializer && (ts.isJsxExpression(declaration.initializer) ? declaration.initializer.expression : undefined); - case 282 /* ShorthandPropertyAssignment */: - case 158 /* PropertySignature */: - case 284 /* EnumMember */: - case 323 /* JSDocPropertyTag */: - case 317 /* JSDocParameterTag */: + case 286 /* ShorthandPropertyAssignment */: + case 161 /* PropertySignature */: + case 288 /* EnumMember */: + case 328 /* JSDocPropertyTag */: + case 322 /* JSDocParameterTag */: return undefined; } } function addReturnStatement(changes, sourceFile, expression, statement) { ts.suppressLeadingAndTrailingTrivia(expression); var probablyNeedSemi = ts.probablyUsesSemicolons(sourceFile); - changes.replaceNode(sourceFile, statement, ts.createReturn(expression), { + changes.replaceNode(sourceFile, statement, ts.factory.createReturnStatement(expression), { leadingTriviaOption: ts.textChanges.LeadingTriviaOption.Exclude, trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Exclude, suffix: probablyNeedSemi ? ";" : undefined }); } function removeBlockBodyBrace(changes, sourceFile, declaration, expression, commentSource, withParen) { - var newBody = (withParen || ts.needsParentheses(expression)) ? ts.createParen(expression) : expression; + var newBody = (withParen || ts.needsParentheses(expression)) ? ts.factory.createParenthesizedExpression(expression) : expression; ts.suppressLeadingAndTrailingTrivia(commentSource); ts.copyComments(commentSource, newBody); changes.replaceNode(sourceFile, declaration.body, newBody); } function wrapBlockWithParen(changes, sourceFile, declaration, expression) { - changes.replaceNode(sourceFile, declaration.body, ts.createParen(expression)); + changes.replaceNode(sourceFile, declaration.body, ts.factory.createParenthesizedExpression(expression)); } function getActionForfixAddReturnStatement(context, expression, statement) { var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addReturnStatement(t, context.sourceFile, expression, statement); }); return codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_a_return_statement, fixIdAddReturnStatement, ts.Diagnostics.Add_all_missing_return_statement); } - function getActionForfixRemoveBlockBodyBrace(context, declaration, expression, commentSource) { + function getActionForFixRemoveBracesFromArrowFunctionBody(context, declaration, expression, commentSource) { var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return removeBlockBodyBrace(t, context.sourceFile, declaration, expression, commentSource, /* withParen */ false); }); - return codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Remove_block_body_braces, fixIdRemoveBlockBodyBrace, ts.Diagnostics.Remove_all_incorrect_body_block_braces); + return codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Remove_braces_from_arrow_function_body, fixRemoveBracesFromArrowFunctionBody, ts.Diagnostics.Remove_braces_from_all_arrow_function_bodies_with_relevant_issues); } function getActionForfixWrapTheBlockWithParen(context, declaration, expression) { var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return wrapBlockWithParen(t, context.sourceFile, declaration, expression); }); @@ -131289,26 +134709,22 @@ var ts; errorCodes: errorCodes, getCodeActions: function (context) { var info = getInfo(context.sourceFile, context.span.start, context.program.getTypeChecker(), context.program); - if (!info) + if (!info) { return undefined; + } if (info.kind === 0 /* Enum */) { var token_1 = info.token, parentDeclaration_1 = info.parentDeclaration; var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addEnumMemberDeclaration(t, context.program.getTypeChecker(), token_1, parentDeclaration_1); }); return [codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_missing_enum_member_0, token_1.text], fixId, ts.Diagnostics.Add_all_missing_members)]; } - var parentDeclaration = info.parentDeclaration, declSourceFile = info.declSourceFile, inJs = info.inJs, makeStatic = info.makeStatic, token = info.token, call = info.call; - var methodCodeAction = call && getActionForMethodDeclaration(context, declSourceFile, parentDeclaration, token, call, makeStatic, inJs); - var addMember = inJs && !ts.isInterfaceDeclaration(parentDeclaration) ? - ts.singleElementArray(getActionsForAddMissingMemberInJavascriptFile(context, declSourceFile, parentDeclaration, token, makeStatic)) : - getActionsForAddMissingMemberInTypeScriptFile(context, declSourceFile, parentDeclaration, token, makeStatic); - return ts.concatenate(ts.singleElementArray(methodCodeAction), addMember); + return ts.concatenate(getActionsForMissingMethodDeclaration(context, info), getActionsForMissingMemberDeclaration(context, info)); }, fixIds: [fixId], getAllCodeActions: function (context) { var program = context.program; var checker = program.getTypeChecker(); - var seen = ts.createMap(); - var typeDeclToMembers = new ts.NodeMap(); + var seen = new ts.Map(); + var typeDeclToMembers = new ts.Map(); return codefix.createCombinedCodeActions(ts.textChanges.ChangeTracker.with(context, function (changes) { codefix.eachDiagnostic(context, errorCodes, function (diag) { var info = getInfo(diag.file, diag.start, checker, context.program); @@ -131321,13 +134737,13 @@ var ts; } else { var parentDeclaration = info.parentDeclaration, token_2 = info.token; - var infos = typeDeclToMembers.getOrUpdate(parentDeclaration, function () { return []; }); + var infos = ts.getOrUpdate(typeDeclToMembers, parentDeclaration, function () { return []; }); if (!infos.some(function (i) { return i.token.text === token_2.text; })) infos.push(info); } }); typeDeclToMembers.forEach(function (infos, classDeclaration) { - var supers = getAllSupers(classDeclaration, checker); + var supers = codefix.getAllSupers(classDeclaration, checker); var _loop_13 = function (info) { // If some superclass added this property, don't add it again. if (supers.some(function (superClassOrInterface) { @@ -131338,18 +134754,18 @@ var ts; }); })) return "continue"; - var parentDeclaration = info.parentDeclaration, declSourceFile = info.declSourceFile, inJs = info.inJs, makeStatic = info.makeStatic, token = info.token, call = info.call; + var parentDeclaration = info.parentDeclaration, declSourceFile = info.declSourceFile, modifierFlags = info.modifierFlags, token = info.token, call = info.call, isJSFile = info.isJSFile; // Always prefer to add a method declaration if possible. if (call && !ts.isPrivateIdentifier(token)) { - addMethodDeclaration(context, changes, declSourceFile, parentDeclaration, token, call, makeStatic, inJs); + addMethodDeclaration(context, changes, call, token.text, modifierFlags & 32 /* Static */, parentDeclaration, declSourceFile, isJSFile); } else { - if (inJs && !ts.isInterfaceDeclaration(parentDeclaration)) { - addMissingMemberInJs(changes, declSourceFile, parentDeclaration, token, makeStatic); + if (isJSFile && !ts.isInterfaceDeclaration(parentDeclaration)) { + addMissingMemberInJs(changes, declSourceFile, parentDeclaration, token, !!(modifierFlags & 32 /* Static */)); } else { var typeNode = getTypeNode(program.getTypeChecker(), parentDeclaration, token); - addPropertyDeclaration(changes, declSourceFile, parentDeclaration, token.text, typeNode, makeStatic ? 32 /* Static */ : 0); + addPropertyDeclaration(changes, declSourceFile, parentDeclaration, token.text, typeNode, modifierFlags & 32 /* Static */); } } }; @@ -131361,19 +134777,6 @@ var ts; })); }, }); - function getAllSupers(decl, checker) { - var res = []; - while (decl) { - var superElement = ts.getClassExtendsHeritageElement(decl); - var superSymbol = superElement && checker.getSymbolAtLocation(superElement.expression); - var superDecl = superSymbol && ts.find(superSymbol.declarations, ts.isClassLike); - if (superDecl) { - res.push(superDecl); - } - decl = superDecl; - } - return res; - } var InfoKind; (function (InfoKind) { InfoKind[InfoKind["Enum"] = 0] = "Enum"; @@ -131407,9 +134810,10 @@ var ts; return undefined; } var declSourceFile = classOrInterface.getSourceFile(); - var inJs = ts.isSourceFileJS(declSourceFile); + var modifierFlags = (makeStatic ? 32 /* Static */ : 0) | (ts.startsWithUnderscore(token.text) ? 8 /* Private */ : 0); + var isJSFile = ts.isSourceFileJS(declSourceFile); var call = ts.tryCast(parent.parent, ts.isCallExpression); - return { kind: 1 /* ClassOrInterface */, token: token, parentDeclaration: classOrInterface, makeStatic: makeStatic, declSourceFile: declSourceFile, inJs: inJs, call: call }; + return { kind: 1 /* ClassOrInterface */, token: token, call: call, modifierFlags: modifierFlags, parentDeclaration: classOrInterface, declSourceFile: declSourceFile, isJSFile: isJSFile }; } var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration); if (enumDeclaration && !ts.isPrivateIdentifier(token) && !program.isSourceFileFromExternalLibrary(enumDeclaration.getSourceFile())) { @@ -131417,27 +134821,35 @@ var ts; } return undefined; } - function getActionsForAddMissingMemberInJavascriptFile(context, declSourceFile, classDeclaration, token, makeStatic) { - var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addMissingMemberInJs(t, declSourceFile, classDeclaration, token, makeStatic); }); + function getActionsForMissingMemberDeclaration(context, info) { + return info.isJSFile ? ts.singleElementArray(createActionForAddMissingMemberInJavascriptFile(context, info)) : + createActionsForAddMissingMemberInTypeScriptFile(context, info); + } + function createActionForAddMissingMemberInJavascriptFile(context, _a) { + var parentDeclaration = _a.parentDeclaration, declSourceFile = _a.declSourceFile, modifierFlags = _a.modifierFlags, token = _a.token; + if (ts.isInterfaceDeclaration(parentDeclaration)) { + return undefined; + } + var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addMissingMemberInJs(t, declSourceFile, parentDeclaration, token, !!(modifierFlags & 32 /* Static */)); }); if (changes.length === 0) { return undefined; } - var diagnostic = makeStatic ? ts.Diagnostics.Initialize_static_property_0 : + var diagnostic = modifierFlags & 32 /* Static */ ? ts.Diagnostics.Initialize_static_property_0 : ts.isPrivateIdentifier(token) ? ts.Diagnostics.Declare_a_private_field_named_0 : ts.Diagnostics.Initialize_property_0_in_the_constructor; return codefix.createCodeFixAction(fixName, changes, [diagnostic, token.text], fixId, ts.Diagnostics.Add_all_missing_members); } function addMissingMemberInJs(changeTracker, declSourceFile, classDeclaration, token, makeStatic) { var tokenName = token.text; if (makeStatic) { - if (classDeclaration.kind === 214 /* ClassExpression */) { + if (classDeclaration.kind === 218 /* ClassExpression */) { return; } var className = classDeclaration.name.getText(); - var staticInitialization = initializePropertyToUndefined(ts.createIdentifier(className), tokenName); + var staticInitialization = initializePropertyToUndefined(ts.factory.createIdentifier(className), tokenName); changeTracker.insertNodeAfter(declSourceFile, classDeclaration, staticInitialization); } else if (ts.isPrivateIdentifier(token)) { - var property = ts.createProperty( + var property = ts.factory.createPropertyDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, tokenName, /*questionToken*/ undefined, @@ -131456,28 +134868,32 @@ var ts; if (!classConstructor) { return; } - var propertyInitialization = initializePropertyToUndefined(ts.createThis(), tokenName); + var propertyInitialization = initializePropertyToUndefined(ts.factory.createThis(), tokenName); changeTracker.insertNodeAtConstructorEnd(declSourceFile, classConstructor, propertyInitialization); } } function initializePropertyToUndefined(obj, propertyName) { - return ts.createStatement(ts.createAssignment(ts.createPropertyAccess(obj, propertyName), ts.createIdentifier("undefined"))); + return ts.factory.createExpressionStatement(ts.factory.createAssignment(ts.factory.createPropertyAccessExpression(obj, propertyName), ts.factory.createIdentifier("undefined"))); } - function getActionsForAddMissingMemberInTypeScriptFile(context, declSourceFile, classDeclaration, token, makeStatic) { - var typeNode = getTypeNode(context.program.getTypeChecker(), classDeclaration, token); - var actions = [createAddPropertyDeclarationAction(context, declSourceFile, classDeclaration, token.text, typeNode, makeStatic ? 32 /* Static */ : 0)]; - if (makeStatic || ts.isPrivateIdentifier(token)) { + function createActionsForAddMissingMemberInTypeScriptFile(context, _a) { + var parentDeclaration = _a.parentDeclaration, declSourceFile = _a.declSourceFile, modifierFlags = _a.modifierFlags, token = _a.token; + var memberName = token.text; + var isStatic = modifierFlags & 32 /* Static */; + var typeNode = getTypeNode(context.program.getTypeChecker(), parentDeclaration, token); + var addPropertyDeclarationChanges = function (modifierFlags) { return ts.textChanges.ChangeTracker.with(context, function (t) { return addPropertyDeclaration(t, declSourceFile, parentDeclaration, memberName, typeNode, modifierFlags); }); }; + var actions = [codefix.createCodeFixAction(fixName, addPropertyDeclarationChanges(modifierFlags & 32 /* Static */), [isStatic ? ts.Diagnostics.Declare_static_property_0 : ts.Diagnostics.Declare_property_0, memberName], fixId, ts.Diagnostics.Add_all_missing_members)]; + if (isStatic || ts.isPrivateIdentifier(token)) { return actions; } - if (ts.startsWithUnderscore(token.text)) { - actions.unshift(createAddPropertyDeclarationAction(context, declSourceFile, classDeclaration, token.text, typeNode, 8 /* Private */)); + if (modifierFlags & 8 /* Private */) { + actions.unshift(codefix.createCodeFixActionWithoutFixAll(fixName, addPropertyDeclarationChanges(8 /* Private */), [ts.Diagnostics.Declare_private_property_0, memberName])); } - actions.push(createAddIndexSignatureAction(context, declSourceFile, classDeclaration, token.text, typeNode)); + actions.push(createAddIndexSignatureAction(context, declSourceFile, parentDeclaration, token.text, typeNode)); return actions; } function getTypeNode(checker, classDeclaration, token) { var typeNode; - if (token.parent.parent.kind === 209 /* BinaryExpression */) { + if (token.parent.parent.kind === 213 /* BinaryExpression */) { var binaryExpression = token.parent.parent; var otherExpression = token.parent === binaryExpression.left ? binaryExpression.right : binaryExpression.left; var widenedType = checker.getWidenedType(checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(otherExpression))); @@ -131487,19 +134903,12 @@ var ts; var contextualType = checker.getContextualType(token.parent); typeNode = contextualType ? checker.typeToTypeNode(contextualType, /*enclosingDeclaration*/ undefined, /*flags*/ undefined) : undefined; } - return typeNode || ts.createKeywordTypeNode(125 /* AnyKeyword */); - } - function createAddPropertyDeclarationAction(context, declSourceFile, classDeclaration, tokenName, typeNode, modifierFlags) { - var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addPropertyDeclaration(t, declSourceFile, classDeclaration, tokenName, typeNode, modifierFlags); }); - if (modifierFlags & 8 /* Private */) { - return codefix.createCodeFixActionWithoutFixAll(fixName, changes, [ts.Diagnostics.Declare_private_property_0, tokenName]); - } - return codefix.createCodeFixAction(fixName, changes, [modifierFlags & 32 /* Static */ ? ts.Diagnostics.Declare_static_property_0 : ts.Diagnostics.Declare_property_0, tokenName], fixId, ts.Diagnostics.Add_all_missing_members); + return typeNode || ts.factory.createKeywordTypeNode(128 /* AnyKeyword */); } function addPropertyDeclaration(changeTracker, declSourceFile, classDeclaration, tokenName, typeNode, modifierFlags) { - var property = ts.createProperty( + var property = ts.factory.createPropertyDeclaration( /*decorators*/ undefined, - /*modifiers*/ modifierFlags ? ts.createNodeArray(ts.createModifiersFromModifierFlags(modifierFlags)) : undefined, tokenName, + /*modifiers*/ modifierFlags ? ts.factory.createNodeArray(ts.factory.createModifiersFromModifierFlags(modifierFlags)) : undefined, tokenName, /*questionToken*/ undefined, typeNode, /*initializer*/ undefined); var lastProp = getNodeToInsertPropertyAfter(classDeclaration); @@ -131523,39 +134932,48 @@ var ts; } function createAddIndexSignatureAction(context, declSourceFile, classDeclaration, tokenName, typeNode) { // Index signatures cannot have the static modifier. - var stringTypeNode = ts.createKeywordTypeNode(143 /* StringKeyword */); - var indexingParameter = ts.createParameter( + var stringTypeNode = ts.factory.createKeywordTypeNode(146 /* StringKeyword */); + var indexingParameter = ts.factory.createParameterDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "x", /*questionToken*/ undefined, stringTypeNode, /*initializer*/ undefined); - var indexSignature = ts.createIndexSignature( + var indexSignature = ts.factory.createIndexSignature( /*decorators*/ undefined, /*modifiers*/ undefined, [indexingParameter], typeNode); var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return t.insertNodeAtClassStart(declSourceFile, classDeclaration, indexSignature); }); // No fixId here because code-fix-all currently only works on adding individual named properties. return codefix.createCodeFixActionWithoutFixAll(fixName, changes, [ts.Diagnostics.Add_index_signature_for_property_0, tokenName]); } - function getActionForMethodDeclaration(context, declSourceFile, classDeclaration, token, callExpression, makeStatic, inJs) { + function getActionsForMissingMethodDeclaration(context, info) { + var parentDeclaration = info.parentDeclaration, declSourceFile = info.declSourceFile, modifierFlags = info.modifierFlags, token = info.token, call = info.call, isJSFile = info.isJSFile; + if (call === undefined) { + return undefined; + } // Private methods are not implemented yet. if (ts.isPrivateIdentifier(token)) { return undefined; } - var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addMethodDeclaration(context, t, declSourceFile, classDeclaration, token, callExpression, makeStatic, inJs); }); - return codefix.createCodeFixAction(fixName, changes, [makeStatic ? ts.Diagnostics.Declare_static_method_0 : ts.Diagnostics.Declare_method_0, token.text], fixId, ts.Diagnostics.Add_all_missing_members); + var methodName = token.text; + var addMethodDeclarationChanges = function (modifierFlags) { return ts.textChanges.ChangeTracker.with(context, function (t) { return addMethodDeclaration(context, t, call, methodName, modifierFlags, parentDeclaration, declSourceFile, isJSFile); }); }; + var actions = [codefix.createCodeFixAction(fixName, addMethodDeclarationChanges(modifierFlags & 32 /* Static */), [modifierFlags & 32 /* Static */ ? ts.Diagnostics.Declare_static_method_0 : ts.Diagnostics.Declare_method_0, methodName], fixId, ts.Diagnostics.Add_all_missing_members)]; + if (modifierFlags & 8 /* Private */) { + actions.unshift(codefix.createCodeFixActionWithoutFixAll(fixName, addMethodDeclarationChanges(8 /* Private */), [ts.Diagnostics.Declare_private_method_0, methodName])); + } + return actions; } - function addMethodDeclaration(context, changeTracker, declSourceFile, typeDecl, token, callExpression, makeStatic, inJs) { - var importAdder = codefix.createImportAdder(declSourceFile, context.program, context.preferences, context.host); - var methodDeclaration = codefix.createMethodFromCallExpression(context, callExpression, token.text, inJs, makeStatic, typeDecl, importAdder); - var containingMethodDeclaration = ts.getAncestor(callExpression, 161 /* MethodDeclaration */); - if (containingMethodDeclaration && containingMethodDeclaration.parent === typeDecl) { - changeTracker.insertNodeAfter(declSourceFile, containingMethodDeclaration, methodDeclaration); + function addMethodDeclaration(context, changes, callExpression, methodName, modifierFlags, parentDeclaration, sourceFile, isJSFile) { + var importAdder = codefix.createImportAdder(sourceFile, context.program, context.preferences, context.host); + var methodDeclaration = codefix.createMethodFromCallExpression(context, importAdder, callExpression, methodName, modifierFlags, parentDeclaration, isJSFile); + var containingMethodDeclaration = ts.findAncestor(callExpression, function (n) { return ts.isMethodDeclaration(n) || ts.isConstructorDeclaration(n); }); + if (containingMethodDeclaration && containingMethodDeclaration.parent === parentDeclaration) { + changes.insertNodeAfter(sourceFile, containingMethodDeclaration, methodDeclaration); } else { - changeTracker.insertNodeAtClassStart(declSourceFile, typeDecl, methodDeclaration); + changes.insertNodeAtClassStart(sourceFile, parentDeclaration, methodDeclaration); } - importAdder.writeFixes(changeTracker); + importAdder.writeFixes(changes); } function addEnumMemberDeclaration(changes, checker, token, enumDeclaration) { /** @@ -131567,8 +134985,8 @@ var ts; var type = checker.getTypeAtLocation(member); return !!(type && type.flags & 132 /* StringLike */); }); - var enumMember = ts.createEnumMember(token, hasStringInitializer ? ts.createStringLiteral(token.text) : undefined); - changes.replaceNode(enumDeclaration.getSourceFile(), enumDeclaration, ts.updateEnumDeclaration(enumDeclaration, enumDeclaration.decorators, enumDeclaration.modifiers, enumDeclaration.name, ts.concatenate(enumDeclaration.members, ts.singleElementArray(enumMember))), { + var enumMember = ts.factory.createEnumMember(token, hasStringInitializer ? ts.factory.createStringLiteral(token.text) : undefined); + changes.replaceNode(enumDeclaration.getSourceFile(), enumDeclaration, ts.factory.updateEnumDeclaration(enumDeclaration, enumDeclaration.decorators, enumDeclaration.modifiers, enumDeclaration.name, ts.concatenate(enumDeclaration.members, ts.singleElementArray(enumMember))), { leadingTriviaOption: ts.textChanges.LeadingTriviaOption.IncludeAll, trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Exclude }); @@ -131596,7 +135014,7 @@ var ts; }); function addMissingNewOperator(changes, sourceFile, span) { var call = ts.cast(findAncestorMatchingSpan(sourceFile, span), ts.isCallExpression); - var newExpression = ts.createNew(call.expression, call.typeArguments, call.arguments); + var newExpression = ts.factory.createNewExpression(call.expression, call.typeArguments, call.arguments); changes.replaceNode(sourceFile, call, newExpression); } function findAncestorMatchingSpan(sourceFile, span) { @@ -131689,7 +135107,7 @@ var ts; }, fixIds: [fixId], getAllCodeActions: function (context) { - var seenClassDeclarations = ts.createMap(); + var seenClassDeclarations = new ts.Map(); return codefix.codeFixAll(context, errorCodes, function (changes, diag) { var classDeclaration = getClass(diag.file, diag.start); if (ts.addToSeen(seenClassDeclarations, ts.getNodeId(classDeclaration))) { @@ -131712,13 +135130,13 @@ var ts; // so duplicates cannot occur. var abstractAndNonPrivateExtendsSymbols = checker.getPropertiesOfType(instantiatedExtendsType).filter(symbolPointsToNonPrivateAndAbstractMember); var importAdder = codefix.createImportAdder(sourceFile, context.program, preferences, context.host); - codefix.createMissingMemberNodes(classDeclaration, abstractAndNonPrivateExtendsSymbols, context, preferences, importAdder, function (member) { return changeTracker.insertNodeAtClassStart(sourceFile, classDeclaration, member); }); + codefix.createMissingMemberNodes(classDeclaration, abstractAndNonPrivateExtendsSymbols, sourceFile, context, preferences, importAdder, function (member) { return changeTracker.insertNodeAtClassStart(sourceFile, classDeclaration, member); }); importAdder.writeFixes(changeTracker); } function symbolPointsToNonPrivateAndAbstractMember(symbol) { // See `codeFixClassExtendAbstractProtectedProperty.ts` in https://github.com/Microsoft/TypeScript/pull/11547/files // (now named `codeFixClassExtendAbstractPrivateProperty.ts`) - var flags = ts.getModifierFlags(ts.first(symbol.getDeclarations())); + var flags = ts.getSyntacticModifierFlags(ts.first(symbol.getDeclarations())); return !(flags & 8 /* Private */) && !!(flags & 128 /* Abstract */); } })(codefix = ts.codefix || (ts.codefix = {})); @@ -131744,7 +135162,7 @@ var ts; fixIds: [fixId], getAllCodeActions: function (context) { var sourceFile = context.sourceFile; - var seenClasses = ts.createMap(); // Ensure we only do this once per class. + var seenClasses = new ts.Map(); // Ensure we only do this once per class. return codefix.codeFixAll(context, errorCodes, function (changes, diag) { var nodes = getNodes(diag.file, diag.start); if (!nodes) @@ -131762,7 +135180,7 @@ var ts; } function getNodes(sourceFile, pos) { var token = ts.getTokenAtPosition(sourceFile, pos); - if (token.kind !== 104 /* ThisKeyword */) + if (token.kind !== 107 /* ThisKeyword */) return undefined; var constructor = ts.getContainingFunction(token); var superCall = findSuperCall(constructor.body); @@ -131805,7 +135223,7 @@ var ts; return token.parent; } function doChange(changes, sourceFile, ctr) { - var superCall = ts.createStatement(ts.createCall(ts.createSuper(), /*typeArguments*/ undefined, /*argumentsArray*/ ts.emptyArray)); + var superCall = ts.factory.createExpressionStatement(ts.factory.createCallExpression(ts.factory.createSuper(), /*typeArguments*/ undefined, /*argumentsArray*/ ts.emptyArray)); changes.insertNodeAtConstructorStart(sourceFile, ctr, superCall); } })(codefix = ts.codefix || (ts.codefix = {})); @@ -131839,7 +135257,7 @@ var ts; }); }, }); function doChange(changeTracker, configFile) { - codefix.setJsonCompilerOptionValue(changeTracker, configFile, "experimentalDecorators", ts.createTrue()); + codefix.setJsonCompilerOptionValue(changeTracker, configFile, "experimentalDecorators", ts.factory.createTrue()); } })(codefix = ts.codefix || (ts.codefix = {})); })(ts || (ts = {})); @@ -131876,7 +135294,7 @@ var ts; } }); function doChange(changeTracker, configFile) { - codefix.setJsonCompilerOptionValue(changeTracker, configFile, "jsx", ts.createStringLiteral("react")); + codefix.setJsonCompilerOptionValue(changeTracker, configFile, "jsx", ts.factory.createStringLiteral("react")); } })(codefix = ts.codefix || (ts.codefix = {})); })(ts || (ts = {})); @@ -131898,7 +135316,7 @@ var ts; var moduleOutOfRange = moduleKind >= ts.ModuleKind.ES2015 && moduleKind < ts.ModuleKind.ESNext; if (moduleOutOfRange) { var changes = ts.textChanges.ChangeTracker.with(context, function (changes) { - codefix.setJsonCompilerOptionValue(changes, configFile, "module", ts.createStringLiteral("esnext")); + codefix.setJsonCompilerOptionValue(changes, configFile, "module", ts.factory.createStringLiteral("esnext")); }); codeFixes.push(codefix.createCodeFixActionWithoutFixAll("fixModuleOption", changes, [ts.Diagnostics.Set_the_module_option_in_your_configuration_file_to_0, "esnext"])); } @@ -131909,10 +135327,10 @@ var ts; var configObject = ts.getTsConfigObjectLiteralExpression(configFile); if (!configObject) return; - var options = [["target", ts.createStringLiteral("es2017")]]; + var options = [["target", ts.factory.createStringLiteral("es2017")]]; if (moduleKind === ts.ModuleKind.CommonJS) { // Ensure we preserve the default module kind (commonjs), as targets >= ES2015 have a default module kind of es2015. - options.push(["module", ts.createStringLiteral("commonjs")]); + options.push(["module", ts.factory.createStringLiteral("commonjs")]); } codefix.setJsonCompilerOptionValues(tracker, configFile, options); }); @@ -131925,6 +135343,36 @@ var ts; })(ts || (ts = {})); /* @internal */ var ts; +(function (ts) { + var codefix; + (function (codefix) { + var fixId = "fixPropertyAssignment"; + var errorCodes = [ + ts.Diagnostics.Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern.code + ]; + codefix.registerCodeFix({ + errorCodes: errorCodes, + fixIds: [fixId], + getCodeActions: function (context) { + var sourceFile = context.sourceFile, span = context.span; + var property = getProperty(sourceFile, span.start); + var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, context.sourceFile, property); }); + return [codefix.createCodeFixAction(fixId, changes, [ts.Diagnostics.Change_0_to_1, "=", ":"], fixId, [ts.Diagnostics.Switch_each_misused_0_to_1, "=", ":"])]; + }, + getAllCodeActions: function (context) { + return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return doChange(changes, diag.file, getProperty(diag.file, diag.start)); }); + } + }); + function doChange(changes, sourceFile, node) { + changes.replaceNode(sourceFile, node, ts.factory.createPropertyAssignment(node.name, node.objectAssignmentInitializer)); + } + function getProperty(sourceFile, pos) { + return ts.cast(ts.getTokenAtPosition(sourceFile, pos).parent, ts.isShorthandPropertyAssignment); + } + })(codefix = ts.codefix || (ts.codefix = {})); +})(ts || (ts = {})); +/* @internal */ +var ts; (function (ts) { var codefix; (function (codefix) { @@ -131952,17 +135400,17 @@ var ts; var token = ts.getTokenAtPosition(sourceFile, pos); var heritageClauses = ts.getContainingClass(token).heritageClauses; var extendsToken = heritageClauses[0].getFirstToken(); - return extendsToken.kind === 90 /* ExtendsKeyword */ ? { extendsToken: extendsToken, heritageClauses: heritageClauses } : undefined; + return extendsToken.kind === 93 /* ExtendsKeyword */ ? { extendsToken: extendsToken, heritageClauses: heritageClauses } : undefined; } function doChanges(changes, sourceFile, extendsToken, heritageClauses) { - changes.replaceNode(sourceFile, extendsToken, ts.createToken(113 /* ImplementsKeyword */)); + changes.replaceNode(sourceFile, extendsToken, ts.factory.createToken(116 /* ImplementsKeyword */)); // If there is already an implements clause, replace the implements keyword with a comma. if (heritageClauses.length === 2 && - heritageClauses[0].token === 90 /* ExtendsKeyword */ && - heritageClauses[1].token === 113 /* ImplementsKeyword */) { + heritageClauses[0].token === 93 /* ExtendsKeyword */ && + heritageClauses[1].token === 116 /* ImplementsKeyword */) { var implementsToken = heritageClauses[1].getFirstToken(); var implementsFullStart = implementsToken.getFullStart(); - changes.replaceRange(sourceFile, { pos: implementsFullStart, end: implementsFullStart }, ts.createToken(27 /* CommaToken */)); + changes.replaceRange(sourceFile, { pos: implementsFullStart, end: implementsFullStart }, ts.factory.createToken(27 /* CommaToken */)); // Rough heuristic: delete trailing whitespace after keyword so that it's not excessive. // (Trailing because leading might be indentation, which is more sensitive.) var text = sourceFile.text; @@ -132015,7 +135463,7 @@ var ts; var node = _a.node, className = _a.className; // TODO (https://github.com/Microsoft/TypeScript/issues/21246): use shared helper ts.suppressLeadingAndTrailingTrivia(node); - changes.replaceNode(sourceFile, node, ts.createPropertyAccess(className ? ts.createIdentifier(className) : ts.createThis(), node)); + changes.replaceNode(sourceFile, node, ts.factory.createPropertyAccessExpression(className ? ts.factory.createIdentifier(className) : ts.factory.createThis(), node)); } })(codefix = ts.codefix || (ts.codefix = {})); })(ts || (ts = {})); @@ -132101,18 +135549,34 @@ var ts; var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return t.delete(sourceFile, importDecl); }); return [createDeleteFix(changes, [ts.Diagnostics.Remove_import_from_0, ts.showModuleSpecifier(importDecl)])]; } - var delDestructure = ts.textChanges.ChangeTracker.with(context, function (t) { - return tryDeleteFullDestructure(token, t, sourceFile, checker, sourceFiles, /*isFixAll*/ false); - }); - if (delDestructure.length) { - return [createDeleteFix(delDestructure, ts.Diagnostics.Remove_destructuring)]; + if (ts.isObjectBindingPattern(token.parent)) { + if (ts.isParameter(token.parent.parent)) { + var elements = token.parent.elements; + var diagnostic = [ + elements.length > 1 ? ts.Diagnostics.Remove_unused_declarations_for_Colon_0 : ts.Diagnostics.Remove_unused_declaration_for_Colon_0, + ts.map(elements, function (e) { return e.getText(sourceFile); }).join(", ") + ]; + return [ + createDeleteFix(ts.textChanges.ChangeTracker.with(context, function (t) { + return deleteDestructuringElements(t, sourceFile, token.parent); + }), diagnostic) + ]; + } + return [ + createDeleteFix(ts.textChanges.ChangeTracker.with(context, function (t) { + return t.delete(sourceFile, token.parent.parent); + }), ts.Diagnostics.Remove_unused_destructuring_declaration) + ]; } - var delVar = ts.textChanges.ChangeTracker.with(context, function (t) { return tryDeleteFullVariableStatement(sourceFile, token, t); }); - if (delVar.length) { - return [createDeleteFix(delVar, ts.Diagnostics.Remove_variable_statement)]; + if (canDeleteEntireVariableStatement(sourceFile, token)) { + return [ + createDeleteFix(ts.textChanges.ChangeTracker.with(context, function (t) { + return deleteEntireVariableStatement(t, sourceFile, token.parent); + }), ts.Diagnostics.Remove_variable_statement) + ]; } var result = []; - if (token.kind === 132 /* InferKeyword */) { + if (token.kind === 135 /* InferKeyword */) { var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return changeInferToUnknown(t, sourceFile, token); }); var name = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name.text; result.push(codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Replace_infer_0_with_unknown, name], fixIdInfer, ts.Diagnostics.Replace_all_unused_infer_with_unknown)); @@ -132144,8 +135608,9 @@ var ts; tryPrefixDeclaration(changes, diag.code, sourceFile, token); break; case fixIdDelete: { - if (token.kind === 132 /* InferKeyword */) + if (token.kind === 135 /* InferKeyword */) { break; // Can't delete + } var importDecl = tryGetFullImport(token); if (importDecl) { changes.delete(sourceFile, importDecl); @@ -132156,14 +135621,24 @@ var ts; else if (token.kind === 29 /* LessThanToken */) { deleteTypeParameters(changes, sourceFile, token); } - else if (!tryDeleteFullDestructure(token, changes, sourceFile, checker, sourceFiles, /*isFixAll*/ true) && - !tryDeleteFullVariableStatement(sourceFile, token, changes)) { + else if (ts.isObjectBindingPattern(token.parent)) { + if (ts.isParameter(token.parent.parent)) { + deleteDestructuringElements(changes, sourceFile, token.parent); + } + else { + changes.delete(sourceFile, token.parent.parent); + } + } + else if (canDeleteEntireVariableStatement(sourceFile, token)) { + deleteEntireVariableStatement(changes, sourceFile, token.parent); + } + else { tryDeleteDeclaration(sourceFile, token, changes, checker, sourceFiles, /*isFixAll*/ true); } break; } case fixIdInfer: - if (token.kind === 132 /* InferKeyword */) { + if (token.kind === 135 /* InferKeyword */) { changeInferToUnknown(changes, sourceFile, token); } break; @@ -132174,7 +135649,7 @@ var ts; }, }); function changeInferToUnknown(changes, sourceFile, token) { - changes.replaceNode(sourceFile, token.parent, ts.createKeywordTypeNode(148 /* UnknownKeyword */)); + changes.replaceNode(sourceFile, token.parent, ts.factory.createKeywordTypeNode(151 /* UnknownKeyword */)); } function createDeleteFix(changes, diag) { return codefix.createCodeFixAction(fixName, changes, diag, fixIdDelete, ts.Diagnostics.Delete_all_unused_declarations); @@ -132184,41 +135659,30 @@ var ts; } // Sometimes the diagnostic span is an entire ImportDeclaration, so we should remove the whole thing. function tryGetFullImport(token) { - return token.kind === 96 /* ImportKeyword */ ? ts.tryCast(token.parent, ts.isImportDeclaration) : undefined; + return token.kind === 99 /* ImportKeyword */ ? ts.tryCast(token.parent, ts.isImportDeclaration) : undefined; } - function tryDeleteFullDestructure(token, changes, sourceFile, checker, sourceFiles, isFixAll) { - if (token.kind !== 18 /* OpenBraceToken */ || !ts.isObjectBindingPattern(token.parent)) - return false; - var decl = token.parent.parent; - if (decl.kind === 156 /* Parameter */) { - tryDeleteParameter(changes, sourceFile, decl, checker, sourceFiles, isFixAll); - } - else { - changes.delete(sourceFile, decl); - } - return true; + function canDeleteEntireVariableStatement(sourceFile, token) { + return ts.isVariableDeclarationList(token.parent) && ts.first(token.parent.getChildren(sourceFile)) === token; } - function tryDeleteFullVariableStatement(sourceFile, token, changes) { - var declarationList = ts.tryCast(token.parent, ts.isVariableDeclarationList); - if (declarationList && declarationList.getChildren(sourceFile)[0] === token) { - changes.delete(sourceFile, declarationList.parent.kind === 225 /* VariableStatement */ ? declarationList.parent : declarationList); - return true; - } - return false; + function deleteEntireVariableStatement(changes, sourceFile, node) { + changes.delete(sourceFile, node.parent.kind === 229 /* VariableStatement */ ? node.parent : node); + } + function deleteDestructuringElements(changes, sourceFile, node) { + ts.forEach(node.elements, function (n) { return changes.delete(sourceFile, n); }); } function tryPrefixDeclaration(changes, errorCode, sourceFile, token) { // Don't offer to prefix a property. if (errorCode === ts.Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code) return; - if (token.kind === 132 /* InferKeyword */) { + if (token.kind === 135 /* InferKeyword */) { token = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name; } if (ts.isIdentifier(token) && canPrefix(token)) { - changes.replaceNode(sourceFile, token, ts.createIdentifier("_" + token.text)); + changes.replaceNode(sourceFile, token, ts.factory.createIdentifier("_" + token.text)); if (ts.isParameter(token.parent)) { ts.getJSDocParameterTags(token.parent).forEach(function (tag) { if (ts.isIdentifier(tag.name)) { - changes.replaceNode(sourceFile, tag.name, ts.createIdentifier("_" + tag.name.text)); + changes.replaceNode(sourceFile, tag.name, ts.factory.createIdentifier("_" + tag.name.text)); } }); } @@ -132226,14 +135690,14 @@ var ts; } function canPrefix(token) { switch (token.parent.kind) { - case 156 /* Parameter */: - case 155 /* TypeParameter */: + case 159 /* Parameter */: + case 158 /* TypeParameter */: return true; - case 242 /* VariableDeclaration */: { + case 246 /* VariableDeclaration */: { var varDecl = token.parent; switch (varDecl.parent.parent.kind) { - case 232 /* ForOfStatement */: - case 231 /* ForInStatement */: + case 236 /* ForOfStatement */: + case 235 /* ForInStatement */: return true; } } @@ -132264,6 +135728,7 @@ var ts; } } function tryDeleteParameter(changes, sourceFile, p, checker, sourceFiles, isFixAll) { + if (isFixAll === void 0) { isFixAll = false; } if (mayDeleteParameter(p, checker, isFixAll)) { if (p.modifiers && p.modifiers.length > 0 && (!ts.isIdentifier(p.name) || ts.FindAllReferences.Core.isSymbolReferencedInFile(p.name, checker, sourceFile))) { @@ -132280,26 +135745,26 @@ var ts; function mayDeleteParameter(p, checker, isFixAll) { var parent = p.parent; switch (parent.kind) { - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: // Don't remove a parameter if this overrides something. var symbol = checker.getSymbolAtLocation(parent.name); if (ts.isMemberSymbolInBaseType(symbol, checker)) return false; // falls through - case 162 /* Constructor */: - case 244 /* FunctionDeclaration */: + case 165 /* Constructor */: + case 248 /* FunctionDeclaration */: return true; - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: { + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: { // Can't remove a non-last parameter in a callback. Can remove a parameter in code-fix-all if future parameters are also unused. var parameters = parent.parameters; var index = parameters.indexOf(p); ts.Debug.assert(index !== -1, "The parameter should already be in the list"); return isFixAll - ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 75 /* Identifier */ && !p.symbol.isReferenced; }) + ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 78 /* Identifier */ && !p.symbol.isReferenced; }) : index === parameters.length - 1; } - case 164 /* SetAccessor */: + case 167 /* SetAccessor */: // Setter must have a parameter return false; default: @@ -132348,19 +135813,19 @@ var ts; var container = (ts.isBlock(statement.parent) ? statement.parent : statement).parent; if (!ts.isBlock(statement.parent) || statement === ts.first(statement.parent.statements)) { switch (container.kind) { - case 227 /* IfStatement */: + case 231 /* IfStatement */: if (container.elseStatement) { if (ts.isBlock(statement.parent)) { break; } else { - changes.replaceNode(sourceFile, statement, ts.createBlock(ts.emptyArray)); + changes.replaceNode(sourceFile, statement, ts.factory.createBlock(ts.emptyArray)); } return; } // falls through - case 229 /* WhileStatement */: - case 230 /* ForStatement */: + case 233 /* WhileStatement */: + case 234 /* ForStatement */: changes.delete(sourceFile, container); return; } @@ -132433,7 +135898,7 @@ var ts; var typeNode = info.typeNode, type = info.type; var original = typeNode.getText(sourceFile); var actions = [fix(type, fixIdPlain, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript)]; - if (typeNode.kind === 297 /* JSDocNullableType */) { + if (typeNode.kind === 301 /* JSDocNullableType */) { // for nullable types, suggest the flow-compatible `T | null | undefined` // in addition to the jsdoc/closure-compatible `T | null` actions.push(fix(checker.getNullableType(type, 32768 /* Undefined */), fixIdNullable, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript_and_add_undefined_to_nullable_types)); @@ -132453,7 +135918,7 @@ var ts; if (!info) return; var typeNode = info.typeNode, type = info.type; - var fixedType = typeNode.kind === 297 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type; + var fixedType = typeNode.kind === 301 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type; doChange(changes, sourceFile, typeNode, fixedType, checker); }); } @@ -132470,22 +135935,22 @@ var ts; // NOTE: Some locations are not handled yet: // MappedTypeNode.typeParameters and SignatureDeclaration.typeParameters, as well as CallExpression.typeArguments switch (node.kind) { - case 217 /* AsExpression */: - case 165 /* CallSignature */: - case 166 /* ConstructSignature */: - case 244 /* FunctionDeclaration */: - case 163 /* GetAccessor */: - case 167 /* IndexSignature */: - case 186 /* MappedType */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 156 /* Parameter */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: - case 164 /* SetAccessor */: - case 247 /* TypeAliasDeclaration */: - case 199 /* TypeAssertionExpression */: - case 242 /* VariableDeclaration */: + case 221 /* AsExpression */: + case 168 /* CallSignature */: + case 169 /* ConstructSignature */: + case 248 /* FunctionDeclaration */: + case 166 /* GetAccessor */: + case 170 /* IndexSignature */: + case 189 /* MappedType */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 159 /* Parameter */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: + case 167 /* SetAccessor */: + case 251 /* TypeAliasDeclaration */: + case 203 /* TypeAssertionExpression */: + case 246 /* VariableDeclaration */: return true; default: return false; @@ -132560,7 +136025,7 @@ var ts; }, fixIds: [fixId], getAllCodeActions: function (context) { - var seen = ts.createMap(); + var seen = new ts.Map(); return codefix.codeFixAll(context, errorCodes, function (changes, diag) { var nodes = getNodes(diag.file, diag.start); if (!nodes || !ts.addToSeen(seen, ts.getNodeId(nodes.insertBefore))) @@ -132587,14 +136052,14 @@ var ts; } var insertBefore; switch (containingFunction.kind) { - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: insertBefore = containingFunction.name; break; - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - insertBefore = ts.findChildOfKind(containingFunction, 94 /* FunctionKeyword */, sourceFile); + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + insertBefore = ts.findChildOfKind(containingFunction, 97 /* FunctionKeyword */, sourceFile); break; - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: insertBefore = ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile) || ts.first(containingFunction.parameters); break; default: @@ -132609,11 +136074,71 @@ var ts; var insertBefore = _a.insertBefore, returnType = _a.returnType; if (returnType) { var entityName = ts.getEntityNameFromTypeNode(returnType); - if (!entityName || entityName.kind !== 75 /* Identifier */ || entityName.text !== "Promise") { - changes.replaceNode(sourceFile, returnType, ts.createTypeReferenceNode("Promise", ts.createNodeArray([returnType]))); + if (!entityName || entityName.kind !== 78 /* Identifier */ || entityName.text !== "Promise") { + changes.replaceNode(sourceFile, returnType, ts.factory.createTypeReferenceNode("Promise", ts.factory.createNodeArray([returnType]))); } } - changes.insertModifierBefore(sourceFile, 126 /* AsyncKeyword */, insertBefore); + changes.insertModifierBefore(sourceFile, 129 /* AsyncKeyword */, insertBefore); + } + })(codefix = ts.codefix || (ts.codefix = {})); +})(ts || (ts = {})); +/* @internal */ +var ts; +(function (ts) { + var codefix; + (function (codefix) { + var errorCodes = [ + ts.Diagnostics._0_is_defined_as_an_accessor_in_class_1_but_is_overridden_here_in_2_as_an_instance_property.code, + ts.Diagnostics._0_is_defined_as_a_property_in_class_1_but_is_overridden_here_in_2_as_an_accessor.code, + ]; + var fixId = "fixPropertyOverrideAccessor"; + codefix.registerCodeFix({ + errorCodes: errorCodes, + getCodeActions: function (context) { + var edits = doChange(context.sourceFile, context.span.start, context.span.length, context.errorCode, context); + if (edits) { + return [codefix.createCodeFixAction(fixId, edits, ts.Diagnostics.Generate_get_and_set_accessors, fixId, ts.Diagnostics.Generate_get_and_set_accessors_for_all_overriding_properties)]; + } + }, + fixIds: [fixId], + getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) { + var edits = doChange(diag.file, diag.start, diag.length, diag.code, context); + if (edits) { + for (var _i = 0, edits_2 = edits; _i < edits_2.length; _i++) { + var edit = edits_2[_i]; + changes.pushRaw(context.sourceFile, edit); + } + } + }); }, + }); + function doChange(file, start, length, code, context) { + var startPosition; + var endPosition; + if (code === ts.Diagnostics._0_is_defined_as_an_accessor_in_class_1_but_is_overridden_here_in_2_as_an_instance_property.code) { + startPosition = start; + endPosition = start + length; + } + else if (code === ts.Diagnostics._0_is_defined_as_a_property_in_class_1_but_is_overridden_here_in_2_as_an_accessor.code) { + var checker = context.program.getTypeChecker(); + var node = ts.getTokenAtPosition(file, start).parent; + ts.Debug.assert(ts.isAccessor(node), "error span of fixPropertyOverrideAccessor should only be on an accessor"); + var containingClass = node.parent; + ts.Debug.assert(ts.isClassLike(containingClass), "erroneous accessors should only be inside classes"); + var base = ts.singleOrUndefined(codefix.getAllSupers(containingClass, checker)); + if (!base) + return []; + var name = ts.unescapeLeadingUnderscores(ts.getTextOfPropertyName(node.name)); + var baseProp = checker.getPropertyOfType(checker.getTypeAtLocation(base), name); + if (!baseProp || !baseProp.valueDeclaration) + return []; + startPosition = baseProp.valueDeclaration.pos; + endPosition = baseProp.valueDeclaration.end; + file = ts.getSourceFileOfNode(baseProp.valueDeclaration); + } + else { + ts.Debug.fail("fixPropertyOverrideAccessor codefix got unexpected error code " + code); + } + return codefix.generateAccessorFromProperty(file, startPosition, endPosition, context, ts.Diagnostics.Generate_get_and_set_accessors.message); } })(codefix = ts.codefix || (ts.codefix = {})); })(ts || (ts = {})); @@ -132713,7 +136238,7 @@ var ts; return errorCode; } function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host, preferences) { - if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 75 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 104 /* ThisKeyword */) { + if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 78 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 107 /* ThisKeyword */) { return undefined; } var parent = token.parent; @@ -132733,7 +136258,7 @@ var ts; var typeNode = ts.getTypeNodeIfAccessible(type, parent, program, host); if (typeNode) { // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags - var typeTag = ts.createJSDocTypeTag(ts.createJSDocTypeExpression(typeNode), /*comment*/ ""); + var typeTag = ts.factory.createJSDocTypeTag(/*tagName*/ undefined, ts.factory.createJSDocTypeExpression(typeNode), /*comment*/ ""); addJSDocTags(changes, sourceFile, ts.cast(parent.parent.parent, ts.isExpressionStatement), [typeTag]); } importAdder.writeFixes(changes); @@ -132816,7 +136341,7 @@ var ts; else { var needParens = ts.isArrowFunction(containingFunction) && !ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile); if (needParens) - changes.insertNodeBefore(sourceFile, ts.first(containingFunction.parameters), ts.createToken(20 /* OpenParenToken */)); + changes.insertNodeBefore(sourceFile, ts.first(containingFunction.parameters), ts.factory.createToken(20 /* OpenParenToken */)); for (var _i = 0, parameterInferences_1 = parameterInferences; _i < parameterInferences_1.length; _i++) { var _a = parameterInferences_1[_i], declaration = _a.declaration, type = _a.type; if (declaration && !declaration.type && !declaration.initializer) { @@ -132824,7 +136349,7 @@ var ts; } } if (needParens) - changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */)); + changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.factory.createToken(21 /* CloseParenToken */)); } } function annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken) { @@ -132846,7 +136371,7 @@ var ts; } function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) { addJSDocTags(changes, sourceFile, containingFunction, [ - ts.createJSDocThisTag(ts.createJSDocTypeExpression(typeNode)), + ts.factory.createJSDocThisTag(/*tagName*/ undefined, ts.factory.createJSDocTypeExpression(typeNode)), ]); } function annotateSetAccessor(changes, importAdder, sourceFile, setAccessorDeclaration, program, host, cancellationToken) { @@ -132867,23 +136392,23 @@ var ts; function annotate(changes, importAdder, sourceFile, declaration, type, program, host) { var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host); if (typeNode) { - if (ts.isInJSFile(sourceFile) && declaration.kind !== 158 /* PropertySignature */) { + if (ts.isInJSFile(sourceFile) && declaration.kind !== 161 /* PropertySignature */) { var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration; if (!parent) { return; } - var typeExpression = ts.createJSDocTypeExpression(typeNode); - var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.createJSDocReturnTag(typeExpression, "") : ts.createJSDocTypeTag(typeExpression, ""); + var typeExpression = ts.factory.createJSDocTypeExpression(typeNode); + var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.factory.createJSDocReturnTag(/*tagName*/ undefined, typeExpression, "") : ts.factory.createJSDocTypeTag(/*tagName*/ undefined, typeExpression, ""); addJSDocTags(changes, sourceFile, parent, [typeTag]); } - else if (!tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, ts.getEmitScriptTarget(program.getCompilerOptions()))) { + else if (!tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, sourceFile, changes, importAdder, ts.getEmitScriptTarget(program.getCompilerOptions()))) { changes.tryInsertTypeAnnotation(sourceFile, declaration, typeNode); } } } - function tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, scriptTarget) { - var importableReference = codefix.tryGetAutoImportableReferenceFromImportTypeNode(typeNode, type, scriptTarget); - if (importableReference && changes.tryInsertTypeAnnotation(sourceFile, declaration, importableReference.typeReference)) { + function tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, sourceFile, changes, importAdder, scriptTarget) { + var importableReference = codefix.tryGetAutoImportableReferenceFromTypeNode(typeNode, scriptTarget); + if (importableReference && changes.tryInsertTypeAnnotation(sourceFile, declaration, importableReference.typeNode)) { ts.forEach(importableReference.symbols, function (s) { return importAdder.addImportFromExportedSymbol(s, /*usageIsTypeOnly*/ true); }); return true; } @@ -132900,9 +136425,9 @@ var ts; if (param.initializer || ts.getJSDocType(param) || !ts.isIdentifier(param.name)) return; var typeNode = inference.type && ts.getTypeNodeIfAccessible(inference.type, param, program, host); - var name = ts.getSynthesizedClone(param.name); + var name = ts.factory.cloneNode(param.name); ts.setEmitFlags(name, 1536 /* NoComments */ | 2048 /* NoNestedComments */); - return typeNode && ts.createJSDocParamTag(name, !!inference.isOptional, ts.createJSDocTypeExpression(typeNode), ""); + return typeNode && ts.factory.createJSDocParameterTag(/*tagName*/ undefined, name, /*isBracketed*/ !!inference.isOptional, ts.factory.createJSDocTypeExpression(typeNode), /* isNameFirst */ false, ""); }); addJSDocTags(changes, sourceFile, signature, paramTags); } @@ -132915,15 +136440,15 @@ var ts; oldTags[i] = merged; return !!merged; }); }); - var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray(__spreadArrays((oldTags || ts.emptyArray), unmergedNewTags))); - var jsDocNode = parent.kind === 202 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent; + var tag = ts.factory.createJSDocComment(comments.join("\n"), ts.factory.createNodeArray(__spreadArrays((oldTags || ts.emptyArray), unmergedNewTags))); + var jsDocNode = parent.kind === 206 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent; jsDocNode.jsDoc = parent.jsDoc; jsDocNode.jsDocCache = parent.jsDocCache; changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag); } codefix.addJSDocTags = addJSDocTags; function getJsDocNodeForArrowFunction(signature) { - if (signature.parent.kind === 159 /* PropertyDeclaration */) { + if (signature.parent.kind === 162 /* PropertyDeclaration */) { return signature.parent; } return signature.parent.parent; @@ -132933,15 +136458,15 @@ var ts; return undefined; } switch (oldTag.kind) { - case 317 /* JSDocParameterTag */: { + case 322 /* JSDocParameterTag */: { var oldParam = oldTag; var newParam = newTag; return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText - ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment) + ? ts.factory.createJSDocParameterTag(/*tagName*/ undefined, newParam.name, /*isBracketed*/ false, newParam.typeExpression, newParam.isNameFirst, oldParam.comment) : undefined; } - case 318 /* JSDocReturnTag */: - return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment); + case 323 /* JSDocReturnTag */: + return ts.factory.createJSDocReturnTag(/*tagName*/ undefined, newTag.typeExpression, oldTag.comment); } } function getReferences(token, program, cancellationToken) { @@ -132965,18 +136490,18 @@ var ts; function getFunctionReferences(containingFunction, sourceFile, program, cancellationToken) { var searchToken; switch (containingFunction.kind) { - case 162 /* Constructor */: - searchToken = ts.findChildOfKind(containingFunction, 129 /* ConstructorKeyword */, sourceFile); + case 165 /* Constructor */: + searchToken = ts.findChildOfKind(containingFunction, 132 /* ConstructorKeyword */, sourceFile); break; - case 202 /* ArrowFunction */: - case 201 /* FunctionExpression */: + case 206 /* ArrowFunction */: + case 205 /* FunctionExpression */: var parent = containingFunction.parent; searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ? parent.name : containingFunction.name; break; - case 244 /* FunctionDeclaration */: - case 161 /* MethodDeclaration */: + case 248 /* FunctionDeclaration */: + case 164 /* MethodDeclaration */: searchToken = containingFunction.name; break; } @@ -133020,7 +136545,7 @@ var ts; }; } function combineUsages(usages) { - var combinedProperties = ts.createUnderscoreEscapedMap(); + var combinedProperties = new ts.Map(); for (var _i = 0, usages_1 = usages; _i < usages_1.length; _i++) { var u = usages_1[_i]; if (u.properties) { @@ -133032,7 +136557,7 @@ var ts; }); } } - var properties = ts.createUnderscoreEscapedMap(); + var properties = new ts.Map(); combinedProperties.forEach(function (ps, name) { properties.set(name, combineUsages(ps)); }); @@ -133118,24 +136643,24 @@ var ts; node = node.parent; } switch (node.parent.kind) { - case 226 /* ExpressionStatement */: + case 230 /* ExpressionStatement */: inferTypeFromExpressionStatement(node, usage); break; - case 208 /* PostfixUnaryExpression */: + case 212 /* PostfixUnaryExpression */: usage.isNumber = true; break; - case 207 /* PrefixUnaryExpression */: + case 211 /* PrefixUnaryExpression */: inferTypeFromPrefixUnaryExpression(node.parent, usage); break; - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: inferTypeFromBinaryExpression(node, node.parent, usage); break; - case 277 /* CaseClause */: - case 278 /* DefaultClause */: + case 281 /* CaseClause */: + case 282 /* DefaultClause */: inferTypeFromSwitchStatementLabel(node.parent, usage); break; - case 196 /* CallExpression */: - case 197 /* NewExpression */: + case 200 /* CallExpression */: + case 201 /* NewExpression */: if (node.parent.expression === node) { inferTypeFromCallExpression(node.parent, usage); } @@ -133143,20 +136668,20 @@ var ts; inferTypeFromContextualType(node, usage); } break; - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: inferTypeFromPropertyAccessExpression(node.parent, usage); break; - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: inferTypeFromPropertyElementExpression(node.parent, node, usage); break; - case 281 /* PropertyAssignment */: - case 282 /* ShorthandPropertyAssignment */: + case 285 /* PropertyAssignment */: + case 286 /* ShorthandPropertyAssignment */: inferTypeFromPropertyAssignment(node.parent, usage); break; - case 159 /* PropertyDeclaration */: + case 162 /* PropertyDeclaration */: inferTypeFromPropertyDeclaration(node.parent, usage); break; - case 242 /* VariableDeclaration */: { + case 246 /* VariableDeclaration */: { var _a = node.parent, name = _a.name, initializer = _a.initializer; if (node === name) { if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error. @@ -133221,7 +136746,7 @@ var ts; case 68 /* PercentEqualsToken */: case 72 /* AmpersandEqualsToken */: case 73 /* BarEqualsToken */: - case 74 /* CaretEqualsToken */: + case 77 /* CaretEqualsToken */: case 69 /* LessThanLessThanEqualsToken */: case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */: case 70 /* GreaterThanGreaterThanEqualsToken */: @@ -133269,7 +136794,7 @@ var ts; case 35 /* ExclamationEqualsToken */: addCandidateType(usage, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left)); break; - case 97 /* InKeyword */: + case 100 /* InKeyword */: if (node === parent.left) { usage.isString = true; } @@ -133278,7 +136803,7 @@ var ts; case 56 /* BarBarToken */: case 60 /* QuestionQuestionToken */: if (node === parent.left && - (node.parent.parent.kind === 242 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) { + (node.parent.parent.kind === 246 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) { // var x = x || {}; // TODO: use getFalsyflagsOfType addCandidateType(usage, checker.getTypeAtLocation(parent.right)); @@ -133286,7 +136811,7 @@ var ts; break; case 55 /* AmpersandAmpersandToken */: case 27 /* CommaToken */: - case 98 /* InstanceOfKeyword */: + case 101 /* InstanceOfKeyword */: // nothing to infer here break; } @@ -133306,7 +136831,7 @@ var ts; } } calculateUsageOfNode(parent, call.return_); - if (parent.kind === 196 /* CallExpression */) { + if (parent.kind === 200 /* CallExpression */) { (usage.calls || (usage.calls = [])).push(call); } else { @@ -133316,7 +136841,7 @@ var ts; function inferTypeFromPropertyAccessExpression(parent, usage) { var name = ts.escapeLeadingUnderscores(parent.name.text); if (!usage.properties) { - usage.properties = ts.createUnderscoreEscapedMap(); + usage.properties = new ts.Map(); } var propertyUsage = usage.properties.get(name) || createEmptyUsage(); calculateUsageOfNode(parent, propertyUsage); @@ -133453,7 +136978,7 @@ var ts; return types; } function inferStructuralType(usage) { - var members = ts.createUnderscoreEscapedMap(); + var members = new ts.Map(); if (usage.properties) { usage.properties.forEach(function (u, name) { var symbol = checker.createSymbol(4 /* Property */, name); @@ -133599,6 +137124,59 @@ var ts; })(ts || (ts = {})); /* @internal */ var ts; +(function (ts) { + var codefix; + (function (codefix) { + var fixId = "fixReturnTypeInAsyncFunction"; + var errorCodes = [ + ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0.code, + ]; + codefix.registerCodeFix({ + errorCodes: errorCodes, + fixIds: [fixId], + getCodeActions: function (context) { + var sourceFile = context.sourceFile, program = context.program, span = context.span; + var checker = program.getTypeChecker(); + var info = getInfo(sourceFile, program.getTypeChecker(), span.start); + if (!info) { + return undefined; + } + var returnTypeNode = info.returnTypeNode, returnType = info.returnType, promisedTypeNode = info.promisedTypeNode, promisedType = info.promisedType; + var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, returnTypeNode, promisedTypeNode); }); + return [codefix.createCodeFixAction(fixId, changes, [ts.Diagnostics.Replace_0_with_Promise_1, + checker.typeToString(returnType), checker.typeToString(promisedType)], fixId, ts.Diagnostics.Fix_all_incorrect_return_type_of_an_async_functions)]; + }, + getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) { + var info = getInfo(diag.file, context.program.getTypeChecker(), diag.start); + if (info) { + doChange(changes, diag.file, info.returnTypeNode, info.promisedTypeNode); + } + }); } + }); + function getInfo(sourceFile, checker, pos) { + if (ts.isInJSFile(sourceFile)) { + return undefined; + } + var token = ts.getTokenAtPosition(sourceFile, pos); + var func = ts.findAncestor(token, ts.isFunctionLikeDeclaration); + var returnTypeNode = func === null || func === void 0 ? void 0 : func.type; + if (!returnTypeNode) { + return undefined; + } + var returnType = checker.getTypeFromTypeNode(returnTypeNode); + var promisedType = checker.getAwaitedType(returnType) || checker.getVoidType(); + var promisedTypeNode = checker.typeToTypeNode(promisedType, /*enclosingDeclaration*/ returnTypeNode, /*flags*/ undefined); + if (promisedTypeNode) { + return { returnTypeNode: returnTypeNode, returnType: returnType, promisedTypeNode: promisedTypeNode, promisedType: promisedType }; + } + } + function doChange(changes, sourceFile, returnTypeNode, promisedTypeNode) { + changes.replaceNode(sourceFile, returnTypeNode, ts.factory.createTypeReferenceNode("Promise", [promisedTypeNode])); + } + })(codefix = ts.codefix || (ts.codefix = {})); +})(ts || (ts = {})); +/* @internal */ +var ts; (function (ts) { var codefix; (function (codefix) { @@ -133631,7 +137209,7 @@ var ts; }, fixIds: [fixId], getAllCodeActions: function (context) { - var seenLines = ts.createMap(); + var seenLines = new ts.Set(); return codefix.codeFixAll(context, errorCodes, function (changes, diag) { if (ts.textChanges.isValidLocationToAddComment(diag.file, diag.start)) { makeChange(changes, diag.file, diag.start, seenLines); @@ -133642,7 +137220,7 @@ var ts; function makeChange(changes, sourceFile, position, seenLines) { var lineNumber = ts.getLineAndCharacterOfPosition(sourceFile, position).line; // Only need to add `// @ts-ignore` for a line once. - if (!seenLines || ts.addToSeen(seenLines, lineNumber)) { + if (!seenLines || ts.tryAddToSet(seenLines, lineNumber)) { changes.insertCommentBeforeLine(sourceFile, lineNumber, position, " @ts-ignore"); } } @@ -133660,12 +137238,12 @@ var ts; * @param importAdder If provided, type annotations will use identifier type references instead of ImportTypeNodes, and the missing imports will be added to the importAdder. * @returns Empty string iff there are no member insertions. */ - function createMissingMemberNodes(classDeclaration, possiblyMissingSymbols, context, preferences, importAdder, addClassElement) { + function createMissingMemberNodes(classDeclaration, possiblyMissingSymbols, sourceFile, context, preferences, importAdder, addClassElement) { var classMembers = classDeclaration.symbol.members; for (var _i = 0, possiblyMissingSymbols_1 = possiblyMissingSymbols; _i < possiblyMissingSymbols_1.length; _i++) { var symbol = possiblyMissingSymbols_1[_i]; if (!classMembers.has(symbol.escapedName)) { - addNewNodeForMemberSymbol(symbol, classDeclaration, context, preferences, importAdder, addClassElement); + addNewNodeForMemberSymbol(symbol, classDeclaration, sourceFile, context, preferences, importAdder, addClassElement); } } } @@ -133680,7 +137258,7 @@ var ts; /** * @returns Empty string iff there we can't figure out a representation for `symbol` in `enclosingDeclaration`. */ - function addNewNodeForMemberSymbol(symbol, enclosingDeclaration, context, preferences, importAdder, addClassElement) { + function addNewNodeForMemberSymbol(symbol, enclosingDeclaration, sourceFile, context, preferences, importAdder, addClassElement) { var declarations = symbol.getDeclarations(); if (!(declarations && declarations.length)) { return undefined; @@ -133689,59 +137267,60 @@ var ts; var scriptTarget = ts.getEmitScriptTarget(context.program.getCompilerOptions()); var declaration = declarations[0]; var name = ts.getSynthesizedDeepClone(ts.getNameOfDeclaration(declaration), /*includeTrivia*/ false); - var visibilityModifier = createVisibilityModifier(ts.getModifierFlags(declaration)); - var modifiers = visibilityModifier ? ts.createNodeArray([visibilityModifier]) : undefined; + var visibilityModifier = createVisibilityModifier(ts.getEffectiveModifierFlags(declaration)); + var modifiers = visibilityModifier ? ts.factory.createNodeArray([visibilityModifier]) : undefined; var type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration)); var optional = !!(symbol.flags & 16777216 /* Optional */); var ambient = !!(enclosingDeclaration.flags & 8388608 /* Ambient */); + var quotePreference = ts.getQuotePreference(sourceFile, preferences); switch (declaration.kind) { - case 158 /* PropertySignature */: - case 159 /* PropertyDeclaration */: - var flags = preferences.quotePreference === "single" ? 268435456 /* UseSingleQuotesForStringLiteralType */ : undefined; + case 161 /* PropertySignature */: + case 162 /* PropertyDeclaration */: + var flags = quotePreference === 0 /* Single */ ? 268435456 /* UseSingleQuotesForStringLiteralType */ : undefined; var typeNode = checker.typeToTypeNode(type, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context)); if (importAdder) { - var importableReference = tryGetAutoImportableReferenceFromImportTypeNode(typeNode, type, scriptTarget); + var importableReference = tryGetAutoImportableReferenceFromTypeNode(typeNode, scriptTarget); if (importableReference) { - typeNode = importableReference.typeReference; + typeNode = importableReference.typeNode; importSymbols(importAdder, importableReference.symbols); } } - addClassElement(ts.createProperty( - /*decorators*/ undefined, modifiers, name, optional ? ts.createToken(57 /* QuestionToken */) : undefined, typeNode, + addClassElement(ts.factory.createPropertyDeclaration( + /*decorators*/ undefined, modifiers, name, optional ? ts.factory.createToken(57 /* QuestionToken */) : undefined, typeNode, /*initializer*/ undefined)); break; - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: { + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: { var typeNode_1 = checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context)); var allAccessors = ts.getAllAccessorDeclarations(declarations, declaration); var orderedAccessors = allAccessors.secondAccessor ? [allAccessors.firstAccessor, allAccessors.secondAccessor] : [allAccessors.firstAccessor]; if (importAdder) { - var importableReference = tryGetAutoImportableReferenceFromImportTypeNode(typeNode_1, type, scriptTarget); + var importableReference = tryGetAutoImportableReferenceFromTypeNode(typeNode_1, scriptTarget); if (importableReference) { - typeNode_1 = importableReference.typeReference; + typeNode_1 = importableReference.typeNode; importSymbols(importAdder, importableReference.symbols); } } for (var _i = 0, orderedAccessors_1 = orderedAccessors; _i < orderedAccessors_1.length; _i++) { var accessor = orderedAccessors_1[_i]; if (ts.isGetAccessorDeclaration(accessor)) { - addClassElement(ts.createGetAccessor( - /*decorators*/ undefined, modifiers, name, ts.emptyArray, typeNode_1, ambient ? undefined : createStubbedMethodBody(preferences))); + addClassElement(ts.factory.createGetAccessorDeclaration( + /*decorators*/ undefined, modifiers, name, ts.emptyArray, typeNode_1, ambient ? undefined : createStubbedMethodBody(quotePreference))); } else { ts.Debug.assertNode(accessor, ts.isSetAccessorDeclaration, "The counterpart to a getter should be a setter"); var parameter = ts.getSetAccessorValueParameter(accessor); var parameterName = parameter && ts.isIdentifier(parameter.name) ? ts.idText(parameter.name) : undefined; - addClassElement(ts.createSetAccessor( - /*decorators*/ undefined, modifiers, name, createDummyParameters(1, [parameterName], [typeNode_1], 1, /*inJs*/ false), ambient ? undefined : createStubbedMethodBody(preferences))); + addClassElement(ts.factory.createSetAccessorDeclaration( + /*decorators*/ undefined, modifiers, name, createDummyParameters(1, [parameterName], [typeNode_1], 1, /*inJs*/ false), ambient ? undefined : createStubbedMethodBody(quotePreference))); } } break; } - case 160 /* MethodSignature */: - case 161 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 164 /* MethodDeclaration */: // The signature for the implementation appears as an entry in `signatures` iff // there is only one signature. // If there are overloads and an implementation signature, it appears as an @@ -133756,84 +137335,93 @@ var ts; if (declarations.length === 1) { ts.Debug.assert(signatures.length === 1, "One declaration implies one signature"); var signature = signatures[0]; - outputMethod(signature, modifiers, name, ambient ? undefined : createStubbedMethodBody(preferences)); + outputMethod(quotePreference, signature, modifiers, name, ambient ? undefined : createStubbedMethodBody(quotePreference)); break; } for (var _a = 0, signatures_1 = signatures; _a < signatures_1.length; _a++) { var signature = signatures_1[_a]; // Need to ensure nodes are fresh each time so they can have different positions. - outputMethod(signature, ts.getSynthesizedDeepClones(modifiers, /*includeTrivia*/ false), ts.getSynthesizedDeepClone(name, /*includeTrivia*/ false)); + outputMethod(quotePreference, signature, ts.getSynthesizedDeepClones(modifiers, /*includeTrivia*/ false), ts.getSynthesizedDeepClone(name, /*includeTrivia*/ false)); } if (!ambient) { if (declarations.length > signatures.length) { var signature = checker.getSignatureFromDeclaration(declarations[declarations.length - 1]); - outputMethod(signature, modifiers, name, createStubbedMethodBody(preferences)); + outputMethod(quotePreference, signature, modifiers, name, createStubbedMethodBody(quotePreference)); } else { ts.Debug.assert(declarations.length === signatures.length, "Declarations and signatures should match count"); - addClassElement(createMethodImplementingSignatures(signatures, name, optional, modifiers, preferences)); + addClassElement(createMethodImplementingSignatures(signatures, name, optional, modifiers, quotePreference)); } } break; } - function outputMethod(signature, modifiers, name, body) { - var method = signatureToMethodDeclaration(context, signature, enclosingDeclaration, modifiers, name, optional, body, importAdder); + function outputMethod(quotePreference, signature, modifiers, name, body) { + var method = signatureToMethodDeclaration(context, quotePreference, signature, enclosingDeclaration, modifiers, name, optional, body, importAdder); if (method) addClassElement(method); } } - function signatureToMethodDeclaration(context, signature, enclosingDeclaration, modifiers, name, optional, body, importAdder) { + function signatureToMethodDeclaration(context, quotePreference, signature, enclosingDeclaration, modifiers, name, optional, body, importAdder) { var program = context.program; var checker = program.getTypeChecker(); var scriptTarget = ts.getEmitScriptTarget(program.getCompilerOptions()); - var signatureDeclaration = checker.signatureToSignatureDeclaration(signature, 161 /* MethodDeclaration */, enclosingDeclaration, 1 /* NoTruncation */ | 256 /* SuppressAnyReturnType */, getNoopSymbolTrackerWithResolver(context)); + var flags = 1 /* NoTruncation */ | 1073741824 /* NoUndefinedOptionalParameterType */ | 256 /* SuppressAnyReturnType */ | (quotePreference === 0 /* Single */ ? 268435456 /* UseSingleQuotesForStringLiteralType */ : 0); + var signatureDeclaration = checker.signatureToSignatureDeclaration(signature, 164 /* MethodDeclaration */, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context)); if (!signatureDeclaration) { return undefined; } + var typeParameters = signatureDeclaration.typeParameters; + var parameters = signatureDeclaration.parameters; + var type = signatureDeclaration.type; if (importAdder) { - if (signatureDeclaration.typeParameters) { - ts.forEach(signatureDeclaration.typeParameters, function (typeParameterDecl, i) { - var typeParameter = signature.typeParameters[i]; - if (typeParameterDecl.constraint) { - var importableReference = tryGetAutoImportableReferenceFromImportTypeNode(typeParameterDecl.constraint, typeParameter.constraint, scriptTarget); + if (typeParameters) { + var newTypeParameters = ts.sameMap(typeParameters, function (typeParameterDecl) { + var constraint = typeParameterDecl.constraint; + var defaultType = typeParameterDecl.default; + if (constraint) { + var importableReference = tryGetAutoImportableReferenceFromTypeNode(constraint, scriptTarget); if (importableReference) { - typeParameterDecl.constraint = importableReference.typeReference; + constraint = importableReference.typeNode; importSymbols(importAdder, importableReference.symbols); } } - if (typeParameterDecl.default) { - var importableReference = tryGetAutoImportableReferenceFromImportTypeNode(typeParameterDecl.default, typeParameter.default, scriptTarget); + if (defaultType) { + var importableReference = tryGetAutoImportableReferenceFromTypeNode(defaultType, scriptTarget); if (importableReference) { - typeParameterDecl.default = importableReference.typeReference; + defaultType = importableReference.typeNode; importSymbols(importAdder, importableReference.symbols); } } + return ts.factory.updateTypeParameterDeclaration(typeParameterDecl, typeParameterDecl.name, constraint, defaultType); }); + if (typeParameters !== newTypeParameters) { + typeParameters = ts.setTextRange(ts.factory.createNodeArray(newTypeParameters, typeParameters.hasTrailingComma), typeParameters); + } } - ts.forEach(signatureDeclaration.parameters, function (parameterDecl, i) { - var parameter = signature.parameters[i]; - var importableReference = tryGetAutoImportableReferenceFromImportTypeNode(parameterDecl.type, checker.getTypeAtLocation(parameter.valueDeclaration), scriptTarget); + var newParameters = ts.sameMap(parameters, function (parameterDecl) { + var importableReference = tryGetAutoImportableReferenceFromTypeNode(parameterDecl.type, scriptTarget); + var type = parameterDecl.type; if (importableReference) { - parameterDecl.type = importableReference.typeReference; + type = importableReference.typeNode; importSymbols(importAdder, importableReference.symbols); } + return ts.factory.updateParameterDeclaration(parameterDecl, parameterDecl.decorators, parameterDecl.modifiers, parameterDecl.dotDotDotToken, parameterDecl.name, parameterDecl.questionToken, type, parameterDecl.initializer); }); - if (signatureDeclaration.type) { - var importableReference = tryGetAutoImportableReferenceFromImportTypeNode(signatureDeclaration.type, signature.resolvedReturnType, scriptTarget); + if (parameters !== newParameters) { + parameters = ts.setTextRange(ts.factory.createNodeArray(newParameters, parameters.hasTrailingComma), parameters); + } + if (type) { + var importableReference = tryGetAutoImportableReferenceFromTypeNode(type, scriptTarget); if (importableReference) { - signatureDeclaration.type = importableReference.typeReference; + type = importableReference.typeNode; importSymbols(importAdder, importableReference.symbols); } } } - signatureDeclaration.decorators = undefined; - signatureDeclaration.modifiers = modifiers; - signatureDeclaration.name = name; - signatureDeclaration.questionToken = optional ? ts.createToken(57 /* QuestionToken */) : undefined; - signatureDeclaration.body = body; - return signatureDeclaration; + return ts.factory.updateMethodDeclaration(signatureDeclaration, + /*decorators*/ undefined, modifiers, signatureDeclaration.asteriskToken, name, optional ? ts.factory.createToken(57 /* QuestionToken */) : undefined, typeParameters, parameters, type, body); } - function createMethodFromCallExpression(context, call, methodName, inJs, makeStatic, contextNode, importAdder) { + function createMethodFromCallExpression(context, importAdder, call, methodName, modifierFlags, contextNode, inJs) { var body = !ts.isInterfaceDeclaration(contextNode); var typeArguments = call.typeArguments, args = call.arguments, parent = call.parent; var scriptTarget = ts.getEmitScriptTarget(context.program.getCompilerOptions()); @@ -133847,25 +137435,26 @@ var ts; }); var contextualType = checker.getContextualType(call); var returnType = (inJs || !contextualType) ? undefined : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker); - return ts.createMethod( + var quotePreference = ts.getQuotePreference(context.sourceFile, context.preferences); + return ts.factory.createMethodDeclaration( /*decorators*/ undefined, - /*modifiers*/ makeStatic ? [ts.createToken(120 /* StaticKeyword */)] : undefined, - /*asteriskToken*/ ts.isYieldExpression(parent) ? ts.createToken(41 /* AsteriskToken */) : undefined, methodName, + /*modifiers*/ modifierFlags ? ts.factory.createNodeArray(ts.factory.createModifiersFromModifierFlags(modifierFlags)) : undefined, + /*asteriskToken*/ ts.isYieldExpression(parent) ? ts.factory.createToken(41 /* AsteriskToken */) : undefined, methodName, /*questionToken*/ undefined, /*typeParameters*/ inJs ? undefined : ts.map(typeArguments, function (_, i) { - return ts.createTypeParameterDeclaration(84 /* T */ + typeArguments.length - 1 <= 90 /* Z */ ? String.fromCharCode(84 /* T */ + i) : "T" + i); + return ts.factory.createTypeParameterDeclaration(84 /* T */ + typeArguments.length - 1 <= 90 /* Z */ ? String.fromCharCode(84 /* T */ + i) : "T" + i); }), /*parameters*/ createDummyParameters(args.length, names, types, /*minArgumentCount*/ undefined, inJs), - /*type*/ returnType, body ? createStubbedMethodBody(context.preferences) : undefined); + /*type*/ returnType, body ? createStubbedMethodBody(quotePreference) : undefined); } codefix.createMethodFromCallExpression = createMethodFromCallExpression; function typeToAutoImportableTypeNode(checker, importAdder, type, contextNode, scriptTarget, flags, tracker) { var typeNode = checker.typeToTypeNode(type, contextNode, flags, tracker); if (typeNode && ts.isImportTypeNode(typeNode)) { - var importableReference = tryGetAutoImportableReferenceFromImportTypeNode(typeNode, type, scriptTarget); + var importableReference = tryGetAutoImportableReferenceFromTypeNode(typeNode, scriptTarget); if (importableReference) { importSymbols(importAdder, importableReference.symbols); - return importableReference.typeReference; + return importableReference.typeNode; } } return typeNode; @@ -133874,19 +137463,19 @@ var ts; function createDummyParameters(argCount, names, types, minArgumentCount, inJs) { var parameters = []; for (var i = 0; i < argCount; i++) { - var newParameter = ts.createParameter( + var newParameter = ts.factory.createParameterDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, /*name*/ names && names[i] || "arg" + i, - /*questionToken*/ minArgumentCount !== undefined && i >= minArgumentCount ? ts.createToken(57 /* QuestionToken */) : undefined, - /*type*/ inJs ? undefined : types && types[i] || ts.createKeywordTypeNode(125 /* AnyKeyword */), + /*questionToken*/ minArgumentCount !== undefined && i >= minArgumentCount ? ts.factory.createToken(57 /* QuestionToken */) : undefined, + /*type*/ inJs ? undefined : types && types[i] || ts.factory.createKeywordTypeNode(128 /* AnyKeyword */), /*initializer*/ undefined); parameters.push(newParameter); } return parameters; } - function createMethodImplementingSignatures(signatures, name, optional, modifiers, preferences) { + function createMethodImplementingSignatures(signatures, name, optional, modifiers, quotePreference) { /** This is *a* signature with the maximal number of arguments, * such that if there is a "maximal" signature without rest arguments, * this is one of them. @@ -133908,36 +137497,36 @@ var ts; var maxArgsParameterSymbolNames = maxArgsSignature.parameters.map(function (symbol) { return symbol.name; }); var parameters = createDummyParameters(maxNonRestArgs, maxArgsParameterSymbolNames, /* types */ undefined, minArgumentCount, /*inJs*/ false); if (someSigHasRestParameter) { - var anyArrayType = ts.createArrayTypeNode(ts.createKeywordTypeNode(125 /* AnyKeyword */)); - var restParameter = ts.createParameter( + var anyArrayType = ts.factory.createArrayTypeNode(ts.factory.createKeywordTypeNode(128 /* AnyKeyword */)); + var restParameter = ts.factory.createParameterDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.createToken(25 /* DotDotDotToken */), maxArgsParameterSymbolNames[maxNonRestArgs] || "rest", - /*questionToken*/ maxNonRestArgs >= minArgumentCount ? ts.createToken(57 /* QuestionToken */) : undefined, anyArrayType, + /*modifiers*/ undefined, ts.factory.createToken(25 /* DotDotDotToken */), maxArgsParameterSymbolNames[maxNonRestArgs] || "rest", + /*questionToken*/ maxNonRestArgs >= minArgumentCount ? ts.factory.createToken(57 /* QuestionToken */) : undefined, anyArrayType, /*initializer*/ undefined); parameters.push(restParameter); } return createStubbedMethod(modifiers, name, optional, /*typeParameters*/ undefined, parameters, - /*returnType*/ undefined, preferences); + /*returnType*/ undefined, quotePreference); } - function createStubbedMethod(modifiers, name, optional, typeParameters, parameters, returnType, preferences) { - return ts.createMethod( + function createStubbedMethod(modifiers, name, optional, typeParameters, parameters, returnType, quotePreference) { + return ts.factory.createMethodDeclaration( /*decorators*/ undefined, modifiers, - /*asteriskToken*/ undefined, name, optional ? ts.createToken(57 /* QuestionToken */) : undefined, typeParameters, parameters, returnType, createStubbedMethodBody(preferences)); + /*asteriskToken*/ undefined, name, optional ? ts.factory.createToken(57 /* QuestionToken */) : undefined, typeParameters, parameters, returnType, createStubbedMethodBody(quotePreference)); } - function createStubbedMethodBody(preferences) { - return ts.createBlock([ts.createThrow(ts.createNew(ts.createIdentifier("Error"), + function createStubbedMethodBody(quotePreference) { + return ts.factory.createBlock([ts.factory.createThrowStatement(ts.factory.createNewExpression(ts.factory.createIdentifier("Error"), /*typeArguments*/ undefined, // TODO Handle auto quote preference. - [ts.createLiteral("Method not implemented.", /*isSingleQuote*/ preferences.quotePreference === "single")]))], + [ts.factory.createStringLiteral("Method not implemented.", /*isSingleQuote*/ quotePreference === 0 /* Single */)]))], /*multiline*/ true); } function createVisibilityModifier(flags) { if (flags & 4 /* Public */) { - return ts.createToken(119 /* PublicKeyword */); + return ts.factory.createToken(122 /* PublicKeyword */); } else if (flags & 16 /* Protected */) { - return ts.createToken(118 /* ProtectedKeyword */); + return ts.factory.createToken(121 /* ProtectedKeyword */); } return undefined; } @@ -133947,7 +137536,7 @@ var ts; return undefined; var compilerOptionsProperty = findJsonProperty(tsconfigObjectLiteral, "compilerOptions"); if (compilerOptionsProperty === undefined) { - changeTracker.insertNodeAtObjectStart(configFile, tsconfigObjectLiteral, createJsonPropertyAssignment("compilerOptions", ts.createObjectLiteral(options.map(function (_a) { + changeTracker.insertNodeAtObjectStart(configFile, tsconfigObjectLiteral, createJsonPropertyAssignment("compilerOptions", ts.factory.createObjectLiteralExpression(options.map(function (_a) { var optionName = _a[0], optionValue = _a[1]; return createJsonPropertyAssignment(optionName, optionValue); }), /*multiLine*/ true))); @@ -133974,7 +137563,7 @@ var ts; } codefix.setJsonCompilerOptionValue = setJsonCompilerOptionValue; function createJsonPropertyAssignment(name, initializer) { - return ts.createPropertyAssignment(ts.createStringLiteral(name), initializer); + return ts.factory.createPropertyAssignment(ts.factory.createStringLiteral(name), initializer); } codefix.createJsonPropertyAssignment = createJsonPropertyAssignment; function findJsonProperty(obj, name) { @@ -133982,44 +137571,38 @@ var ts; } codefix.findJsonProperty = findJsonProperty; /** - * Given an ImportTypeNode 'import("./a").SomeType>', + * Given a type node containing 'import("./a").SomeType>', * returns an equivalent type reference node with any nested ImportTypeNodes also replaced * with type references, and a list of symbols that must be imported to use the type reference. */ - function tryGetAutoImportableReferenceFromImportTypeNode(importTypeNode, type, scriptTarget) { - if (importTypeNode && ts.isLiteralImportTypeNode(importTypeNode) && importTypeNode.qualifier && (!type || type.symbol)) { - // Symbol for the left-most thing after the dot - var firstIdentifier = ts.getFirstIdentifier(importTypeNode.qualifier); - var name = ts.getNameForExportedSymbol(firstIdentifier.symbol, scriptTarget); - var qualifier = name !== firstIdentifier.text - ? replaceFirstIdentifierOfEntityName(importTypeNode.qualifier, ts.createIdentifier(name)) - : importTypeNode.qualifier; - var symbols_4 = [firstIdentifier.symbol]; - var typeArguments_1 = []; - if (importTypeNode.typeArguments) { - importTypeNode.typeArguments.forEach(function (arg) { - var ref = tryGetAutoImportableReferenceFromImportTypeNode(arg, /*undefined*/ type, scriptTarget); - if (ref) { - symbols_4.push.apply(symbols_4, ref.symbols); - typeArguments_1.push(ref.typeReference); - } - else { - typeArguments_1.push(arg); - } - }); + function tryGetAutoImportableReferenceFromTypeNode(importTypeNode, scriptTarget) { + var symbols; + var typeNode = ts.visitNode(importTypeNode, visit); + if (symbols && typeNode) { + return { typeNode: typeNode, symbols: symbols }; + } + function visit(node) { + var _a; + if (ts.isLiteralImportTypeNode(node) && node.qualifier) { + // Symbol for the left-most thing after the dot + var firstIdentifier = ts.getFirstIdentifier(node.qualifier); + var name = ts.getNameForExportedSymbol(firstIdentifier.symbol, scriptTarget); + var qualifier = name !== firstIdentifier.text + ? replaceFirstIdentifierOfEntityName(node.qualifier, ts.factory.createIdentifier(name)) + : node.qualifier; + symbols = ts.append(symbols, firstIdentifier.symbol); + var typeArguments = (_a = node.typeArguments) === null || _a === void 0 ? void 0 : _a.map(visit); + return ts.factory.createTypeReferenceNode(qualifier, typeArguments); } - return { - symbols: symbols_4, - typeReference: ts.createTypeReferenceNode(qualifier, typeArguments_1) - }; + return ts.visitEachChild(node, visit, ts.nullTransformationContext); } } - codefix.tryGetAutoImportableReferenceFromImportTypeNode = tryGetAutoImportableReferenceFromImportTypeNode; + codefix.tryGetAutoImportableReferenceFromTypeNode = tryGetAutoImportableReferenceFromTypeNode; function replaceFirstIdentifierOfEntityName(name, newIdentifier) { - if (name.kind === 75 /* Identifier */) { + if (name.kind === 78 /* Identifier */) { return newIdentifier; } - return ts.createQualifiedName(replaceFirstIdentifierOfEntityName(name.left, newIdentifier), name.right); + return ts.factory.createQualifiedName(replaceFirstIdentifierOfEntityName(name.left, newIdentifier), name.right); } function importSymbols(importAdder, symbols) { symbols.forEach(function (s) { return importAdder.addImportFromExportedSymbol(s, /*usageIsTypeOnly*/ true); }); @@ -134029,6 +137612,205 @@ var ts; })(ts || (ts = {})); /* @internal */ var ts; +(function (ts) { + var codefix; + (function (codefix) { + function generateAccessorFromProperty(file, start, end, context, _actionName) { + var fieldInfo = getAccessorConvertiblePropertyAtPosition(file, start, end); + if (!fieldInfo || !fieldInfo.info) + return undefined; + var changeTracker = ts.textChanges.ChangeTracker.fromContext(context); + var _a = fieldInfo.info, isStatic = _a.isStatic, isReadonly = _a.isReadonly, fieldName = _a.fieldName, accessorName = _a.accessorName, originalName = _a.originalName, type = _a.type, container = _a.container, declaration = _a.declaration; + ts.suppressLeadingAndTrailingTrivia(fieldName); + ts.suppressLeadingAndTrailingTrivia(accessorName); + ts.suppressLeadingAndTrailingTrivia(declaration); + ts.suppressLeadingAndTrailingTrivia(container); + var accessorModifiers; + var fieldModifiers; + if (ts.isClassLike(container)) { + var modifierFlags = ts.getEffectiveModifierFlags(declaration); + if (ts.isSourceFileJS(file)) { + var modifiers = createModifiers(modifierFlags); + accessorModifiers = modifiers; + fieldModifiers = modifiers; + } + else { + accessorModifiers = createModifiers(prepareModifierFlagsForAccessor(modifierFlags)); + fieldModifiers = createModifiers(prepareModifierFlagsForField(modifierFlags)); + } + } + updateFieldDeclaration(changeTracker, file, declaration, fieldName, fieldModifiers); + var getAccessor = generateGetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container); + ts.suppressLeadingAndTrailingTrivia(getAccessor); + insertAccessor(changeTracker, file, getAccessor, declaration, container); + if (isReadonly) { + // readonly modifier only existed in classLikeDeclaration + var constructor = ts.getFirstConstructorWithBody(container); + if (constructor) { + updateReadonlyPropertyInitializerStatementConstructor(changeTracker, file, constructor, fieldName.text, originalName); + } + } + else { + var setAccessor = generateSetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container); + ts.suppressLeadingAndTrailingTrivia(setAccessor); + insertAccessor(changeTracker, file, setAccessor, declaration, container); + } + return changeTracker.getChanges(); + } + codefix.generateAccessorFromProperty = generateAccessorFromProperty; + function isConvertibleName(name) { + return ts.isIdentifier(name) || ts.isStringLiteral(name); + } + function isAcceptedDeclaration(node) { + return ts.isParameterPropertyDeclaration(node, node.parent) || ts.isPropertyDeclaration(node) || ts.isPropertyAssignment(node); + } + function createPropertyName(name, originalName) { + return ts.isIdentifier(originalName) ? ts.factory.createIdentifier(name) : ts.factory.createStringLiteral(name); + } + function createAccessorAccessExpression(fieldName, isStatic, container) { + var leftHead = isStatic ? container.name : ts.factory.createThis(); // TODO: GH#18217 + return ts.isIdentifier(fieldName) ? ts.factory.createPropertyAccessExpression(leftHead, fieldName) : ts.factory.createElementAccessExpression(leftHead, ts.factory.createStringLiteralFromNode(fieldName)); + } + function createModifiers(modifierFlags) { + return modifierFlags ? ts.factory.createNodeArray(ts.factory.createModifiersFromModifierFlags(modifierFlags)) : undefined; + } + function prepareModifierFlagsForAccessor(modifierFlags) { + modifierFlags &= ~64 /* Readonly */; // avoid Readonly modifier because it will convert to get accessor + modifierFlags &= ~8 /* Private */; + if (!(modifierFlags & 16 /* Protected */)) { + modifierFlags |= 4 /* Public */; + } + return modifierFlags; + } + function prepareModifierFlagsForField(modifierFlags) { + modifierFlags &= ~4 /* Public */; + modifierFlags &= ~16 /* Protected */; + modifierFlags |= 8 /* Private */; + return modifierFlags; + } + function getAccessorConvertiblePropertyAtPosition(file, start, end, considerEmptySpans) { + if (considerEmptySpans === void 0) { considerEmptySpans = true; } + var node = ts.getTokenAtPosition(file, start); + var cursorRequest = start === end && considerEmptySpans; + var declaration = ts.findAncestor(node.parent, isAcceptedDeclaration); + // make sure declaration have AccessibilityModifier or Static Modifier or Readonly Modifier + var meaning = 28 /* AccessibilityModifier */ | 32 /* Static */ | 64 /* Readonly */; + if (!declaration || (!(ts.nodeOverlapsWithStartEnd(declaration.name, file, start, end) || cursorRequest))) { + return { + error: ts.getLocaleSpecificMessage(ts.Diagnostics.Could_not_find_property_for_which_to_generate_accessor) + }; + } + if (!isConvertibleName(declaration.name)) { + return { + error: ts.getLocaleSpecificMessage(ts.Diagnostics.Name_is_not_valid) + }; + } + if ((ts.getEffectiveModifierFlags(declaration) | meaning) !== meaning) { + return { + error: ts.getLocaleSpecificMessage(ts.Diagnostics.Can_only_convert_property_with_modifier) + }; + } + var name = declaration.name.text; + var startWithUnderscore = ts.startsWithUnderscore(name); + var fieldName = createPropertyName(startWithUnderscore ? name : ts.getUniqueName("_" + name, file), declaration.name); + var accessorName = createPropertyName(startWithUnderscore ? ts.getUniqueName(name.substring(1), file) : name, declaration.name); + return { + info: { + isStatic: ts.hasStaticModifier(declaration), + isReadonly: ts.hasEffectiveReadonlyModifier(declaration), + type: ts.getTypeAnnotationNode(declaration), + container: declaration.kind === 159 /* Parameter */ ? declaration.parent.parent : declaration.parent, + originalName: declaration.name.text, + declaration: declaration, + fieldName: fieldName, + accessorName: accessorName, + renameAccessor: startWithUnderscore + } + }; + } + codefix.getAccessorConvertiblePropertyAtPosition = getAccessorConvertiblePropertyAtPosition; + function generateGetAccessor(fieldName, accessorName, type, modifiers, isStatic, container) { + return ts.factory.createGetAccessorDeclaration( + /*decorators*/ undefined, modifiers, accessorName, + /*parameters*/ undefined, // TODO: GH#18217 + type, ts.factory.createBlock([ + ts.factory.createReturnStatement(createAccessorAccessExpression(fieldName, isStatic, container)) + ], /*multiLine*/ true)); + } + function generateSetAccessor(fieldName, accessorName, type, modifiers, isStatic, container) { + return ts.factory.createSetAccessorDeclaration( + /*decorators*/ undefined, modifiers, accessorName, [ts.factory.createParameterDeclaration( + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*dotDotDotToken*/ undefined, ts.factory.createIdentifier("value"), + /*questionToken*/ undefined, type)], ts.factory.createBlock([ + ts.factory.createExpressionStatement(ts.factory.createAssignment(createAccessorAccessExpression(fieldName, isStatic, container), ts.factory.createIdentifier("value"))) + ], /*multiLine*/ true)); + } + function updatePropertyDeclaration(changeTracker, file, declaration, fieldName, modifiers) { + var property = ts.factory.updatePropertyDeclaration(declaration, declaration.decorators, modifiers, fieldName, declaration.questionToken || declaration.exclamationToken, declaration.type, declaration.initializer); + changeTracker.replaceNode(file, declaration, property); + } + function updatePropertyAssignmentDeclaration(changeTracker, file, declaration, fieldName) { + var assignment = ts.factory.updatePropertyAssignment(declaration, fieldName, declaration.initializer); + changeTracker.replacePropertyAssignment(file, declaration, assignment); + } + function updateFieldDeclaration(changeTracker, file, declaration, fieldName, modifiers) { + if (ts.isPropertyDeclaration(declaration)) { + updatePropertyDeclaration(changeTracker, file, declaration, fieldName, modifiers); + } + else if (ts.isPropertyAssignment(declaration)) { + updatePropertyAssignmentDeclaration(changeTracker, file, declaration, fieldName); + } + else { + changeTracker.replaceNode(file, declaration, ts.factory.updateParameterDeclaration(declaration, declaration.decorators, modifiers, declaration.dotDotDotToken, ts.cast(fieldName, ts.isIdentifier), declaration.questionToken, declaration.type, declaration.initializer)); + } + } + function insertAccessor(changeTracker, file, accessor, declaration, container) { + ts.isParameterPropertyDeclaration(declaration, declaration.parent) ? changeTracker.insertNodeAtClassStart(file, container, accessor) : + ts.isPropertyAssignment(declaration) ? changeTracker.insertNodeAfterComma(file, declaration, accessor) : + changeTracker.insertNodeAfter(file, declaration, accessor); + } + function updateReadonlyPropertyInitializerStatementConstructor(changeTracker, file, constructor, fieldName, originalName) { + if (!constructor.body) + return; + constructor.body.forEachChild(function recur(node) { + if (ts.isElementAccessExpression(node) && + node.expression.kind === 107 /* ThisKeyword */ && + ts.isStringLiteral(node.argumentExpression) && + node.argumentExpression.text === originalName && + ts.isWriteAccess(node)) { + changeTracker.replaceNode(file, node.argumentExpression, ts.factory.createStringLiteral(fieldName)); + } + if (ts.isPropertyAccessExpression(node) && node.expression.kind === 107 /* ThisKeyword */ && node.name.text === originalName && ts.isWriteAccess(node)) { + changeTracker.replaceNode(file, node.name, ts.factory.createIdentifier(fieldName)); + } + if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) { + node.forEachChild(recur); + } + }); + } + function getAllSupers(decl, checker) { + var res = []; + while (decl) { + var superElement = ts.getClassExtendsHeritageElement(decl); + var superSymbol = superElement && checker.getSymbolAtLocation(superElement.expression); + if (!superSymbol) + break; + var symbol = superSymbol.flags & 2097152 /* Alias */ ? checker.getAliasedSymbol(superSymbol) : superSymbol; + var superDecl = ts.find(symbol.declarations, ts.isClassLike); + if (!superDecl) + break; + res.push(superDecl); + decl = superDecl; + } + return res; + } + codefix.getAllSupers = getAllSupers; + })(codefix = ts.codefix || (ts.codefix = {})); +})(ts || (ts = {})); +/* @internal */ +var ts; (function (ts) { var codefix; (function (codefix) { @@ -134042,9 +137824,9 @@ var ts; variations.push(createAction(context, sourceFile, node, ts.makeImport(namespace.name, /*namedImports*/ undefined, node.moduleSpecifier, ts.getQuotePreference(sourceFile, context.preferences)))); if (ts.getEmitModuleKind(opts) === ts.ModuleKind.CommonJS) { // import Bluebird = require("bluebird"); - variations.push(createAction(context, sourceFile, node, ts.createImportEqualsDeclaration( + variations.push(createAction(context, sourceFile, node, ts.factory.createImportEqualsDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, namespace.name, ts.createExternalModuleReference(node.moduleSpecifier)))); + /*modifiers*/ undefined, namespace.name, ts.factory.createExternalModuleReference(node.moduleSpecifier)))); } return variations; } @@ -134061,7 +137843,7 @@ var ts; }); function getActionsForUsageOfInvalidImport(context) { var sourceFile = context.sourceFile; - var targetKind = ts.Diagnostics.This_expression_is_not_callable.code === context.errorCode ? 196 /* CallExpression */ : 197 /* NewExpression */; + var targetKind = ts.Diagnostics.This_expression_is_not_callable.code === context.errorCode ? 200 /* CallExpression */ : 201 /* NewExpression */; var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.kind === targetKind; }); if (!node) { return []; @@ -134107,7 +137889,7 @@ var ts; } if (ts.isExpression(expr) && !(ts.isNamedDeclaration(expr.parent) && expr.parent.name === expr)) { var sourceFile_1 = context.sourceFile; - var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return t.replaceNode(sourceFile_1, expr, ts.createPropertyAccess(expr, "default"), {}); }); + var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return t.replaceNode(sourceFile_1, expr, ts.factory.createPropertyAccessExpression(expr, "default"), {}); }); fixes.push(codefix.createCodeFixActionWithoutFixAll(fixName, changes, ts.Diagnostics.Use_synthetic_default_member)); } return fixes; @@ -134172,7 +137954,7 @@ var ts; return codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_definite_assignment_assertion_to_property_0, propertyDeclaration.getText()], fixIdAddDefiniteAssignmentAssertions, ts.Diagnostics.Add_definite_assignment_assertions_to_all_uninitialized_properties); } function addDefiniteAssignmentAssertion(changeTracker, propertyDeclarationSourceFile, propertyDeclaration) { - var property = ts.updateProperty(propertyDeclaration, propertyDeclaration.decorators, propertyDeclaration.modifiers, propertyDeclaration.name, ts.createToken(53 /* ExclamationToken */), propertyDeclaration.type, propertyDeclaration.initializer); + var property = ts.factory.updatePropertyDeclaration(propertyDeclaration, propertyDeclaration.decorators, propertyDeclaration.modifiers, propertyDeclaration.name, ts.factory.createToken(53 /* ExclamationToken */), propertyDeclaration.type, propertyDeclaration.initializer); changeTracker.replaceNode(propertyDeclarationSourceFile, propertyDeclaration, property); } function getActionForAddMissingUndefinedType(context, propertyDeclaration) { @@ -134180,10 +137962,10 @@ var ts; return codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_undefined_type_to_property_0, propertyDeclaration.name.getText()], fixIdAddUndefinedType, ts.Diagnostics.Add_undefined_type_to_all_uninitialized_properties); } function addUndefinedType(changeTracker, propertyDeclarationSourceFile, propertyDeclaration) { - var undefinedTypeNode = ts.createKeywordTypeNode(146 /* UndefinedKeyword */); + var undefinedTypeNode = ts.factory.createKeywordTypeNode(149 /* UndefinedKeyword */); var type = propertyDeclaration.type; // TODO: GH#18217 var types = ts.isUnionTypeNode(type) ? type.types.concat(undefinedTypeNode) : [type, undefinedTypeNode]; - changeTracker.replaceNode(propertyDeclarationSourceFile, type, ts.createUnionTypeNode(types)); + changeTracker.replaceNode(propertyDeclarationSourceFile, type, ts.factory.createUnionTypeNode(types)); } function getActionForAddMissingInitializer(context, propertyDeclaration) { var checker = context.program.getTypeChecker(); @@ -134194,7 +137976,7 @@ var ts; return codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_initializer_to_property_0, propertyDeclaration.name.getText()], fixIdAddInitializer, ts.Diagnostics.Add_initializers_to_all_uninitialized_properties); } function addInitializer(changeTracker, propertyDeclarationSourceFile, propertyDeclaration, initializer) { - var property = ts.updateProperty(propertyDeclaration, propertyDeclaration.decorators, propertyDeclaration.modifiers, propertyDeclaration.name, propertyDeclaration.questionToken, propertyDeclaration.type, initializer); + var property = ts.factory.updatePropertyDeclaration(propertyDeclaration, propertyDeclaration.decorators, propertyDeclaration.modifiers, propertyDeclaration.name, propertyDeclaration.questionToken, propertyDeclaration.type, initializer); changeTracker.replaceNode(propertyDeclarationSourceFile, propertyDeclaration, property); } function getInitializer(checker, propertyDeclaration) { @@ -134202,25 +137984,31 @@ var ts; } function getDefaultValueFromType(checker, type) { if (type.flags & 512 /* BooleanLiteral */) { - return (type === checker.getFalseType() || type === checker.getFalseType(/*fresh*/ true)) ? ts.createFalse() : ts.createTrue(); + return (type === checker.getFalseType() || type === checker.getFalseType(/*fresh*/ true)) ? ts.factory.createFalse() : ts.factory.createTrue(); } - else if (type.isLiteral()) { - return ts.createLiteral(type.value); + else if (type.isStringLiteral()) { + return ts.factory.createStringLiteral(type.value); + } + else if (type.isNumberLiteral()) { + return ts.factory.createNumericLiteral(type.value); + } + else if (type.flags & 2048 /* BigIntLiteral */) { + return ts.factory.createBigIntLiteral(type.value); } else if (type.isUnion()) { return ts.firstDefined(type.types, function (t) { return getDefaultValueFromType(checker, t); }); } else if (type.isClass()) { var classDeclaration = ts.getClassLikeDeclarationOfSymbol(type.symbol); - if (!classDeclaration || ts.hasModifier(classDeclaration, 128 /* Abstract */)) + if (!classDeclaration || ts.hasSyntacticModifier(classDeclaration, 128 /* Abstract */)) return undefined; var constructorDeclaration = ts.getFirstConstructorWithBody(classDeclaration); if (constructorDeclaration && constructorDeclaration.parameters.length) return undefined; - return ts.createNew(ts.createIdentifier(type.symbol.name), /*typeArguments*/ undefined, /*argumentsArray*/ undefined); + return ts.factory.createNewExpression(ts.factory.createIdentifier(type.symbol.name), /*typeArguments*/ undefined, /*argumentsArray*/ undefined); } else if (checker.isArrayLikeType(type)) { - return ts.createArrayLiteral(); + return ts.factory.createArrayLiteralExpression(); } return undefined; } @@ -134236,24 +138024,57 @@ var ts; codefix.registerCodeFix({ errorCodes: errorCodes, getCodeActions: function (context) { - var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, context.sourceFile, context.span.start, context.program); }); + var info = getInfo(context.sourceFile, context.program, context.span.start); + if (!info) { + return undefined; + } + var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, context.sourceFile, info); }); return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Convert_require_to_import, fixId, ts.Diagnostics.Convert_all_require_to_import)]; }, fixIds: [fixId], - getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return doChange(changes, diag.file, diag.start, context.program); }); }, + getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) { + var info = getInfo(diag.file, context.program, diag.start); + if (info) { + doChange(changes, context.sourceFile, info); + } + }); }, }); - function doChange(changes, sourceFile, pos, program) { - var _a = getInfo(sourceFile, pos), statement = _a.statement, name = _a.name, required = _a.required; - changes.replaceNode(sourceFile, statement, ts.getAllowSyntheticDefaultImports(program.getCompilerOptions()) - ? ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(name, /*namedBindings*/ undefined), required) - : ts.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, name, ts.createExternalModuleReference(required))); + function doChange(changes, sourceFile, info) { + var allowSyntheticDefaults = info.allowSyntheticDefaults, defaultImportName = info.defaultImportName, namedImports = info.namedImports, statement = info.statement, required = info.required; + changes.replaceNode(sourceFile, statement, defaultImportName && !allowSyntheticDefaults + ? ts.factory.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, defaultImportName, ts.factory.createExternalModuleReference(required)) + : ts.factory.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, defaultImportName, namedImports), required)); } - function getInfo(sourceFile, pos) { + function getInfo(sourceFile, program, pos) { var parent = ts.getTokenAtPosition(sourceFile, pos).parent; - if (!ts.isRequireCall(parent, /*checkArgumentIsStringLiteralLike*/ true)) + if (!ts.isRequireCall(parent, /*checkArgumentIsStringLiteralLike*/ true)) { throw ts.Debug.failBadSyntaxKind(parent); + } var decl = ts.cast(parent.parent, ts.isVariableDeclaration); - return { statement: ts.cast(decl.parent.parent, ts.isVariableStatement), name: ts.cast(decl.name, ts.isIdentifier), required: parent.arguments[0] }; + var defaultImportName = ts.tryCast(decl.name, ts.isIdentifier); + var namedImports = ts.isObjectBindingPattern(decl.name) ? tryCreateNamedImportsFromObjectBindingPattern(decl.name) : undefined; + if (defaultImportName || namedImports) { + return { + allowSyntheticDefaults: ts.getAllowSyntheticDefaultImports(program.getCompilerOptions()), + defaultImportName: defaultImportName, + namedImports: namedImports, + statement: ts.cast(decl.parent.parent, ts.isVariableStatement), + required: ts.first(parent.arguments) + }; + } + } + function tryCreateNamedImportsFromObjectBindingPattern(node) { + var importSpecifiers = []; + for (var _i = 0, _a = node.elements; _i < _a.length; _i++) { + var element = _a[_i]; + if (!ts.isIdentifier(element.name) || element.initializer) { + return undefined; + } + importSpecifiers.push(ts.factory.createImportSpecifier(ts.tryCast(element.propertyName, ts.isIdentifier), element.name)); + } + if (importSpecifiers.length) { + return ts.factory.createNamedImports(importSpecifiers); + } } })(codefix = ts.codefix || (ts.codefix = {})); })(ts || (ts = {})); @@ -134328,7 +138149,7 @@ var ts; } // We use .getText to overcome parser inaccuracies: https://github.com/microsoft/TypeScript/issues/33298 var newText = numericLiteral.getText(sourceFile) + "n"; - changeTracker.replaceNode(sourceFile, numericLiteral, ts.createBigIntLiteral(newText)); + changeTracker.replaceNode(sourceFile, numericLiteral, ts.factory.createBigIntLiteral(newText)); } })(codefix = ts.codefix || (ts.codefix = {})); })(ts || (ts = {})); @@ -134355,18 +138176,98 @@ var ts; }); function getImportTypeNode(sourceFile, pos) { var token = ts.getTokenAtPosition(sourceFile, pos); - ts.Debug.assert(token.kind === 96 /* ImportKeyword */, "This token should be an ImportKeyword"); - ts.Debug.assert(token.parent.kind === 188 /* ImportType */, "Token parent should be an ImportType"); + ts.Debug.assert(token.kind === 99 /* ImportKeyword */, "This token should be an ImportKeyword"); + ts.Debug.assert(token.parent.kind === 192 /* ImportType */, "Token parent should be an ImportType"); return token.parent; } function doChange(changes, sourceFile, importType) { - var newTypeNode = ts.updateImportTypeNode(importType, importType.argument, importType.qualifier, importType.typeArguments, /* isTypeOf */ true); + var newTypeNode = ts.factory.updateImportTypeNode(importType, importType.argument, importType.qualifier, importType.typeArguments, /* isTypeOf */ true); changes.replaceNode(sourceFile, importType, newTypeNode); } })(codefix = ts.codefix || (ts.codefix = {})); })(ts || (ts = {})); /* @internal */ var ts; +(function (ts) { + var codefix; + (function (codefix) { + var fixID = "wrapJsxInFragment"; + var errorCodes = [ts.Diagnostics.JSX_expressions_must_have_one_parent_element.code]; + codefix.registerCodeFix({ + errorCodes: errorCodes, + getCodeActions: function (context) { + var jsx = context.program.getCompilerOptions().jsx; + if (jsx !== 2 /* React */ && jsx !== 3 /* ReactNative */) { + return undefined; + } + var sourceFile = context.sourceFile, span = context.span; + var node = findNodeToFix(sourceFile, span.start); + if (!node) + return undefined; + var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, node); }); + return [codefix.createCodeFixAction(fixID, changes, ts.Diagnostics.Wrap_in_JSX_fragment, fixID, ts.Diagnostics.Wrap_all_unparented_JSX_in_JSX_fragment)]; + }, + fixIds: [fixID], + getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) { + var node = findNodeToFix(context.sourceFile, diag.start); + if (!node) + return undefined; + doChange(changes, context.sourceFile, node); + }); }, + }); + function findNodeToFix(sourceFile, pos) { + // The error always at 1st token that is "<" in "" + var lessThanToken = ts.getTokenAtPosition(sourceFile, pos); + var firstJsxElementOrOpenElement = lessThanToken.parent; + var binaryExpr = firstJsxElementOrOpenElement.parent; + if (!ts.isBinaryExpression(binaryExpr)) { + // In case the start element is a JsxSelfClosingElement, it the end. + // For JsxOpenElement, find one more parent + binaryExpr = binaryExpr.parent; + if (!ts.isBinaryExpression(binaryExpr)) + return undefined; + } + if (!ts.nodeIsMissing(binaryExpr.operatorToken)) + return undefined; + return binaryExpr; + } + function doChange(changeTracker, sf, node) { + var jsx = flattenInvalidBinaryExpr(node); + if (jsx) + changeTracker.replaceNode(sf, node, ts.factory.createJsxFragment(ts.factory.createJsxOpeningFragment(), jsx, ts.factory.createJsxJsxClosingFragment())); + } + // The invalid syntax is constructed as + // InvalidJsxTree :: One of + // JsxElement CommaToken InvalidJsxTree + // JsxElement CommaToken JsxElement + function flattenInvalidBinaryExpr(node) { + var children = []; + var current = node; + while (true) { + if (ts.isBinaryExpression(current) && ts.nodeIsMissing(current.operatorToken) && current.operatorToken.kind === 27 /* CommaToken */) { + children.push(current.left); + if (ts.isJsxChild(current.right)) { + children.push(current.right); + // Indicates the tree has go to the bottom + return children; + } + else if (ts.isBinaryExpression(current.right)) { + current = current.right; + continue; + } + // Unreachable case + else + return undefined; + } + // Unreachable case + else + return undefined; + } + } + })(codefix = ts.codefix || (ts.codefix = {})); +})(ts || (ts = {})); +/* @internal */ +var ts; (function (ts) { var codefix; (function (codefix) { @@ -134400,24 +138301,49 @@ var ts; return { indexSignature: indexSignature, container: container }; } function createTypeAliasFromInterface(declaration, type) { - return ts.createTypeAliasDeclaration(declaration.decorators, declaration.modifiers, declaration.name, declaration.typeParameters, type); + return ts.factory.createTypeAliasDeclaration(declaration.decorators, declaration.modifiers, declaration.name, declaration.typeParameters, type); } function doChange(changes, sourceFile, _a) { var indexSignature = _a.indexSignature, container = _a.container; var members = ts.isInterfaceDeclaration(container) ? container.members : container.type.members; var otherMembers = members.filter(function (member) { return !ts.isIndexSignatureDeclaration(member); }); var parameter = ts.first(indexSignature.parameters); - var mappedTypeParameter = ts.createTypeParameterDeclaration(ts.cast(parameter.name, ts.isIdentifier), parameter.type); - var mappedIntersectionType = ts.createMappedTypeNode(ts.hasReadonlyModifier(indexSignature) ? ts.createModifier(138 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type); - var intersectionType = ts.createIntersectionTypeNode(__spreadArrays(ts.getAllSuperTypeNodes(container), [ + var mappedTypeParameter = ts.factory.createTypeParameterDeclaration(ts.cast(parameter.name, ts.isIdentifier), parameter.type); + var mappedIntersectionType = ts.factory.createMappedTypeNode(ts.hasEffectiveReadonlyModifier(indexSignature) ? ts.factory.createModifier(141 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type); + var intersectionType = ts.factory.createIntersectionTypeNode(__spreadArrays(ts.getAllSuperTypeNodes(container), [ mappedIntersectionType - ], (otherMembers.length ? [ts.createTypeLiteralNode(otherMembers)] : ts.emptyArray))); + ], (otherMembers.length ? [ts.factory.createTypeLiteralNode(otherMembers)] : ts.emptyArray))); changes.replaceNode(sourceFile, container, createTypeAliasFromInterface(container, intersectionType)); } })(codefix = ts.codefix || (ts.codefix = {})); })(ts || (ts = {})); /* @internal */ var ts; +(function (ts) { + var codefix; + (function (codefix) { + var fixId = "removeAccidentalCallParentheses"; + var errorCodes = [ + ts.Diagnostics.This_expression_is_not_callable_because_it_is_a_get_accessor_Did_you_mean_to_use_it_without.code, + ]; + codefix.registerCodeFix({ + errorCodes: errorCodes, + getCodeActions: function (context) { + var callExpression = ts.findAncestor(ts.getTokenAtPosition(context.sourceFile, context.span.start), ts.isCallExpression); + if (!callExpression) { + return undefined; + } + var changes = ts.textChanges.ChangeTracker.with(context, function (t) { + t.deleteRange(context.sourceFile, { pos: callExpression.expression.end, end: callExpression.end }); + }); + return [codefix.createCodeFixActionWithoutFixAll(fixId, changes, ts.Diagnostics.Remove_parentheses)]; + }, + fixIds: [fixId], + }); + })(codefix = ts.codefix || (ts.codefix = {})); +})(ts || (ts = {})); +/* @internal */ +var ts; (function (ts) { var codefix; (function (codefix) { @@ -134439,7 +138365,7 @@ var ts; }, }); function makeChange(changeTracker, sourceFile, span) { - var awaitKeyword = ts.tryCast(ts.getTokenAtPosition(sourceFile, span.start), function (node) { return node.kind === 127 /* AwaitKeyword */; }); + var awaitKeyword = ts.tryCast(ts.getTokenAtPosition(sourceFile, span.start), function (node) { return node.kind === 130 /* AwaitKeyword */; }); var awaitExpression = awaitKeyword && ts.tryCast(awaitKeyword.parent, ts.isAwaitExpression); if (!awaitExpression) { return; @@ -134450,7 +138376,7 @@ var ts; var leftMostExpression = ts.getLeftmostExpression(awaitExpression.expression, /*stopAtCallExpressions*/ false); if (ts.isIdentifier(leftMostExpression)) { var precedingToken = ts.findPrecedingToken(awaitExpression.parent.pos, sourceFile); - if (precedingToken && precedingToken.kind !== 99 /* NewKeyword */) { + if (precedingToken && precedingToken.kind !== 102 /* NewKeyword */) { expressionToReplace = awaitExpression.parent; } } @@ -134489,10 +138415,10 @@ var ts; return; } var importClause = ts.Debug.checkDefined(importDeclaration.importClause); - changes.replaceNode(context.sourceFile, importDeclaration, ts.updateImportDeclaration(importDeclaration, importDeclaration.decorators, importDeclaration.modifiers, ts.updateImportClause(importClause, importClause.name, /*namedBindings*/ undefined, importClause.isTypeOnly), importDeclaration.moduleSpecifier)); - changes.insertNodeAfter(context.sourceFile, importDeclaration, ts.createImportDeclaration( + changes.replaceNode(context.sourceFile, importDeclaration, ts.factory.updateImportDeclaration(importDeclaration, importDeclaration.decorators, importDeclaration.modifiers, ts.factory.updateImportClause(importClause, importClause.isTypeOnly, importClause.name, /*namedBindings*/ undefined), importDeclaration.moduleSpecifier)); + changes.insertNodeAfter(context.sourceFile, importDeclaration, ts.factory.createImportDeclaration( /*decorators*/ undefined, - /*modifiers*/ undefined, ts.updateImportClause(importClause, /*name*/ undefined, importClause.namedBindings, importClause.isTypeOnly), importDeclaration.moduleSpecifier)); + /*modifiers*/ undefined, ts.factory.updateImportClause(importClause, importClause.isTypeOnly, /*name*/ undefined, importClause.namedBindings), importDeclaration.moduleSpecifier)); } })(codefix = ts.codefix || (ts.codefix = {})); })(ts || (ts = {})); @@ -134565,7 +138491,7 @@ var ts; } function doChange(changes, sourceFile, _a) { var node = _a.node; - var newNode = ts.createNode(27 /* CommaToken */); + var newNode = ts.factory.createToken(27 /* CommaToken */); changes.replaceNode(sourceFile, node, newNode); } })(codefix = ts.codefix || (ts.codefix = {})); @@ -134580,45 +138506,55 @@ var ts; var actionNameNamedToDefault = "Convert named export to default export"; refactor.registerRefactor(refactorName, { getAvailableActions: function (context) { - var info = getInfo(context); + var info = getInfo(context, context.triggerReason === "invoked"); if (!info) return ts.emptyArray; - var description = info.wasDefault ? ts.Diagnostics.Convert_default_export_to_named_export.message : ts.Diagnostics.Convert_named_export_to_default_export.message; - var actionName = info.wasDefault ? actionNameDefaultToNamed : actionNameNamedToDefault; - return [{ name: refactorName, description: description, actions: [{ name: actionName, description: description }] }]; + if (info.error === undefined) { + var description = info.info.wasDefault ? ts.Diagnostics.Convert_default_export_to_named_export.message : ts.Diagnostics.Convert_named_export_to_default_export.message; + var actionName = info.info.wasDefault ? actionNameDefaultToNamed : actionNameNamedToDefault; + return [{ name: refactorName, description: description, actions: [{ name: actionName, description: description }] }]; + } + if (context.preferences.provideRefactorNotApplicableReason) { + return [ + { name: refactorName, description: ts.Diagnostics.Convert_default_export_to_named_export.message, actions: [{ name: actionNameDefaultToNamed, description: ts.Diagnostics.Convert_default_export_to_named_export.message, notApplicableReason: info.error }] }, + { name: refactorName, description: ts.Diagnostics.Convert_named_export_to_default_export.message, actions: [{ name: actionNameNamedToDefault, description: ts.Diagnostics.Convert_named_export_to_default_export.message, notApplicableReason: info.error }] }, + ]; + } + return ts.emptyArray; }, getEditsForAction: function (context, actionName) { ts.Debug.assert(actionName === actionNameDefaultToNamed || actionName === actionNameNamedToDefault, "Unexpected action name"); - var edits = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(context.file, context.program, ts.Debug.checkDefined(getInfo(context), "context must have info"), t, context.cancellationToken); }); + var edits = ts.textChanges.ChangeTracker.with(context, function (t) { var _a; return doChange(context.file, context.program, ts.Debug.checkDefined((_a = getInfo(context)) === null || _a === void 0 ? void 0 : _a.info, "context must have info"), t, context.cancellationToken); }); return { edits: edits, renameFilename: undefined, renameLocation: undefined }; }, }); - function getInfo(context) { + function getInfo(context, considerPartialSpans) { + if (considerPartialSpans === void 0) { considerPartialSpans = true; } var file = context.file; var span = ts.getRefactorContextSpan(context); var token = ts.getTokenAtPosition(file, span.start); - var exportNode = ts.getParentNodeInSpan(token, file, span); + var exportNode = !!(token.parent && ts.getSyntacticModifierFlags(token.parent) & 1 /* Export */) && considerPartialSpans ? token.parent : ts.getParentNodeInSpan(token, file, span); if (!exportNode || (!ts.isSourceFile(exportNode.parent) && !(ts.isModuleBlock(exportNode.parent) && ts.isAmbientModule(exportNode.parent.parent)))) { - return undefined; + return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Could_not_find_export_statement) }; } var exportingModuleSymbol = ts.isSourceFile(exportNode.parent) ? exportNode.parent.symbol : exportNode.parent.parent.symbol; - var flags = ts.getModifierFlags(exportNode); + var flags = ts.getSyntacticModifierFlags(exportNode); var wasDefault = !!(flags & 512 /* Default */); // If source file already has a default export, don't offer refactor. if (!(flags & 1 /* Export */) || !wasDefault && exportingModuleSymbol.exports.has("default" /* Default */)) { - return undefined; + return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.This_file_already_has_a_default_export) }; } switch (exportNode.kind) { - case 244 /* FunctionDeclaration */: - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: - case 248 /* EnumDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 249 /* ModuleDeclaration */: { + case 248 /* FunctionDeclaration */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: + case 252 /* EnumDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 253 /* ModuleDeclaration */: { var node = exportNode; - return node.name && ts.isIdentifier(node.name) ? { exportNode: node, exportName: node.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } : undefined; + return node.name && ts.isIdentifier(node.name) ? { info: { exportNode: node, exportName: node.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } } : undefined; } - case 225 /* VariableStatement */: { + case 229 /* VariableStatement */: { var vs = exportNode; // Must be `export const x = something;`. if (!(vs.declarationList.flags & 2 /* Const */) || vs.declarationList.declarations.length !== 1) { @@ -134628,7 +138564,7 @@ var ts; if (!decl.initializer) return undefined; ts.Debug.assert(!wasDefault, "Can't have a default flag here"); - return ts.isIdentifier(decl.name) ? { exportNode: vs, exportName: decl.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } : undefined; + return ts.isIdentifier(decl.name) ? { info: { exportNode: vs, exportName: decl.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } } : undefined; } default: return undefined; @@ -134641,30 +138577,30 @@ var ts; function changeExport(exportingSourceFile, _a, changes, checker) { var wasDefault = _a.wasDefault, exportNode = _a.exportNode, exportName = _a.exportName; if (wasDefault) { - changes.delete(exportingSourceFile, ts.Debug.checkDefined(ts.findModifier(exportNode, 84 /* DefaultKeyword */), "Should find a default keyword in modifier list")); + changes.delete(exportingSourceFile, ts.Debug.checkDefined(ts.findModifier(exportNode, 87 /* DefaultKeyword */), "Should find a default keyword in modifier list")); } else { - var exportKeyword = ts.Debug.checkDefined(ts.findModifier(exportNode, 89 /* ExportKeyword */), "Should find an export keyword in modifier list"); + var exportKeyword = ts.Debug.checkDefined(ts.findModifier(exportNode, 92 /* ExportKeyword */), "Should find an export keyword in modifier list"); switch (exportNode.kind) { - case 244 /* FunctionDeclaration */: - case 245 /* ClassDeclaration */: - case 246 /* InterfaceDeclaration */: - changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.createToken(84 /* DefaultKeyword */)); + case 248 /* FunctionDeclaration */: + case 249 /* ClassDeclaration */: + case 250 /* InterfaceDeclaration */: + changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.factory.createToken(87 /* DefaultKeyword */)); break; - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: // If 'x' isn't used in this file, `export const x = 0;` --> `export default 0;` if (!ts.FindAllReferences.Core.isSymbolReferencedInFile(exportName, checker, exportingSourceFile)) { // We checked in `getInfo` that an initializer exists. - changes.replaceNode(exportingSourceFile, exportNode, ts.createExportDefault(ts.Debug.checkDefined(ts.first(exportNode.declarationList.declarations).initializer, "Initializer was previously known to be present"))); + changes.replaceNode(exportingSourceFile, exportNode, ts.factory.createExportDefault(ts.Debug.checkDefined(ts.first(exportNode.declarationList.declarations).initializer, "Initializer was previously known to be present"))); break; } // falls through - case 248 /* EnumDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 249 /* ModuleDeclaration */: + case 252 /* EnumDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 253 /* ModuleDeclaration */: // `export type T = number;` -> `type T = number; export default T;` changes.deleteModifier(exportingSourceFile, exportKeyword); - changes.insertNodeAfter(exportingSourceFile, exportNode, ts.createExportDefault(ts.createIdentifier(exportName.text))); + changes.insertNodeAfter(exportingSourceFile, exportNode, ts.factory.createExportDefault(ts.factory.createIdentifier(exportName.text))); break; default: ts.Debug.assertNever(exportNode, "Unexpected exportNode kind " + exportNode.kind); @@ -134688,27 +138624,27 @@ var ts; function changeDefaultToNamedImport(importingSourceFile, ref, changes, exportName) { var parent = ref.parent; switch (parent.kind) { - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: // `a.default` --> `a.foo` - changes.replaceNode(importingSourceFile, ref, ts.createIdentifier(exportName)); + changes.replaceNode(importingSourceFile, ref, ts.factory.createIdentifier(exportName)); break; - case 258 /* ImportSpecifier */: - case 263 /* ExportSpecifier */: { + case 262 /* ImportSpecifier */: + case 267 /* ExportSpecifier */: { var spec = parent; // `default as foo` --> `foo`, `default as bar` --> `foo as bar` changes.replaceNode(importingSourceFile, spec, makeImportSpecifier(exportName, spec.name.text)); break; } - case 255 /* ImportClause */: { + case 259 /* ImportClause */: { var clause = parent; ts.Debug.assert(clause.name === ref, "Import clause name should match provided ref"); var spec = makeImportSpecifier(exportName, ref.text); var namedBindings = clause.namedBindings; if (!namedBindings) { // `import foo from "./a";` --> `import { foo } from "./a";` - changes.replaceNode(importingSourceFile, ref, ts.createNamedImports([spec])); + changes.replaceNode(importingSourceFile, ref, ts.factory.createNamedImports([spec])); } - else if (namedBindings.kind === 256 /* NamespaceImport */) { + else if (namedBindings.kind === 260 /* NamespaceImport */) { // `import foo, * as a from "./a";` --> `import * as a from ".a/"; import { foo } from "./a";` changes.deleteRange(importingSourceFile, { pos: ref.getStart(importingSourceFile), end: namedBindings.getStart(importingSourceFile) }); var quotePreference = ts.isStringLiteral(clause.parent.moduleSpecifier) ? ts.quotePreferenceFromString(clause.parent.moduleSpecifier, importingSourceFile) : 1 /* Double */; @@ -134729,14 +138665,14 @@ var ts; function changeNamedToDefaultImport(importingSourceFile, ref, changes) { var parent = ref.parent; switch (parent.kind) { - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: // `a.foo` --> `a.default` - changes.replaceNode(importingSourceFile, ref, ts.createIdentifier("default")); + changes.replaceNode(importingSourceFile, ref, ts.factory.createIdentifier("default")); break; - case 258 /* ImportSpecifier */: { + case 262 /* ImportSpecifier */: { // `import { foo } from "./a";` --> `import foo from "./a";` // `import { foo as bar } from "./a";` --> `import bar from "./a";` - var defaultImport = ts.createIdentifier(parent.name.text); + var defaultImport = ts.factory.createIdentifier(parent.name.text); if (parent.parent.elements.length === 1) { changes.replaceNode(importingSourceFile, parent.parent, defaultImport); } @@ -134746,7 +138682,7 @@ var ts; } break; } - case 263 /* ExportSpecifier */: { + case 267 /* ExportSpecifier */: { // `export { foo } from "./a";` --> `export { default as foo } from "./a";` // `export { foo as bar } from "./a";` --> `export { default as bar } from "./a";` // `export { foo as default } from "./a";` --> `export { default } from "./a";` @@ -134759,10 +138695,10 @@ var ts; } } function makeImportSpecifier(propertyName, name) { - return ts.createImportSpecifier(propertyName === name ? undefined : ts.createIdentifier(propertyName), ts.createIdentifier(name)); + return ts.factory.createImportSpecifier(propertyName === name ? undefined : ts.factory.createIdentifier(propertyName), ts.factory.createIdentifier(name)); } function makeExportSpecifier(propertyName, name) { - return ts.createExportSpecifier(propertyName === name ? undefined : ts.createIdentifier(propertyName), ts.createIdentifier(name)); + return ts.factory.createExportSpecifier(propertyName === name ? undefined : ts.factory.createIdentifier(propertyName), ts.factory.createIdentifier(name)); } })(refactor = ts.refactor || (ts.refactor = {})); })(ts || (ts = {})); @@ -134776,33 +138712,51 @@ var ts; var actionNameNamedToNamespace = "Convert named imports to namespace import"; refactor.registerRefactor(refactorName, { getAvailableActions: function (context) { - var i = getImportToConvert(context); + var i = getImportToConvert(context, context.triggerReason === "invoked"); if (!i) return ts.emptyArray; - var description = i.kind === 256 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message; - var actionName = i.kind === 256 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace; - return [{ name: refactorName, description: description, actions: [{ name: actionName, description: description }] }]; + if (i.error === undefined) { + var description = i.info.kind === 260 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message; + var actionName = i.info.kind === 260 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace; + return [{ name: refactorName, description: description, actions: [{ name: actionName, description: description }] }]; + } + if (context.preferences.provideRefactorNotApplicableReason) { + return [ + { name: refactorName, description: ts.Diagnostics.Convert_namespace_import_to_named_imports.message, actions: [{ name: actionNameNamespaceToNamed, description: ts.Diagnostics.Convert_namespace_import_to_named_imports.message, notApplicableReason: i.error }] }, + { name: refactorName, description: ts.Diagnostics.Convert_named_imports_to_namespace_import.message, actions: [{ name: actionNameNamedToNamespace, description: ts.Diagnostics.Convert_named_imports_to_namespace_import.message, notApplicableReason: i.error }] } + ]; + } + return ts.emptyArray; }, getEditsForAction: function (context, actionName) { ts.Debug.assert(actionName === actionNameNamespaceToNamed || actionName === actionNameNamedToNamespace, "Unexpected action name"); - var edits = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(context.file, context.program, t, ts.Debug.checkDefined(getImportToConvert(context), "Context must provide an import to convert")); }); + var edits = ts.textChanges.ChangeTracker.with(context, function (t) { var _a; return doChange(context.file, context.program, t, ts.Debug.checkDefined((_a = getImportToConvert(context)) === null || _a === void 0 ? void 0 : _a.info, "Context must provide an import to convert")); }); return { edits: edits, renameFilename: undefined, renameLocation: undefined }; } }); // Can convert imports of the form `import * as m from "m";` or `import d, { x, y } from "m";`. - function getImportToConvert(context) { + function getImportToConvert(context, considerPartialSpans) { + if (considerPartialSpans === void 0) { considerPartialSpans = true; } var file = context.file; var span = ts.getRefactorContextSpan(context); var token = ts.getTokenAtPosition(file, span.start); - var importDecl = ts.getParentNodeInSpan(token, file, span); + var importDecl = considerPartialSpans ? ts.findAncestor(token, ts.isImportDeclaration) : ts.getParentNodeInSpan(token, file, span); if (!importDecl || !ts.isImportDeclaration(importDecl)) + return { error: "Selection is not an import declaration." }; + if (importDecl.getEnd() < span.start + span.length) return undefined; var importClause = importDecl.importClause; - return importClause && importClause.namedBindings; + if (!importClause) { + return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Could_not_find_import_clause) }; + } + if (!importClause.namedBindings) { + return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Could_not_find_namespace_import_or_named_imports) }; + } + return { info: importClause.namedBindings }; } function doChange(sourceFile, program, changes, toConvert) { var checker = program.getTypeChecker(); - if (toConvert.kind === 256 /* NamespaceImport */) { + if (toConvert.kind === 260 /* NamespaceImport */) { doChangeNamespaceToNamed(sourceFile, checker, changes, toConvert, ts.getAllowSyntheticDefaultImports(program.getCompilerOptions())); } else { @@ -134812,7 +138766,7 @@ var ts; function doChangeNamespaceToNamed(sourceFile, checker, changes, toConvert, allowSyntheticDefaultImports) { var usedAsNamespaceOrDefault = false; var nodesToReplace = []; - var conflictingNames = ts.createMap(); + var conflictingNames = new ts.Map(); ts.FindAllReferences.Core.eachSymbolReferenceInFile(toConvert.name, checker, sourceFile, function (id) { if (!ts.isPropertyAccessExpression(id.parent)) { usedAsNamespaceOrDefault = true; @@ -134828,7 +138782,7 @@ var ts; } }); // We may need to change `mod.x` to `_x` to avoid a name conflict. - var exportNameToImportName = ts.createMap(); + var exportNameToImportName = new ts.Map(); for (var _i = 0, nodesToReplace_1 = nodesToReplace; _i < nodesToReplace_1.length; _i++) { var propertyAccess = nodesToReplace_1[_i]; var exportName = propertyAccess.name.text; @@ -134836,11 +138790,11 @@ var ts; if (importName === undefined) { exportNameToImportName.set(exportName, importName = conflictingNames.has(exportName) ? ts.getUniqueName(exportName, sourceFile) : exportName); } - changes.replaceNode(sourceFile, propertyAccess, ts.createIdentifier(importName)); + changes.replaceNode(sourceFile, propertyAccess, ts.factory.createIdentifier(importName)); } var importSpecifiers = []; exportNameToImportName.forEach(function (name, propertyName) { - importSpecifiers.push(ts.createImportSpecifier(name === propertyName ? undefined : ts.createIdentifier(propertyName), ts.createIdentifier(name))); + importSpecifiers.push(ts.factory.createImportSpecifier(name === propertyName ? undefined : ts.factory.createIdentifier(propertyName), ts.factory.createIdentifier(name))); }); var importDecl = toConvert.parent.parent; if (usedAsNamespaceOrDefault && !allowSyntheticDefaultImports) { @@ -134848,7 +138802,7 @@ var ts; changes.insertNodeAfter(sourceFile, importDecl, updateImport(importDecl, /*defaultImportName*/ undefined, importSpecifiers)); } else { - changes.replaceNode(sourceFile, importDecl, updateImport(importDecl, usedAsNamespaceOrDefault ? ts.createIdentifier(toConvert.name.text) : undefined, importSpecifiers)); + changes.replaceNode(sourceFile, importDecl, updateImport(importDecl, usedAsNamespaceOrDefault ? ts.factory.createIdentifier(toConvert.name.text) : undefined, importSpecifiers)); } } function doChangeNamedToNamespace(sourceFile, checker, changes, toConvert) { @@ -134865,13 +138819,13 @@ var ts; var _loop_15 = function (element) { var propertyName = (element.propertyName || element.name).text; ts.FindAllReferences.Core.eachSymbolReferenceInFile(element.name, checker, sourceFile, function (id) { - var access = ts.createPropertyAccess(ts.createIdentifier(namespaceImportName), propertyName); + var access = ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(namespaceImportName), propertyName); if (ts.isShorthandPropertyAssignment(id.parent)) { - changes.replaceNode(sourceFile, id.parent, ts.createPropertyAssignment(id.text, access)); + changes.replaceNode(sourceFile, id.parent, ts.factory.createPropertyAssignment(id.text, access)); } else if (ts.isExportSpecifier(id.parent) && !id.parent.propertyName) { if (!neededNamedImports.some(function (n) { return n.name === element.name; })) { - neededNamedImports.push(ts.createImportSpecifier(element.propertyName && ts.createIdentifier(element.propertyName.text), ts.createIdentifier(element.name.text))); + neededNamedImports.push(ts.factory.createImportSpecifier(element.propertyName && ts.factory.createIdentifier(element.propertyName.text), ts.factory.createIdentifier(element.name.text))); } } else { @@ -134883,18 +138837,422 @@ var ts; var element = _a[_i]; _loop_15(element); } - changes.replaceNode(sourceFile, toConvert, ts.createNamespaceImport(ts.createIdentifier(namespaceImportName))); + changes.replaceNode(sourceFile, toConvert, ts.factory.createNamespaceImport(ts.factory.createIdentifier(namespaceImportName))); if (neededNamedImports.length) { changes.insertNodeAfter(sourceFile, toConvert.parent.parent, updateImport(importDecl, /*defaultImportName*/ undefined, neededNamedImports)); } } function updateImport(old, defaultImportName, elements) { - return ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(defaultImportName, elements && elements.length ? ts.createNamedImports(elements) : undefined), old.moduleSpecifier); + return ts.factory.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, defaultImportName, elements && elements.length ? ts.factory.createNamedImports(elements) : undefined), old.moduleSpecifier); } })(refactor = ts.refactor || (ts.refactor = {})); })(ts || (ts = {})); /* @internal */ var ts; +(function (ts) { + var refactor; + (function (refactor) { + var convertToOptionalChainExpression; + (function (convertToOptionalChainExpression) { + var refactorName = "Convert to optional chain expression"; + var convertToOptionalChainExpressionMessage = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_to_optional_chain_expression); + refactor.registerRefactor(refactorName, { getAvailableActions: getAvailableActions, getEditsForAction: getEditsForAction }); + function getAvailableActions(context) { + var info = getInfo(context, context.triggerReason === "invoked"); + if (!info) + return ts.emptyArray; + if (!info.error) { + return [{ + name: refactorName, + description: convertToOptionalChainExpressionMessage, + actions: [{ + name: refactorName, + description: convertToOptionalChainExpressionMessage + }] + }]; + } + if (context.preferences.provideRefactorNotApplicableReason) { + return [{ + name: refactorName, + description: convertToOptionalChainExpressionMessage, + actions: [{ + name: refactorName, + description: convertToOptionalChainExpressionMessage, + notApplicableReason: info.error + }] + }]; + } + return ts.emptyArray; + } + function getEditsForAction(context, actionName) { + var info = getInfo(context); + if (!info || !info.info) + return undefined; + var edits = ts.textChanges.ChangeTracker.with(context, function (t) { + return doChange(context.file, context.program.getTypeChecker(), t, ts.Debug.checkDefined(info.info, "context must have info"), actionName); + }); + return { edits: edits, renameFilename: undefined, renameLocation: undefined }; + } + ; + function isValidExpression(node) { + return ts.isBinaryExpression(node) || ts.isConditionalExpression(node); + } + function isValidStatement(node) { + return ts.isExpressionStatement(node) || ts.isReturnStatement(node) || ts.isVariableStatement(node); + } + function isValidExpressionOrStatement(node) { + return isValidExpression(node) || isValidStatement(node); + } + function getInfo(context, considerEmptySpans) { + if (considerEmptySpans === void 0) { considerEmptySpans = true; } + var file = context.file, program = context.program; + var span = ts.getRefactorContextSpan(context); + var forEmptySpan = span.length === 0; + if (forEmptySpan && !considerEmptySpans) + return undefined; + // selecting fo[|o && foo.ba|]r should be valid, so adjust span to fit start and end tokens + var startToken = ts.getTokenAtPosition(file, span.start); + var endToken = ts.findTokenOnLeftOfPosition(file, span.start + span.length); + var adjustedSpan = ts.createTextSpanFromBounds(startToken.pos, endToken && endToken.end >= startToken.pos ? endToken.getEnd() : startToken.getEnd()); + var parent = forEmptySpan ? getValidParentNodeOfEmptySpan(startToken) : getValidParentNodeContainingSpan(startToken, adjustedSpan); + var expression = parent && isValidExpressionOrStatement(parent) ? getExpression(parent) : undefined; + if (!expression) + return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Could_not_find_convertible_access_expression) }; + var checker = program.getTypeChecker(); + return ts.isConditionalExpression(expression) ? getConditionalInfo(expression, checker) : getBinaryInfo(expression); + } + function getConditionalInfo(expression, checker) { + var condition = expression.condition; + var finalExpression = getFinalExpressionInChain(expression.whenTrue); + if (!finalExpression || checker.isNullableType(checker.getTypeAtLocation(finalExpression))) { + return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Could_not_find_convertible_access_expression) }; + } + ; + if ((ts.isPropertyAccessExpression(condition) || ts.isIdentifier(condition)) + && getMatchingStart(condition, finalExpression.expression)) { + return { info: { finalExpression: finalExpression, occurrences: [condition], expression: expression } }; + } + else if (ts.isBinaryExpression(condition)) { + var occurrences = getOccurrencesInExpression(finalExpression.expression, condition); + return occurrences ? { info: { finalExpression: finalExpression, occurrences: occurrences, expression: expression } } : + { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Could_not_find_matching_access_expressions) }; + } + } + function getBinaryInfo(expression) { + if (expression.operatorToken.kind !== 55 /* AmpersandAmpersandToken */) { + return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Can_only_convert_logical_AND_access_chains) }; + } + ; + var finalExpression = getFinalExpressionInChain(expression.right); + if (!finalExpression) + return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Could_not_find_convertible_access_expression) }; + var occurrences = getOccurrencesInExpression(finalExpression.expression, expression.left); + return occurrences ? { info: { finalExpression: finalExpression, occurrences: occurrences, expression: expression } } : + { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Could_not_find_matching_access_expressions) }; + } + /** + * Gets a list of property accesses that appear in matchTo and occur in sequence in expression. + */ + function getOccurrencesInExpression(matchTo, expression) { + var occurrences = []; + while (ts.isBinaryExpression(expression) && expression.operatorToken.kind === 55 /* AmpersandAmpersandToken */) { + var match = getMatchingStart(ts.skipParentheses(matchTo), ts.skipParentheses(expression.right)); + if (!match) { + break; + } + occurrences.push(match); + matchTo = match; + expression = expression.left; + } + var finalMatch = getMatchingStart(matchTo, expression); + if (finalMatch) { + occurrences.push(finalMatch); + } + return occurrences.length > 0 ? occurrences : undefined; + } + /** + * Returns subchain if chain begins with subchain syntactically. + */ + function getMatchingStart(chain, subchain) { + return (ts.isIdentifier(subchain) || ts.isPropertyAccessExpression(subchain)) && + chainStartsWith(chain, subchain) ? subchain : undefined; + } + /** + * Returns true if chain begins with subchain syntactically. + */ + function chainStartsWith(chain, subchain) { + // skip until we find a matching identifier. + while (ts.isCallExpression(chain) || ts.isPropertyAccessExpression(chain)) { + var subchainName = ts.isPropertyAccessExpression(subchain) ? subchain.name.getText() : subchain.getText(); + if (ts.isPropertyAccessExpression(chain) && chain.name.getText() === subchainName) + break; + chain = chain.expression; + } + // check that the chains match at each access. Call chains in subchain are not valid. + while (ts.isPropertyAccessExpression(chain) && ts.isPropertyAccessExpression(subchain)) { + if (chain.name.getText() !== subchain.name.getText()) + return false; + chain = chain.expression; + subchain = subchain.expression; + } + // check if we have reached a final identifier. + return ts.isIdentifier(chain) && ts.isIdentifier(subchain) && chain.getText() === subchain.getText(); + } + /** + * Find the least ancestor of the input node that is a valid type for extraction and contains the input span. + */ + function getValidParentNodeContainingSpan(node, span) { + while (node.parent) { + if (isValidExpressionOrStatement(node) && span.length !== 0 && node.end >= span.start + span.length) { + return node; + } + node = node.parent; + } + return undefined; + } + /** + * Finds an ancestor of the input node that is a valid type for extraction, skipping subexpressions. + */ + function getValidParentNodeOfEmptySpan(node) { + while (node.parent) { + if (isValidExpressionOrStatement(node) && !isValidExpressionOrStatement(node.parent)) { + return node; + } + node = node.parent; + } + return undefined; + } + /** + * Gets an expression of valid extraction type from a valid statement or expression. + */ + function getExpression(node) { + if (isValidExpression(node)) { + return node; + } + if (ts.isVariableStatement(node)) { + var variable = ts.getSingleVariableOfVariableStatement(node); + var initializer = variable === null || variable === void 0 ? void 0 : variable.initializer; + return initializer && isValidExpression(initializer) ? initializer : undefined; + } + return node.expression && isValidExpression(node.expression) ? node.expression : undefined; + } + /** + * Gets a property access expression which may be nested inside of a binary expression. The final + * expression in an && chain will occur as the right child of the parent binary expression, unless + * it is followed by a different binary operator. + * @param node the right child of a binary expression or a call expression. + */ + function getFinalExpressionInChain(node) { + // foo && |foo.bar === 1|; - here the right child of the && binary expression is another binary expression. + // the rightmost member of the && chain should be the leftmost child of that expression. + node = ts.skipParentheses(node); + if (ts.isBinaryExpression(node)) { + return getFinalExpressionInChain(node.left); + } + // foo && |foo.bar()()| - nested calls are treated like further accesses. + else if ((ts.isPropertyAccessExpression(node) || ts.isCallExpression(node)) && !ts.isOptionalChain(node)) { + return node; + } + return undefined; + } + /** + * Creates an access chain from toConvert with '?.' accesses at expressions appearing in occurrences. + */ + function convertOccurrences(checker, toConvert, occurrences) { + if (ts.isPropertyAccessExpression(toConvert) || ts.isCallExpression(toConvert)) { + var chain = convertOccurrences(checker, toConvert.expression, occurrences); + var lastOccurrence = occurrences.length > 0 ? occurrences[occurrences.length - 1] : undefined; + var isOccurrence = (lastOccurrence === null || lastOccurrence === void 0 ? void 0 : lastOccurrence.getText()) === toConvert.expression.getText(); + if (isOccurrence) + occurrences.pop(); + if (ts.isCallExpression(toConvert)) { + return isOccurrence ? + ts.factory.createCallChain(chain, ts.factory.createToken(28 /* QuestionDotToken */), toConvert.typeArguments, toConvert.arguments) : + ts.factory.createCallChain(chain, toConvert.questionDotToken, toConvert.typeArguments, toConvert.arguments); + } + else if (ts.isPropertyAccessExpression(toConvert)) { + return isOccurrence ? + ts.factory.createPropertyAccessChain(chain, ts.factory.createToken(28 /* QuestionDotToken */), toConvert.name) : + ts.factory.createPropertyAccessChain(chain, toConvert.questionDotToken, toConvert.name); + } + } + return toConvert; + } + function doChange(sourceFile, checker, changes, info, _actionName) { + var finalExpression = info.finalExpression, occurrences = info.occurrences, expression = info.expression; + var firstOccurrence = occurrences[occurrences.length - 1]; + var convertedChain = convertOccurrences(checker, finalExpression, occurrences); + if (convertedChain && (ts.isPropertyAccessExpression(convertedChain) || ts.isCallExpression(convertedChain))) { + if (ts.isBinaryExpression(expression)) { + changes.replaceNodeRange(sourceFile, firstOccurrence, finalExpression, convertedChain); + } + else if (ts.isConditionalExpression(expression)) { + changes.replaceNode(sourceFile, expression, ts.factory.createBinaryExpression(convertedChain, ts.factory.createToken(60 /* QuestionQuestionToken */), expression.whenFalse)); + } + } + } + })(convertToOptionalChainExpression = refactor.convertToOptionalChainExpression || (refactor.convertToOptionalChainExpression = {})); + })(refactor = ts.refactor || (ts.refactor = {})); +})(ts || (ts = {})); +/* @internal */ +var ts; +(function (ts) { + var refactor; + (function (refactor) { + var addOrRemoveBracesToArrowFunction; + (function (addOrRemoveBracesToArrowFunction) { + var refactorName = "Convert overload list to single signature"; + var refactorDescription = ts.Diagnostics.Convert_overload_list_to_single_signature.message; + refactor.registerRefactor(refactorName, { getEditsForAction: getEditsForAction, getAvailableActions: getAvailableActions }); + function getAvailableActions(context) { + var file = context.file, startPosition = context.startPosition, program = context.program; + var info = getConvertableOverloadListAtPosition(file, startPosition, program); + if (!info) + return ts.emptyArray; + return [{ + name: refactorName, + description: refactorDescription, + actions: [{ + name: refactorName, + description: refactorDescription + }] + }]; + } + function getEditsForAction(context) { + var file = context.file, startPosition = context.startPosition, program = context.program; + var signatureDecls = getConvertableOverloadListAtPosition(file, startPosition, program); + if (!signatureDecls) + return undefined; + var checker = program.getTypeChecker(); + var lastDeclaration = signatureDecls[signatureDecls.length - 1]; + var updated = lastDeclaration; + switch (lastDeclaration.kind) { + case 163 /* MethodSignature */: { + updated = ts.factory.updateMethodSignature(lastDeclaration, lastDeclaration.modifiers, lastDeclaration.name, lastDeclaration.questionToken, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type); + break; + } + case 164 /* MethodDeclaration */: { + updated = ts.factory.updateMethodDeclaration(lastDeclaration, lastDeclaration.decorators, lastDeclaration.modifiers, lastDeclaration.asteriskToken, lastDeclaration.name, lastDeclaration.questionToken, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type, lastDeclaration.body); + break; + } + case 168 /* CallSignature */: { + updated = ts.factory.updateCallSignature(lastDeclaration, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type); + break; + } + case 165 /* Constructor */: { + updated = ts.factory.updateConstructorDeclaration(lastDeclaration, lastDeclaration.decorators, lastDeclaration.modifiers, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.body); + break; + } + case 169 /* ConstructSignature */: { + updated = ts.factory.updateConstructSignature(lastDeclaration, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type); + break; + } + case 248 /* FunctionDeclaration */: { + updated = ts.factory.updateFunctionDeclaration(lastDeclaration, lastDeclaration.decorators, lastDeclaration.modifiers, lastDeclaration.asteriskToken, lastDeclaration.name, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type, lastDeclaration.body); + break; + } + default: return ts.Debug.failBadSyntaxKind(lastDeclaration, "Unhandled signature kind in overload list conversion refactoring"); + } + if (updated === lastDeclaration) { + return; // No edits to apply, do nothing + } + var edits = ts.textChanges.ChangeTracker.with(context, function (t) { + t.replaceNodeRange(file, signatureDecls[0], signatureDecls[signatureDecls.length - 1], updated); + }); + return { renameFilename: undefined, renameLocation: undefined, edits: edits }; + function getNewParametersForCombinedSignature(signatureDeclarations) { + var lastSig = signatureDeclarations[signatureDeclarations.length - 1]; + if (ts.isFunctionLikeDeclaration(lastSig) && lastSig.body) { + // Trim away implementation signature arguments (they should already be compatible with overloads, but are likely less precise to guarantee compatability with the overloads) + signatureDeclarations = signatureDeclarations.slice(0, signatureDeclarations.length - 1); + } + return ts.factory.createNodeArray([ + ts.factory.createParameterDeclaration( + /*decorators*/ undefined, + /*modifiers*/ undefined, ts.factory.createToken(25 /* DotDotDotToken */), "args", + /*questionToken*/ undefined, ts.factory.createUnionTypeNode(ts.map(signatureDeclarations, convertSignatureParametersToTuple))) + ]); + } + function convertSignatureParametersToTuple(decl) { + var members = ts.map(decl.parameters, convertParameterToNamedTupleMember); + return ts.setEmitFlags(ts.factory.createTupleTypeNode(members), ts.some(members, function (m) { return !!ts.length(ts.getSyntheticLeadingComments(m)); }) ? 0 /* None */ : 1 /* SingleLine */); + } + function convertParameterToNamedTupleMember(p) { + ts.Debug.assert(ts.isIdentifier(p.name)); // This is checked during refactoring applicability checking + var result = ts.setTextRange(ts.factory.createNamedTupleMember(p.dotDotDotToken, p.name, p.questionToken, p.type || ts.factory.createKeywordTypeNode(128 /* AnyKeyword */)), p); + var parameterDocComment = p.symbol && p.symbol.getDocumentationComment(checker); + if (parameterDocComment) { + var newComment = ts.displayPartsToString(parameterDocComment); + if (newComment.length) { + ts.setSyntheticLeadingComments(result, [{ + text: "*\n" + newComment.split("\n").map(function (c) { return " * " + c; }).join("\n") + "\n ", + kind: 3 /* MultiLineCommentTrivia */, + pos: -1, + end: -1, + hasTrailingNewLine: true, + hasLeadingNewline: true, + }]); + } + } + return result; + } + } + function isConvertableSignatureDeclaration(d) { + switch (d.kind) { + case 163 /* MethodSignature */: + case 164 /* MethodDeclaration */: + case 168 /* CallSignature */: + case 165 /* Constructor */: + case 169 /* ConstructSignature */: + case 248 /* FunctionDeclaration */: + return true; + } + return false; + } + function getConvertableOverloadListAtPosition(file, startPosition, program) { + var node = ts.getTokenAtPosition(file, startPosition); + var containingDecl = ts.findAncestor(node, isConvertableSignatureDeclaration); + if (!containingDecl) { + return; + } + var checker = program.getTypeChecker(); + var signatureSymbol = containingDecl.symbol; + if (!signatureSymbol) { + return; + } + var decls = signatureSymbol.declarations; + if (ts.length(decls) <= 1) { + return; + } + if (!ts.every(decls, function (d) { return ts.getSourceFileOfNode(d) === file; })) { + return; + } + if (!isConvertableSignatureDeclaration(decls[0])) { + return; + } + var kindOne = decls[0].kind; + if (!ts.every(decls, function (d) { return d.kind === kindOne; })) { + return; + } + var signatureDecls = decls; + if (ts.some(signatureDecls, function (d) { return !!d.typeParameters || ts.some(d.parameters, function (p) { return !!p.decorators || !!p.modifiers || !ts.isIdentifier(p.name); }); })) { + return; + } + var signatures = ts.mapDefined(signatureDecls, function (d) { return checker.getSignatureFromDeclaration(d); }); + if (ts.length(signatures) !== ts.length(decls)) { + return; + } + var returnOne = checker.getReturnTypeOfSignature(signatures[0]); + if (!ts.every(signatures, function (s) { return checker.getReturnTypeOfSignature(s) === returnOne; })) { + return; + } + return signatureDecls; + } + })(addOrRemoveBracesToArrowFunction = refactor.addOrRemoveBracesToArrowFunction || (refactor.addOrRemoveBracesToArrowFunction = {})); + })(refactor = ts.refactor || (ts.refactor = {})); +})(ts || (ts = {})); +/* @internal */ +var ts; (function (ts) { var refactor; (function (refactor) { @@ -134907,10 +139265,30 @@ var ts; * Exported for tests. */ function getAvailableActions(context) { - var rangeToExtract = getRangeToExtract(context.file, ts.getRefactorContextSpan(context)); + var rangeToExtract = getRangeToExtract(context.file, ts.getRefactorContextSpan(context), context.triggerReason === "invoked"); var targetRange = rangeToExtract.targetRange; if (targetRange === undefined) { - return ts.emptyArray; + if (!rangeToExtract.errors || rangeToExtract.errors.length === 0 || !context.preferences.provideRefactorNotApplicableReason) { + return ts.emptyArray; + } + return [{ + name: refactorName, + description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_function), + actions: [{ + description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_function), + name: "function_extract_error", + notApplicableReason: getStringError(rangeToExtract.errors) + }] + }, + { + name: refactorName, + description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_constant), + actions: [{ + description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_constant), + name: "constant_extract_error", + notApplicableReason: getStringError(rangeToExtract.errors) + }] + }]; } var extractions = getPossibleExtractions(targetRange, context); if (extractions === undefined) { @@ -134918,18 +139296,19 @@ var ts; return ts.emptyArray; } var functionActions = []; - var usedFunctionNames = ts.createMap(); + var usedFunctionNames = new ts.Map(); + var innermostErrorFunctionAction; var constantActions = []; - var usedConstantNames = ts.createMap(); + var usedConstantNames = new ts.Map(); + var innermostErrorConstantAction; var i = 0; for (var _i = 0, extractions_1 = extractions; _i < extractions_1.length; _i++) { var _a = extractions_1[_i], functionExtraction = _a.functionExtraction, constantExtraction = _a.constantExtraction; - // Skip these since we don't have a way to report errors yet + var description = functionExtraction.description; if (functionExtraction.errors.length === 0) { // Don't issue refactorings with duplicated names. // Scopes come back in "innermost first" order, so extractions will // preferentially go into nearer scopes - var description = functionExtraction.description; if (!usedFunctionNames.has(description)) { usedFunctionNames.set(description, true); functionActions.push({ @@ -134938,32 +139317,39 @@ var ts; }); } } + else if (!innermostErrorFunctionAction) { + innermostErrorFunctionAction = { + description: description, + name: "function_scope_" + i, + notApplicableReason: getStringError(functionExtraction.errors) + }; + } // Skip these since we don't have a way to report errors yet if (constantExtraction.errors.length === 0) { // Don't issue refactorings with duplicated names. // Scopes come back in "innermost first" order, so extractions will // preferentially go into nearer scopes - var description = constantExtraction.description; - if (!usedConstantNames.has(description)) { - usedConstantNames.set(description, true); + var description_1 = constantExtraction.description; + if (!usedConstantNames.has(description_1)) { + usedConstantNames.set(description_1, true); constantActions.push({ - description: description, + description: description_1, name: "constant_scope_" + i }); } } + else if (!innermostErrorConstantAction) { + innermostErrorConstantAction = { + description: description, + name: "constant_scope_" + i, + notApplicableReason: getStringError(constantExtraction.errors) + }; + } // *do* increment i anyway because we'll look for the i-th scope // later when actually doing the refactoring if the user requests it i++; } var infos = []; - if (constantActions.length) { - infos.push({ - name: refactorName, - description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_constant), - actions: constantActions - }); - } if (functionActions.length) { infos.push({ name: refactorName, @@ -134971,7 +139357,35 @@ var ts; actions: functionActions }); } + else if (context.preferences.provideRefactorNotApplicableReason && innermostErrorFunctionAction) { + infos.push({ + name: refactorName, + description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_function), + actions: [innermostErrorFunctionAction] + }); + } + if (constantActions.length) { + infos.push({ + name: refactorName, + description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_constant), + actions: constantActions + }); + } + else if (context.preferences.provideRefactorNotApplicableReason && innermostErrorConstantAction) { + infos.push({ + name: refactorName, + description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_constant), + actions: [innermostErrorConstantAction] + }); + } return infos.length ? infos : ts.emptyArray; + function getStringError(errors) { + var error = errors[0].messageText; + if (typeof error !== "string") { + error = error.messageText; + } + return error; + } } extractSymbol.getAvailableActions = getAvailableActions; /* Exported for tests */ @@ -135042,16 +139456,20 @@ var ts; * not shown to the user, but can be used by us diagnostically) */ // exported only for tests - function getRangeToExtract(sourceFile, span) { + function getRangeToExtract(sourceFile, span, considerEmptySpans) { + if (considerEmptySpans === void 0) { considerEmptySpans = true; } var length = span.length; - if (length === 0) { + if (length === 0 && !considerEmptySpans) { return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractEmpty)] }; } + var cursorRequest = length === 0 && considerEmptySpans; // Walk up starting from the the start position until we find a non-SourceFile node that subsumes the selected span. // This may fail (e.g. you select two statements in the root of a source file) - var start = ts.getParentNodeInSpan(ts.getTokenAtPosition(sourceFile, span.start), sourceFile, span); + var startToken = ts.getTokenAtPosition(sourceFile, span.start); + var start = cursorRequest ? getExtractableParent(startToken) : ts.getParentNodeInSpan(startToken, sourceFile, span); // Do the same for the ending position - var end = ts.getParentNodeInSpan(ts.findTokenOnLeftOfPosition(sourceFile, ts.textSpanEnd(span)), sourceFile, span); + var endToken = ts.findTokenOnLeftOfPosition(sourceFile, ts.textSpanEnd(span)); + var end = cursorRequest ? start : ts.getParentNodeInSpan(endToken, sourceFile, span); var declarations = []; // We'll modify these flags as we walk the tree to collect data // about what things need to be done as part of the extraction. @@ -135149,21 +139567,21 @@ var ts; function checkForStaticContext(nodeToCheck, containingClass) { var current = nodeToCheck; while (current !== containingClass) { - if (current.kind === 159 /* PropertyDeclaration */) { - if (ts.hasModifier(current, 32 /* Static */)) { + if (current.kind === 162 /* PropertyDeclaration */) { + if (ts.hasSyntacticModifier(current, 32 /* Static */)) { rangeFacts |= RangeFacts.InStaticRegion; } break; } - else if (current.kind === 156 /* Parameter */) { + else if (current.kind === 159 /* Parameter */) { var ctorOrMethod = ts.getContainingFunction(current); - if (ctorOrMethod.kind === 162 /* Constructor */) { + if (ctorOrMethod.kind === 165 /* Constructor */) { rangeFacts |= RangeFacts.InStaticRegion; } break; } - else if (current.kind === 161 /* MethodDeclaration */) { - if (ts.hasModifier(current, 32 /* Static */)) { + else if (current.kind === 164 /* MethodDeclaration */) { + if (ts.hasSyntacticModifier(current, 32 /* Static */)) { rangeFacts |= RangeFacts.InStaticRegion; } } @@ -135205,8 +139623,8 @@ var ts; return true; } if (ts.isDeclaration(node)) { - var declaringNode = (node.kind === 242 /* VariableDeclaration */) ? node.parent.parent : node; - if (ts.hasModifier(declaringNode, 1 /* Export */)) { + var declaringNode = (node.kind === 246 /* VariableDeclaration */) ? node.parent.parent : node; + if (ts.hasSyntacticModifier(declaringNode, 1 /* Export */)) { // TODO: GH#18217 Silly to use `errors ||` since it's definitely not defined (see top of `visit`) // Also, if we're only pushing one error, just use `let error: Diagnostic | undefined`! // Also TODO: GH#19956 @@ -135217,13 +139635,13 @@ var ts; } // Some things can't be extracted in certain situations switch (node.kind) { - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractImport)); return true; - case 102 /* SuperKeyword */: + case 105 /* SuperKeyword */: // For a super *constructor call*, we have to be extracting the entire class, // but a super *method call* simply implies a 'this' reference - if (node.parent.kind === 196 /* CallExpression */) { + if (node.parent.kind === 200 /* CallExpression */) { // Super constructor call var containingClass_1 = ts.getContainingClass(node); // TODO:GH#18217 if (containingClass_1.pos < span.start || containingClass_1.end >= (span.start + span.length)) { @@ -135235,37 +139653,53 @@ var ts; rangeFacts |= RangeFacts.UsesThis; } break; - } - if (ts.isFunctionLikeDeclaration(node) || ts.isClassLike(node)) { - switch (node.kind) { - case 244 /* FunctionDeclaration */: - case 245 /* ClassDeclaration */: - if (ts.isSourceFile(node.parent) && node.parent.externalModuleIndicator === undefined) { - // You cannot extract global declarations - (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.functionWillNotBeVisibleInTheNewScope)); + case 206 /* ArrowFunction */: + // check if arrow function uses this + ts.forEachChild(node, function check(n) { + if (ts.isThis(n)) { + rangeFacts |= RangeFacts.UsesThis; } - break; - } - // do not dive into functions or classes - return false; + else if (ts.isClassLike(n) || (ts.isFunctionLike(n) && !ts.isArrowFunction(n))) { + return false; + } + else { + ts.forEachChild(n, check); + } + }); + // falls through + case 249 /* ClassDeclaration */: + case 248 /* FunctionDeclaration */: + if (ts.isSourceFile(node.parent) && node.parent.externalModuleIndicator === undefined) { + // You cannot extract global declarations + (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.functionWillNotBeVisibleInTheNewScope)); + } + // falls through + case 218 /* ClassExpression */: + case 205 /* FunctionExpression */: + case 164 /* MethodDeclaration */: + case 165 /* Constructor */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + // do not dive into functions or classes + return false; } var savedPermittedJumps = permittedJumps; switch (node.kind) { - case 227 /* IfStatement */: + case 231 /* IfStatement */: permittedJumps = 0 /* None */; break; - case 240 /* TryStatement */: + case 244 /* TryStatement */: // forbid all jumps inside try blocks permittedJumps = 0 /* None */; break; - case 223 /* Block */: - if (node.parent && node.parent.kind === 240 /* TryStatement */ && node.parent.finallyBlock === node) { + case 227 /* Block */: + if (node.parent && node.parent.kind === 244 /* TryStatement */ && node.parent.finallyBlock === node) { // allow unconditional returns from finally blocks permittedJumps = 4 /* Return */; } break; - case 278 /* DefaultClause */: - case 277 /* CaseClause */: + case 282 /* DefaultClause */: + case 281 /* CaseClause */: // allow unlabeled break inside case clauses permittedJumps |= 1 /* Break */; break; @@ -135277,19 +139711,19 @@ var ts; break; } switch (node.kind) { - case 183 /* ThisType */: - case 104 /* ThisKeyword */: + case 186 /* ThisType */: + case 107 /* ThisKeyword */: rangeFacts |= RangeFacts.UsesThis; break; - case 238 /* LabeledStatement */: { + case 242 /* LabeledStatement */: { var label = node.label; (seenLabels || (seenLabels = [])).push(label.escapedText); ts.forEachChild(node, visit); seenLabels.pop(); break; } - case 234 /* BreakStatement */: - case 233 /* ContinueStatement */: { + case 238 /* BreakStatement */: + case 237 /* ContinueStatement */: { var label = node.label; if (label) { if (!ts.contains(seenLabels, label.escapedText)) { @@ -135298,20 +139732,20 @@ var ts; } } else { - if (!(permittedJumps & (node.kind === 234 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) { + if (!(permittedJumps & (node.kind === 238 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) { // attempt to break or continue in a forbidden context (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractRangeContainingConditionalBreakOrContinueStatements)); } } break; } - case 206 /* AwaitExpression */: + case 210 /* AwaitExpression */: rangeFacts |= RangeFacts.IsAsyncFunction; break; - case 212 /* YieldExpression */: + case 216 /* YieldExpression */: rangeFacts |= RangeFacts.IsGenerator; break; - case 235 /* ReturnStatement */: + case 239 /* ReturnStatement */: if (permittedJumps & 4 /* Return */) { rangeFacts |= RangeFacts.HasReturn; } @@ -135365,7 +139799,7 @@ var ts; while (true) { current = current.parent; // A function parameter's initializer is actually in the outer scope, not the function declaration - if (current.kind === 156 /* Parameter */) { + if (current.kind === 159 /* Parameter */) { // Skip all the way to the outer scope of the function that declared this parameter current = ts.findAncestor(current, function (parent) { return ts.isFunctionLikeDeclaration(parent); }).parent; } @@ -135376,7 +139810,7 @@ var ts; // * Module/namespace or source file if (isScope(current)) { scopes.push(current); - if (current.kind === 290 /* SourceFile */) { + if (current.kind === 294 /* SourceFile */) { return scopes; } } @@ -135466,32 +139900,32 @@ var ts; } function getDescriptionForFunctionLikeDeclaration(scope) { switch (scope.kind) { - case 162 /* Constructor */: + case 165 /* Constructor */: return "constructor"; - case 201 /* FunctionExpression */: - case 244 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 248 /* FunctionDeclaration */: return scope.name ? "function '" + scope.name.text + "'" : ts.ANONYMOUS; - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: return "arrow function"; - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: return "method '" + scope.name.getText() + "'"; - case 163 /* GetAccessor */: + case 166 /* GetAccessor */: return "'get " + scope.name.getText() + "'"; - case 164 /* SetAccessor */: + case 167 /* SetAccessor */: return "'set " + scope.name.getText() + "'"; default: throw ts.Debug.assertNever(scope, "Unexpected scope kind " + scope.kind); } } function getDescriptionForClassLikeDeclaration(scope) { - return scope.kind === 245 /* ClassDeclaration */ + return scope.kind === 249 /* ClassDeclaration */ ? scope.name ? "class '" + scope.name.text + "'" : "anonymous class declaration" : scope.name ? "class expression '" + scope.name.text + "'" : "anonymous class expression"; } function getDescriptionForModuleLikeDeclaration(scope) { - return scope.kind === 250 /* ModuleBlock */ + return scope.kind === 254 /* ModuleBlock */ ? "namespace '" + scope.parent.name.getText() + "'" : scope.externalModuleIndicator ? 0 /* Module */ : 1 /* Global */; } @@ -135513,7 +139947,7 @@ var ts; var file = scope.getSourceFile(); var functionNameText = ts.getUniqueName(ts.isClassLike(scope) ? "newMethod" : "newFunction", file); var isJS = ts.isInJSFile(scope); - var functionName = ts.createIdentifier(functionNameText); + var functionName = ts.factory.createIdentifier(functionNameText); var returnType; var parameters = []; var callArguments = []; @@ -135526,7 +139960,7 @@ var ts; type = checker.getBaseTypeOfLiteralType(type); typeNode = ts.codefix.typeToAutoImportableTypeNode(checker, importAdder, type, scope, scriptTarget, 1 /* NoTruncation */); } - var paramDecl = ts.createParameter( + var paramDecl = ts.factory.createParameterDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, @@ -135536,7 +139970,7 @@ var ts; if (usage.usage === 2 /* Write */) { (writes || (writes = [])).push(usage); } - callArguments.push(ts.createIdentifier(name)); + callArguments.push(ts.factory.createIdentifier(name)); }); var typeParametersAndDeclarations = ts.arrayFrom(typeParameterUsages.values()).map(function (type) { return ({ type: type, declaration: getFirstDeclaration(type) }); }); var sortedTypeParametersAndDeclarations = typeParametersAndDeclarations.sort(compareTypesByDeclarationOrder); @@ -135546,7 +139980,7 @@ var ts; // Strictly speaking, we should check whether each name actually binds to the appropriate type // parameter. In cases of shadowing, they may not. var callTypeArguments = typeParameters !== undefined - ? typeParameters.map(function (decl) { return ts.createTypeReferenceNode(decl.name, /*typeArguments*/ undefined); }) + ? typeParameters.map(function (decl) { return ts.factory.createTypeReferenceNode(decl.name, /*typeArguments*/ undefined); }) : undefined; // Provide explicit return types for contextually-typed functions // to avoid problems when there are literal types present @@ -135559,20 +139993,20 @@ var ts; var newFunction; if (ts.isClassLike(scope)) { // always create private method in TypeScript files - var modifiers = isJS ? [] : [ts.createToken(117 /* PrivateKeyword */)]; + var modifiers = isJS ? [] : [ts.factory.createModifier(120 /* PrivateKeyword */)]; if (range.facts & RangeFacts.InStaticRegion) { - modifiers.push(ts.createToken(120 /* StaticKeyword */)); + modifiers.push(ts.factory.createModifier(123 /* StaticKeyword */)); } if (range.facts & RangeFacts.IsAsyncFunction) { - modifiers.push(ts.createToken(126 /* AsyncKeyword */)); + modifiers.push(ts.factory.createModifier(129 /* AsyncKeyword */)); } - newFunction = ts.createMethod( - /*decorators*/ undefined, modifiers.length ? modifiers : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(41 /* AsteriskToken */) : undefined, functionName, + newFunction = ts.factory.createMethodDeclaration( + /*decorators*/ undefined, modifiers.length ? modifiers : undefined, range.facts & RangeFacts.IsGenerator ? ts.factory.createToken(41 /* AsteriskToken */) : undefined, functionName, /*questionToken*/ undefined, typeParameters, parameters, returnType, body); } else { - newFunction = ts.createFunctionDeclaration( - /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.createToken(126 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(41 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body); + newFunction = ts.factory.createFunctionDeclaration( + /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.factory.createToken(129 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.factory.createToken(41 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body); } var changeTracker = ts.textChanges.ChangeTracker.fromContext(context); var minInsertionPos = (isReadonlyArray(range.range) ? ts.last(range.range) : range.range).end; @@ -135587,13 +140021,16 @@ var ts; var newNodes = []; // replace range with function call var called = getCalledExpression(scope, range, functionNameText); - var call = ts.createCall(called, callTypeArguments, // Note that no attempt is made to take advantage of type argument inference + var call = ts.factory.createCallExpression(called, callTypeArguments, // Note that no attempt is made to take advantage of type argument inference callArguments); if (range.facts & RangeFacts.IsGenerator) { - call = ts.createYield(ts.createToken(41 /* AsteriskToken */), call); + call = ts.factory.createYieldExpression(ts.factory.createToken(41 /* AsteriskToken */), call); } if (range.facts & RangeFacts.IsAsyncFunction) { - call = ts.createAwait(call); + call = ts.factory.createAwaitExpression(call); + } + if (isInJSXContent(node)) { + call = ts.factory.createJsxExpression(/*dotDotDotToken*/ undefined, call); } if (exposedVariableDeclarations.length && !writes) { // No need to mix declarations and writes. @@ -135603,8 +140040,8 @@ var ts; if (exposedVariableDeclarations.length === 1) { // Declaring exactly one variable: let x = newFunction(); var variableDeclaration = exposedVariableDeclarations[0]; - newNodes.push(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(variableDeclaration.name), /*type*/ ts.getSynthesizedDeepClone(variableDeclaration.type), /*initializer*/ call)], // TODO (acasey): test binding patterns + newNodes.push(ts.factory.createVariableStatement( + /*modifiers*/ undefined, ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(ts.getSynthesizedDeepClone(variableDeclaration.name), /*exclamationToken*/ undefined, /*type*/ ts.getSynthesizedDeepClone(variableDeclaration.type), /*initializer*/ call)], // TODO (acasey): test binding patterns variableDeclaration.parent.flags))); } else { @@ -135616,27 +140053,27 @@ var ts; var sawExplicitType = false; for (var _i = 0, exposedVariableDeclarations_1 = exposedVariableDeclarations; _i < exposedVariableDeclarations_1.length; _i++) { var variableDeclaration = exposedVariableDeclarations_1[_i]; - bindingElements.push(ts.createBindingElement( + bindingElements.push(ts.factory.createBindingElement( /*dotDotDotToken*/ undefined, /*propertyName*/ undefined, /*name*/ ts.getSynthesizedDeepClone(variableDeclaration.name))); // Being returned through an object literal will have widened the type. var variableType = checker.typeToTypeNode(checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(variableDeclaration)), scope, 1 /* NoTruncation */); - typeElements.push(ts.createPropertySignature( + typeElements.push(ts.factory.createPropertySignature( /*modifiers*/ undefined, /*name*/ variableDeclaration.symbol.name, /*questionToken*/ undefined, - /*type*/ variableType, - /*initializer*/ undefined)); + /*type*/ variableType)); sawExplicitType = sawExplicitType || variableDeclaration.type !== undefined; commonNodeFlags = commonNodeFlags & variableDeclaration.parent.flags; } - var typeLiteral = sawExplicitType ? ts.createTypeLiteralNode(typeElements) : undefined; + var typeLiteral = sawExplicitType ? ts.factory.createTypeLiteralNode(typeElements) : undefined; if (typeLiteral) { ts.setEmitFlags(typeLiteral, 1 /* SingleLine */); } - newNodes.push(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.createObjectBindingPattern(bindingElements), + newNodes.push(ts.factory.createVariableStatement( + /*modifiers*/ undefined, ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(ts.factory.createObjectBindingPattern(bindingElements), + /*exclamationToken*/ undefined, /*type*/ typeLiteral, /*initializer*/ call)], commonNodeFlags))); } @@ -135650,45 +140087,45 @@ var ts; if (flags & 2 /* Const */) { flags = (flags & ~2 /* Const */) | 1 /* Let */; } - newNodes.push(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(variableDeclaration.symbol.name, getTypeDeepCloneUnionUndefined(variableDeclaration.type))], flags))); + newNodes.push(ts.factory.createVariableStatement( + /*modifiers*/ undefined, ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(variableDeclaration.symbol.name, /*exclamationToken*/ undefined, getTypeDeepCloneUnionUndefined(variableDeclaration.type))], flags))); } } if (returnValueProperty) { // has both writes and return, need to create variable declaration to hold return value; - newNodes.push(ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(returnValueProperty, getTypeDeepCloneUnionUndefined(returnType))], 1 /* Let */))); + newNodes.push(ts.factory.createVariableStatement( + /*modifiers*/ undefined, ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(returnValueProperty, /*exclamationToken*/ undefined, getTypeDeepCloneUnionUndefined(returnType))], 1 /* Let */))); } var assignments = getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes); if (returnValueProperty) { - assignments.unshift(ts.createShorthandPropertyAssignment(returnValueProperty)); + assignments.unshift(ts.factory.createShorthandPropertyAssignment(returnValueProperty)); } // propagate writes back if (assignments.length === 1) { // We would only have introduced a return value property if there had been // other assignments to make. ts.Debug.assert(!returnValueProperty, "Shouldn't have returnValueProperty here"); - newNodes.push(ts.createStatement(ts.createAssignment(assignments[0].name, call))); + newNodes.push(ts.factory.createExpressionStatement(ts.factory.createAssignment(assignments[0].name, call))); if (range.facts & RangeFacts.HasReturn) { - newNodes.push(ts.createReturn()); + newNodes.push(ts.factory.createReturnStatement()); } } else { // emit e.g. // { a, b, __return } = newFunction(a, b); // return __return; - newNodes.push(ts.createStatement(ts.createAssignment(ts.createObjectLiteral(assignments), call))); + newNodes.push(ts.factory.createExpressionStatement(ts.factory.createAssignment(ts.factory.createObjectLiteralExpression(assignments), call))); if (returnValueProperty) { - newNodes.push(ts.createReturn(ts.createIdentifier(returnValueProperty))); + newNodes.push(ts.factory.createReturnStatement(ts.factory.createIdentifier(returnValueProperty))); } } } else { if (range.facts & RangeFacts.HasReturn) { - newNodes.push(ts.createReturn(call)); + newNodes.push(ts.factory.createReturnStatement(call)); } else if (isReadonlyArray(range.range)) { - newNodes.push(ts.createStatement(call)); + newNodes.push(ts.factory.createExpressionStatement(call)); } else { newNodes.push(call); @@ -135714,9 +140151,9 @@ var ts; while (ts.isParenthesizedTypeNode(withoutParens)) { withoutParens = withoutParens.type; } - return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 146 /* UndefinedKeyword */; }) + return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 149 /* UndefinedKeyword */; }) ? clone - : ts.createUnionTypeNode([clone, ts.createKeywordTypeNode(146 /* UndefinedKeyword */)]); + : ts.factory.createUnionTypeNode([clone, ts.factory.createKeywordTypeNode(149 /* UndefinedKeyword */)]); } } /** @@ -135741,17 +140178,20 @@ var ts; if (ts.isClassLike(scope)) { ts.Debug.assert(!isJS, "Cannot extract to a JS class"); // See CannotExtractToJSClass var modifiers = []; - modifiers.push(ts.createToken(117 /* PrivateKeyword */)); + modifiers.push(ts.factory.createModifier(120 /* PrivateKeyword */)); if (rangeFacts & RangeFacts.InStaticRegion) { - modifiers.push(ts.createToken(120 /* StaticKeyword */)); + modifiers.push(ts.factory.createModifier(123 /* StaticKeyword */)); } - modifiers.push(ts.createToken(138 /* ReadonlyKeyword */)); - var newVariable = ts.createProperty( + modifiers.push(ts.factory.createModifier(141 /* ReadonlyKeyword */)); + var newVariable = ts.factory.createPropertyDeclaration( /*decorators*/ undefined, modifiers, localNameText, /*questionToken*/ undefined, variableType, initializer); - var localReference = ts.createPropertyAccess(rangeFacts & RangeFacts.InStaticRegion - ? ts.createIdentifier(scope.name.getText()) // TODO: GH#18217 - : ts.createThis(), ts.createIdentifier(localNameText)); + var localReference = ts.factory.createPropertyAccessExpression(rangeFacts & RangeFacts.InStaticRegion + ? ts.factory.createIdentifier(scope.name.getText()) // TODO: GH#18217 + : ts.factory.createThis(), ts.factory.createIdentifier(localNameText)); + if (isInJSXContent(node)) { + localReference = ts.factory.createJsxExpression(/*dotDotDotToken*/ undefined, localReference); + } // Declare var maxInsertionPos = node.pos; var nodeToInsertBefore = getNodeToInsertPropertyBefore(maxInsertionPos, scope); @@ -135760,7 +140200,7 @@ var ts; changeTracker.replaceNode(context.file, node, localReference); } else { - var newVariableDeclaration = ts.createVariableDeclaration(localNameText, variableType, initializer); + var newVariableDeclaration = ts.factory.createVariableDeclaration(localNameText, /*exclamationToken*/ undefined, variableType, initializer); // If the node is part of an initializer in a list of variable declarations, insert a new // variable declaration into the list (in case it depends on earlier ones). // CONSIDER: If the declaration list isn't const, we might want to split it into multiple @@ -135771,19 +140211,19 @@ var ts; // CONSIDER: could detect that each is on a separate line (See `extractConstant_VariableList_MultipleLines` in `extractConstants.ts`) changeTracker.insertNodeBefore(context.file, oldVariableDeclaration, newVariableDeclaration); // Consume - var localReference = ts.createIdentifier(localNameText); + var localReference = ts.factory.createIdentifier(localNameText); changeTracker.replaceNode(context.file, node, localReference); } - else if (node.parent.kind === 226 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) { + else if (node.parent.kind === 230 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) { // If the parent is an expression statement and the target scope is the immediately enclosing one, // replace the statement with the declaration. - var newVariableStatement = ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([newVariableDeclaration], 2 /* Const */)); + var newVariableStatement = ts.factory.createVariableStatement( + /*modifiers*/ undefined, ts.factory.createVariableDeclarationList([newVariableDeclaration], 2 /* Const */)); changeTracker.replaceNode(context.file, node.parent, newVariableStatement); } else { - var newVariableStatement = ts.createVariableStatement( - /*modifiers*/ undefined, ts.createVariableDeclarationList([newVariableDeclaration], 2 /* Const */)); + var newVariableStatement = ts.factory.createVariableStatement( + /*modifiers*/ undefined, ts.factory.createVariableDeclarationList([newVariableDeclaration], 2 /* Const */)); // Declare var nodeToInsertBefore = getNodeToInsertConstantBefore(node, scope); if (nodeToInsertBefore.pos === 0) { @@ -135793,12 +140233,17 @@ var ts; changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /*blankLineBetween*/ false); } // Consume - if (node.parent.kind === 226 /* ExpressionStatement */) { + if (node.parent.kind === 230 /* ExpressionStatement */) { // If the parent is an expression statement, delete it. changeTracker.delete(context.file, node.parent); } else { - var localReference = ts.createIdentifier(localNameText); + var localReference = ts.factory.createIdentifier(localNameText); + // When extract to a new variable in JSX content, need to wrap a {} out of the new variable + // or it will become a plain text + if (isInJSXContent(node)) { + localReference = ts.factory.createJsxExpression(/*dotDotDotToken*/ undefined, localReference); + } changeTracker.replaceNode(context.file, node, localReference); } } @@ -135834,7 +140279,7 @@ var ts; var paramType = checker.getTypeAtLocation(p); if (paramType === checker.getAnyType()) hasAny = true; - parameters.push(ts.updateParameter(p, p.decorators, p.modifiers, p.dotDotDotToken, p.name, p.questionToken, p.type || checker.typeToTypeNode(paramType, scope, 1 /* NoTruncation */), p.initializer)); + parameters.push(ts.factory.updateParameterDeclaration(p, p.decorators, p.modifiers, p.dotDotDotToken, p.name, p.questionToken, p.type || checker.typeToTypeNode(paramType, scope, 1 /* NoTruncation */), p.initializer)); } } // If a parameter was inferred as any we skip adding function parameters at all. @@ -135844,7 +140289,7 @@ var ts; return { variableType: variableType, initializer: initializer }; variableType = undefined; if (ts.isArrowFunction(initializer)) { - initializer = ts.updateArrowFunction(initializer, node.modifiers, initializer.typeParameters, parameters, initializer.type || checker.typeToTypeNode(functionSignature.getReturnType(), scope, 1 /* NoTruncation */), initializer.equalsGreaterThanToken, initializer.body); + initializer = ts.factory.updateArrowFunction(initializer, node.modifiers, initializer.typeParameters, parameters, initializer.type || checker.typeToTypeNode(functionSignature.getReturnType(), scope, 1 /* NoTruncation */), initializer.equalsGreaterThanToken, initializer.body); } else { if (functionSignature && !!functionSignature.thisParameter) { @@ -135853,14 +140298,14 @@ var ts; // Note: If this parameter was already there, it would have been previously updated with the type if not type was present if ((!firstParameter || (ts.isIdentifier(firstParameter.name) && firstParameter.name.escapedText !== "this"))) { var thisType = checker.getTypeOfSymbolAtLocation(functionSignature.thisParameter, node); - parameters.splice(0, 0, ts.createParameter( + parameters.splice(0, 0, ts.factory.createParameterDeclaration( /* decorators */ undefined, /* modifiers */ undefined, /* dotDotDotToken */ undefined, "this", /* questionToken */ undefined, checker.typeToTypeNode(thisType, scope, 1 /* NoTruncation */))); } } - initializer = ts.updateFunctionExpression(initializer, node.modifiers, initializer.asteriskToken, initializer.name, initializer.typeParameters, parameters, initializer.type || checker.typeToTypeNode(functionSignature.getReturnType(), scope, 1 /* NoTruncation */), initializer.body); + initializer = ts.factory.updateFunctionExpression(initializer, node.modifiers, initializer.asteriskToken, initializer.name, initializer.typeParameters, parameters, initializer.type || checker.typeToTypeNode(functionSignature.getReturnType(), scope, 1 /* NoTruncation */), initializer.body); } return { variableType: variableType, initializer: initializer }; } @@ -135899,10 +140344,10 @@ var ts; || ts.compareValues(type1.id, type2.id); } function getCalledExpression(scope, range, functionNameText) { - var functionReference = ts.createIdentifier(functionNameText); + var functionReference = ts.factory.createIdentifier(functionNameText); if (ts.isClassLike(scope)) { - var lhs = range.facts & RangeFacts.InStaticRegion ? ts.createIdentifier(scope.name.text) : ts.createThis(); // TODO: GH#18217 - return ts.createPropertyAccess(lhs, functionReference); + var lhs = range.facts & RangeFacts.InStaticRegion ? ts.factory.createIdentifier(scope.name.text) : ts.factory.createThis(); // TODO: GH#18217 + return ts.factory.createPropertyAccessExpression(lhs, functionReference); } else { return functionReference; @@ -135912,11 +140357,11 @@ var ts; var hasWritesOrVariableDeclarations = writes !== undefined || exposedVariableDeclarations.length > 0; if (ts.isBlock(body) && !hasWritesOrVariableDeclarations && substitutions.size === 0) { // already block, no declarations or writes to propagate back, no substitutions - can use node as is - return { body: ts.createBlock(body.statements, /*multLine*/ true), returnValueProperty: undefined }; + return { body: ts.factory.createBlock(body.statements, /*multLine*/ true), returnValueProperty: undefined }; } var returnValueProperty; var ignoreReturns = false; - var statements = ts.createNodeArray(ts.isBlock(body) ? body.statements.slice(0) : [ts.isStatement(body) ? body : ts.createReturn(body)]); + var statements = ts.factory.createNodeArray(ts.isBlock(body) ? body.statements.slice(0) : [ts.isStatement(body) ? body : ts.factory.createReturnStatement(body)]); // rewrite body if either there are writes that should be propagated back via return statements or there are substitutions if (hasWritesOrVariableDeclarations || substitutions.size) { var rewrittenStatements = ts.visitNodes(statements, visitor).slice(); @@ -135925,31 +140370,31 @@ var ts; // it is ok to know that range has at least one return since it we only allow unconditional returns var assignments = getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes); if (assignments.length === 1) { - rewrittenStatements.push(ts.createReturn(assignments[0].name)); + rewrittenStatements.push(ts.factory.createReturnStatement(assignments[0].name)); } else { - rewrittenStatements.push(ts.createReturn(ts.createObjectLiteral(assignments))); + rewrittenStatements.push(ts.factory.createReturnStatement(ts.factory.createObjectLiteralExpression(assignments))); } } - return { body: ts.createBlock(rewrittenStatements, /*multiLine*/ true), returnValueProperty: returnValueProperty }; + return { body: ts.factory.createBlock(rewrittenStatements, /*multiLine*/ true), returnValueProperty: returnValueProperty }; } else { - return { body: ts.createBlock(statements, /*multiLine*/ true), returnValueProperty: undefined }; + return { body: ts.factory.createBlock(statements, /*multiLine*/ true), returnValueProperty: undefined }; } function visitor(node) { - if (!ignoreReturns && node.kind === 235 /* ReturnStatement */ && hasWritesOrVariableDeclarations) { + if (!ignoreReturns && ts.isReturnStatement(node) && hasWritesOrVariableDeclarations) { var assignments = getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes); if (node.expression) { if (!returnValueProperty) { returnValueProperty = "__return"; } - assignments.unshift(ts.createPropertyAssignment(returnValueProperty, ts.visitNode(node.expression, visitor))); + assignments.unshift(ts.factory.createPropertyAssignment(returnValueProperty, ts.visitNode(node.expression, visitor))); } if (assignments.length === 1) { - return ts.createReturn(assignments[0].name); + return ts.factory.createReturnStatement(assignments[0].name); } else { - return ts.createReturn(ts.createObjectLiteral(assignments)); + return ts.factory.createReturnStatement(ts.factory.createObjectLiteralExpression(assignments)); } } else { @@ -136052,8 +140497,8 @@ var ts; } } function getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes) { - var variableAssignments = ts.map(exposedVariableDeclarations, function (v) { return ts.createShorthandPropertyAssignment(v.symbol.name); }); - var writeAssignments = ts.map(writes, function (w) { return ts.createShorthandPropertyAssignment(w.symbol.name); }); + var variableAssignments = ts.map(exposedVariableDeclarations, function (v) { return ts.factory.createShorthandPropertyAssignment(v.symbol.name); }); + var writeAssignments = ts.map(writes, function (w) { return ts.factory.createShorthandPropertyAssignment(w.symbol.name); }); // TODO: GH#18217 `variableAssignments` not possibly undefined! return variableAssignments === undefined ? writeAssignments @@ -136086,13 +140531,13 @@ var ts; Usage[Usage["Write"] = 2] = "Write"; })(Usage || (Usage = {})); function collectReadsAndWrites(targetRange, scopes, enclosingTextRange, sourceFile, checker, cancellationToken) { - var allTypeParameterUsages = ts.createMap(); // Key is type ID + var allTypeParameterUsages = new ts.Map(); // Key is type ID var usagesPerScope = []; var substitutionsPerScope = []; var functionErrorsPerScope = []; var constantErrorsPerScope = []; var visibleDeclarationsInExtractedRange = []; - var exposedVariableSymbolSet = ts.createMap(); // Key is symbol ID + var exposedVariableSymbolSet = new ts.Map(); // Key is symbol ID var exposedVariableDeclarations = []; var firstExposedNonVariableDeclaration; var expression = !isReadonlyArray(targetRange.range) @@ -136113,9 +140558,9 @@ var ts; // initialize results for (var _i = 0, scopes_1 = scopes; _i < scopes_1.length; _i++) { var scope = scopes_1[_i]; - usagesPerScope.push({ usages: ts.createMap(), typeParameterUsages: ts.createMap(), substitutions: ts.createMap() }); - substitutionsPerScope.push(ts.createMap()); - functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 244 /* FunctionDeclaration */ + usagesPerScope.push({ usages: new ts.Map(), typeParameterUsages: new ts.Map(), substitutions: new ts.Map() }); + substitutionsPerScope.push(new ts.Map()); + functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 248 /* FunctionDeclaration */ ? [ts.createDiagnosticForNode(scope, Messages.cannotExtractToOtherFunctionLike)] : []); var constantErrors = []; @@ -136131,8 +140576,8 @@ var ts; } constantErrorsPerScope.push(constantErrors); } - var seenUsages = ts.createMap(); - var target = isReadonlyArray(targetRange.range) ? ts.createBlock(targetRange.range) : targetRange.range; + var seenUsages = new ts.Map(); + var target = isReadonlyArray(targetRange.range) ? ts.factory.createBlock(targetRange.range) : targetRange.range; var unmodifiedNode = isReadonlyArray(targetRange.range) ? ts.first(targetRange.range) : targetRange.range; var inGenericContext = isInGenericContext(unmodifiedNode); collectUsages(target); @@ -136144,15 +140589,15 @@ var ts; recordTypeParameterUsages(contextualType); } if (allTypeParameterUsages.size > 0) { - var seenTypeParameterUsages = ts.createMap(); // Key is type ID - var i_1 = 0; - for (var curr = unmodifiedNode; curr !== undefined && i_1 < scopes.length; curr = curr.parent) { - if (curr === scopes[i_1]) { + var seenTypeParameterUsages = new ts.Map(); // Key is type ID + var i_2 = 0; + for (var curr = unmodifiedNode; curr !== undefined && i_2 < scopes.length; curr = curr.parent) { + if (curr === scopes[i_2]) { // Copy current contents of seenTypeParameterUsages into scope. seenTypeParameterUsages.forEach(function (typeParameter, id) { - usagesPerScope[i_1].typeParameterUsages.set(id, typeParameter); + usagesPerScope[i_2].typeParameterUsages.set(id, typeParameter); }); - i_1++; + i_2++; } // Note that we add the current node's type parameters *after* updating the corresponding scope. if (ts.isDeclarationWithTypeParameters(curr)) { @@ -136168,7 +140613,7 @@ var ts; // If we didn't get through all the scopes, then there were some that weren't in our // parent chain (impossible at time of writing). A conservative solution would be to // copy allTypeParameterUsages into all remaining scopes. - ts.Debug.assert(i_1 === scopes.length, "Should have iterated all scopes"); + ts.Debug.assert(i_2 === scopes.length, "Should have iterated all scopes"); } // If there are any declarations in the extracted block that are used in the same enclosing // lexical scope, we can't move the extraction "up" as those declarations will become unreachable @@ -136194,7 +140639,7 @@ var ts; hasWrite = true; if (value.symbol.flags & 106500 /* ClassMember */ && value.symbol.valueDeclaration && - ts.hasModifier(value.symbol.valueDeclaration, 64 /* Readonly */)) { + ts.hasEffectiveModifier(value.symbol.valueDeclaration, 64 /* Readonly */)) { readonlyClassPropertyWrite = value.symbol.valueDeclaration; } } @@ -136410,17 +140855,20 @@ var ts; } var decls = symbol.getDeclarations(); if (decls && decls.some(function (d) { return d.parent === scopeDecl; })) { - return ts.createIdentifier(symbol.name); + return ts.factory.createIdentifier(symbol.name); } var prefix = tryReplaceWithQualifiedNameOrPropertyAccess(symbol.parent, scopeDecl, isTypeNode); if (prefix === undefined) { return undefined; } return isTypeNode - ? ts.createQualifiedName(prefix, ts.createIdentifier(symbol.name)) - : ts.createPropertyAccess(prefix, symbol.name); + ? ts.factory.createQualifiedName(prefix, ts.factory.createIdentifier(symbol.name)) + : ts.factory.createPropertyAccessExpression(prefix, symbol.name); } } + function getExtractableParent(node) { + return ts.findAncestor(node, function (node) { return node.parent && isExtractableExpression(node) && !ts.isBinaryExpression(node.parent); }); + } /** * Computes whether or not a node represents an expression in a position where it could * be extracted. @@ -136431,35 +140879,38 @@ var ts; function isExtractableExpression(node) { var parent = node.parent; switch (parent.kind) { - case 284 /* EnumMember */: + case 288 /* EnumMember */: return false; } switch (node.kind) { case 10 /* StringLiteral */: - return parent.kind !== 254 /* ImportDeclaration */ && - parent.kind !== 258 /* ImportSpecifier */; - case 213 /* SpreadElement */: - case 189 /* ObjectBindingPattern */: - case 191 /* BindingElement */: + return parent.kind !== 258 /* ImportDeclaration */ && + parent.kind !== 262 /* ImportSpecifier */; + case 217 /* SpreadElement */: + case 193 /* ObjectBindingPattern */: + case 195 /* BindingElement */: return false; - case 75 /* Identifier */: - return parent.kind !== 191 /* BindingElement */ && - parent.kind !== 258 /* ImportSpecifier */ && - parent.kind !== 263 /* ExportSpecifier */; + case 78 /* Identifier */: + return parent.kind !== 195 /* BindingElement */ && + parent.kind !== 262 /* ImportSpecifier */ && + parent.kind !== 267 /* ExportSpecifier */; } return true; } function isBlockLike(node) { switch (node.kind) { - case 223 /* Block */: - case 290 /* SourceFile */: - case 250 /* ModuleBlock */: - case 277 /* CaseClause */: + case 227 /* Block */: + case 294 /* SourceFile */: + case 254 /* ModuleBlock */: + case 281 /* CaseClause */: return true; default: return false; } } + function isInJSXContent(node) { + return (ts.isJsxElement(node) || ts.isJsxSelfClosingElement(node) || ts.isJsxFragment(node)) && ts.isJsxElement(node.parent); + } })(extractSymbol = refactor.extractSymbol || (refactor.extractSymbol = {})); })(refactor = ts.refactor || (ts.refactor = {})); })(ts || (ts = {})); @@ -136474,24 +140925,39 @@ var ts; var extractToTypeDef = "Extract to typedef"; refactor.registerRefactor(refactorName, { getAvailableActions: function (context) { - var info = getRangeToExtract(context); + var info = getRangeToExtract(context, context.triggerReason === "invoked"); if (!info) return ts.emptyArray; - return [{ - name: refactorName, - description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_type), - actions: info.isJS ? [{ - name: extractToTypeDef, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_typedef) - }] : ts.append([{ - name: extractToTypeAlias, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_type_alias) - }], info.typeElements && { - name: extractToInterface, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_interface) - }) - }]; + if (info.error === undefined) { + return [{ + name: refactorName, + description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_type), + actions: info.info.isJS ? [{ + name: extractToTypeDef, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_typedef) + }] : ts.append([{ + name: extractToTypeAlias, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_type_alias) + }], info.info.typeElements && { + name: extractToInterface, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_interface) + }) + }]; + } + if (context.preferences.provideRefactorNotApplicableReason) { + return [{ + name: refactorName, + description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_type), + actions: [ + { name: extractToTypeDef, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_typedef), notApplicableReason: info.error }, + { name: extractToTypeAlias, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_type_alias), notApplicableReason: info.error }, + { name: extractToInterface, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_interface), notApplicableReason: info.error }, + ] + }]; + } + return ts.emptyArray; }, getEditsForAction: function (context, actionName) { + var _a; var file = context.file; - var info = ts.Debug.checkDefined(getRangeToExtract(context), "Expected to find a range to extract"); + var info = ts.Debug.checkDefined((_a = getRangeToExtract(context)) === null || _a === void 0 ? void 0 : _a.info, "Expected to find a range to extract"); var name = ts.getUniqueName("NewType", file); var edits = ts.textChanges.ChangeTracker.with(context, function (changes) { switch (actionName) { @@ -136513,28 +140979,31 @@ var ts; return { edits: edits, renameFilename: renameFilename, renameLocation: renameLocation }; } }); - function getRangeToExtract(context) { + function getRangeToExtract(context, considerEmptySpans) { + if (considerEmptySpans === void 0) { considerEmptySpans = true; } var file = context.file, startPosition = context.startPosition; var isJS = ts.isSourceFileJS(file); var current = ts.getTokenAtPosition(file, startPosition); var range = ts.createTextRangeFromSpan(ts.getRefactorContextSpan(context)); - var selection = ts.findAncestor(current, (function (node) { return node.parent && rangeContainsSkipTrivia(range, node, file) && !rangeContainsSkipTrivia(range, node.parent, file); })); + var cursorRequest = range.pos === range.end && considerEmptySpans; + var selection = ts.findAncestor(current, (function (node) { return node.parent && ts.isTypeNode(node) && !rangeContainsSkipTrivia(range, node.parent, file) && + (cursorRequest || ts.nodeOverlapsWithStartEnd(current, file, range.pos, range.end)); })); if (!selection || !ts.isTypeNode(selection)) - return undefined; + return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Selection_is_not_a_valid_type_node) }; var checker = context.program.getTypeChecker(); var firstStatement = ts.Debug.checkDefined(ts.findAncestor(selection, ts.isStatement), "Should find a statement"); var typeParameters = collectTypeParameters(checker, selection, firstStatement, file); if (!typeParameters) - return undefined; + return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.No_type_could_be_extracted_from_this_type_node) }; var typeElements = flattenTypeLiteralNodeReference(checker, selection); - return { isJS: isJS, selection: selection, firstStatement: firstStatement, typeParameters: typeParameters, typeElements: typeElements }; + return { info: { isJS: isJS, selection: selection, firstStatement: firstStatement, typeParameters: typeParameters, typeElements: typeElements } }; } function flattenTypeLiteralNodeReference(checker, node) { if (!node) return undefined; if (ts.isIntersectionTypeNode(node)) { var result = []; - var seen_1 = ts.createMap(); + var seen_1 = new ts.Map(); for (var _i = 0, _a = node.types; _i < _a.length; _i++) { var type = _a[_i]; var flattenedTypeMembers = flattenTypeLiteralNodeReference(checker, type); @@ -136596,46 +141065,41 @@ var ts; } } } + if (file && ts.isTupleTypeNode(node) && (ts.getLineAndCharacterOfPosition(file, node.pos).line === ts.getLineAndCharacterOfPosition(file, node.end).line)) { + ts.setEmitFlags(node, 1 /* SingleLine */); + } return ts.forEachChild(node, visitor); } } function doTypeAliasChange(changes, file, name, info) { var firstStatement = info.firstStatement, selection = info.selection, typeParameters = info.typeParameters; - var newTypeNode = ts.createTypeAliasDeclaration( + var newTypeNode = ts.factory.createTypeAliasDeclaration( /* decorators */ undefined, - /* modifiers */ undefined, name, typeParameters.map(function (id) { return ts.updateTypeParameterDeclaration(id, id.name, id.constraint, /* defaultType */ undefined); }), selection); + /* modifiers */ undefined, name, typeParameters.map(function (id) { return ts.factory.updateTypeParameterDeclaration(id, id.name, id.constraint, /* defaultType */ undefined); }), selection); changes.insertNodeBefore(file, firstStatement, ts.ignoreSourceNewlines(newTypeNode), /* blankLineBetween */ true); - changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); }))); + changes.replaceNode(file, selection, ts.factory.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.factory.createTypeReferenceNode(id.name, /* typeArguments */ undefined); }))); } function doInterfaceChange(changes, file, name, info) { var firstStatement = info.firstStatement, selection = info.selection, typeParameters = info.typeParameters, typeElements = info.typeElements; - var newTypeNode = ts.createInterfaceDeclaration( + var newTypeNode = ts.factory.createInterfaceDeclaration( /* decorators */ undefined, /* modifiers */ undefined, name, typeParameters, /* heritageClauses */ undefined, typeElements); changes.insertNodeBefore(file, firstStatement, ts.ignoreSourceNewlines(newTypeNode), /* blankLineBetween */ true); - changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); }))); + changes.replaceNode(file, selection, ts.factory.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.factory.createTypeReferenceNode(id.name, /* typeArguments */ undefined); }))); } function doTypedefChange(changes, file, name, info) { var firstStatement = info.firstStatement, selection = info.selection, typeParameters = info.typeParameters; - var node = ts.createNode(322 /* JSDocTypedefTag */); - node.tagName = ts.createIdentifier("typedef"); // TODO: jsdoc factory https://github.com/Microsoft/TypeScript/pull/29539 - node.fullName = ts.createIdentifier(name); - node.name = node.fullName; - node.typeExpression = ts.createJSDocTypeExpression(selection); + var node = ts.factory.createJSDocTypedefTag(ts.factory.createIdentifier("typedef"), ts.factory.createJSDocTypeExpression(selection), ts.factory.createIdentifier(name)); var templates = []; ts.forEach(typeParameters, function (typeParameter) { var constraint = ts.getEffectiveConstraintOfTypeParameter(typeParameter); - var template = ts.createNode(321 /* JSDocTemplateTag */); - template.tagName = ts.createIdentifier("template"); - template.constraint = constraint && ts.cast(constraint, ts.isJSDocTypeExpression); - var parameter = ts.createNode(155 /* TypeParameter */); - parameter.name = typeParameter.name; - template.typeParameters = ts.createNodeArray([parameter]); + var parameter = ts.factory.createTypeParameterDeclaration(typeParameter.name); + var template = ts.factory.createJSDocTemplateTag(ts.factory.createIdentifier("template"), constraint && ts.cast(constraint, ts.isJSDocTypeExpression), [parameter]); templates.push(template); }); - changes.insertNodeBefore(file, firstStatement, ts.createJSDocComment(/* comment */ undefined, ts.createNodeArray(ts.concatenate(templates, [node]))), /* blankLineBetween */ true); - changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); }))); + changes.insertNodeBefore(file, firstStatement, ts.factory.createJSDocComment(/* comment */ undefined, ts.factory.createNodeArray(ts.concatenate(templates, [node]))), /* blankLineBetween */ true); + changes.replaceNode(file, selection, ts.factory.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.factory.createTypeReferenceNode(id.name, /* typeArguments */ undefined); }))); } })(refactor = ts.refactor || (ts.refactor = {})); })(ts || (ts = {})); @@ -136648,168 +141112,54 @@ var ts; (function (generateGetAccessorAndSetAccessor) { var actionName = "Generate 'get' and 'set' accessors"; var actionDescription = ts.Diagnostics.Generate_get_and_set_accessors.message; - refactor.registerRefactor(actionName, { getEditsForAction: getEditsForAction, getAvailableActions: getAvailableActions }); - function getAvailableActions(context) { - if (!getConvertibleFieldAtPosition(context)) - return ts.emptyArray; - return [{ - name: actionName, - description: actionDescription, - actions: [ - { + refactor.registerRefactor(actionName, { + getEditsForAction: function (context, actionName) { + if (!context.endPosition) + return undefined; + var info = ts.codefix.getAccessorConvertiblePropertyAtPosition(context.file, context.startPosition, context.endPosition); + if (!info || !info.info) + return undefined; + var edits = ts.codefix.generateAccessorFromProperty(context.file, context.startPosition, context.endPosition, context, actionName); + if (!edits) + return undefined; + var renameFilename = context.file.fileName; + var nameNeedRename = info.info.renameAccessor ? info.info.accessorName : info.info.fieldName; + var renameLocationOffset = ts.isIdentifier(nameNeedRename) ? 0 : -1; + var renameLocation = renameLocationOffset + ts.getRenameLocation(edits, renameFilename, nameNeedRename.text, /*preferLastLocation*/ ts.isParameter(info.info.declaration)); + return { renameFilename: renameFilename, renameLocation: renameLocation, edits: edits }; + }, + getAvailableActions: function (context) { + if (!context.endPosition) + return ts.emptyArray; + var info = ts.codefix.getAccessorConvertiblePropertyAtPosition(context.file, context.startPosition, context.endPosition, context.triggerReason === "invoked"); + if (!info) + return ts.emptyArray; + if (!info.error) { + return [{ name: actionName, - description: actionDescription - } - ] - }]; - } - function getEditsForAction(context, _actionName) { - var file = context.file; - var fieldInfo = getConvertibleFieldAtPosition(context); - if (!fieldInfo) - return undefined; - var isJS = ts.isSourceFileJS(file); - var changeTracker = ts.textChanges.ChangeTracker.fromContext(context); - var isStatic = fieldInfo.isStatic, isReadonly = fieldInfo.isReadonly, fieldName = fieldInfo.fieldName, accessorName = fieldInfo.accessorName, originalName = fieldInfo.originalName, type = fieldInfo.type, container = fieldInfo.container, declaration = fieldInfo.declaration, renameAccessor = fieldInfo.renameAccessor; - ts.suppressLeadingAndTrailingTrivia(fieldName); - ts.suppressLeadingAndTrailingTrivia(accessorName); - ts.suppressLeadingAndTrailingTrivia(declaration); - ts.suppressLeadingAndTrailingTrivia(container); - var isInClassLike = ts.isClassLike(container); - // avoid Readonly modifier because it will convert to get accessor - var modifierFlags = ts.getModifierFlags(declaration) & ~64 /* Readonly */; - var accessorModifiers = isInClassLike - ? !modifierFlags || modifierFlags & 8 /* Private */ - ? getModifiers(isJS, isStatic, 119 /* PublicKeyword */) - : ts.createNodeArray(ts.createModifiersFromModifierFlags(modifierFlags)) - : undefined; - var fieldModifiers = isInClassLike ? getModifiers(isJS, isStatic, 117 /* PrivateKeyword */) : undefined; - updateFieldDeclaration(changeTracker, file, declaration, fieldName, fieldModifiers); - var getAccessor = generateGetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container); - ts.suppressLeadingAndTrailingTrivia(getAccessor); - insertAccessor(changeTracker, file, getAccessor, declaration, container); - if (isReadonly) { - // readonly modifier only existed in classLikeDeclaration - var constructor = ts.getFirstConstructorWithBody(container); - if (constructor) { - updateReadonlyPropertyInitializerStatementConstructor(changeTracker, file, constructor, fieldName.text, originalName); + description: actionDescription, + actions: [ + { + name: actionName, + description: actionDescription + } + ] + }]; } - } - else { - var setAccessor = generateSetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container); - ts.suppressLeadingAndTrailingTrivia(setAccessor); - insertAccessor(changeTracker, file, setAccessor, declaration, container); - } - var edits = changeTracker.getChanges(); - var renameFilename = file.fileName; - var nameNeedRename = renameAccessor ? accessorName : fieldName; - var renameLocationOffset = ts.isIdentifier(nameNeedRename) ? 0 : -1; - var renameLocation = renameLocationOffset + ts.getRenameLocation(edits, renameFilename, nameNeedRename.text, /*preferLastLocation*/ ts.isParameter(declaration)); - return { renameFilename: renameFilename, renameLocation: renameLocation, edits: edits }; - } - function isConvertibleName(name) { - return ts.isIdentifier(name) || ts.isStringLiteral(name); - } - function isAcceptedDeclaration(node) { - return ts.isParameterPropertyDeclaration(node, node.parent) || ts.isPropertyDeclaration(node) || ts.isPropertyAssignment(node); - } - function createPropertyName(name, originalName) { - return ts.isIdentifier(originalName) ? ts.createIdentifier(name) : ts.createLiteral(name); - } - function createAccessorAccessExpression(fieldName, isStatic, container) { - var leftHead = isStatic ? container.name : ts.createThis(); // TODO: GH#18217 - return ts.isIdentifier(fieldName) ? ts.createPropertyAccess(leftHead, fieldName) : ts.createElementAccess(leftHead, ts.createLiteral(fieldName)); - } - function getModifiers(isJS, isStatic, accessModifier) { - var modifiers = ts.append(!isJS ? [ts.createToken(accessModifier)] : undefined, isStatic ? ts.createToken(120 /* StaticKeyword */) : undefined); - return modifiers && ts.createNodeArray(modifiers); - } - function getConvertibleFieldAtPosition(context) { - var file = context.file, startPosition = context.startPosition, endPosition = context.endPosition; - var node = ts.getTokenAtPosition(file, startPosition); - var declaration = ts.findAncestor(node.parent, isAcceptedDeclaration); - // make sure declaration have AccessibilityModifier or Static Modifier or Readonly Modifier - var meaning = 28 /* AccessibilityModifier */ | 32 /* Static */ | 64 /* Readonly */; - if (!declaration || !ts.nodeOverlapsWithStartEnd(declaration.name, file, startPosition, endPosition) // TODO: GH#18217 - || !isConvertibleName(declaration.name) || (ts.getModifierFlags(declaration) | meaning) !== meaning) - return undefined; - var name = declaration.name.text; - var startWithUnderscore = ts.startsWithUnderscore(name); - var fieldName = createPropertyName(startWithUnderscore ? name : ts.getUniqueName("_" + name, file), declaration.name); - var accessorName = createPropertyName(startWithUnderscore ? ts.getUniqueName(name.substring(1), file) : name, declaration.name); - return { - isStatic: ts.hasStaticModifier(declaration), - isReadonly: ts.hasReadonlyModifier(declaration), - type: ts.getTypeAnnotationNode(declaration), - container: declaration.kind === 156 /* Parameter */ ? declaration.parent.parent : declaration.parent, - originalName: declaration.name.text, - declaration: declaration, - fieldName: fieldName, - accessorName: accessorName, - renameAccessor: startWithUnderscore - }; - } - function generateGetAccessor(fieldName, accessorName, type, modifiers, isStatic, container) { - return ts.createGetAccessor( - /*decorators*/ undefined, modifiers, accessorName, - /*parameters*/ undefined, // TODO: GH#18217 - type, ts.createBlock([ - ts.createReturn(createAccessorAccessExpression(fieldName, isStatic, container)) - ], /*multiLine*/ true)); - } - function generateSetAccessor(fieldName, accessorName, type, modifiers, isStatic, container) { - return ts.createSetAccessor( - /*decorators*/ undefined, modifiers, accessorName, [ts.createParameter( - /*decorators*/ undefined, - /*modifiers*/ undefined, - /*dotDotDotToken*/ undefined, ts.createIdentifier("value"), - /*questionToken*/ undefined, type)], ts.createBlock([ - ts.createStatement(ts.createAssignment(createAccessorAccessExpression(fieldName, isStatic, container), ts.createIdentifier("value"))) - ], /*multiLine*/ true)); - } - function updatePropertyDeclaration(changeTracker, file, declaration, fieldName, modifiers) { - var property = ts.updateProperty(declaration, declaration.decorators, modifiers, fieldName, declaration.questionToken || declaration.exclamationToken, declaration.type, declaration.initializer); - changeTracker.replaceNode(file, declaration, property); - } - function updatePropertyAssignmentDeclaration(changeTracker, file, declaration, fieldName) { - var assignment = ts.updatePropertyAssignment(declaration, fieldName, declaration.initializer); - changeTracker.replacePropertyAssignment(file, declaration, assignment); - } - function updateFieldDeclaration(changeTracker, file, declaration, fieldName, modifiers) { - if (ts.isPropertyDeclaration(declaration)) { - updatePropertyDeclaration(changeTracker, file, declaration, fieldName, modifiers); - } - else if (ts.isPropertyAssignment(declaration)) { - updatePropertyAssignmentDeclaration(changeTracker, file, declaration, fieldName); - } - else { - changeTracker.replaceNode(file, declaration, ts.updateParameter(declaration, declaration.decorators, modifiers, declaration.dotDotDotToken, ts.cast(fieldName, ts.isIdentifier), declaration.questionToken, declaration.type, declaration.initializer)); - } - } - function insertAccessor(changeTracker, file, accessor, declaration, container) { - ts.isParameterPropertyDeclaration(declaration, declaration.parent) ? changeTracker.insertNodeAtClassStart(file, container, accessor) : - ts.isPropertyAssignment(declaration) ? changeTracker.insertNodeAfterComma(file, declaration, accessor) : - changeTracker.insertNodeAfter(file, declaration, accessor); - } - function updateReadonlyPropertyInitializerStatementConstructor(changeTracker, file, constructor, fieldName, originalName) { - if (!constructor.body) - return; - constructor.body.forEachChild(function recur(node) { - if (ts.isElementAccessExpression(node) && - node.expression.kind === 104 /* ThisKeyword */ && - ts.isStringLiteral(node.argumentExpression) && - node.argumentExpression.text === originalName && - ts.isWriteAccess(node)) { - changeTracker.replaceNode(file, node.argumentExpression, ts.createStringLiteral(fieldName)); + if (context.preferences.provideRefactorNotApplicableReason) { + return [{ + name: actionName, + description: actionDescription, + actions: [{ + name: actionName, + description: actionDescription, + notApplicableReason: info.error + }] + }]; } - if (ts.isPropertyAccessExpression(node) && node.expression.kind === 104 /* ThisKeyword */ && node.name.text === originalName && ts.isWriteAccess(node)) { - changeTracker.replaceNode(file, node.name, ts.createIdentifier(fieldName)); - } - if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) { - node.forEachChild(recur); - } - }); - } + return ts.emptyArray; + } + }); })(generateGetAccessorAndSetAccessor = refactor.generateGetAccessorAndSetAccessor || (refactor.generateGetAccessorAndSetAccessor = {})); })(refactor = ts.refactor || (ts.refactor = {})); })(ts || (ts = {})); @@ -136884,11 +141234,11 @@ var ts; } function isPureImport(node) { switch (node.kind) { - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: return true; - case 253 /* ImportEqualsDeclaration */: - return !ts.hasModifier(node, 1 /* Export */); - case 225 /* VariableStatement */: + case 257 /* ImportEqualsDeclaration */: + return !ts.hasSyntacticModifier(node, 1 /* Export */); + case 229 /* VariableStatement */: return node.declarationList.declarations.every(function (d) { return !!d.initializer && ts.isRequireCall(d.initializer, /*checkArgumentIsStringLiteralLike*/ true); }); default: return false; @@ -136905,7 +141255,7 @@ var ts; return ts.isPropertyAssignment(prop) && ts.isStringLiteral(prop.name) && prop.name.text === "files"; }); if (filesProp && ts.isArrayLiteralExpression(filesProp.initializer)) { - changes.insertNodeInListAfter(cfg, ts.last(filesProp.initializer.elements), ts.createLiteral(newFilePath), filesProp.initializer.elements); + changes.insertNodeInListAfter(cfg, ts.last(filesProp.initializer.elements), ts.factory.createStringLiteral(newFilePath), filesProp.initializer.elements); } } function getNewStatementsAndRemoveFromOldFile(oldFile, usage, changes, toMove, program, newModuleName, preferences) { @@ -136923,7 +141273,14 @@ var ts; deleteUnusedOldImports(oldFile, toMove.all, changes, usage.unusedImportsFromOldFile, checker); deleteMovedStatements(oldFile, toMove.ranges, changes); updateImportsInOtherFiles(changes, program, oldFile, usage.movedSymbols, newModuleName); - return __spreadArrays(getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByNewFile, usage.newFileImportsFromOldFile, changes, checker, useEs6ModuleSyntax, quotePreference), addExports(oldFile, toMove.all, usage.oldFileImportsFromNewFile, useEs6ModuleSyntax)); + var imports = getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByNewFile, usage.newFileImportsFromOldFile, changes, checker, useEs6ModuleSyntax, quotePreference); + var body = addExports(oldFile, toMove.all, usage.oldFileImportsFromNewFile, useEs6ModuleSyntax); + if (imports.length && body.length) { + return __spreadArrays(imports, [ + 4 /* NewLineTrivia */ + ], body); + } + return __spreadArrays(imports, body); } function deleteMovedStatements(sourceFile, moved, changes) { for (var _i = 0, moved_1 = moved; _i < moved_1.length; _i++) { @@ -136956,7 +141313,7 @@ var ts; }; deleteUnusedImports(sourceFile, importNode, changes, shouldMove); // These will be changed to imports from the new file var newModuleSpecifier = ts.combinePaths(ts.getDirectoryPath(moduleSpecifierFromImport(importNode).text), newModuleName); - var newImportDeclaration = filterImport(importNode, ts.createLiteral(newModuleSpecifier), shouldMove); + var newImportDeclaration = filterImport(importNode, ts.factory.createStringLiteral(newModuleSpecifier), shouldMove); if (newImportDeclaration) changes.insertNodeAfter(sourceFile, statement, newImportDeclaration); var ns = getNamespaceLikeImport(importNode); @@ -136976,12 +141333,12 @@ var ts; } function getNamespaceLikeImport(node) { switch (node.kind) { - case 254 /* ImportDeclaration */: - return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 256 /* NamespaceImport */ ? + case 258 /* ImportDeclaration */: + return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 260 /* NamespaceImport */ ? node.importClause.namedBindings.name : undefined; - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return node.name; - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return ts.tryCast(node.name, ts.isIdentifier); default: return ts.Debug.assertNever(node, "Unexpected node kind " + node.kind); @@ -137003,29 +141360,29 @@ var ts; var newNamespaceName = needUniqueName ? ts.getUniqueName(preferredNewNamespaceName, sourceFile) : preferredNewNamespaceName; for (var _i = 0, toChange_1 = toChange; _i < toChange_1.length; _i++) { var ref = toChange_1[_i]; - changes.replaceNode(sourceFile, ref, ts.createIdentifier(newNamespaceName)); + changes.replaceNode(sourceFile, ref, ts.factory.createIdentifier(newNamespaceName)); } changes.insertNodeAfter(sourceFile, oldImportNode, updateNamespaceLikeImportNode(oldImportNode, newModuleName, newModuleSpecifier)); } } function updateNamespaceLikeImportNode(node, newNamespaceName, newModuleSpecifier) { - var newNamespaceId = ts.createIdentifier(newNamespaceName); - var newModuleString = ts.createLiteral(newModuleSpecifier); + var newNamespaceId = ts.factory.createIdentifier(newNamespaceName); + var newModuleString = ts.factory.createStringLiteral(newModuleSpecifier); switch (node.kind) { - case 254 /* ImportDeclaration */: - return ts.createImportDeclaration( - /*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(/*name*/ undefined, ts.createNamespaceImport(newNamespaceId)), newModuleString); - case 253 /* ImportEqualsDeclaration */: - return ts.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, newNamespaceId, ts.createExternalModuleReference(newModuleString)); - case 242 /* VariableDeclaration */: - return ts.createVariableDeclaration(newNamespaceId, /*type*/ undefined, createRequireCall(newModuleString)); + case 258 /* ImportDeclaration */: + return ts.factory.createImportDeclaration( + /*decorators*/ undefined, /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, /*name*/ undefined, ts.factory.createNamespaceImport(newNamespaceId)), newModuleString); + case 257 /* ImportEqualsDeclaration */: + return ts.factory.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, newNamespaceId, ts.factory.createExternalModuleReference(newModuleString)); + case 246 /* VariableDeclaration */: + return ts.factory.createVariableDeclaration(newNamespaceId, /*exclamationToken*/ undefined, /*type*/ undefined, createRequireCall(newModuleString)); default: return ts.Debug.assertNever(node, "Unexpected node kind " + node.kind); } } function moduleSpecifierFromImport(i) { - return (i.kind === 254 /* ImportDeclaration */ ? i.moduleSpecifier - : i.kind === 253 /* ImportEqualsDeclaration */ ? i.moduleReference.expression + return (i.kind === 258 /* ImportDeclaration */ ? i.moduleSpecifier + : i.kind === 257 /* ImportEqualsDeclaration */ ? i.moduleReference.expression : i.initializer.arguments[0]); } function forEachImportInStatement(statement, cb) { @@ -137052,7 +141409,7 @@ var ts; var imports = []; newFileNeedExport.forEach(function (symbol) { if (symbol.escapedName === "default" /* Default */) { - defaultImport = ts.createIdentifier(ts.symbolNameNoDefault(symbol)); // TODO: GH#18217 + defaultImport = ts.factory.createIdentifier(ts.symbolNameNoDefault(symbol)); // TODO: GH#18217 } else { imports.push(symbol.name); @@ -137063,23 +141420,23 @@ var ts; function makeImportOrRequire(defaultImport, imports, path, useEs6Imports, quotePreference) { path = ts.ensurePathIsNonModuleName(path); if (useEs6Imports) { - var specifiers = imports.map(function (i) { return ts.createImportSpecifier(/*propertyName*/ undefined, ts.createIdentifier(i)); }); + var specifiers = imports.map(function (i) { return ts.factory.createImportSpecifier(/*propertyName*/ undefined, ts.factory.createIdentifier(i)); }); return ts.makeImportIfNecessary(defaultImport, specifiers, path, quotePreference); } else { ts.Debug.assert(!defaultImport, "No default import should exist"); // If there's a default export, it should have been an es6 module. - var bindingElements = imports.map(function (i) { return ts.createBindingElement(/*dotDotDotToken*/ undefined, /*propertyName*/ undefined, i); }); + var bindingElements = imports.map(function (i) { return ts.factory.createBindingElement(/*dotDotDotToken*/ undefined, /*propertyName*/ undefined, i); }); return bindingElements.length - ? makeVariableStatement(ts.createObjectBindingPattern(bindingElements), /*type*/ undefined, createRequireCall(ts.createLiteral(path))) + ? makeVariableStatement(ts.factory.createObjectBindingPattern(bindingElements), /*type*/ undefined, createRequireCall(ts.factory.createStringLiteral(path))) : undefined; } } function makeVariableStatement(name, type, initializer, flags) { if (flags === void 0) { flags = 2 /* Const */; } - return ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(name, type, initializer)], flags)); + return ts.factory.createVariableStatement(/*modifiers*/ undefined, ts.factory.createVariableDeclarationList([ts.factory.createVariableDeclaration(name, /*exclamationToken*/ undefined, type, initializer)], flags)); } function createRequireCall(moduleSpecifier) { - return ts.createCall(ts.createIdentifier("require"), /*typeArguments*/ undefined, [moduleSpecifier]); + return ts.factory.createCallExpression(ts.factory.createIdentifier("require"), /*typeArguments*/ undefined, [moduleSpecifier]); } function addExports(sourceFile, toMove, needExport, useEs6Exports) { return ts.flatMap(toMove, function (statement) { @@ -137095,15 +141452,15 @@ var ts; } function deleteUnusedImports(sourceFile, importDecl, changes, isUnused) { switch (importDecl.kind) { - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: deleteUnusedImportsInDeclaration(sourceFile, importDecl, changes, isUnused); break; - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: if (isUnused(importDecl.name)) { changes.delete(sourceFile, importDecl); } break; - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: deleteUnusedImportsInVariableDeclaration(sourceFile, importDecl, changes, isUnused); break; default: @@ -137116,7 +141473,7 @@ var ts; var _a = importDecl.importClause, name = _a.name, namedBindings = _a.namedBindings; var defaultUnused = !name || isUnused(name); var namedBindingsUnused = !namedBindings || - (namedBindings.kind === 256 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); })); + (namedBindings.kind === 260 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); })); if (defaultUnused && namedBindingsUnused) { changes.delete(sourceFile, importDecl); } @@ -137126,9 +141483,9 @@ var ts; } if (namedBindings) { if (namedBindingsUnused) { - changes.replaceNode(sourceFile, importDecl.importClause, ts.updateImportClause(importDecl.importClause, name, /*namedBindings*/ undefined, importDecl.importClause.isTypeOnly)); + changes.replaceNode(sourceFile, importDecl.importClause, ts.factory.updateImportClause(importDecl.importClause, importDecl.importClause.isTypeOnly, name, /*namedBindings*/ undefined)); } - else if (namedBindings.kind === 257 /* NamedImports */) { + else if (namedBindings.kind === 261 /* NamedImports */) { for (var _i = 0, _b = namedBindings.elements; _i < _b.length; _i++) { var element = _b[_i]; if (isUnused(element.name)) @@ -137141,14 +141498,14 @@ var ts; function deleteUnusedImportsInVariableDeclaration(sourceFile, varDecl, changes, isUnused) { var name = varDecl.name; switch (name.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: if (isUnused(name)) { changes.delete(sourceFile, name); } break; - case 190 /* ArrayBindingPattern */: + case 194 /* ArrayBindingPattern */: break; - case 189 /* ObjectBindingPattern */: + case 193 /* ObjectBindingPattern */: if (name.elements.every(function (e) { return ts.isIdentifier(e.name) && isUnused(e.name); })) { changes.delete(sourceFile, ts.isVariableDeclarationList(varDecl.parent) && varDecl.parent.declarations.length === 1 ? varDecl.parent.parent : varDecl); } @@ -137187,7 +141544,7 @@ var ts; if (markSeenTop(top)) { addExportToChanges(oldFile, top, changes, useEs6ModuleSyntax); } - if (ts.hasModifier(decl, 512 /* Default */)) { + if (ts.hasSyntacticModifier(decl, 512 /* Default */)) { oldFileDefault = name; } else { @@ -137275,14 +141632,14 @@ var ts; // Below should all be utilities function isInImport(decl) { switch (decl.kind) { - case 253 /* ImportEqualsDeclaration */: - case 258 /* ImportSpecifier */: - case 255 /* ImportClause */: - case 256 /* NamespaceImport */: + case 257 /* ImportEqualsDeclaration */: + case 262 /* ImportSpecifier */: + case 259 /* ImportClause */: + case 260 /* NamespaceImport */: return true; - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return isVariableDeclarationInImport(decl); - case 191 /* BindingElement */: + case 195 /* BindingElement */: return ts.isVariableDeclaration(decl.parent.parent) && isVariableDeclarationInImport(decl.parent.parent); default: return false; @@ -137294,19 +141651,19 @@ var ts; } function filterImport(i, moduleSpecifier, keep) { switch (i.kind) { - case 254 /* ImportDeclaration */: { + case 258 /* ImportDeclaration */: { var clause = i.importClause; if (!clause) return undefined; var defaultImport = clause.name && keep(clause.name) ? clause.name : undefined; var namedBindings = clause.namedBindings && filterNamedBindings(clause.namedBindings, keep); return defaultImport || namedBindings - ? ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(defaultImport, namedBindings), moduleSpecifier) + ? ts.factory.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, defaultImport, namedBindings), moduleSpecifier) : undefined; } - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: return keep(i.name) ? i : undefined; - case 242 /* VariableDeclaration */: { + case 246 /* VariableDeclaration */: { var name = filterBindingName(i.name, keep); return name ? makeVariableStatement(name, i.type, createRequireCall(moduleSpecifier), i.parent.flags) : undefined; } @@ -137315,24 +141672,24 @@ var ts; } } function filterNamedBindings(namedBindings, keep) { - if (namedBindings.kind === 256 /* NamespaceImport */) { + if (namedBindings.kind === 260 /* NamespaceImport */) { return keep(namedBindings.name) ? namedBindings : undefined; } else { var newElements = namedBindings.elements.filter(function (e) { return keep(e.name); }); - return newElements.length ? ts.createNamedImports(newElements) : undefined; + return newElements.length ? ts.factory.createNamedImports(newElements) : undefined; } } function filterBindingName(name, keep) { switch (name.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return keep(name) ? name : undefined; - case 190 /* ArrayBindingPattern */: + case 194 /* ArrayBindingPattern */: return name; - case 189 /* ObjectBindingPattern */: { + case 193 /* ObjectBindingPattern */: { // We can't handle nested destructurings or property names well here, so just copy them all. var newElements = name.elements.filter(function (prop) { return prop.propertyName || !ts.isIdentifier(prop.name) || keep(prop.name); }); - return newElements.length ? ts.createObjectBindingPattern(newElements) : undefined; + return newElements.length ? ts.factory.createObjectBindingPattern(newElements) : undefined; } } } @@ -137350,7 +141707,7 @@ var ts; } var SymbolSet = /** @class */ (function () { function SymbolSet() { - this.map = ts.createMap(); + this.map = new ts.Map(); } SymbolSet.prototype.add = function (symbol) { this.map.set(String(ts.getSymbolId(symbol)), symbol); @@ -137386,13 +141743,13 @@ var ts; } function isNonVariableTopLevelDeclaration(node) { switch (node.kind) { - case 244 /* FunctionDeclaration */: - case 245 /* ClassDeclaration */: - case 249 /* ModuleDeclaration */: - case 248 /* EnumDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 246 /* InterfaceDeclaration */: - case 253 /* ImportEqualsDeclaration */: + case 248 /* FunctionDeclaration */: + case 249 /* ClassDeclaration */: + case 253 /* ModuleDeclaration */: + case 252 /* EnumDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 250 /* InterfaceDeclaration */: + case 257 /* ImportEqualsDeclaration */: return true; default: return false; @@ -137400,17 +141757,17 @@ var ts; } function forEachTopLevelDeclaration(statement, cb) { switch (statement.kind) { - case 244 /* FunctionDeclaration */: - case 245 /* ClassDeclaration */: - case 249 /* ModuleDeclaration */: - case 248 /* EnumDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 246 /* InterfaceDeclaration */: - case 253 /* ImportEqualsDeclaration */: + case 248 /* FunctionDeclaration */: + case 249 /* ClassDeclaration */: + case 253 /* ModuleDeclaration */: + case 252 /* EnumDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 250 /* InterfaceDeclaration */: + case 257 /* ImportEqualsDeclaration */: return cb(statement); - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: return ts.firstDefined(statement.declarationList.declarations, function (decl) { return forEachTopLevelDeclarationInBindingName(decl.name, cb); }); - case 226 /* ExpressionStatement */: { + case 230 /* ExpressionStatement */: { var expression = statement.expression; return ts.isBinaryExpression(expression) && ts.getAssignmentDeclarationKind(expression) === 1 /* ExportsProperty */ ? cb(statement) @@ -137420,10 +141777,10 @@ var ts; } function forEachTopLevelDeclarationInBindingName(name, cb) { switch (name.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return cb(ts.cast(name.parent, function (x) { return ts.isVariableDeclaration(x) || ts.isBindingElement(x); })); - case 190 /* ArrayBindingPattern */: - case 189 /* ObjectBindingPattern */: + case 194 /* ArrayBindingPattern */: + case 193 /* ObjectBindingPattern */: return ts.firstDefined(name.elements, function (em) { return ts.isOmittedExpression(em) ? undefined : forEachTopLevelDeclarationInBindingName(em.name, cb); }); default: return ts.Debug.assertNever(name, "Unexpected name kind " + name.kind); @@ -137434,9 +141791,9 @@ var ts; } function getTopLevelDeclarationStatement(d) { switch (d.kind) { - case 242 /* VariableDeclaration */: + case 246 /* VariableDeclaration */: return d.parent.parent; - case 191 /* BindingElement */: + case 195 /* BindingElement */: return getTopLevelDeclarationStatement(ts.cast(d.parent.parent, function (p) { return ts.isVariableDeclaration(p) || ts.isBindingElement(p); })); default: return d; @@ -137457,7 +141814,7 @@ var ts; } function isExported(sourceFile, decl, useEs6Exports) { if (useEs6Exports) { - return !ts.isExpressionStatement(decl) && ts.hasModifier(decl, 1 /* Export */); + return !ts.isExpressionStatement(decl) && ts.hasSyntacticModifier(decl, 1 /* Export */); } else { return getNamesToExportInCommonJS(decl).some(function (name) { return sourceFile.symbol.exports.has(ts.escapeLeadingUnderscores(name)); }); @@ -137467,25 +141824,25 @@ var ts; return useEs6Exports ? [addEs6Export(decl)] : addCommonjsExport(decl); } function addEs6Export(d) { - var modifiers = ts.concatenate([ts.createModifier(89 /* ExportKeyword */)], d.modifiers); + var modifiers = ts.concatenate([ts.factory.createModifier(92 /* ExportKeyword */)], d.modifiers); switch (d.kind) { - case 244 /* FunctionDeclaration */: - return ts.updateFunctionDeclaration(d, d.decorators, modifiers, d.asteriskToken, d.name, d.typeParameters, d.parameters, d.type, d.body); - case 245 /* ClassDeclaration */: - return ts.updateClassDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members); - case 225 /* VariableStatement */: - return ts.updateVariableStatement(d, modifiers, d.declarationList); - case 249 /* ModuleDeclaration */: - return ts.updateModuleDeclaration(d, d.decorators, modifiers, d.name, d.body); - case 248 /* EnumDeclaration */: - return ts.updateEnumDeclaration(d, d.decorators, modifiers, d.name, d.members); - case 247 /* TypeAliasDeclaration */: - return ts.updateTypeAliasDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.type); - case 246 /* InterfaceDeclaration */: - return ts.updateInterfaceDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members); - case 253 /* ImportEqualsDeclaration */: - return ts.updateImportEqualsDeclaration(d, d.decorators, modifiers, d.name, d.moduleReference); - case 226 /* ExpressionStatement */: + case 248 /* FunctionDeclaration */: + return ts.factory.updateFunctionDeclaration(d, d.decorators, modifiers, d.asteriskToken, d.name, d.typeParameters, d.parameters, d.type, d.body); + case 249 /* ClassDeclaration */: + return ts.factory.updateClassDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members); + case 229 /* VariableStatement */: + return ts.factory.updateVariableStatement(d, modifiers, d.declarationList); + case 253 /* ModuleDeclaration */: + return ts.factory.updateModuleDeclaration(d, d.decorators, modifiers, d.name, d.body); + case 252 /* EnumDeclaration */: + return ts.factory.updateEnumDeclaration(d, d.decorators, modifiers, d.name, d.members); + case 251 /* TypeAliasDeclaration */: + return ts.factory.updateTypeAliasDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.type); + case 250 /* InterfaceDeclaration */: + return ts.factory.updateInterfaceDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members); + case 257 /* ImportEqualsDeclaration */: + return ts.factory.updateImportEqualsDeclaration(d, d.decorators, modifiers, d.name, d.moduleReference); + case 230 /* ExpressionStatement */: return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...` default: return ts.Debug.assertNever(d, "Unexpected declaration kind " + d.kind); @@ -137496,18 +141853,18 @@ var ts; } function getNamesToExportInCommonJS(decl) { switch (decl.kind) { - case 244 /* FunctionDeclaration */: - case 245 /* ClassDeclaration */: + case 248 /* FunctionDeclaration */: + case 249 /* ClassDeclaration */: return [decl.name.text]; // TODO: GH#18217 - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: return ts.mapDefined(decl.declarationList.declarations, function (d) { return ts.isIdentifier(d.name) ? d.name.text : undefined; }); - case 249 /* ModuleDeclaration */: - case 248 /* EnumDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 246 /* InterfaceDeclaration */: - case 253 /* ImportEqualsDeclaration */: + case 253 /* ModuleDeclaration */: + case 252 /* EnumDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 250 /* InterfaceDeclaration */: + case 257 /* ImportEqualsDeclaration */: return ts.emptyArray; - case 226 /* ExpressionStatement */: + case 230 /* ExpressionStatement */: return ts.Debug.fail("Can't export an ExpressionStatement"); // Shouldn't try to add 'export' keyword to `exports.x = ...` default: return ts.Debug.assertNever(decl, "Unexpected decl kind " + decl.kind); @@ -137515,7 +141872,7 @@ var ts; } /** Creates `exports.x = x;` */ function createExportAssignment(name) { - return ts.createExpressionStatement(ts.createBinary(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(name)), 62 /* EqualsToken */, ts.createIdentifier(name))); + return ts.factory.createExpressionStatement(ts.factory.createBinaryExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("exports"), ts.factory.createIdentifier(name)), 62 /* EqualsToken */, ts.factory.createIdentifier(name))); } })(refactor = ts.refactor || (ts.refactor = {})); })(ts || (ts = {})); @@ -137534,41 +141891,59 @@ var ts; var removeBracesActionDescription = ts.Diagnostics.Remove_braces_from_arrow_function.message; refactor.registerRefactor(refactorName, { getEditsForAction: getEditsForAction, getAvailableActions: getAvailableActions }); function getAvailableActions(context) { - var file = context.file, startPosition = context.startPosition; - var info = getConvertibleArrowFunctionAtPosition(file, startPosition); + var file = context.file, startPosition = context.startPosition, triggerReason = context.triggerReason; + var info = getConvertibleArrowFunctionAtPosition(file, startPosition, triggerReason === "invoked"); if (!info) return ts.emptyArray; - return [{ - name: refactorName, - description: refactorDescription, - actions: [ - info.addBraces ? - { + if (info.error === undefined) { + return [{ + name: refactorName, + description: refactorDescription, + actions: [ + info.info.addBraces ? + { + name: addBracesActionName, + description: addBracesActionDescription + } : { + name: removeBracesActionName, + description: removeBracesActionDescription + } + ] + }]; + } + if (context.preferences.provideRefactorNotApplicableReason) { + return [{ + name: refactorName, + description: refactorDescription, + actions: [{ name: addBracesActionName, - description: addBracesActionDescription - } : { - name: removeBracesActionName, - description: removeBracesActionDescription - } - ] - }]; + description: addBracesActionDescription, + notApplicableReason: info.error + }, { + name: removeBracesActionName, + description: removeBracesActionDescription, + notApplicableReason: info.error + }] + }]; + } + return ts.emptyArray; } function getEditsForAction(context, actionName) { var file = context.file, startPosition = context.startPosition; var info = getConvertibleArrowFunctionAtPosition(file, startPosition); - if (!info) + if (!info || !info.info) return undefined; - var expression = info.expression, returnStatement = info.returnStatement, func = info.func; + var _a = info.info, expression = _a.expression, returnStatement = _a.returnStatement, func = _a.func; var body; if (actionName === addBracesActionName) { - var returnStatement_1 = ts.createReturn(expression); - body = ts.createBlock([returnStatement_1], /* multiLine */ true); + var returnStatement_1 = ts.factory.createReturnStatement(expression); + body = ts.factory.createBlock([returnStatement_1], /* multiLine */ true); ts.suppressLeadingAndTrailingTrivia(body); ts.copyLeadingComments(expression, returnStatement_1, file, 3 /* MultiLineCommentTrivia */, /* hasTrailingNewLine */ true); } else if (actionName === removeBracesActionName && returnStatement) { - var actualExpression = expression || ts.createVoidZero(); - body = ts.needsParentheses(actualExpression) ? ts.createParen(actualExpression) : actualExpression; + var actualExpression = expression || ts.factory.createVoidZero(); + body = ts.needsParentheses(actualExpression) ? ts.factory.createParenthesizedExpression(actualExpression) : actualExpression; ts.suppressLeadingAndTrailingTrivia(body); ts.copyTrailingAsLeadingComments(returnStatement, body, file, 3 /* MultiLineCommentTrivia */, /* hasTrailingNewLine */ false); ts.copyLeadingComments(returnStatement, body, file, 3 /* MultiLineCommentTrivia */, /* hasTrailingNewLine */ false); @@ -137582,26 +141957,42 @@ var ts; }); return { renameFilename: undefined, renameLocation: undefined, edits: edits }; } - function getConvertibleArrowFunctionAtPosition(file, startPosition) { + function getConvertibleArrowFunctionAtPosition(file, startPosition, considerFunctionBodies) { + if (considerFunctionBodies === void 0) { considerFunctionBodies = true; } var node = ts.getTokenAtPosition(file, startPosition); var func = ts.getContainingFunction(node); - if (!func || !ts.isArrowFunction(func) || (!ts.rangeContainsRange(func, node) || ts.rangeContainsRange(func.body, node))) + if (!func) { + return { + error: ts.getLocaleSpecificMessage(ts.Diagnostics.Could_not_find_a_containing_arrow_function) + }; + } + if (!ts.isArrowFunction(func)) { + return { + error: ts.getLocaleSpecificMessage(ts.Diagnostics.Containing_function_is_not_an_arrow_function) + }; + } + if ((!ts.rangeContainsRange(func, node) || ts.rangeContainsRange(func.body, node) && !considerFunctionBodies)) { return undefined; + } if (ts.isExpression(func.body)) { return { - func: func, - addBraces: true, - expression: func.body + info: { + func: func, + addBraces: true, + expression: func.body + } }; } else if (func.body.statements.length === 1) { var firstStatement = ts.first(func.body.statements); if (ts.isReturnStatement(firstStatement)) { return { - func: func, - addBraces: false, - expression: firstStatement.expression, - returnStatement: firstStatement + info: { + func: func, + addBraces: false, + expression: firstStatement.expression, + returnStatement: firstStatement + } }; } } @@ -137778,15 +142169,15 @@ var ts; var parent = functionReference.parent; switch (parent.kind) { // foo(...) or super(...) or new Foo(...) - case 196 /* CallExpression */: - case 197 /* NewExpression */: + case 200 /* CallExpression */: + case 201 /* NewExpression */: var callOrNewExpression = ts.tryCast(parent, ts.isCallOrNewExpression); if (callOrNewExpression && callOrNewExpression.expression === functionReference) { return callOrNewExpression; } break; // x.foo(...) - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression); if (propertyAccessExpression && propertyAccessExpression.parent && propertyAccessExpression.name === functionReference) { var callOrNewExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallOrNewExpression); @@ -137796,7 +142187,7 @@ var ts; } break; // x["foo"](...) - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression); if (elementAccessExpression && elementAccessExpression.parent && elementAccessExpression.argumentExpression === functionReference) { var callOrNewExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallOrNewExpression); @@ -137815,14 +142206,14 @@ var ts; var parent = reference.parent; switch (parent.kind) { // `C.foo` - case 194 /* PropertyAccessExpression */: + case 198 /* PropertyAccessExpression */: var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression); if (propertyAccessExpression && propertyAccessExpression.expression === reference) { return propertyAccessExpression; } break; // `C["foo"]` - case 195 /* ElementAccessExpression */: + case 199 /* ElementAccessExpression */: var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression); if (elementAccessExpression && elementAccessExpression.expression === reference) { return elementAccessExpression; @@ -137864,11 +142255,11 @@ var ts; if (!isValidParameterNodeArray(functionDeclaration.parameters, checker)) return false; switch (functionDeclaration.kind) { - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: return hasNameOrDefault(functionDeclaration) && isSingleImplementation(functionDeclaration, checker); - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: return isSingleImplementation(functionDeclaration, checker); - case 162 /* Constructor */: + case 165 /* Constructor */: if (ts.isClassDeclaration(functionDeclaration.parent)) { return hasNameOrDefault(functionDeclaration.parent) && isSingleImplementation(functionDeclaration, checker); } @@ -137876,8 +142267,8 @@ var ts; return isValidVariableDeclaration(functionDeclaration.parent.parent) && isSingleImplementation(functionDeclaration, checker); } - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: return isValidVariableDeclaration(functionDeclaration.parent); } return false; @@ -137887,7 +142278,7 @@ var ts; } function hasNameOrDefault(functionOrClassDeclaration) { if (!functionOrClassDeclaration.name) { - var defaultKeyword = ts.findModifier(functionOrClassDeclaration, 84 /* DefaultKeyword */); + var defaultKeyword = ts.findModifier(functionOrClassDeclaration, 87 /* DefaultKeyword */); return !!defaultKeyword; } return true; @@ -137918,15 +142309,15 @@ var ts; } function getRefactorableParameters(parameters) { if (hasThisParameter(parameters)) { - parameters = ts.createNodeArray(parameters.slice(1), parameters.hasTrailingComma); + parameters = ts.factory.createNodeArray(parameters.slice(1), parameters.hasTrailingComma); } return parameters; } function createPropertyOrShorthandAssignment(name, initializer) { if (ts.isIdentifier(initializer) && ts.getTextOfIdentifierOrLiteral(initializer) === name) { - return ts.createShorthandPropertyAssignment(name); + return ts.factory.createShorthandPropertyAssignment(name); } - return ts.createPropertyAssignment(name, initializer); + return ts.factory.createPropertyAssignment(name, initializer); } function createNewArgument(functionDeclaration, functionArguments) { var parameters = getRefactorableParameters(functionDeclaration.parameters); @@ -137943,31 +142334,31 @@ var ts; }); if (hasRestParameter && functionArguments.length >= parameters.length) { var restArguments = functionArguments.slice(parameters.length - 1); - var restProperty = ts.createPropertyAssignment(getParameterName(ts.last(parameters)), ts.createArrayLiteral(restArguments)); + var restProperty = ts.factory.createPropertyAssignment(getParameterName(ts.last(parameters)), ts.factory.createArrayLiteralExpression(restArguments)); properties.push(restProperty); } - var objectLiteral = ts.createObjectLiteral(properties, /*multiLine*/ false); + var objectLiteral = ts.factory.createObjectLiteralExpression(properties, /*multiLine*/ false); return objectLiteral; } function createNewParameters(functionDeclaration, program, host) { var checker = program.getTypeChecker(); var refactorableParameters = getRefactorableParameters(functionDeclaration.parameters); var bindingElements = ts.map(refactorableParameters, createBindingElementFromParameterDeclaration); - var objectParameterName = ts.createObjectBindingPattern(bindingElements); + var objectParameterName = ts.factory.createObjectBindingPattern(bindingElements); var objectParameterType = createParameterTypeNode(refactorableParameters); var objectInitializer; // If every parameter in the original function was optional, add an empty object initializer to the new object parameter if (ts.every(refactorableParameters, isOptionalParameter)) { - objectInitializer = ts.createObjectLiteral(); + objectInitializer = ts.factory.createObjectLiteralExpression(); } - var objectParameter = ts.createParameter( + var objectParameter = ts.factory.createParameterDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, objectParameterName, /*questionToken*/ undefined, objectParameterType, objectInitializer); if (hasThisParameter(functionDeclaration.parameters)) { var thisParameter = functionDeclaration.parameters[0]; - var newThisParameter = ts.createParameter( + var newThisParameter = ts.factory.createParameterDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, thisParameter.name, @@ -137978,13 +142369,13 @@ var ts; ts.suppressLeadingAndTrailingTrivia(newThisParameter.type); ts.copyComments(thisParameter.type, newThisParameter.type); } - return ts.createNodeArray([newThisParameter, objectParameter]); + return ts.factory.createNodeArray([newThisParameter, objectParameter]); } - return ts.createNodeArray([objectParameter]); + return ts.factory.createNodeArray([objectParameter]); function createBindingElementFromParameterDeclaration(parameterDeclaration) { - var element = ts.createBindingElement( + var element = ts.factory.createBindingElement( /*dotDotDotToken*/ undefined, - /*propertyName*/ undefined, getParameterName(parameterDeclaration), ts.isRestParameter(parameterDeclaration) && isOptionalParameter(parameterDeclaration) ? ts.createArrayLiteral() : parameterDeclaration.initializer); + /*propertyName*/ undefined, getParameterName(parameterDeclaration), ts.isRestParameter(parameterDeclaration) && isOptionalParameter(parameterDeclaration) ? ts.factory.createArrayLiteralExpression() : parameterDeclaration.initializer); ts.suppressLeadingAndTrailingTrivia(element); if (parameterDeclaration.initializer && element.initializer) { ts.copyComments(parameterDeclaration.initializer, element.initializer); @@ -137993,7 +142384,7 @@ var ts; } function createParameterTypeNode(parameters) { var members = ts.map(parameters, createPropertySignatureFromParameterDeclaration); - var typeNode = ts.addEmitFlags(ts.createTypeLiteralNode(members), 1 /* SingleLine */); + var typeNode = ts.addEmitFlags(ts.factory.createTypeLiteralNode(members), 1 /* SingleLine */); return typeNode; } function createPropertySignatureFromParameterDeclaration(parameterDeclaration) { @@ -138001,9 +142392,8 @@ var ts; if (!parameterType && (parameterDeclaration.initializer || ts.isRestParameter(parameterDeclaration))) { parameterType = getTypeNode(parameterDeclaration); } - var propertySignature = ts.createPropertySignature( - /*modifiers*/ undefined, getParameterName(parameterDeclaration), isOptionalParameter(parameterDeclaration) ? ts.createToken(57 /* QuestionToken */) : parameterDeclaration.questionToken, parameterType, - /*initializer*/ undefined); + var propertySignature = ts.factory.createPropertySignature( + /*modifiers*/ undefined, getParameterName(parameterDeclaration), isOptionalParameter(parameterDeclaration) ? ts.factory.createToken(57 /* QuestionToken */) : parameterDeclaration.questionToken, parameterType); ts.suppressLeadingAndTrailingTrivia(propertySignature); ts.copyComments(parameterDeclaration.name, propertySignature.name); if (parameterDeclaration.type && propertySignature.type) { @@ -138028,15 +142418,15 @@ var ts; } function getClassNames(constructorDeclaration) { switch (constructorDeclaration.parent.kind) { - case 245 /* ClassDeclaration */: + case 249 /* ClassDeclaration */: var classDeclaration = constructorDeclaration.parent; if (classDeclaration.name) return [classDeclaration.name]; // If the class declaration doesn't have a name, it should have a default modifier. // We validated this in `isValidFunctionDeclaration` through `hasNameOrDefault` - var defaultModifier = ts.Debug.checkDefined(ts.findModifier(classDeclaration, 84 /* DefaultKeyword */), "Nameless class declaration should be a default export"); + var defaultModifier = ts.Debug.checkDefined(ts.findModifier(classDeclaration, 87 /* DefaultKeyword */), "Nameless class declaration should be a default export"); return [defaultModifier]; - case 214 /* ClassExpression */: + case 218 /* ClassExpression */: var classExpression = constructorDeclaration.parent; var variableDeclaration = constructorDeclaration.parent.parent; var className = classExpression.name; @@ -138047,25 +142437,25 @@ var ts; } function getFunctionNames(functionDeclaration) { switch (functionDeclaration.kind) { - case 244 /* FunctionDeclaration */: + case 248 /* FunctionDeclaration */: if (functionDeclaration.name) return [functionDeclaration.name]; // If the function declaration doesn't have a name, it should have a default modifier. // We validated this in `isValidFunctionDeclaration` through `hasNameOrDefault` - var defaultModifier = ts.Debug.checkDefined(ts.findModifier(functionDeclaration, 84 /* DefaultKeyword */), "Nameless function declaration should be a default export"); + var defaultModifier = ts.Debug.checkDefined(ts.findModifier(functionDeclaration, 87 /* DefaultKeyword */), "Nameless function declaration should be a default export"); return [defaultModifier]; - case 161 /* MethodDeclaration */: + case 164 /* MethodDeclaration */: return [functionDeclaration.name]; - case 162 /* Constructor */: - var ctrKeyword = ts.Debug.checkDefined(ts.findChildOfKind(functionDeclaration, 129 /* ConstructorKeyword */, functionDeclaration.getSourceFile()), "Constructor declaration should have constructor keyword"); - if (functionDeclaration.parent.kind === 214 /* ClassExpression */) { + case 165 /* Constructor */: + var ctrKeyword = ts.Debug.checkDefined(ts.findChildOfKind(functionDeclaration, 132 /* ConstructorKeyword */, functionDeclaration.getSourceFile()), "Constructor declaration should have constructor keyword"); + if (functionDeclaration.parent.kind === 218 /* ClassExpression */) { var variableDeclaration = functionDeclaration.parent.parent; return [variableDeclaration.name, ctrKeyword]; } return [ctrKeyword]; - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: return [functionDeclaration.parent.name]; - case 201 /* FunctionExpression */: + case 205 /* FunctionExpression */: if (functionDeclaration.name) return [functionDeclaration.name, functionDeclaration.parent.name]; return [functionDeclaration.parent.name]; @@ -138199,23 +142589,23 @@ var ts; var copyCommentFromStringLiterals = copyCommentFromMultiNode(nodes, file, copyOperatorComments); var _b = concatConsecutiveString(0, nodes), begin = _b[0], headText = _b[1], headIndexes = _b[2]; if (begin === nodes.length) { - var noSubstitutionTemplateLiteral = ts.createNoSubstitutionTemplateLiteral(headText); + var noSubstitutionTemplateLiteral = ts.factory.createNoSubstitutionTemplateLiteral(headText); copyCommentFromStringLiterals(headIndexes, noSubstitutionTemplateLiteral); return noSubstitutionTemplateLiteral; } var templateSpans = []; - var templateHead = ts.createTemplateHead(headText); + var templateHead = ts.factory.createTemplateHead(headText); copyCommentFromStringLiterals(headIndexes, templateHead); for (var i = begin; i < nodes.length; i++) { var currentNode = getExpressionFromParenthesesOrExpression(nodes[i]); copyOperatorComments(i, currentNode); var _c = concatConsecutiveString(i + 1, nodes), newIndex = _c[0], subsequentText = _c[1], stringIndexes = _c[2]; i = newIndex - 1; - var templatePart = i === nodes.length - 1 ? ts.createTemplateTail(subsequentText) : ts.createTemplateMiddle(subsequentText); + var templatePart = i === nodes.length - 1 ? ts.factory.createTemplateTail(subsequentText) : ts.factory.createTemplateMiddle(subsequentText); copyCommentFromStringLiterals(stringIndexes, templatePart); - templateSpans.push(ts.createTemplateSpan(currentNode, templatePart)); + templateSpans.push(ts.factory.createTemplateSpan(currentNode, templatePart)); } - return ts.createTemplateExpression(templateHead, templateSpans); + return ts.factory.createTemplateExpression(templateHead, templateSpans); } // to copy comments following the opening & closing parentheses // "foo" + ( /* comment */ 5 + 5 ) /* comment */ + "bar" @@ -138234,14 +142624,192 @@ var ts; })(convertStringOrTemplateLiteral = refactor.convertStringOrTemplateLiteral || (refactor.convertStringOrTemplateLiteral = {})); })(refactor = ts.refactor || (ts.refactor = {})); })(ts || (ts = {})); +/* @internal */ +var ts; +(function (ts) { + var refactor; + (function (refactor) { + var convertArrowFunctionOrFunctionExpression; + (function (convertArrowFunctionOrFunctionExpression) { + var refactorName = "Convert arrow function or function expression"; + var refactorDescription = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_arrow_function_or_function_expression); + var toAnonymousFunctionActionName = "Convert to anonymous function"; + var toNamedFunctionActionName = "Convert to named function"; + var toArrowFunctionActionName = "Convert to arrow function"; + var toAnonymousFunctionActionDescription = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_to_anonymous_function); + var toNamedFunctionActionDescription = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_to_named_function); + var toArrowFunctionActionDescription = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_to_arrow_function); + refactor.registerRefactor(refactorName, { getEditsForAction: getEditsForAction, getAvailableActions: getAvailableActions }); + function getAvailableActions(context) { + var file = context.file, startPosition = context.startPosition, program = context.program; + var info = getFunctionInfo(file, startPosition, program); + if (!info) + return ts.emptyArray; + var selectedVariableDeclaration = info.selectedVariableDeclaration, func = info.func; + var possibleActions = []; + if (selectedVariableDeclaration || (ts.isArrowFunction(func) && ts.isVariableDeclaration(func.parent))) { + possibleActions.push({ + name: toNamedFunctionActionName, + description: toNamedFunctionActionDescription + }); + } + if (!selectedVariableDeclaration && ts.isArrowFunction(func)) { + possibleActions.push({ + name: toAnonymousFunctionActionName, + description: toAnonymousFunctionActionDescription + }); + } + if (ts.isFunctionExpression(func)) { + possibleActions.push({ + name: toArrowFunctionActionName, + description: toArrowFunctionActionDescription + }); + } + return [{ + name: refactorName, + description: refactorDescription, + actions: possibleActions + }]; + } + function getEditsForAction(context, actionName) { + var file = context.file, startPosition = context.startPosition, program = context.program; + var info = getFunctionInfo(file, startPosition, program); + if (!info) + return undefined; + var func = info.func; + var edits = []; + switch (actionName) { + case toAnonymousFunctionActionName: + edits.push.apply(edits, getEditInfoForConvertToAnonymousFunction(context, func)); + break; + case toNamedFunctionActionName: + var variableInfo = getVariableInfo(func); + if (!variableInfo) + return undefined; + edits.push.apply(edits, getEditInfoForConvertToNamedFunction(context, func, variableInfo)); + break; + case toArrowFunctionActionName: + if (!ts.isFunctionExpression(func)) + return undefined; + edits.push.apply(edits, getEditInfoForConvertToArrowFunction(context, func)); + break; + default: + return ts.Debug.fail("invalid action"); + } + return { renameFilename: undefined, renameLocation: undefined, edits: edits }; + } + function containingThis(node) { + var containsThis = false; + node.forEachChild(function checkThis(child) { + if (ts.isThis(child)) { + containsThis = true; + return; + } + if (!ts.isClassLike(child) && !ts.isFunctionDeclaration(child) && !ts.isFunctionExpression(child)) { + ts.forEachChild(child, checkThis); + } + }); + return containsThis; + } + function getFunctionInfo(file, startPosition, program) { + var token = ts.getTokenAtPosition(file, startPosition); + var arrowFunc = getArrowFunctionFromVariableDeclaration(token.parent); + if (arrowFunc && !containingThis(arrowFunc.body)) + return { selectedVariableDeclaration: true, func: arrowFunc }; + var maybeFunc = ts.getContainingFunction(token); + var typeChecker = program.getTypeChecker(); + if (maybeFunc && + (ts.isFunctionExpression(maybeFunc) || ts.isArrowFunction(maybeFunc)) && + !ts.rangeContainsRange(maybeFunc.body, token) && + !containingThis(maybeFunc.body)) { + if ((ts.isFunctionExpression(maybeFunc) && maybeFunc.name && ts.FindAllReferences.Core.isSymbolReferencedInFile(maybeFunc.name, typeChecker, file))) + return undefined; + return { selectedVariableDeclaration: false, func: maybeFunc }; + } + return undefined; + } + function isSingleVariableDeclaration(parent) { + return ts.isVariableDeclaration(parent) || (ts.isVariableDeclarationList(parent) && parent.declarations.length === 1); + } + function getArrowFunctionFromVariableDeclaration(parent) { + if (!isSingleVariableDeclaration(parent)) + return undefined; + var variableDeclaration = ts.isVariableDeclaration(parent) ? parent : parent.declarations[0]; + var initializer = variableDeclaration.initializer; + if (!initializer || !ts.isArrowFunction(initializer)) + return undefined; + return initializer; + } + function convertToBlock(body) { + if (ts.isExpression(body)) { + return ts.factory.createBlock([ts.factory.createReturnStatement(body)], /* multiLine */ true); + } + else { + return body; + } + } + function getVariableInfo(func) { + var variableDeclaration = func.parent; + if (!ts.isVariableDeclaration(variableDeclaration) || !ts.isVariableDeclarationInVariableStatement(variableDeclaration)) + return undefined; + var variableDeclarationList = variableDeclaration.parent; + var statement = variableDeclarationList.parent; + if (!ts.isVariableDeclarationList(variableDeclarationList) || !ts.isVariableStatement(statement) || !ts.isIdentifier(variableDeclaration.name)) + return undefined; + return { variableDeclaration: variableDeclaration, variableDeclarationList: variableDeclarationList, statement: statement, name: variableDeclaration.name }; + } + function getEditInfoForConvertToAnonymousFunction(context, func) { + var file = context.file; + var body = convertToBlock(func.body); + var newNode = ts.factory.createFunctionExpression(func.modifiers, func.asteriskToken, /* name */ undefined, func.typeParameters, func.parameters, func.type, body); + return ts.textChanges.ChangeTracker.with(context, function (t) { return t.replaceNode(file, func, newNode); }); + } + function getEditInfoForConvertToNamedFunction(context, func, variableInfo) { + var file = context.file; + var body = convertToBlock(func.body); + var variableDeclaration = variableInfo.variableDeclaration, variableDeclarationList = variableInfo.variableDeclarationList, statement = variableInfo.statement, name = variableInfo.name; + ts.suppressLeadingTrivia(statement); + var newNode = ts.factory.createFunctionDeclaration(func.decorators, statement.modifiers, func.asteriskToken, name, func.typeParameters, func.parameters, func.type, body); + if (variableDeclarationList.declarations.length === 1) { + return ts.textChanges.ChangeTracker.with(context, function (t) { return t.replaceNode(file, statement, newNode); }); + } + else { + return ts.textChanges.ChangeTracker.with(context, function (t) { + t.delete(file, variableDeclaration); + t.insertNodeAfter(file, statement, newNode); + }); + } + } + function getEditInfoForConvertToArrowFunction(context, func) { + var file = context.file; + var statements = func.body.statements; + var head = statements[0]; + var body; + if (canBeConvertedToExpression(func.body, head)) { + body = head.expression; + ts.suppressLeadingAndTrailingTrivia(body); + ts.copyComments(head, body); + } + else { + body = func.body; + } + var newNode = ts.factory.createArrowFunction(func.modifiers, func.typeParameters, func.parameters, func.type, ts.factory.createToken(38 /* EqualsGreaterThanToken */), body); + return ts.textChanges.ChangeTracker.with(context, function (t) { return t.replaceNode(file, func, newNode); }); + } + function canBeConvertedToExpression(body, head) { + return body.statements.length === 1 && ((ts.isReturnStatement(head) && !!head.expression)); + } + })(convertArrowFunctionOrFunctionExpression = refactor.convertArrowFunctionOrFunctionExpression || (refactor.convertArrowFunctionOrFunctionExpression = {})); + })(refactor = ts.refactor || (ts.refactor = {})); +})(ts || (ts = {})); var ts; (function (ts) { /** The version of the language service API */ ts.servicesVersion = "0.8"; function createNode(kind, pos, end, parent) { var node = ts.isNodeKind(kind) ? new NodeObject(kind, pos, end) : - kind === 75 /* Identifier */ ? new IdentifierObject(75 /* Identifier */, pos, end) : - kind === 76 /* PrivateIdentifier */ ? new PrivateIdentifierObject(76 /* PrivateIdentifier */, pos, end) : + kind === 78 /* Identifier */ ? new IdentifierObject(78 /* Identifier */, pos, end) : + kind === 79 /* PrivateIdentifier */ ? new PrivateIdentifierObject(79 /* PrivateIdentifier */, pos, end) : new TokenObject(kind, pos, end); node.parent = parent; node.flags = parent.flags & 25358336 /* ContextFlags */; @@ -138315,8 +142883,8 @@ var ts; if (!children.length) { return undefined; } - var child = ts.find(children, function (kid) { return kid.kind < 294 /* FirstJSDocNode */ || kid.kind > 323 /* LastJSDocNode */; }); - return child.kind < 153 /* FirstNode */ ? + var child = ts.find(children, function (kid) { return kid.kind < 298 /* FirstJSDocNode */ || kid.kind > 328 /* LastJSDocNode */; }); + return child.kind < 156 /* FirstNode */ ? child : child.getFirstToken(sourceFile); }; @@ -138327,7 +142895,7 @@ var ts; if (!child) { return undefined; } - return child.kind < 153 /* FirstNode */ ? child : child.getLastToken(sourceFile); + return child.kind < 156 /* FirstNode */ ? child : child.getLastToken(sourceFile); }; NodeObject.prototype.forEachChild = function (cbNode, cbNodeArray) { return ts.forEachChild(this, cbNode, cbNodeArray); @@ -138373,7 +142941,7 @@ var ts; var token = ts.scanner.scan(); var textPos = ts.scanner.getTextPos(); if (textPos <= end) { - if (token === 75 /* Identifier */) { + if (token === 78 /* Identifier */) { ts.Debug.fail("Did not expect " + ts.Debug.formatSyntaxKind(parent.kind) + " to have an Identifier in its trivia"); } nodes.push(createNode(token, pos, textPos, parent)); @@ -138385,7 +142953,7 @@ var ts; } } function createSyntaxList(nodes, parent) { - var list = createNode(324 /* SyntaxList */, nodes.pos, nodes.end, parent); + var list = createNode(329 /* SyntaxList */, nodes.pos, nodes.end, parent); list._children = []; var pos = nodes.pos; for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) { @@ -138484,10 +143052,34 @@ var ts; SymbolObject.prototype.getDocumentationComment = function (checker) { if (!this.documentationComment) { this.documentationComment = ts.emptyArray; // Set temporarily to avoid an infinite loop finding inherited docs - this.documentationComment = getDocumentationComment(this.declarations, checker); + if (!this.declarations && this.target && this.target.tupleLabelDeclaration) { + var labelDecl = this.target.tupleLabelDeclaration; + this.documentationComment = getDocumentationComment([labelDecl], checker); + } + else { + this.documentationComment = getDocumentationComment(this.declarations, checker); + } } return this.documentationComment; }; + SymbolObject.prototype.getContextualDocumentationComment = function (context, checker) { + switch (context === null || context === void 0 ? void 0 : context.kind) { + case 166 /* GetAccessor */: + if (!this.contextualGetAccessorDocumentationComment) { + this.contextualGetAccessorDocumentationComment = ts.emptyArray; + this.contextualGetAccessorDocumentationComment = getDocumentationComment(ts.filter(this.declarations, ts.isGetAccessor), checker); + } + return this.contextualGetAccessorDocumentationComment; + case 167 /* SetAccessor */: + if (!this.contextualSetAccessorDocumentationComment) { + this.contextualSetAccessorDocumentationComment = ts.emptyArray; + this.contextualSetAccessorDocumentationComment = getDocumentationComment(ts.filter(this.declarations, ts.isSetAccessor), checker); + } + return this.contextualSetAccessorDocumentationComment; + default: + return this.getDocumentationComment(checker); + } + }; SymbolObject.prototype.getJsDocTags = function () { if (this.tags === undefined) { this.tags = ts.JsDoc.getJsDocTagsFromDeclarations(this.declarations); @@ -138509,7 +143101,7 @@ var ts; __extends(IdentifierObject, _super); function IdentifierObject(_kind, pos, end) { var _this = _super.call(this, pos, end) || this; - _this.kind = 75 /* Identifier */; + _this.kind = 78 /* Identifier */; return _this; } Object.defineProperty(IdentifierObject.prototype, "text", { @@ -138521,7 +143113,7 @@ var ts; }); return IdentifierObject; }(TokenOrIdentifierObject)); - IdentifierObject.prototype.kind = 75 /* Identifier */; + IdentifierObject.prototype.kind = 78 /* Identifier */; var PrivateIdentifierObject = /** @class */ (function (_super) { __extends(PrivateIdentifierObject, _super); function PrivateIdentifierObject(_kind, pos, end) { @@ -138536,7 +143128,7 @@ var ts; }); return PrivateIdentifierObject; }(TokenOrIdentifierObject)); - PrivateIdentifierObject.prototype.kind = 76 /* PrivateIdentifier */; + PrivateIdentifierObject.prototype.kind = 79 /* PrivateIdentifier */; var TypeObject = /** @class */ (function () { function TypeObject(checker, flags) { this.checker = checker; @@ -138699,7 +143291,7 @@ var ts; __extends(SourceFileObject, _super); function SourceFileObject(kind, pos, end) { var _this = _super.call(this, kind, pos, end) || this; - _this.kind = 290 /* SourceFile */; + _this.kind = 294 /* SourceFile */; return _this; } SourceFileObject.prototype.update = function (newText, textChangeRange) { @@ -138758,10 +143350,10 @@ var ts; } function visit(node) { switch (node.kind) { - case 244 /* FunctionDeclaration */: - case 201 /* FunctionExpression */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: + case 248 /* FunctionDeclaration */: + case 205 /* FunctionExpression */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: var functionDeclaration = node; var declarationName = getDeclarationName(functionDeclaration); if (declarationName) { @@ -138781,31 +143373,31 @@ var ts; } ts.forEachChild(node, visit); break; - case 245 /* ClassDeclaration */: - case 214 /* ClassExpression */: - case 246 /* InterfaceDeclaration */: - case 247 /* TypeAliasDeclaration */: - case 248 /* EnumDeclaration */: - case 249 /* ModuleDeclaration */: - case 253 /* ImportEqualsDeclaration */: - case 263 /* ExportSpecifier */: - case 258 /* ImportSpecifier */: - case 255 /* ImportClause */: - case 256 /* NamespaceImport */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 173 /* TypeLiteral */: + case 249 /* ClassDeclaration */: + case 218 /* ClassExpression */: + case 250 /* InterfaceDeclaration */: + case 251 /* TypeAliasDeclaration */: + case 252 /* EnumDeclaration */: + case 253 /* ModuleDeclaration */: + case 257 /* ImportEqualsDeclaration */: + case 267 /* ExportSpecifier */: + case 262 /* ImportSpecifier */: + case 259 /* ImportClause */: + case 260 /* NamespaceImport */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 176 /* TypeLiteral */: addDeclaration(node); ts.forEachChild(node, visit); break; - case 156 /* Parameter */: + case 159 /* Parameter */: // Only consider parameter properties - if (!ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) { + if (!ts.hasSyntacticModifier(node, 92 /* ParameterPropertyModifier */)) { break; } // falls through - case 242 /* VariableDeclaration */: - case 191 /* BindingElement */: { + case 246 /* VariableDeclaration */: + case 195 /* BindingElement */: { var decl = node; if (ts.isBindingPattern(decl.name)) { ts.forEachChild(decl.name, visit); @@ -138816,12 +143408,12 @@ var ts; } } // falls through - case 284 /* EnumMember */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: + case 288 /* EnumMember */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: addDeclaration(node); break; - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: // Handle named exports case e.g.: // export {a, b as B} from "mod"; var exportDeclaration = node; @@ -138834,7 +143426,7 @@ var ts; } } break; - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: var importClause = node.importClause; if (importClause) { // Handle default import case e.g.: @@ -138846,7 +143438,7 @@ var ts; // import * as NS from "mod"; // import {a, b as B} from "mod"; if (importClause.namedBindings) { - if (importClause.namedBindings.kind === 256 /* NamespaceImport */) { + if (importClause.namedBindings.kind === 260 /* NamespaceImport */) { addDeclaration(importClause.namedBindings); } else { @@ -138855,7 +143447,7 @@ var ts; } } break; - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: if (ts.getAssignmentDeclarationKind(node) !== 0 /* None */) { addDeclaration(node); } @@ -138942,7 +143534,7 @@ var ts; this.host = host; // script id => script index this.currentDirectory = host.getCurrentDirectory(); - this.fileNameToEntry = ts.createMap(); + this.fileNameToEntry = new ts.Map(); // Initialize the list with the root file names var rootFileNames = host.getScriptFileNames(); for (var _i = 0, rootFileNames_1 = rootFileNames; _i < rootFileNames_1.length; _i++) { @@ -139138,10 +143730,58 @@ var ts; return ThrottledCancellationToken; }()); ts.ThrottledCancellationToken = ThrottledCancellationToken; - function createLanguageService(host, documentRegistry, syntaxOnly) { + var invalidOperationsInPartialSemanticMode = [ + "getSyntacticDiagnostics", + "getSemanticDiagnostics", + "getSuggestionDiagnostics", + "getCompilerOptionsDiagnostics", + "getSemanticClassifications", + "getEncodedSemanticClassifications", + "getCodeFixesAtPosition", + "getCombinedCodeFix", + "applyCodeActionCommand", + "organizeImports", + "getEditsForFileRename", + "getEmitOutput", + "getApplicableRefactors", + "getEditsForRefactor", + "prepareCallHierarchy", + "provideCallHierarchyIncomingCalls", + "provideCallHierarchyOutgoingCalls", + ]; + var invalidOperationsInSyntacticMode = __spreadArrays(invalidOperationsInPartialSemanticMode, [ + "getCompletionsAtPosition", + "getCompletionEntryDetails", + "getCompletionEntrySymbol", + "getSignatureHelpItems", + "getQuickInfoAtPosition", + "getDefinitionAtPosition", + "getDefinitionAndBoundSpan", + "getImplementationAtPosition", + "getTypeDefinitionAtPosition", + "getReferencesAtPosition", + "findReferences", + "getOccurrencesAtPosition", + "getDocumentHighlights", + "getNavigateToItems", + "getRenameInfo", + "findRenameLocations", + "getApplicableRefactors", + ]); + function createLanguageService(host, documentRegistry, syntaxOnlyOrLanguageServiceMode) { var _a; if (documentRegistry === void 0) { documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); } - if (syntaxOnly === void 0) { syntaxOnly = false; } + var languageServiceMode; + if (syntaxOnlyOrLanguageServiceMode === undefined) { + languageServiceMode = ts.LanguageServiceMode.Semantic; + } + else if (typeof syntaxOnlyOrLanguageServiceMode === "boolean") { + // languageServiceMode = SyntaxOnly + languageServiceMode = syntaxOnlyOrLanguageServiceMode ? ts.LanguageServiceMode.Syntactic : ts.LanguageServiceMode.Semantic; + } + else { + languageServiceMode = syntaxOnlyOrLanguageServiceMode; + } var syntaxTreeCache = new SyntaxTreeCache(host); var program; var lastProjectVersion; @@ -139181,13 +143821,13 @@ var ts; return sourceFile; } function synchronizeHostData() { - var _a; - ts.Debug.assert(!syntaxOnly); + var _a, _b; + ts.Debug.assert(languageServiceMode !== ts.LanguageServiceMode.Syntactic); // perform fast check if host supports it if (host.getProjectVersion) { var hostProjectVersion = host.getProjectVersion(); if (hostProjectVersion) { - if (lastProjectVersion === hostProjectVersion && !host.hasChangedAutomaticTypeDirectiveNames) { + if (lastProjectVersion === hostProjectVersion && !((_a = host.hasChangedAutomaticTypeDirectiveNames) === null || _a === void 0 ? void 0 : _a.call(host))) { return; } lastProjectVersion = hostProjectVersion; @@ -139203,9 +143843,10 @@ var ts; var hostCache = new HostCache(host, getCanonicalFileName); var rootFileNames = hostCache.getRootFileNames(); var hasInvalidatedResolution = host.hasInvalidatedResolution || ts.returnFalse; + var hasChangedAutomaticTypeDirectiveNames = ts.maybeBind(host, host.hasChangedAutomaticTypeDirectiveNames); var projectReferences = hostCache.getProjectReferences(); // If the program is already up-to-date, we can reuse it - if (ts.isProgramUptoDate(program, rootFileNames, hostCache.compilationSettings(), function (_path, fileName) { return host.getScriptVersion(fileName); }, fileExists, hasInvalidatedResolution, !!host.hasChangedAutomaticTypeDirectiveNames, projectReferences)) { + if (ts.isProgramUptoDate(program, rootFileNames, hostCache.compilationSettings(), function (_path, fileName) { return host.getScriptVersion(fileName); }, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences)) { return; } // IMPORTANT - It is critical from this moment onward that we do not check @@ -139227,7 +143868,8 @@ var ts; getCurrentDirectory: function () { return currentDirectory; }, fileExists: fileExists, readFile: readFile, - realpath: host.realpath && (function (path) { return host.realpath(path); }), + getSymlinkCache: ts.maybeBind(host, host.getSymlinkCache), + realpath: ts.maybeBind(host, host.realpath), directoryExists: function (directoryName) { return ts.directoryProbablyExists(directoryName, host); }, @@ -139240,33 +143882,13 @@ var ts; }, onReleaseOldSourceFile: onReleaseOldSourceFile, hasInvalidatedResolution: hasInvalidatedResolution, - hasChangedAutomaticTypeDirectiveNames: host.hasChangedAutomaticTypeDirectiveNames + hasChangedAutomaticTypeDirectiveNames: hasChangedAutomaticTypeDirectiveNames, + trace: ts.maybeBind(host, host.trace), + resolveModuleNames: ts.maybeBind(host, host.resolveModuleNames), + resolveTypeReferenceDirectives: ts.maybeBind(host, host.resolveTypeReferenceDirectives), + useSourceOfProjectReferenceRedirect: ts.maybeBind(host, host.useSourceOfProjectReferenceRedirect), }; - if (host.trace) { - compilerHost.trace = function (message) { return host.trace(message); }; - } - if (host.resolveModuleNames) { - compilerHost.resolveModuleNames = function () { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - return host.resolveModuleNames.apply(host, args); - }; - } - if (host.resolveTypeReferenceDirectives) { - compilerHost.resolveTypeReferenceDirectives = function () { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - return host.resolveTypeReferenceDirectives.apply(host, args); - }; - } - if (host.useSourceOfProjectReferenceRedirect) { - compilerHost.useSourceOfProjectReferenceRedirect = function () { return host.useSourceOfProjectReferenceRedirect(); }; - } - (_a = host.setCompilerHost) === null || _a === void 0 ? void 0 : _a.call(host, compilerHost); + (_b = host.setCompilerHost) === null || _b === void 0 ? void 0 : _b.call(host, compilerHost); var documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings); var options = { rootNames: rootFileNames, @@ -139340,7 +143962,7 @@ var ts; // // Each LS has a reference to file 'foo.ts' at version 1. LS2 then updates // it's version of 'foo.ts' to version 2. This will cause LS2 and the - // DocumentRegistry to have version 2 of the document. HOwever, LS1 will + // DocumentRegistry to have version 2 of the document. However, LS1 will // have version 1. And *importantly* this source file will be *corrupt*. // The act of creating version 2 of the file irrevocably damages the version // 1 file. @@ -139363,19 +143985,23 @@ var ts; } // TODO: GH#18217 frequently asserted as defined function getProgram() { - if (syntaxOnly) { + if (languageServiceMode === ts.LanguageServiceMode.Syntactic) { ts.Debug.assert(program === undefined); return undefined; } synchronizeHostData(); return program; } + function getAutoImportProvider() { + var _a; + return (_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host); + } function cleanupSemanticCache() { program = undefined; // TODO: GH#18217 } function dispose() { if (program) { - // Use paths to ensure we are using correct key and paths as document registry could bre created with different current directory than host + // Use paths to ensure we are using correct key and paths as document registry could be created with different current directory than host var key_1 = documentRegistry.getKeyForCompilationSettings(program.getCompilerOptions()); ts.forEach(program.getSourceFiles(), function (f) { return documentRegistry.releaseDocumentWithKey(f.resolvedPath, key_1); @@ -139474,15 +144100,15 @@ var ts; } function shouldGetType(sourceFile, node, position) { switch (node.kind) { - case 75 /* Identifier */: + case 78 /* Identifier */: return !ts.isLabelName(node) && !ts.isTagName(node); - case 194 /* PropertyAccessExpression */: - case 153 /* QualifiedName */: + case 198 /* PropertyAccessExpression */: + case 156 /* QualifiedName */: // Don't return quickInfo if inside the comment in `a/**/.b` return !ts.isInComment(sourceFile, position); - case 104 /* ThisKeyword */: - case 183 /* ThisType */: - case 102 /* SuperKeyword */: + case 107 /* ThisKeyword */: + case 186 /* ThisType */: + case 105 /* SuperKeyword */: return true; default: return false; @@ -139583,16 +144209,16 @@ var ts; return undefined; } switch (node.kind) { - case 194 /* PropertyAccessExpression */: - case 153 /* QualifiedName */: + case 198 /* PropertyAccessExpression */: + case 156 /* QualifiedName */: case 10 /* StringLiteral */: - case 91 /* FalseKeyword */: - case 106 /* TrueKeyword */: - case 100 /* NullKeyword */: - case 102 /* SuperKeyword */: - case 104 /* ThisKeyword */: - case 183 /* ThisType */: - case 75 /* Identifier */: + case 94 /* FalseKeyword */: + case 109 /* TrueKeyword */: + case 103 /* NullKeyword */: + case 105 /* SuperKeyword */: + case 107 /* ThisKeyword */: + case 186 /* ThisType */: + case 78 /* Identifier */: break; // Cant create the text span default: @@ -139608,7 +144234,7 @@ var ts; // If this is name of a module declarations, check if this is right side of dotted module name // If parent of the module declaration which is parent of this node is module declaration and its body is the module declaration that this node is name of // Then this name is name from dotted module - if (nodeForStartPos.parent.parent.kind === 249 /* ModuleDeclaration */ && + if (nodeForStartPos.parent.parent.kind === 253 /* ModuleDeclaration */ && nodeForStartPos.parent.parent.body === nodeForStartPos.parent) { // Use parent module declarations name for start pos nodeForStartPos = nodeForStartPos.parent.parent.name; @@ -139669,12 +144295,12 @@ var ts; var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); return ts.OutliningElementsCollector.collectElements(sourceFile, cancellationToken); } - var braceMatching = ts.createMapFromTemplate((_a = {}, + var braceMatching = new ts.Map(ts.getEntries((_a = {}, _a[18 /* OpenBraceToken */] = 19 /* CloseBraceToken */, _a[20 /* OpenParenToken */] = 21 /* CloseParenToken */, _a[22 /* OpenBracketToken */] = 23 /* CloseBracketToken */, _a[31 /* GreaterThanToken */] = 29 /* LessThanToken */, - _a)); + _a))); braceMatching.forEach(function (value, key) { return braceMatching.set(value.toString(), Number(key)); }); function getBraceMatchingAtPosition(fileName, position) { var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); @@ -139803,6 +144429,207 @@ var ts; return { newText: "" }; } } + function getLinesForRange(sourceFile, textRange) { + return { + lineStarts: sourceFile.getLineStarts(), + firstLine: sourceFile.getLineAndCharacterOfPosition(textRange.pos).line, + lastLine: sourceFile.getLineAndCharacterOfPosition(textRange.end).line + }; + } + function toggleLineComment(fileName, textRange, insertComment) { + var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + var textChanges = []; + var _a = getLinesForRange(sourceFile, textRange), lineStarts = _a.lineStarts, firstLine = _a.firstLine, lastLine = _a.lastLine; + var isCommenting = insertComment || false; + var leftMostPosition = Number.MAX_VALUE; + var lineTextStarts = new ts.Map(); + var firstNonWhitespaceCharacterRegex = new RegExp(/\S/); + var isJsx = ts.isInsideJsxElement(sourceFile, lineStarts[firstLine]); + var openComment = isJsx ? "{/*" : "//"; + // Check each line before any text changes. + for (var i = firstLine; i <= lastLine; i++) { + var lineText = sourceFile.text.substring(lineStarts[i], sourceFile.getLineEndOfPosition(lineStarts[i])); + // Find the start of text and the left-most character. No-op on empty lines. + var regExec = firstNonWhitespaceCharacterRegex.exec(lineText); + if (regExec) { + leftMostPosition = Math.min(leftMostPosition, regExec.index); + lineTextStarts.set(i.toString(), regExec.index); + if (lineText.substr(regExec.index, openComment.length) !== openComment) { + isCommenting = insertComment === undefined || insertComment; + } + } + } + // Push all text changes. + for (var i = firstLine; i <= lastLine; i++) { + var lineTextStart = lineTextStarts.get(i.toString()); + // If the line is not an empty line; otherwise no-op. + if (lineTextStart !== undefined) { + if (isJsx) { + textChanges.push.apply(textChanges, toggleMultilineComment(fileName, { pos: lineStarts[i] + leftMostPosition, end: sourceFile.getLineEndOfPosition(lineStarts[i]) }, isCommenting, isJsx)); + } + else if (isCommenting) { + textChanges.push({ + newText: openComment, + span: { + length: 0, + start: lineStarts[i] + leftMostPosition + } + }); + } + else if (sourceFile.text.substr(lineStarts[i] + lineTextStart, openComment.length) === openComment) { + textChanges.push({ + newText: "", + span: { + length: openComment.length, + start: lineStarts[i] + lineTextStart + } + }); + } + } + } + return textChanges; + } + function toggleMultilineComment(fileName, textRange, insertComment, isInsideJsx) { + var _a; + var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + var textChanges = []; + var text = sourceFile.text; + var hasComment = false; + var isCommenting = insertComment || false; + var positions = []; + var pos = textRange.pos; + var isJsx = isInsideJsx !== undefined ? isInsideJsx : ts.isInsideJsxElement(sourceFile, pos); + var openMultiline = isJsx ? "{/*" : "/*"; + var closeMultiline = isJsx ? "*/}" : "*/"; + var openMultilineRegex = isJsx ? "\\{\\/\\*" : "\\/\\*"; + var closeMultilineRegex = isJsx ? "\\*\\/\\}" : "\\*\\/"; + // Get all comment positions + while (pos <= textRange.end) { + // Start of comment is considered inside comment. + var offset = text.substr(pos, openMultiline.length) === openMultiline ? openMultiline.length : 0; + var commentRange = ts.isInComment(sourceFile, pos + offset); + // If position is in a comment add it to the positions array. + if (commentRange) { + // Comment range doesn't include the brace character. Increase it to include them. + if (isJsx) { + commentRange.pos--; + commentRange.end++; + } + positions.push(commentRange.pos); + if (commentRange.kind === 3 /* MultiLineCommentTrivia */) { + positions.push(commentRange.end); + } + hasComment = true; + pos = commentRange.end + 1; + } + else { // If it's not in a comment range, then we need to comment the uncommented portions. + var newPos = text.substring(pos, textRange.end).search("(" + openMultilineRegex + ")|(" + closeMultilineRegex + ")"); + isCommenting = insertComment !== undefined + ? insertComment + : isCommenting || !ts.isTextWhiteSpaceLike(text, pos, newPos === -1 ? textRange.end : pos + newPos); // If isCommenting is already true we don't need to check whitespace again. + pos = newPos === -1 ? textRange.end + 1 : pos + newPos + closeMultiline.length; + } + } + // If it didn't found a comment and isCommenting is false means is only empty space. + // We want to insert comment in this scenario. + if (isCommenting || !hasComment) { + if (((_a = ts.isInComment(sourceFile, textRange.pos)) === null || _a === void 0 ? void 0 : _a.kind) !== 2 /* SingleLineCommentTrivia */) { + ts.insertSorted(positions, textRange.pos, ts.compareValues); + } + ts.insertSorted(positions, textRange.end, ts.compareValues); + // Insert open comment if the first position is not a comment already. + var firstPos = positions[0]; + if (text.substr(firstPos, openMultiline.length) !== openMultiline) { + textChanges.push({ + newText: openMultiline, + span: { + length: 0, + start: firstPos + } + }); + } + // Insert open and close comment to all positions between first and last. Exclusive. + for (var i = 1; i < positions.length - 1; i++) { + if (text.substr(positions[i] - closeMultiline.length, closeMultiline.length) !== closeMultiline) { + textChanges.push({ + newText: closeMultiline, + span: { + length: 0, + start: positions[i] + } + }); + } + if (text.substr(positions[i], openMultiline.length) !== openMultiline) { + textChanges.push({ + newText: openMultiline, + span: { + length: 0, + start: positions[i] + } + }); + } + } + // Insert open comment if the last position is not a comment already. + if (textChanges.length % 2 !== 0) { + textChanges.push({ + newText: closeMultiline, + span: { + length: 0, + start: positions[positions.length - 1] + } + }); + } + } + else { + // If is not commenting then remove all comments found. + for (var _i = 0, positions_1 = positions; _i < positions_1.length; _i++) { + var pos_1 = positions_1[_i]; + var from = pos_1 - closeMultiline.length > 0 ? pos_1 - closeMultiline.length : 0; + var offset = text.substr(from, closeMultiline.length) === closeMultiline ? closeMultiline.length : 0; + textChanges.push({ + newText: "", + span: { + length: openMultiline.length, + start: pos_1 - offset + } + }); + } + } + return textChanges; + } + function commentSelection(fileName, textRange) { + var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + var _a = getLinesForRange(sourceFile, textRange), firstLine = _a.firstLine, lastLine = _a.lastLine; + // If there is a selection that is on the same line, add multiline. + return firstLine === lastLine && textRange.pos !== textRange.end + ? toggleMultilineComment(fileName, textRange, /*insertComment*/ true) + : toggleLineComment(fileName, textRange, /*insertComment*/ true); + } + function uncommentSelection(fileName, textRange) { + var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName); + var textChanges = []; + var pos = textRange.pos; + var end = textRange.end; + // If cursor is not a selection we need to increase the end position + // to include the start of the comment. + if (pos === end) { + end += ts.isInsideJsxElement(sourceFile, pos) ? 2 : 1; + } + for (var i = pos; i <= end; i++) { + var commentRange = ts.isInComment(sourceFile, i); + if (commentRange) { + switch (commentRange.kind) { + case 2 /* SingleLineCommentTrivia */: + textChanges.push.apply(textChanges, toggleLineComment(fileName, { end: commentRange.end, pos: commentRange.pos + 1 }, /*insertComment*/ false)); + break; + case 3 /* MultiLineCommentTrivia */: + textChanges.push.apply(textChanges, toggleMultilineComment(fileName, { end: commentRange.end, pos: commentRange.pos + 1 }, /*insertComment*/ false)); + } + i = commentRange.end + 1; + } + } + return textChanges; + } function isUnclosedTag(_a) { var openingElement = _a.openingElement, closingElement = _a.closingElement, parent = _a.parent; return !ts.tagNamesAreEquivalent(openingElement.tagName, closingElement.tagName) || @@ -139941,7 +144768,7 @@ var ts; synchronizeHostData(); return ts.Rename.getRenameInfo(program, getValidSourceFile(fileName), position, options); } - function getRefactorContext(file, positionOrRange, preferences, formatOptions) { + function getRefactorContext(file, positionOrRange, preferences, formatOptions, triggerReason) { var _a = typeof positionOrRange === "number" ? [positionOrRange, undefined] : [positionOrRange.pos, positionOrRange.end], startPosition = _a[0], endPosition = _a[1]; return { file: file, @@ -139952,16 +144779,17 @@ var ts; formatContext: ts.formatting.getFormatContext(formatOptions, host), cancellationToken: cancellationToken, preferences: preferences, + triggerReason: triggerReason, }; } function getSmartSelectionRange(fileName, position) { return ts.SmartSelectionRange.getSmartSelectionRange(position, syntaxTreeCache.getCurrentSourceFile(fileName)); } - function getApplicableRefactors(fileName, positionOrRange, preferences) { + function getApplicableRefactors(fileName, positionOrRange, preferences, triggerReason) { if (preferences === void 0) { preferences = ts.emptyOptions; } synchronizeHostData(); var file = getValidSourceFile(fileName); - return ts.refactor.getApplicableRefactors(getRefactorContext(file, positionOrRange, preferences)); + return ts.refactor.getApplicableRefactors(getRefactorContext(file, positionOrRange, preferences, ts.emptyOptions, triggerReason)); } function getEditsForRefactor(fileName, formatOptions, positionOrRange, refactorName, actionName, preferences) { if (preferences === void 0) { preferences = ts.emptyOptions; } @@ -139986,7 +144814,7 @@ var ts; var declaration = ts.firstOrOnly(ts.CallHierarchy.resolveCallHierarchyDeclaration(program, position === 0 ? sourceFile : ts.getTouchingPropertyName(sourceFile, position))); return declaration ? ts.CallHierarchy.getOutgoingCalls(program, declaration) : []; } - return { + var ls = { dispose: dispose, cleanupSemanticCache: cleanupSemanticCache, getSyntacticDiagnostics: getSyntacticDiagnostics, @@ -140037,6 +144865,7 @@ var ts; getEmitOutput: getEmitOutput, getNonBoundSourceFile: getNonBoundSourceFile, getProgram: getProgram, + getAutoImportProvider: getAutoImportProvider, getApplicableRefactors: getApplicableRefactors, getEditsForRefactor: getEditsForRefactor, toLineColumnOffset: sourceMapper.toLineColumnOffset, @@ -140044,8 +144873,33 @@ var ts; clearSourceMapperCache: function () { return sourceMapper.clearCache(); }, prepareCallHierarchy: prepareCallHierarchy, provideCallHierarchyIncomingCalls: provideCallHierarchyIncomingCalls, - provideCallHierarchyOutgoingCalls: provideCallHierarchyOutgoingCalls + provideCallHierarchyOutgoingCalls: provideCallHierarchyOutgoingCalls, + toggleLineComment: toggleLineComment, + toggleMultilineComment: toggleMultilineComment, + commentSelection: commentSelection, + uncommentSelection: uncommentSelection, }; + switch (languageServiceMode) { + case ts.LanguageServiceMode.Semantic: + break; + case ts.LanguageServiceMode.PartialSemantic: + invalidOperationsInPartialSemanticMode.forEach(function (key) { + return ls[key] = function () { + throw new Error("LanguageService Operation: " + key + " not allowed in LanguageServiceMode.PartialSemantic"); + }; + }); + break; + case ts.LanguageServiceMode.Syntactic: + invalidOperationsInSyntacticMode.forEach(function (key) { + return ls[key] = function () { + throw new Error("LanguageService Operation: " + key + " not allowed in LanguageServiceMode.Syntactic"); + }; + }); + break; + default: + ts.Debug.assertNever(languageServiceMode); + } + return ls; } ts.createLanguageService = createLanguageService; /* @internal */ @@ -140058,7 +144912,7 @@ var ts; } ts.getNameTable = getNameTable; function initializeNameTable(sourceFile) { - var nameTable = sourceFile.nameTable = ts.createUnderscoreEscapedMap(); + var nameTable = sourceFile.nameTable = new ts.Map(); sourceFile.forEachChild(function walk(node) { if (ts.isIdentifier(node) && !ts.isTagName(node) && node.escapedText || ts.isStringOrNumericLiteralLike(node) && literalIsName(node)) { var text = ts.getEscapedTextOfIdentifierOrLiteral(node); @@ -140085,7 +144939,7 @@ var ts; */ function literalIsName(node) { return ts.isDeclarationName(node) || - node.parent.kind === 265 /* ExternalModuleReference */ || + node.parent.kind === 269 /* ExternalModuleReference */ || isArgumentOfElementAccessExpression(node) || ts.isLiteralComputedPropertyDeclarationName(node); } @@ -140103,13 +144957,13 @@ var ts; case 10 /* StringLiteral */: case 14 /* NoSubstitutionTemplateLiteral */: case 8 /* NumericLiteral */: - if (node.parent.kind === 154 /* ComputedPropertyName */) { + if (node.parent.kind === 157 /* ComputedPropertyName */) { return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined; } // falls through - case 75 /* Identifier */: + case 78 /* Identifier */: return ts.isObjectLiteralElement(node.parent) && - (node.parent.parent.kind === 193 /* ObjectLiteralExpression */ || node.parent.parent.kind === 274 /* JsxAttributes */) && + (node.parent.parent.kind === 197 /* ObjectLiteralExpression */ || node.parent.parent.kind === 278 /* JsxAttributes */) && node.parent.name === node ? node.parent : undefined; } return undefined; @@ -140151,7 +145005,7 @@ var ts; function isArgumentOfElementAccessExpression(node) { return node && node.parent && - node.parent.kind === 195 /* ElementAccessExpression */ && + node.parent.kind === 199 /* ElementAccessExpression */ && node.parent.argumentExpression === node; } /** @@ -140231,114 +145085,114 @@ var ts; if (node) { var parent = node.parent; switch (node.kind) { - case 225 /* VariableStatement */: + case 229 /* VariableStatement */: // Span on first variable declaration return spanInVariableDeclaration(node.declarationList.declarations[0]); - case 242 /* VariableDeclaration */: - case 159 /* PropertyDeclaration */: - case 158 /* PropertySignature */: + case 246 /* VariableDeclaration */: + case 162 /* PropertyDeclaration */: + case 161 /* PropertySignature */: return spanInVariableDeclaration(node); - case 156 /* Parameter */: + case 159 /* Parameter */: return spanInParameterDeclaration(node); - case 244 /* FunctionDeclaration */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 162 /* Constructor */: - case 201 /* FunctionExpression */: - case 202 /* ArrowFunction */: + case 248 /* FunctionDeclaration */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 165 /* Constructor */: + case 205 /* FunctionExpression */: + case 206 /* ArrowFunction */: return spanInFunctionDeclaration(node); - case 223 /* Block */: + case 227 /* Block */: if (ts.isFunctionBlock(node)) { return spanInFunctionBlock(node); } // falls through - case 250 /* ModuleBlock */: + case 254 /* ModuleBlock */: return spanInBlock(node); - case 280 /* CatchClause */: + case 284 /* CatchClause */: return spanInBlock(node.block); - case 226 /* ExpressionStatement */: + case 230 /* ExpressionStatement */: // span on the expression return textSpan(node.expression); - case 235 /* ReturnStatement */: + case 239 /* ReturnStatement */: // span on return keyword and expression if present return textSpan(node.getChildAt(0), node.expression); - case 229 /* WhileStatement */: + case 233 /* WhileStatement */: // Span on while(...) return textSpanEndingAtNextToken(node, node.expression); - case 228 /* DoStatement */: + case 232 /* DoStatement */: // span in statement of the do statement return spanInNode(node.statement); - case 241 /* DebuggerStatement */: + case 245 /* DebuggerStatement */: // span on debugger keyword return textSpan(node.getChildAt(0)); - case 227 /* IfStatement */: + case 231 /* IfStatement */: // set on if(..) span return textSpanEndingAtNextToken(node, node.expression); - case 238 /* LabeledStatement */: + case 242 /* LabeledStatement */: // span in statement return spanInNode(node.statement); - case 234 /* BreakStatement */: - case 233 /* ContinueStatement */: + case 238 /* BreakStatement */: + case 237 /* ContinueStatement */: // On break or continue keyword and label if present return textSpan(node.getChildAt(0), node.label); - case 230 /* ForStatement */: + case 234 /* ForStatement */: return spanInForStatement(node); - case 231 /* ForInStatement */: + case 235 /* ForInStatement */: // span of for (a in ...) return textSpanEndingAtNextToken(node, node.expression); - case 232 /* ForOfStatement */: + case 236 /* ForOfStatement */: // span in initializer return spanInInitializerOfForLike(node); - case 237 /* SwitchStatement */: + case 241 /* SwitchStatement */: // span on switch(...) return textSpanEndingAtNextToken(node, node.expression); - case 277 /* CaseClause */: - case 278 /* DefaultClause */: + case 281 /* CaseClause */: + case 282 /* DefaultClause */: // span in first statement of the clause return spanInNode(node.statements[0]); - case 240 /* TryStatement */: + case 244 /* TryStatement */: // span in try block return spanInBlock(node.tryBlock); - case 239 /* ThrowStatement */: + case 243 /* ThrowStatement */: // span in throw ... return textSpan(node, node.expression); - case 259 /* ExportAssignment */: + case 263 /* ExportAssignment */: // span on export = id return textSpan(node, node.expression); - case 253 /* ImportEqualsDeclaration */: + case 257 /* ImportEqualsDeclaration */: // import statement without including semicolon return textSpan(node, node.moduleReference); - case 254 /* ImportDeclaration */: + case 258 /* ImportDeclaration */: // import statement without including semicolon return textSpan(node, node.moduleSpecifier); - case 260 /* ExportDeclaration */: + case 264 /* ExportDeclaration */: // import statement without including semicolon return textSpan(node, node.moduleSpecifier); - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: // span on complete module if it is instantiated if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) { return undefined; } // falls through - case 245 /* ClassDeclaration */: - case 248 /* EnumDeclaration */: - case 284 /* EnumMember */: - case 191 /* BindingElement */: + case 249 /* ClassDeclaration */: + case 252 /* EnumDeclaration */: + case 288 /* EnumMember */: + case 195 /* BindingElement */: // span on complete node return textSpan(node); - case 236 /* WithStatement */: + case 240 /* WithStatement */: // span in statement return spanInNode(node.statement); - case 157 /* Decorator */: + case 160 /* Decorator */: return spanInNodeArray(parent.decorators); - case 189 /* ObjectBindingPattern */: - case 190 /* ArrayBindingPattern */: + case 193 /* ObjectBindingPattern */: + case 194 /* ArrayBindingPattern */: return spanInBindingPattern(node); // No breakpoint in interface, type alias - case 246 /* InterfaceDeclaration */: - case 247 /* TypeAliasDeclaration */: + case 250 /* InterfaceDeclaration */: + case 251 /* TypeAliasDeclaration */: return undefined; // Tokens: case 26 /* SemicolonToken */: @@ -140362,13 +145216,13 @@ var ts; case 29 /* LessThanToken */: return spanInGreaterThanOrLessThanToken(node); // Keywords: - case 111 /* WhileKeyword */: + case 114 /* WhileKeyword */: return spanInWhileKeyword(node); - case 87 /* ElseKeyword */: - case 79 /* CatchKeyword */: - case 92 /* FinallyKeyword */: + case 90 /* ElseKeyword */: + case 82 /* CatchKeyword */: + case 95 /* FinallyKeyword */: return spanInNextNode(node); - case 152 /* OfKeyword */: + case 155 /* OfKeyword */: return spanInOfKeyword(node); default: // Destructuring pattern in destructuring assignment @@ -140380,14 +145234,14 @@ var ts; // Set breakpoint on identifier element of destructuring pattern // `a` or `...c` or `d: x` from // `[a, b, ...c]` or `{ a, b }` or `{ d: x }` from destructuring pattern - if ((node.kind === 75 /* Identifier */ || - node.kind === 213 /* SpreadElement */ || - node.kind === 281 /* PropertyAssignment */ || - node.kind === 282 /* ShorthandPropertyAssignment */) && + if ((node.kind === 78 /* Identifier */ || + node.kind === 217 /* SpreadElement */ || + node.kind === 285 /* PropertyAssignment */ || + node.kind === 286 /* ShorthandPropertyAssignment */) && ts.isArrayLiteralOrObjectLiteralDestructuringPattern(parent)) { return textSpan(node); } - if (node.kind === 209 /* BinaryExpression */) { + if (node.kind === 213 /* BinaryExpression */) { var _a = node, left = _a.left, operatorToken = _a.operatorToken; // Set breakpoint in destructuring pattern if its destructuring assignment // [a, b, c] or {a, b, c} of @@ -140409,22 +145263,22 @@ var ts; } if (ts.isExpressionNode(node)) { switch (parent.kind) { - case 228 /* DoStatement */: + case 232 /* DoStatement */: // Set span as if on while keyword return spanInPreviousNode(node); - case 157 /* Decorator */: + case 160 /* Decorator */: // Set breakpoint on the decorator emit return spanInNode(node.parent); - case 230 /* ForStatement */: - case 232 /* ForOfStatement */: + case 234 /* ForStatement */: + case 236 /* ForOfStatement */: return textSpan(node); - case 209 /* BinaryExpression */: + case 213 /* BinaryExpression */: if (node.parent.operatorToken.kind === 27 /* CommaToken */) { // If this is a comma expression, the breakpoint is possible in this expression return textSpan(node); } break; - case 202 /* ArrowFunction */: + case 206 /* ArrowFunction */: if (node.parent.body === node) { // If this is body of arrow function, it is allowed to have the breakpoint return textSpan(node); @@ -140433,21 +145287,21 @@ var ts; } } switch (node.parent.kind) { - case 281 /* PropertyAssignment */: + case 285 /* PropertyAssignment */: // If this is name of property assignment, set breakpoint in the initializer if (node.parent.name === node && !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) { return spanInNode(node.parent.initializer); } break; - case 199 /* TypeAssertionExpression */: + case 203 /* TypeAssertionExpression */: // Breakpoint in type assertion goes to its operand if (node.parent.type === node) { return spanInNextNode(node.parent.type); } break; - case 242 /* VariableDeclaration */: - case 156 /* Parameter */: { + case 246 /* VariableDeclaration */: + case 159 /* Parameter */: { // initializer of variable/parameter declaration go to previous node var _b = node.parent, initializer = _b.initializer, type = _b.type; if (initializer === node || type === node || ts.isAssignmentOperator(node.kind)) { @@ -140455,7 +145309,7 @@ var ts; } break; } - case 209 /* BinaryExpression */: { + case 213 /* BinaryExpression */: { var left = node.parent.left; if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left) && node !== left) { // If initializer of destructuring assignment move to previous token @@ -140485,7 +145339,7 @@ var ts; } function spanInVariableDeclaration(variableDeclaration) { // If declaration of for in statement, just set the span in parent - if (variableDeclaration.parent.parent.kind === 231 /* ForInStatement */) { + if (variableDeclaration.parent.parent.kind === 235 /* ForInStatement */) { return spanInNode(variableDeclaration.parent.parent); } var parent = variableDeclaration.parent; @@ -140496,8 +145350,8 @@ var ts; // Breakpoint is possible in variableDeclaration only if there is initialization // or its declaration from 'for of' if (variableDeclaration.initializer || - ts.hasModifier(variableDeclaration, 1 /* Export */) || - parent.parent.kind === 232 /* ForOfStatement */) { + ts.hasSyntacticModifier(variableDeclaration, 1 /* Export */) || + parent.parent.kind === 236 /* ForOfStatement */) { return textSpanFromVariableDeclaration(variableDeclaration); } if (ts.isVariableDeclarationList(variableDeclaration.parent) && @@ -140512,7 +145366,7 @@ var ts; function canHaveSpanInParameterDeclaration(parameter) { // Breakpoint is possible on parameter only if it has initializer, is a rest parameter, or has public or private modifier return !!parameter.initializer || parameter.dotDotDotToken !== undefined || - ts.hasModifier(parameter, 4 /* Public */ | 8 /* Private */); + ts.hasSyntacticModifier(parameter, 4 /* Public */ | 8 /* Private */); } function spanInParameterDeclaration(parameter) { if (ts.isBindingPattern(parameter.name)) { @@ -140537,8 +145391,8 @@ var ts; } } function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) { - return ts.hasModifier(functionDeclaration, 1 /* Export */) || - (functionDeclaration.parent.kind === 245 /* ClassDeclaration */ && functionDeclaration.kind !== 162 /* Constructor */); + return ts.hasSyntacticModifier(functionDeclaration, 1 /* Export */) || + (functionDeclaration.parent.kind === 249 /* ClassDeclaration */ && functionDeclaration.kind !== 165 /* Constructor */); } function spanInFunctionDeclaration(functionDeclaration) { // No breakpoints in the function signature @@ -140561,26 +145415,26 @@ var ts; } function spanInBlock(block) { switch (block.parent.kind) { - case 249 /* ModuleDeclaration */: + case 253 /* ModuleDeclaration */: if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) { return undefined; } // Set on parent if on same line otherwise on first statement // falls through - case 229 /* WhileStatement */: - case 227 /* IfStatement */: - case 231 /* ForInStatement */: + case 233 /* WhileStatement */: + case 231 /* IfStatement */: + case 235 /* ForInStatement */: return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]); // Set span on previous token if it starts on same line otherwise on the first statement of the block - case 230 /* ForStatement */: - case 232 /* ForOfStatement */: + case 234 /* ForStatement */: + case 236 /* ForOfStatement */: return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(block.pos, sourceFile, block.parent), block.statements[0]); } // Default action is to set on first statement return spanInNode(block.statements[0]); } function spanInInitializerOfForLike(forLikeStatement) { - if (forLikeStatement.initializer.kind === 243 /* VariableDeclarationList */) { + if (forLikeStatement.initializer.kind === 247 /* VariableDeclarationList */) { // Declaration list - set breakpoint in first declaration var variableDeclarationList = forLikeStatement.initializer; if (variableDeclarationList.declarations.length > 0) { @@ -140605,21 +145459,21 @@ var ts; } function spanInBindingPattern(bindingPattern) { // Set breakpoint in first binding element - var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 215 /* OmittedExpression */ ? element : undefined; }); + var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 219 /* OmittedExpression */ ? element : undefined; }); if (firstBindingElement) { return spanInNode(firstBindingElement); } // Empty binding pattern of binding element, set breakpoint on binding element - if (bindingPattern.parent.kind === 191 /* BindingElement */) { + if (bindingPattern.parent.kind === 195 /* BindingElement */) { return textSpan(bindingPattern.parent); } // Variable declaration is used as the span return textSpanFromVariableDeclaration(bindingPattern.parent); } function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) { - ts.Debug.assert(node.kind !== 190 /* ArrayBindingPattern */ && node.kind !== 189 /* ObjectBindingPattern */); - var elements = node.kind === 192 /* ArrayLiteralExpression */ ? node.elements : node.properties; - var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 215 /* OmittedExpression */ ? element : undefined; }); + ts.Debug.assert(node.kind !== 194 /* ArrayBindingPattern */ && node.kind !== 193 /* ObjectBindingPattern */); + var elements = node.kind === 196 /* ArrayLiteralExpression */ ? node.elements : node.properties; + var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 219 /* OmittedExpression */ ? element : undefined; }); if (firstBindingElement) { return spanInNode(firstBindingElement); } @@ -140627,18 +145481,18 @@ var ts; // just nested element in another destructuring assignment // set breakpoint on assignment when parent is destructuring assignment // Otherwise set breakpoint for this element - return textSpan(node.parent.kind === 209 /* BinaryExpression */ ? node.parent : node); + return textSpan(node.parent.kind === 213 /* BinaryExpression */ ? node.parent : node); } // Tokens: function spanInOpenBraceToken(node) { switch (node.parent.kind) { - case 248 /* EnumDeclaration */: + case 252 /* EnumDeclaration */: var enumDeclaration = node.parent; return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile)); - case 245 /* ClassDeclaration */: + case 249 /* ClassDeclaration */: var classDeclaration = node.parent; return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile)); - case 251 /* CaseBlock */: + case 255 /* CaseBlock */: return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]); } // Default to parent node @@ -140646,25 +145500,25 @@ var ts; } function spanInCloseBraceToken(node) { switch (node.parent.kind) { - case 250 /* ModuleBlock */: + case 254 /* ModuleBlock */: // If this is not an instantiated module block, no bp span if (ts.getModuleInstanceState(node.parent.parent) !== 1 /* Instantiated */) { return undefined; } // falls through - case 248 /* EnumDeclaration */: - case 245 /* ClassDeclaration */: + case 252 /* EnumDeclaration */: + case 249 /* ClassDeclaration */: // Span on close brace token return textSpan(node); - case 223 /* Block */: + case 227 /* Block */: if (ts.isFunctionBlock(node.parent)) { // Span on close brace token return textSpan(node); } // falls through - case 280 /* CatchClause */: + case 284 /* CatchClause */: return spanInNode(ts.lastOrUndefined(node.parent.statements)); - case 251 /* CaseBlock */: + case 255 /* CaseBlock */: // breakpoint in last statement of the last clause var caseBlock = node.parent; var lastClause = ts.lastOrUndefined(caseBlock.clauses); @@ -140672,7 +145526,7 @@ var ts; return spanInNode(ts.lastOrUndefined(lastClause.statements)); } return undefined; - case 189 /* ObjectBindingPattern */: + case 193 /* ObjectBindingPattern */: // Breakpoint in last binding element or binding pattern if it contains no elements var bindingPattern = node.parent; return spanInNode(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern); @@ -140688,7 +145542,7 @@ var ts; } function spanInCloseBracketToken(node) { switch (node.parent.kind) { - case 190 /* ArrayBindingPattern */: + case 194 /* ArrayBindingPattern */: // Breakpoint in last binding element or binding pattern if it contains no elements var bindingPattern = node.parent; return textSpan(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern); @@ -140703,12 +145557,12 @@ var ts; } } function spanInOpenParenToken(node) { - if (node.parent.kind === 228 /* DoStatement */ || // Go to while keyword and do action instead - node.parent.kind === 196 /* CallExpression */ || - node.parent.kind === 197 /* NewExpression */) { + if (node.parent.kind === 232 /* DoStatement */ || // Go to while keyword and do action instead + node.parent.kind === 200 /* CallExpression */ || + node.parent.kind === 201 /* NewExpression */) { return spanInPreviousNode(node); } - if (node.parent.kind === 200 /* ParenthesizedExpression */) { + if (node.parent.kind === 204 /* ParenthesizedExpression */) { return spanInNextNode(node); } // Default to parent node @@ -140717,21 +145571,21 @@ var ts; function spanInCloseParenToken(node) { // Is this close paren token of parameter list, set span in previous token switch (node.parent.kind) { - case 201 /* FunctionExpression */: - case 244 /* FunctionDeclaration */: - case 202 /* ArrowFunction */: - case 161 /* MethodDeclaration */: - case 160 /* MethodSignature */: - case 163 /* GetAccessor */: - case 164 /* SetAccessor */: - case 162 /* Constructor */: - case 229 /* WhileStatement */: - case 228 /* DoStatement */: - case 230 /* ForStatement */: - case 232 /* ForOfStatement */: - case 196 /* CallExpression */: - case 197 /* NewExpression */: - case 200 /* ParenthesizedExpression */: + case 205 /* FunctionExpression */: + case 248 /* FunctionDeclaration */: + case 206 /* ArrowFunction */: + case 164 /* MethodDeclaration */: + case 163 /* MethodSignature */: + case 166 /* GetAccessor */: + case 167 /* SetAccessor */: + case 165 /* Constructor */: + case 233 /* WhileStatement */: + case 232 /* DoStatement */: + case 234 /* ForStatement */: + case 236 /* ForOfStatement */: + case 200 /* CallExpression */: + case 201 /* NewExpression */: + case 204 /* ParenthesizedExpression */: return spanInPreviousNode(node); // Default to parent node default: @@ -140741,20 +145595,20 @@ var ts; function spanInColonToken(node) { // Is this : specifying return annotation of the function declaration if (ts.isFunctionLike(node.parent) || - node.parent.kind === 281 /* PropertyAssignment */ || - node.parent.kind === 156 /* Parameter */) { + node.parent.kind === 285 /* PropertyAssignment */ || + node.parent.kind === 159 /* Parameter */) { return spanInPreviousNode(node); } return spanInNode(node.parent); } function spanInGreaterThanOrLessThanToken(node) { - if (node.parent.kind === 199 /* TypeAssertionExpression */) { + if (node.parent.kind === 203 /* TypeAssertionExpression */) { return spanInNextNode(node); } return spanInNode(node.parent); } function spanInWhileKeyword(node) { - if (node.parent.kind === 228 /* DoStatement */) { + if (node.parent.kind === 232 /* DoStatement */) { // Set span on while expression return textSpanEndingAtNextToken(node, node.parent.expression); } @@ -140762,7 +145616,7 @@ var ts; return spanInNode(node.parent); } function spanInOfKeyword(node) { - if (node.parent.kind === 232 /* ForOfStatement */) { + if (node.parent.kind === 236 /* ForOfStatement */) { // Set using next token return spanInNextNode(node); } @@ -140786,7 +145640,7 @@ var ts; var diagnostics = []; compilerOptions = ts.fixupCompilerOptions(compilerOptions, diagnostics); // TODO: GH#18217 var nodes = ts.isArray(source) ? source : [source]; - var result = ts.transformNodes(/*resolver*/ undefined, /*emitHost*/ undefined, compilerOptions, nodes, transformers, /*allowDtsFiles*/ true); + var result = ts.transformNodes(/*resolver*/ undefined, /*emitHost*/ undefined, ts.factory, compilerOptions, nodes, transformers, /*allowDtsFiles*/ true); result.diagnostics = ts.concatenate(result.diagnostics, diagnostics); return result; } @@ -141068,6 +145922,7 @@ var ts; category: ts.diagnosticCategoryName(diagnostic), code: diagnostic.code, reportsUnnecessary: diagnostic.reportsUnnecessary, + reportsDeprecated: diagnostic.reportsDeprecated }; } var LanguageServiceShimObject = /** @class */ (function (_super) { @@ -141378,6 +146233,22 @@ var ts; return forwardCall(this.logger, "getEmitOutput('" + fileName + "')", /*returnJson*/ false, function () { return _this.languageService.getEmitOutput(fileName); }, this.logPerformance); }; + LanguageServiceShimObject.prototype.toggleLineComment = function (fileName, textRange) { + var _this = this; + return this.forwardJSONCall("toggleLineComment('" + fileName + "', '" + JSON.stringify(textRange) + "')", function () { return _this.languageService.toggleLineComment(fileName, textRange); }); + }; + LanguageServiceShimObject.prototype.toggleMultilineComment = function (fileName, textRange) { + var _this = this; + return this.forwardJSONCall("toggleMultilineComment('" + fileName + "', '" + JSON.stringify(textRange) + "')", function () { return _this.languageService.toggleMultilineComment(fileName, textRange); }); + }; + LanguageServiceShimObject.prototype.commentSelection = function (fileName, textRange) { + var _this = this; + return this.forwardJSONCall("commentSelection('" + fileName + "', '" + JSON.stringify(textRange) + "')", function () { return _this.languageService.commentSelection(fileName, textRange); }); + }; + LanguageServiceShimObject.prototype.uncommentSelection = function (fileName, textRange) { + var _this = this; + return this.forwardJSONCall("uncommentSelection('" + fileName + "', '" + JSON.stringify(textRange) + "')", function () { return _this.languageService.uncommentSelection(fileName, textRange); }); + }; return LanguageServiceShimObject; }(ShimBase)); function convertClassifications(classifications) { @@ -141636,6 +146507,905 @@ if (typeof process === "undefined" || process.browser) { if (typeof module !== "undefined" && module.exports) { module.exports = ts; } +var ts; +(function (ts) { + // The following are deprecations for the public API. Deprecated exports are removed from the compiler itself + // and compatible implementations are added here, along with an appropriate deprecation warning using + // the `@deprecated` JSDoc tag as well as the `Debug.deprecate` API. + // + // Deprecations fall into one of three categories: + // + // * "soft" - Soft deprecations are indicated with the `@deprecated` JSDoc Tag. + // * "warn" - Warning deprecations are indicated with the `@deprecated` JSDoc Tag and a diagnostic message (assuming a compatible host) + // * "error" - Error deprecations are indicated with the `@deprecated` JSDoc tag and will throw a `TypeError` when invoked. + // DEPRECATION: Node factory top-level exports + // DEPRECATION PLAN: + // - soft: 4.0 + // - warn: 4.1 + // - error: TBD + // #region Node factory top-level exports + // NOTE: These exports are deprecated in favor of using a `NodeFactory` instance and exist here purely for backwards compatibility reasons. + var factoryDeprecation = { since: "4.0", warnAfter: "4.1", message: "Use the appropriate method on 'ts.factory' or the 'factory' supplied by your transformation context instead." }; + /** @deprecated Use `factory.createNodeArray` or the factory supplied by your transformation context instead. */ + ts.createNodeArray = ts.Debug.deprecate(ts.factory.createNodeArray, factoryDeprecation); + /** @deprecated Use `factory.createNumericLiteral` or the factory supplied by your transformation context instead. */ + ts.createNumericLiteral = ts.Debug.deprecate(ts.factory.createNumericLiteral, factoryDeprecation); + /** @deprecated Use `factory.createBigIntLiteral` or the factory supplied by your transformation context instead. */ + ts.createBigIntLiteral = ts.Debug.deprecate(ts.factory.createBigIntLiteral, factoryDeprecation); + /** @deprecated Use `factory.createStringLiteral` or the factory supplied by your transformation context instead. */ + ts.createStringLiteral = ts.Debug.deprecate(ts.factory.createStringLiteral, factoryDeprecation); + /** @deprecated Use `factory.createStringLiteralFromNode` or the factory supplied by your transformation context instead. */ + ts.createStringLiteralFromNode = ts.Debug.deprecate(ts.factory.createStringLiteralFromNode, factoryDeprecation); + /** @deprecated Use `factory.createRegularExpressionLiteral` or the factory supplied by your transformation context instead. */ + ts.createRegularExpressionLiteral = ts.Debug.deprecate(ts.factory.createRegularExpressionLiteral, factoryDeprecation); + /** @deprecated Use `factory.createLoopVariable` or the factory supplied by your transformation context instead. */ + ts.createLoopVariable = ts.Debug.deprecate(ts.factory.createLoopVariable, factoryDeprecation); + /** @deprecated Use `factory.createUniqueName` or the factory supplied by your transformation context instead. */ + ts.createUniqueName = ts.Debug.deprecate(ts.factory.createUniqueName, factoryDeprecation); + /** @deprecated Use `factory.createPrivateIdentifier` or the factory supplied by your transformation context instead. */ + ts.createPrivateIdentifier = ts.Debug.deprecate(ts.factory.createPrivateIdentifier, factoryDeprecation); + /** @deprecated Use `factory.createSuper` or the factory supplied by your transformation context instead. */ + ts.createSuper = ts.Debug.deprecate(ts.factory.createSuper, factoryDeprecation); + /** @deprecated Use `factory.createThis` or the factory supplied by your transformation context instead. */ + ts.createThis = ts.Debug.deprecate(ts.factory.createThis, factoryDeprecation); + /** @deprecated Use `factory.createNull` or the factory supplied by your transformation context instead. */ + ts.createNull = ts.Debug.deprecate(ts.factory.createNull, factoryDeprecation); + /** @deprecated Use `factory.createTrue` or the factory supplied by your transformation context instead. */ + ts.createTrue = ts.Debug.deprecate(ts.factory.createTrue, factoryDeprecation); + /** @deprecated Use `factory.createFalse` or the factory supplied by your transformation context instead. */ + ts.createFalse = ts.Debug.deprecate(ts.factory.createFalse, factoryDeprecation); + /** @deprecated Use `factory.createModifier` or the factory supplied by your transformation context instead. */ + ts.createModifier = ts.Debug.deprecate(ts.factory.createModifier, factoryDeprecation); + /** @deprecated Use `factory.createModifiersFromModifierFlags` or the factory supplied by your transformation context instead. */ + ts.createModifiersFromModifierFlags = ts.Debug.deprecate(ts.factory.createModifiersFromModifierFlags, factoryDeprecation); + /** @deprecated Use `factory.createQualifiedName` or the factory supplied by your transformation context instead. */ + ts.createQualifiedName = ts.Debug.deprecate(ts.factory.createQualifiedName, factoryDeprecation); + /** @deprecated Use `factory.updateQualifiedName` or the factory supplied by your transformation context instead. */ + ts.updateQualifiedName = ts.Debug.deprecate(ts.factory.updateQualifiedName, factoryDeprecation); + /** @deprecated Use `factory.createComputedPropertyName` or the factory supplied by your transformation context instead. */ + ts.createComputedPropertyName = ts.Debug.deprecate(ts.factory.createComputedPropertyName, factoryDeprecation); + /** @deprecated Use `factory.updateComputedPropertyName` or the factory supplied by your transformation context instead. */ + ts.updateComputedPropertyName = ts.Debug.deprecate(ts.factory.updateComputedPropertyName, factoryDeprecation); + /** @deprecated Use `factory.createTypeParameterDeclaration` or the factory supplied by your transformation context instead. */ + ts.createTypeParameterDeclaration = ts.Debug.deprecate(ts.factory.createTypeParameterDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateTypeParameterDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateTypeParameterDeclaration = ts.Debug.deprecate(ts.factory.updateTypeParameterDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createParameterDeclaration` or the factory supplied by your transformation context instead. */ + ts.createParameter = ts.Debug.deprecate(ts.factory.createParameterDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateParameterDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateParameter = ts.Debug.deprecate(ts.factory.updateParameterDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createDecorator` or the factory supplied by your transformation context instead. */ + ts.createDecorator = ts.Debug.deprecate(ts.factory.createDecorator, factoryDeprecation); + /** @deprecated Use `factory.updateDecorator` or the factory supplied by your transformation context instead. */ + ts.updateDecorator = ts.Debug.deprecate(ts.factory.updateDecorator, factoryDeprecation); + /** @deprecated Use `factory.createPropertyDeclaration` or the factory supplied by your transformation context instead. */ + ts.createProperty = ts.Debug.deprecate(ts.factory.createPropertyDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updatePropertyDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateProperty = ts.Debug.deprecate(ts.factory.updatePropertyDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createMethodDeclaration` or the factory supplied by your transformation context instead. */ + ts.createMethod = ts.Debug.deprecate(ts.factory.createMethodDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateMethodDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateMethod = ts.Debug.deprecate(ts.factory.updateMethodDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createConstructorDeclaration` or the factory supplied by your transformation context instead. */ + ts.createConstructor = ts.Debug.deprecate(ts.factory.createConstructorDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateConstructorDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateConstructor = ts.Debug.deprecate(ts.factory.updateConstructorDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createGetAccessorDeclaration` or the factory supplied by your transformation context instead. */ + ts.createGetAccessor = ts.Debug.deprecate(ts.factory.createGetAccessorDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateGetAccessorDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateGetAccessor = ts.Debug.deprecate(ts.factory.updateGetAccessorDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createSetAccessorDeclaration` or the factory supplied by your transformation context instead. */ + ts.createSetAccessor = ts.Debug.deprecate(ts.factory.createSetAccessorDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateSetAccessorDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateSetAccessor = ts.Debug.deprecate(ts.factory.updateSetAccessorDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createCallSignature` or the factory supplied by your transformation context instead. */ + ts.createCallSignature = ts.Debug.deprecate(ts.factory.createCallSignature, factoryDeprecation); + /** @deprecated Use `factory.updateCallSignature` or the factory supplied by your transformation context instead. */ + ts.updateCallSignature = ts.Debug.deprecate(ts.factory.updateCallSignature, factoryDeprecation); + /** @deprecated Use `factory.createConstructSignature` or the factory supplied by your transformation context instead. */ + ts.createConstructSignature = ts.Debug.deprecate(ts.factory.createConstructSignature, factoryDeprecation); + /** @deprecated Use `factory.updateConstructSignature` or the factory supplied by your transformation context instead. */ + ts.updateConstructSignature = ts.Debug.deprecate(ts.factory.updateConstructSignature, factoryDeprecation); + /** @deprecated Use `factory.updateIndexSignature` or the factory supplied by your transformation context instead. */ + ts.updateIndexSignature = ts.Debug.deprecate(ts.factory.updateIndexSignature, factoryDeprecation); + /** @deprecated Use `factory.createKeywordTypeNode` or the factory supplied by your transformation context instead. */ + ts.createKeywordTypeNode = ts.Debug.deprecate(ts.factory.createKeywordTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createTypePredicateNode` or the factory supplied by your transformation context instead. */ + ts.createTypePredicateNodeWithModifier = ts.Debug.deprecate(ts.factory.createTypePredicateNode, factoryDeprecation); + /** @deprecated Use `factory.updateTypePredicateNode` or the factory supplied by your transformation context instead. */ + ts.updateTypePredicateNodeWithModifier = ts.Debug.deprecate(ts.factory.updateTypePredicateNode, factoryDeprecation); + /** @deprecated Use `factory.createTypeReferenceNode` or the factory supplied by your transformation context instead. */ + ts.createTypeReferenceNode = ts.Debug.deprecate(ts.factory.createTypeReferenceNode, factoryDeprecation); + /** @deprecated Use `factory.updateTypeReferenceNode` or the factory supplied by your transformation context instead. */ + ts.updateTypeReferenceNode = ts.Debug.deprecate(ts.factory.updateTypeReferenceNode, factoryDeprecation); + /** @deprecated Use `factory.createFunctionTypeNode` or the factory supplied by your transformation context instead. */ + ts.createFunctionTypeNode = ts.Debug.deprecate(ts.factory.createFunctionTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateFunctionTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateFunctionTypeNode = ts.Debug.deprecate(ts.factory.updateFunctionTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createConstructorTypeNode` or the factory supplied by your transformation context instead. */ + ts.createConstructorTypeNode = ts.Debug.deprecate(ts.factory.createConstructorTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateConstructorTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateConstructorTypeNode = ts.Debug.deprecate(ts.factory.updateConstructorTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createTypeQueryNode` or the factory supplied by your transformation context instead. */ + ts.createTypeQueryNode = ts.Debug.deprecate(ts.factory.createTypeQueryNode, factoryDeprecation); + /** @deprecated Use `factory.updateTypeQueryNode` or the factory supplied by your transformation context instead. */ + ts.updateTypeQueryNode = ts.Debug.deprecate(ts.factory.updateTypeQueryNode, factoryDeprecation); + /** @deprecated Use `factory.createTypeLiteralNode` or the factory supplied by your transformation context instead. */ + ts.createTypeLiteralNode = ts.Debug.deprecate(ts.factory.createTypeLiteralNode, factoryDeprecation); + /** @deprecated Use `factory.updateTypeLiteralNode` or the factory supplied by your transformation context instead. */ + ts.updateTypeLiteralNode = ts.Debug.deprecate(ts.factory.updateTypeLiteralNode, factoryDeprecation); + /** @deprecated Use `factory.createArrayTypeNode` or the factory supplied by your transformation context instead. */ + ts.createArrayTypeNode = ts.Debug.deprecate(ts.factory.createArrayTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateArrayTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateArrayTypeNode = ts.Debug.deprecate(ts.factory.updateArrayTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createTupleTypeNode` or the factory supplied by your transformation context instead. */ + ts.createTupleTypeNode = ts.Debug.deprecate(ts.factory.createTupleTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateTupleTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateTupleTypeNode = ts.Debug.deprecate(ts.factory.updateTupleTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createOptionalTypeNode` or the factory supplied by your transformation context instead. */ + ts.createOptionalTypeNode = ts.Debug.deprecate(ts.factory.createOptionalTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateOptionalTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateOptionalTypeNode = ts.Debug.deprecate(ts.factory.updateOptionalTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createRestTypeNode` or the factory supplied by your transformation context instead. */ + ts.createRestTypeNode = ts.Debug.deprecate(ts.factory.createRestTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateRestTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateRestTypeNode = ts.Debug.deprecate(ts.factory.updateRestTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createUnionTypeNode` or the factory supplied by your transformation context instead. */ + ts.createUnionTypeNode = ts.Debug.deprecate(ts.factory.createUnionTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateUnionTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateUnionTypeNode = ts.Debug.deprecate(ts.factory.updateUnionTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createIntersectionTypeNode` or the factory supplied by your transformation context instead. */ + ts.createIntersectionTypeNode = ts.Debug.deprecate(ts.factory.createIntersectionTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateIntersectionTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateIntersectionTypeNode = ts.Debug.deprecate(ts.factory.updateIntersectionTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createConditionalTypeNode` or the factory supplied by your transformation context instead. */ + ts.createConditionalTypeNode = ts.Debug.deprecate(ts.factory.createConditionalTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateConditionalTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateConditionalTypeNode = ts.Debug.deprecate(ts.factory.updateConditionalTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createInferTypeNode` or the factory supplied by your transformation context instead. */ + ts.createInferTypeNode = ts.Debug.deprecate(ts.factory.createInferTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateInferTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateInferTypeNode = ts.Debug.deprecate(ts.factory.updateInferTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createImportTypeNode` or the factory supplied by your transformation context instead. */ + ts.createImportTypeNode = ts.Debug.deprecate(ts.factory.createImportTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateImportTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateImportTypeNode = ts.Debug.deprecate(ts.factory.updateImportTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createParenthesizedType` or the factory supplied by your transformation context instead. */ + ts.createParenthesizedType = ts.Debug.deprecate(ts.factory.createParenthesizedType, factoryDeprecation); + /** @deprecated Use `factory.updateParenthesizedType` or the factory supplied by your transformation context instead. */ + ts.updateParenthesizedType = ts.Debug.deprecate(ts.factory.updateParenthesizedType, factoryDeprecation); + /** @deprecated Use `factory.createThisTypeNode` or the factory supplied by your transformation context instead. */ + ts.createThisTypeNode = ts.Debug.deprecate(ts.factory.createThisTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateTypeOperatorNode` or the factory supplied by your transformation context instead. */ + ts.updateTypeOperatorNode = ts.Debug.deprecate(ts.factory.updateTypeOperatorNode, factoryDeprecation); + /** @deprecated Use `factory.createIndexedAccessTypeNode` or the factory supplied by your transformation context instead. */ + ts.createIndexedAccessTypeNode = ts.Debug.deprecate(ts.factory.createIndexedAccessTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateIndexedAccessTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateIndexedAccessTypeNode = ts.Debug.deprecate(ts.factory.updateIndexedAccessTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createMappedTypeNode` or the factory supplied by your transformation context instead. */ + ts.createMappedTypeNode = ts.Debug.deprecate(ts.factory.createMappedTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateMappedTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateMappedTypeNode = ts.Debug.deprecate(ts.factory.updateMappedTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createLiteralTypeNode` or the factory supplied by your transformation context instead. */ + ts.createLiteralTypeNode = ts.Debug.deprecate(ts.factory.createLiteralTypeNode, factoryDeprecation); + /** @deprecated Use `factory.updateLiteralTypeNode` or the factory supplied by your transformation context instead. */ + ts.updateLiteralTypeNode = ts.Debug.deprecate(ts.factory.updateLiteralTypeNode, factoryDeprecation); + /** @deprecated Use `factory.createObjectBindingPattern` or the factory supplied by your transformation context instead. */ + ts.createObjectBindingPattern = ts.Debug.deprecate(ts.factory.createObjectBindingPattern, factoryDeprecation); + /** @deprecated Use `factory.updateObjectBindingPattern` or the factory supplied by your transformation context instead. */ + ts.updateObjectBindingPattern = ts.Debug.deprecate(ts.factory.updateObjectBindingPattern, factoryDeprecation); + /** @deprecated Use `factory.createArrayBindingPattern` or the factory supplied by your transformation context instead. */ + ts.createArrayBindingPattern = ts.Debug.deprecate(ts.factory.createArrayBindingPattern, factoryDeprecation); + /** @deprecated Use `factory.updateArrayBindingPattern` or the factory supplied by your transformation context instead. */ + ts.updateArrayBindingPattern = ts.Debug.deprecate(ts.factory.updateArrayBindingPattern, factoryDeprecation); + /** @deprecated Use `factory.createBindingElement` or the factory supplied by your transformation context instead. */ + ts.createBindingElement = ts.Debug.deprecate(ts.factory.createBindingElement, factoryDeprecation); + /** @deprecated Use `factory.updateBindingElement` or the factory supplied by your transformation context instead. */ + ts.updateBindingElement = ts.Debug.deprecate(ts.factory.updateBindingElement, factoryDeprecation); + /** @deprecated Use `factory.createArrayLiteral` or the factory supplied by your transformation context instead. */ + ts.createArrayLiteral = ts.Debug.deprecate(ts.factory.createArrayLiteralExpression, factoryDeprecation); + /** @deprecated Use `factory.updateArrayLiteral` or the factory supplied by your transformation context instead. */ + ts.updateArrayLiteral = ts.Debug.deprecate(ts.factory.updateArrayLiteralExpression, factoryDeprecation); + /** @deprecated Use `factory.createObjectLiteral` or the factory supplied by your transformation context instead. */ + ts.createObjectLiteral = ts.Debug.deprecate(ts.factory.createObjectLiteralExpression, factoryDeprecation); + /** @deprecated Use `factory.updateObjectLiteral` or the factory supplied by your transformation context instead. */ + ts.updateObjectLiteral = ts.Debug.deprecate(ts.factory.updateObjectLiteralExpression, factoryDeprecation); + /** @deprecated Use `factory.createPropertyAccess` or the factory supplied by your transformation context instead. */ + ts.createPropertyAccess = ts.Debug.deprecate(ts.factory.createPropertyAccessExpression, factoryDeprecation); + /** @deprecated Use `factory.updatePropertyAccess` or the factory supplied by your transformation context instead. */ + ts.updatePropertyAccess = ts.Debug.deprecate(ts.factory.updatePropertyAccessExpression, factoryDeprecation); + /** @deprecated Use `factory.createPropertyAccessChain` or the factory supplied by your transformation context instead. */ + ts.createPropertyAccessChain = ts.Debug.deprecate(ts.factory.createPropertyAccessChain, factoryDeprecation); + /** @deprecated Use `factory.updatePropertyAccessChain` or the factory supplied by your transformation context instead. */ + ts.updatePropertyAccessChain = ts.Debug.deprecate(ts.factory.updatePropertyAccessChain, factoryDeprecation); + /** @deprecated Use `factory.createElementAccess` or the factory supplied by your transformation context instead. */ + ts.createElementAccess = ts.Debug.deprecate(ts.factory.createElementAccessExpression, factoryDeprecation); + /** @deprecated Use `factory.updateElementAccess` or the factory supplied by your transformation context instead. */ + ts.updateElementAccess = ts.Debug.deprecate(ts.factory.updateElementAccessExpression, factoryDeprecation); + /** @deprecated Use `factory.createElementAccessChain` or the factory supplied by your transformation context instead. */ + ts.createElementAccessChain = ts.Debug.deprecate(ts.factory.createElementAccessChain, factoryDeprecation); + /** @deprecated Use `factory.updateElementAccessChain` or the factory supplied by your transformation context instead. */ + ts.updateElementAccessChain = ts.Debug.deprecate(ts.factory.updateElementAccessChain, factoryDeprecation); + /** @deprecated Use `factory.createCall` or the factory supplied by your transformation context instead. */ + ts.createCall = ts.Debug.deprecate(ts.factory.createCallExpression, factoryDeprecation); + /** @deprecated Use `factory.updateCall` or the factory supplied by your transformation context instead. */ + ts.updateCall = ts.Debug.deprecate(ts.factory.updateCallExpression, factoryDeprecation); + /** @deprecated Use `factory.createCallChain` or the factory supplied by your transformation context instead. */ + ts.createCallChain = ts.Debug.deprecate(ts.factory.createCallChain, factoryDeprecation); + /** @deprecated Use `factory.updateCallChain` or the factory supplied by your transformation context instead. */ + ts.updateCallChain = ts.Debug.deprecate(ts.factory.updateCallChain, factoryDeprecation); + /** @deprecated Use `factory.createNew` or the factory supplied by your transformation context instead. */ + ts.createNew = ts.Debug.deprecate(ts.factory.createNewExpression, factoryDeprecation); + /** @deprecated Use `factory.updateNew` or the factory supplied by your transformation context instead. */ + ts.updateNew = ts.Debug.deprecate(ts.factory.updateNewExpression, factoryDeprecation); + /** @deprecated Use `factory.createTypeAssertion` or the factory supplied by your transformation context instead. */ + ts.createTypeAssertion = ts.Debug.deprecate(ts.factory.createTypeAssertion, factoryDeprecation); + /** @deprecated Use `factory.updateTypeAssertion` or the factory supplied by your transformation context instead. */ + ts.updateTypeAssertion = ts.Debug.deprecate(ts.factory.updateTypeAssertion, factoryDeprecation); + /** @deprecated Use `factory.createParen` or the factory supplied by your transformation context instead. */ + ts.createParen = ts.Debug.deprecate(ts.factory.createParenthesizedExpression, factoryDeprecation); + /** @deprecated Use `factory.updateParen` or the factory supplied by your transformation context instead. */ + ts.updateParen = ts.Debug.deprecate(ts.factory.updateParenthesizedExpression, factoryDeprecation); + /** @deprecated Use `factory.createFunctionExpression` or the factory supplied by your transformation context instead. */ + ts.createFunctionExpression = ts.Debug.deprecate(ts.factory.createFunctionExpression, factoryDeprecation); + /** @deprecated Use `factory.updateFunctionExpression` or the factory supplied by your transformation context instead. */ + ts.updateFunctionExpression = ts.Debug.deprecate(ts.factory.updateFunctionExpression, factoryDeprecation); + /** @deprecated Use `factory.createDelete` or the factory supplied by your transformation context instead. */ + ts.createDelete = ts.Debug.deprecate(ts.factory.createDeleteExpression, factoryDeprecation); + /** @deprecated Use `factory.updateDelete` or the factory supplied by your transformation context instead. */ + ts.updateDelete = ts.Debug.deprecate(ts.factory.updateDeleteExpression, factoryDeprecation); + /** @deprecated Use `factory.createTypeOf` or the factory supplied by your transformation context instead. */ + ts.createTypeOf = ts.Debug.deprecate(ts.factory.createTypeOfExpression, factoryDeprecation); + /** @deprecated Use `factory.updateTypeOf` or the factory supplied by your transformation context instead. */ + ts.updateTypeOf = ts.Debug.deprecate(ts.factory.updateTypeOfExpression, factoryDeprecation); + /** @deprecated Use `factory.createVoid` or the factory supplied by your transformation context instead. */ + ts.createVoid = ts.Debug.deprecate(ts.factory.createVoidExpression, factoryDeprecation); + /** @deprecated Use `factory.updateVoid` or the factory supplied by your transformation context instead. */ + ts.updateVoid = ts.Debug.deprecate(ts.factory.updateVoidExpression, factoryDeprecation); + /** @deprecated Use `factory.createAwait` or the factory supplied by your transformation context instead. */ + ts.createAwait = ts.Debug.deprecate(ts.factory.createAwaitExpression, factoryDeprecation); + /** @deprecated Use `factory.updateAwait` or the factory supplied by your transformation context instead. */ + ts.updateAwait = ts.Debug.deprecate(ts.factory.updateAwaitExpression, factoryDeprecation); + /** @deprecated Use `factory.createPrefix` or the factory supplied by your transformation context instead. */ + ts.createPrefix = ts.Debug.deprecate(ts.factory.createPrefixUnaryExpression, factoryDeprecation); + /** @deprecated Use `factory.updatePrefix` or the factory supplied by your transformation context instead. */ + ts.updatePrefix = ts.Debug.deprecate(ts.factory.updatePrefixUnaryExpression, factoryDeprecation); + /** @deprecated Use `factory.createPostfix` or the factory supplied by your transformation context instead. */ + ts.createPostfix = ts.Debug.deprecate(ts.factory.createPostfixUnaryExpression, factoryDeprecation); + /** @deprecated Use `factory.updatePostfix` or the factory supplied by your transformation context instead. */ + ts.updatePostfix = ts.Debug.deprecate(ts.factory.updatePostfixUnaryExpression, factoryDeprecation); + /** @deprecated Use `factory.createBinary` or the factory supplied by your transformation context instead. */ + ts.createBinary = ts.Debug.deprecate(ts.factory.createBinaryExpression, factoryDeprecation); + /** @deprecated Use `factory.updateConditional` or the factory supplied by your transformation context instead. */ + ts.updateConditional = ts.Debug.deprecate(ts.factory.updateConditionalExpression, factoryDeprecation); + /** @deprecated Use `factory.createTemplateExpression` or the factory supplied by your transformation context instead. */ + ts.createTemplateExpression = ts.Debug.deprecate(ts.factory.createTemplateExpression, factoryDeprecation); + /** @deprecated Use `factory.updateTemplateExpression` or the factory supplied by your transformation context instead. */ + ts.updateTemplateExpression = ts.Debug.deprecate(ts.factory.updateTemplateExpression, factoryDeprecation); + /** @deprecated Use `factory.createTemplateHead` or the factory supplied by your transformation context instead. */ + ts.createTemplateHead = ts.Debug.deprecate(ts.factory.createTemplateHead, factoryDeprecation); + /** @deprecated Use `factory.createTemplateMiddle` or the factory supplied by your transformation context instead. */ + ts.createTemplateMiddle = ts.Debug.deprecate(ts.factory.createTemplateMiddle, factoryDeprecation); + /** @deprecated Use `factory.createTemplateTail` or the factory supplied by your transformation context instead. */ + ts.createTemplateTail = ts.Debug.deprecate(ts.factory.createTemplateTail, factoryDeprecation); + /** @deprecated Use `factory.createNoSubstitutionTemplateLiteral` or the factory supplied by your transformation context instead. */ + ts.createNoSubstitutionTemplateLiteral = ts.Debug.deprecate(ts.factory.createNoSubstitutionTemplateLiteral, factoryDeprecation); + /** @deprecated Use `factory.updateYield` or the factory supplied by your transformation context instead. */ + ts.updateYield = ts.Debug.deprecate(ts.factory.updateYieldExpression, factoryDeprecation); + /** @deprecated Use `factory.createSpread` or the factory supplied by your transformation context instead. */ + ts.createSpread = ts.Debug.deprecate(ts.factory.createSpreadElement, factoryDeprecation); + /** @deprecated Use `factory.updateSpread` or the factory supplied by your transformation context instead. */ + ts.updateSpread = ts.Debug.deprecate(ts.factory.updateSpreadElement, factoryDeprecation); + /** @deprecated Use `factory.createOmittedExpression` or the factory supplied by your transformation context instead. */ + ts.createOmittedExpression = ts.Debug.deprecate(ts.factory.createOmittedExpression, factoryDeprecation); + /** @deprecated Use `factory.createAsExpression` or the factory supplied by your transformation context instead. */ + ts.createAsExpression = ts.Debug.deprecate(ts.factory.createAsExpression, factoryDeprecation); + /** @deprecated Use `factory.updateAsExpression` or the factory supplied by your transformation context instead. */ + ts.updateAsExpression = ts.Debug.deprecate(ts.factory.updateAsExpression, factoryDeprecation); + /** @deprecated Use `factory.createNonNullExpression` or the factory supplied by your transformation context instead. */ + ts.createNonNullExpression = ts.Debug.deprecate(ts.factory.createNonNullExpression, factoryDeprecation); + /** @deprecated Use `factory.updateNonNullExpression` or the factory supplied by your transformation context instead. */ + ts.updateNonNullExpression = ts.Debug.deprecate(ts.factory.updateNonNullExpression, factoryDeprecation); + /** @deprecated Use `factory.createNonNullChain` or the factory supplied by your transformation context instead. */ + ts.createNonNullChain = ts.Debug.deprecate(ts.factory.createNonNullChain, factoryDeprecation); + /** @deprecated Use `factory.updateNonNullChain` or the factory supplied by your transformation context instead. */ + ts.updateNonNullChain = ts.Debug.deprecate(ts.factory.updateNonNullChain, factoryDeprecation); + /** @deprecated Use `factory.createMetaProperty` or the factory supplied by your transformation context instead. */ + ts.createMetaProperty = ts.Debug.deprecate(ts.factory.createMetaProperty, factoryDeprecation); + /** @deprecated Use `factory.updateMetaProperty` or the factory supplied by your transformation context instead. */ + ts.updateMetaProperty = ts.Debug.deprecate(ts.factory.updateMetaProperty, factoryDeprecation); + /** @deprecated Use `factory.createTemplateSpan` or the factory supplied by your transformation context instead. */ + ts.createTemplateSpan = ts.Debug.deprecate(ts.factory.createTemplateSpan, factoryDeprecation); + /** @deprecated Use `factory.updateTemplateSpan` or the factory supplied by your transformation context instead. */ + ts.updateTemplateSpan = ts.Debug.deprecate(ts.factory.updateTemplateSpan, factoryDeprecation); + /** @deprecated Use `factory.createSemicolonClassElement` or the factory supplied by your transformation context instead. */ + ts.createSemicolonClassElement = ts.Debug.deprecate(ts.factory.createSemicolonClassElement, factoryDeprecation); + /** @deprecated Use `factory.createBlock` or the factory supplied by your transformation context instead. */ + ts.createBlock = ts.Debug.deprecate(ts.factory.createBlock, factoryDeprecation); + /** @deprecated Use `factory.updateBlock` or the factory supplied by your transformation context instead. */ + ts.updateBlock = ts.Debug.deprecate(ts.factory.updateBlock, factoryDeprecation); + /** @deprecated Use `factory.createVariableStatement` or the factory supplied by your transformation context instead. */ + ts.createVariableStatement = ts.Debug.deprecate(ts.factory.createVariableStatement, factoryDeprecation); + /** @deprecated Use `factory.updateVariableStatement` or the factory supplied by your transformation context instead. */ + ts.updateVariableStatement = ts.Debug.deprecate(ts.factory.updateVariableStatement, factoryDeprecation); + /** @deprecated Use `factory.createEmptyStatement` or the factory supplied by your transformation context instead. */ + ts.createEmptyStatement = ts.Debug.deprecate(ts.factory.createEmptyStatement, factoryDeprecation); + /** @deprecated Use `factory.createExpressionStatement` or the factory supplied by your transformation context instead. */ + ts.createExpressionStatement = ts.Debug.deprecate(ts.factory.createExpressionStatement, factoryDeprecation); + /** @deprecated Use `factory.updateExpressionStatement` or the factory supplied by your transformation context instead. */ + ts.updateExpressionStatement = ts.Debug.deprecate(ts.factory.updateExpressionStatement, factoryDeprecation); + /** @deprecated Use `factory.createExpressionStatement` or the factory supplied by your transformation context instead. */ + ts.createStatement = ts.Debug.deprecate(ts.factory.createExpressionStatement, factoryDeprecation); + /** @deprecated Use `factory.updateExpressionStatement` or the factory supplied by your transformation context instead. */ + ts.updateStatement = ts.Debug.deprecate(ts.factory.updateExpressionStatement, factoryDeprecation); + /** @deprecated Use `factory.createIf` or the factory supplied by your transformation context instead. */ + ts.createIf = ts.Debug.deprecate(ts.factory.createIfStatement, factoryDeprecation); + /** @deprecated Use `factory.updateIf` or the factory supplied by your transformation context instead. */ + ts.updateIf = ts.Debug.deprecate(ts.factory.updateIfStatement, factoryDeprecation); + /** @deprecated Use `factory.createDo` or the factory supplied by your transformation context instead. */ + ts.createDo = ts.Debug.deprecate(ts.factory.createDoStatement, factoryDeprecation); + /** @deprecated Use `factory.updateDo` or the factory supplied by your transformation context instead. */ + ts.updateDo = ts.Debug.deprecate(ts.factory.updateDoStatement, factoryDeprecation); + /** @deprecated Use `factory.createWhile` or the factory supplied by your transformation context instead. */ + ts.createWhile = ts.Debug.deprecate(ts.factory.createWhileStatement, factoryDeprecation); + /** @deprecated Use `factory.updateWhile` or the factory supplied by your transformation context instead. */ + ts.updateWhile = ts.Debug.deprecate(ts.factory.updateWhileStatement, factoryDeprecation); + /** @deprecated Use `factory.createFor` or the factory supplied by your transformation context instead. */ + ts.createFor = ts.Debug.deprecate(ts.factory.createForStatement, factoryDeprecation); + /** @deprecated Use `factory.updateFor` or the factory supplied by your transformation context instead. */ + ts.updateFor = ts.Debug.deprecate(ts.factory.updateForStatement, factoryDeprecation); + /** @deprecated Use `factory.createForIn` or the factory supplied by your transformation context instead. */ + ts.createForIn = ts.Debug.deprecate(ts.factory.createForInStatement, factoryDeprecation); + /** @deprecated Use `factory.updateForIn` or the factory supplied by your transformation context instead. */ + ts.updateForIn = ts.Debug.deprecate(ts.factory.updateForInStatement, factoryDeprecation); + /** @deprecated Use `factory.createForOf` or the factory supplied by your transformation context instead. */ + ts.createForOf = ts.Debug.deprecate(ts.factory.createForOfStatement, factoryDeprecation); + /** @deprecated Use `factory.updateForOf` or the factory supplied by your transformation context instead. */ + ts.updateForOf = ts.Debug.deprecate(ts.factory.updateForOfStatement, factoryDeprecation); + /** @deprecated Use `factory.createContinue` or the factory supplied by your transformation context instead. */ + ts.createContinue = ts.Debug.deprecate(ts.factory.createContinueStatement, factoryDeprecation); + /** @deprecated Use `factory.updateContinue` or the factory supplied by your transformation context instead. */ + ts.updateContinue = ts.Debug.deprecate(ts.factory.updateContinueStatement, factoryDeprecation); + /** @deprecated Use `factory.createBreak` or the factory supplied by your transformation context instead. */ + ts.createBreak = ts.Debug.deprecate(ts.factory.createBreakStatement, factoryDeprecation); + /** @deprecated Use `factory.updateBreak` or the factory supplied by your transformation context instead. */ + ts.updateBreak = ts.Debug.deprecate(ts.factory.updateBreakStatement, factoryDeprecation); + /** @deprecated Use `factory.createReturn` or the factory supplied by your transformation context instead. */ + ts.createReturn = ts.Debug.deprecate(ts.factory.createReturnStatement, factoryDeprecation); + /** @deprecated Use `factory.updateReturn` or the factory supplied by your transformation context instead. */ + ts.updateReturn = ts.Debug.deprecate(ts.factory.updateReturnStatement, factoryDeprecation); + /** @deprecated Use `factory.createWith` or the factory supplied by your transformation context instead. */ + ts.createWith = ts.Debug.deprecate(ts.factory.createWithStatement, factoryDeprecation); + /** @deprecated Use `factory.updateWith` or the factory supplied by your transformation context instead. */ + ts.updateWith = ts.Debug.deprecate(ts.factory.updateWithStatement, factoryDeprecation); + /** @deprecated Use `factory.createSwitch` or the factory supplied by your transformation context instead. */ + ts.createSwitch = ts.Debug.deprecate(ts.factory.createSwitchStatement, factoryDeprecation); + /** @deprecated Use `factory.updateSwitch` or the factory supplied by your transformation context instead. */ + ts.updateSwitch = ts.Debug.deprecate(ts.factory.updateSwitchStatement, factoryDeprecation); + /** @deprecated Use `factory.createLabel` or the factory supplied by your transformation context instead. */ + ts.createLabel = ts.Debug.deprecate(ts.factory.createLabeledStatement, factoryDeprecation); + /** @deprecated Use `factory.updateLabel` or the factory supplied by your transformation context instead. */ + ts.updateLabel = ts.Debug.deprecate(ts.factory.updateLabeledStatement, factoryDeprecation); + /** @deprecated Use `factory.createThrow` or the factory supplied by your transformation context instead. */ + ts.createThrow = ts.Debug.deprecate(ts.factory.createThrowStatement, factoryDeprecation); + /** @deprecated Use `factory.updateThrow` or the factory supplied by your transformation context instead. */ + ts.updateThrow = ts.Debug.deprecate(ts.factory.updateThrowStatement, factoryDeprecation); + /** @deprecated Use `factory.createTry` or the factory supplied by your transformation context instead. */ + ts.createTry = ts.Debug.deprecate(ts.factory.createTryStatement, factoryDeprecation); + /** @deprecated Use `factory.updateTry` or the factory supplied by your transformation context instead. */ + ts.updateTry = ts.Debug.deprecate(ts.factory.updateTryStatement, factoryDeprecation); + /** @deprecated Use `factory.createDebuggerStatement` or the factory supplied by your transformation context instead. */ + ts.createDebuggerStatement = ts.Debug.deprecate(ts.factory.createDebuggerStatement, factoryDeprecation); + /** @deprecated Use `factory.createVariableDeclarationList` or the factory supplied by your transformation context instead. */ + ts.createVariableDeclarationList = ts.Debug.deprecate(ts.factory.createVariableDeclarationList, factoryDeprecation); + /** @deprecated Use `factory.updateVariableDeclarationList` or the factory supplied by your transformation context instead. */ + ts.updateVariableDeclarationList = ts.Debug.deprecate(ts.factory.updateVariableDeclarationList, factoryDeprecation); + /** @deprecated Use `factory.createFunctionDeclaration` or the factory supplied by your transformation context instead. */ + ts.createFunctionDeclaration = ts.Debug.deprecate(ts.factory.createFunctionDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateFunctionDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateFunctionDeclaration = ts.Debug.deprecate(ts.factory.updateFunctionDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createClassDeclaration` or the factory supplied by your transformation context instead. */ + ts.createClassDeclaration = ts.Debug.deprecate(ts.factory.createClassDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateClassDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateClassDeclaration = ts.Debug.deprecate(ts.factory.updateClassDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createInterfaceDeclaration` or the factory supplied by your transformation context instead. */ + ts.createInterfaceDeclaration = ts.Debug.deprecate(ts.factory.createInterfaceDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateInterfaceDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateInterfaceDeclaration = ts.Debug.deprecate(ts.factory.updateInterfaceDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createTypeAliasDeclaration` or the factory supplied by your transformation context instead. */ + ts.createTypeAliasDeclaration = ts.Debug.deprecate(ts.factory.createTypeAliasDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateTypeAliasDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateTypeAliasDeclaration = ts.Debug.deprecate(ts.factory.updateTypeAliasDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createEnumDeclaration` or the factory supplied by your transformation context instead. */ + ts.createEnumDeclaration = ts.Debug.deprecate(ts.factory.createEnumDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateEnumDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateEnumDeclaration = ts.Debug.deprecate(ts.factory.updateEnumDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createModuleDeclaration` or the factory supplied by your transformation context instead. */ + ts.createModuleDeclaration = ts.Debug.deprecate(ts.factory.createModuleDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateModuleDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateModuleDeclaration = ts.Debug.deprecate(ts.factory.updateModuleDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createModuleBlock` or the factory supplied by your transformation context instead. */ + ts.createModuleBlock = ts.Debug.deprecate(ts.factory.createModuleBlock, factoryDeprecation); + /** @deprecated Use `factory.updateModuleBlock` or the factory supplied by your transformation context instead. */ + ts.updateModuleBlock = ts.Debug.deprecate(ts.factory.updateModuleBlock, factoryDeprecation); + /** @deprecated Use `factory.createCaseBlock` or the factory supplied by your transformation context instead. */ + ts.createCaseBlock = ts.Debug.deprecate(ts.factory.createCaseBlock, factoryDeprecation); + /** @deprecated Use `factory.updateCaseBlock` or the factory supplied by your transformation context instead. */ + ts.updateCaseBlock = ts.Debug.deprecate(ts.factory.updateCaseBlock, factoryDeprecation); + /** @deprecated Use `factory.createNamespaceExportDeclaration` or the factory supplied by your transformation context instead. */ + ts.createNamespaceExportDeclaration = ts.Debug.deprecate(ts.factory.createNamespaceExportDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateNamespaceExportDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateNamespaceExportDeclaration = ts.Debug.deprecate(ts.factory.updateNamespaceExportDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createImportEqualsDeclaration` or the factory supplied by your transformation context instead. */ + ts.createImportEqualsDeclaration = ts.Debug.deprecate(ts.factory.createImportEqualsDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateImportEqualsDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateImportEqualsDeclaration = ts.Debug.deprecate(ts.factory.updateImportEqualsDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createImportDeclaration` or the factory supplied by your transformation context instead. */ + ts.createImportDeclaration = ts.Debug.deprecate(ts.factory.createImportDeclaration, factoryDeprecation); + /** @deprecated Use `factory.updateImportDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateImportDeclaration = ts.Debug.deprecate(ts.factory.updateImportDeclaration, factoryDeprecation); + /** @deprecated Use `factory.createNamespaceImport` or the factory supplied by your transformation context instead. */ + ts.createNamespaceImport = ts.Debug.deprecate(ts.factory.createNamespaceImport, factoryDeprecation); + /** @deprecated Use `factory.updateNamespaceImport` or the factory supplied by your transformation context instead. */ + ts.updateNamespaceImport = ts.Debug.deprecate(ts.factory.updateNamespaceImport, factoryDeprecation); + /** @deprecated Use `factory.createNamedImports` or the factory supplied by your transformation context instead. */ + ts.createNamedImports = ts.Debug.deprecate(ts.factory.createNamedImports, factoryDeprecation); + /** @deprecated Use `factory.updateNamedImports` or the factory supplied by your transformation context instead. */ + ts.updateNamedImports = ts.Debug.deprecate(ts.factory.updateNamedImports, factoryDeprecation); + /** @deprecated Use `factory.createImportSpecifier` or the factory supplied by your transformation context instead. */ + ts.createImportSpecifier = ts.Debug.deprecate(ts.factory.createImportSpecifier, factoryDeprecation); + /** @deprecated Use `factory.updateImportSpecifier` or the factory supplied by your transformation context instead. */ + ts.updateImportSpecifier = ts.Debug.deprecate(ts.factory.updateImportSpecifier, factoryDeprecation); + /** @deprecated Use `factory.createExportAssignment` or the factory supplied by your transformation context instead. */ + ts.createExportAssignment = ts.Debug.deprecate(ts.factory.createExportAssignment, factoryDeprecation); + /** @deprecated Use `factory.updateExportAssignment` or the factory supplied by your transformation context instead. */ + ts.updateExportAssignment = ts.Debug.deprecate(ts.factory.updateExportAssignment, factoryDeprecation); + /** @deprecated Use `factory.createNamedExports` or the factory supplied by your transformation context instead. */ + ts.createNamedExports = ts.Debug.deprecate(ts.factory.createNamedExports, factoryDeprecation); + /** @deprecated Use `factory.updateNamedExports` or the factory supplied by your transformation context instead. */ + ts.updateNamedExports = ts.Debug.deprecate(ts.factory.updateNamedExports, factoryDeprecation); + /** @deprecated Use `factory.createExportSpecifier` or the factory supplied by your transformation context instead. */ + ts.createExportSpecifier = ts.Debug.deprecate(ts.factory.createExportSpecifier, factoryDeprecation); + /** @deprecated Use `factory.updateExportSpecifier` or the factory supplied by your transformation context instead. */ + ts.updateExportSpecifier = ts.Debug.deprecate(ts.factory.updateExportSpecifier, factoryDeprecation); + /** @deprecated Use `factory.createExternalModuleReference` or the factory supplied by your transformation context instead. */ + ts.createExternalModuleReference = ts.Debug.deprecate(ts.factory.createExternalModuleReference, factoryDeprecation); + /** @deprecated Use `factory.updateExternalModuleReference` or the factory supplied by your transformation context instead. */ + ts.updateExternalModuleReference = ts.Debug.deprecate(ts.factory.updateExternalModuleReference, factoryDeprecation); + /** @deprecated Use `factory.createJSDocTypeExpression` or the factory supplied by your transformation context instead. */ + ts.createJSDocTypeExpression = ts.Debug.deprecate(ts.factory.createJSDocTypeExpression, factoryDeprecation); + /** @deprecated Use `factory.createJSDocTypeTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocTypeTag = ts.Debug.deprecate(ts.factory.createJSDocTypeTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocReturnTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocReturnTag = ts.Debug.deprecate(ts.factory.createJSDocReturnTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocThisTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocThisTag = ts.Debug.deprecate(ts.factory.createJSDocThisTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocComment` or the factory supplied by your transformation context instead. */ + ts.createJSDocComment = ts.Debug.deprecate(ts.factory.createJSDocComment, factoryDeprecation); + /** @deprecated Use `factory.createJSDocParameterTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocParameterTag = ts.Debug.deprecate(ts.factory.createJSDocParameterTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocClassTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocClassTag = ts.Debug.deprecate(ts.factory.createJSDocClassTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocAugmentsTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocAugmentsTag = ts.Debug.deprecate(ts.factory.createJSDocAugmentsTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocEnumTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocEnumTag = ts.Debug.deprecate(ts.factory.createJSDocEnumTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocTemplateTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocTemplateTag = ts.Debug.deprecate(ts.factory.createJSDocTemplateTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocTypedefTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocTypedefTag = ts.Debug.deprecate(ts.factory.createJSDocTypedefTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocCallbackTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocCallbackTag = ts.Debug.deprecate(ts.factory.createJSDocCallbackTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocSignature` or the factory supplied by your transformation context instead. */ + ts.createJSDocSignature = ts.Debug.deprecate(ts.factory.createJSDocSignature, factoryDeprecation); + /** @deprecated Use `factory.createJSDocPropertyTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocPropertyTag = ts.Debug.deprecate(ts.factory.createJSDocPropertyTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocTypeLiteral` or the factory supplied by your transformation context instead. */ + ts.createJSDocTypeLiteral = ts.Debug.deprecate(ts.factory.createJSDocTypeLiteral, factoryDeprecation); + /** @deprecated Use `factory.createJSDocImplementsTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocImplementsTag = ts.Debug.deprecate(ts.factory.createJSDocImplementsTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocAuthorTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocAuthorTag = ts.Debug.deprecate(ts.factory.createJSDocAuthorTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocPublicTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocPublicTag = ts.Debug.deprecate(ts.factory.createJSDocPublicTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocPrivateTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocPrivateTag = ts.Debug.deprecate(ts.factory.createJSDocPrivateTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocProtectedTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocProtectedTag = ts.Debug.deprecate(ts.factory.createJSDocProtectedTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocReadonlyTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocReadonlyTag = ts.Debug.deprecate(ts.factory.createJSDocReadonlyTag, factoryDeprecation); + /** @deprecated Use `factory.createJSDocUnknownTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocTag = ts.Debug.deprecate(ts.factory.createJSDocUnknownTag, factoryDeprecation); + /** @deprecated Use `factory.createJsxElement` or the factory supplied by your transformation context instead. */ + ts.createJsxElement = ts.Debug.deprecate(ts.factory.createJsxElement, factoryDeprecation); + /** @deprecated Use `factory.updateJsxElement` or the factory supplied by your transformation context instead. */ + ts.updateJsxElement = ts.Debug.deprecate(ts.factory.updateJsxElement, factoryDeprecation); + /** @deprecated Use `factory.createJsxSelfClosingElement` or the factory supplied by your transformation context instead. */ + ts.createJsxSelfClosingElement = ts.Debug.deprecate(ts.factory.createJsxSelfClosingElement, factoryDeprecation); + /** @deprecated Use `factory.updateJsxSelfClosingElement` or the factory supplied by your transformation context instead. */ + ts.updateJsxSelfClosingElement = ts.Debug.deprecate(ts.factory.updateJsxSelfClosingElement, factoryDeprecation); + /** @deprecated Use `factory.createJsxOpeningElement` or the factory supplied by your transformation context instead. */ + ts.createJsxOpeningElement = ts.Debug.deprecate(ts.factory.createJsxOpeningElement, factoryDeprecation); + /** @deprecated Use `factory.updateJsxOpeningElement` or the factory supplied by your transformation context instead. */ + ts.updateJsxOpeningElement = ts.Debug.deprecate(ts.factory.updateJsxOpeningElement, factoryDeprecation); + /** @deprecated Use `factory.createJsxClosingElement` or the factory supplied by your transformation context instead. */ + ts.createJsxClosingElement = ts.Debug.deprecate(ts.factory.createJsxClosingElement, factoryDeprecation); + /** @deprecated Use `factory.updateJsxClosingElement` or the factory supplied by your transformation context instead. */ + ts.updateJsxClosingElement = ts.Debug.deprecate(ts.factory.updateJsxClosingElement, factoryDeprecation); + /** @deprecated Use `factory.createJsxFragment` or the factory supplied by your transformation context instead. */ + ts.createJsxFragment = ts.Debug.deprecate(ts.factory.createJsxFragment, factoryDeprecation); + /** @deprecated Use `factory.createJsxText` or the factory supplied by your transformation context instead. */ + ts.createJsxText = ts.Debug.deprecate(ts.factory.createJsxText, factoryDeprecation); + /** @deprecated Use `factory.updateJsxText` or the factory supplied by your transformation context instead. */ + ts.updateJsxText = ts.Debug.deprecate(ts.factory.updateJsxText, factoryDeprecation); + /** @deprecated Use `factory.createJsxOpeningFragment` or the factory supplied by your transformation context instead. */ + ts.createJsxOpeningFragment = ts.Debug.deprecate(ts.factory.createJsxOpeningFragment, factoryDeprecation); + /** @deprecated Use `factory.createJsxJsxClosingFragment` or the factory supplied by your transformation context instead. */ + ts.createJsxJsxClosingFragment = ts.Debug.deprecate(ts.factory.createJsxJsxClosingFragment, factoryDeprecation); + /** @deprecated Use `factory.updateJsxFragment` or the factory supplied by your transformation context instead. */ + ts.updateJsxFragment = ts.Debug.deprecate(ts.factory.updateJsxFragment, factoryDeprecation); + /** @deprecated Use `factory.createJsxAttribute` or the factory supplied by your transformation context instead. */ + ts.createJsxAttribute = ts.Debug.deprecate(ts.factory.createJsxAttribute, factoryDeprecation); + /** @deprecated Use `factory.updateJsxAttribute` or the factory supplied by your transformation context instead. */ + ts.updateJsxAttribute = ts.Debug.deprecate(ts.factory.updateJsxAttribute, factoryDeprecation); + /** @deprecated Use `factory.createJsxAttributes` or the factory supplied by your transformation context instead. */ + ts.createJsxAttributes = ts.Debug.deprecate(ts.factory.createJsxAttributes, factoryDeprecation); + /** @deprecated Use `factory.updateJsxAttributes` or the factory supplied by your transformation context instead. */ + ts.updateJsxAttributes = ts.Debug.deprecate(ts.factory.updateJsxAttributes, factoryDeprecation); + /** @deprecated Use `factory.createJsxSpreadAttribute` or the factory supplied by your transformation context instead. */ + ts.createJsxSpreadAttribute = ts.Debug.deprecate(ts.factory.createJsxSpreadAttribute, factoryDeprecation); + /** @deprecated Use `factory.updateJsxSpreadAttribute` or the factory supplied by your transformation context instead. */ + ts.updateJsxSpreadAttribute = ts.Debug.deprecate(ts.factory.updateJsxSpreadAttribute, factoryDeprecation); + /** @deprecated Use `factory.createJsxExpression` or the factory supplied by your transformation context instead. */ + ts.createJsxExpression = ts.Debug.deprecate(ts.factory.createJsxExpression, factoryDeprecation); + /** @deprecated Use `factory.updateJsxExpression` or the factory supplied by your transformation context instead. */ + ts.updateJsxExpression = ts.Debug.deprecate(ts.factory.updateJsxExpression, factoryDeprecation); + /** @deprecated Use `factory.createCaseClause` or the factory supplied by your transformation context instead. */ + ts.createCaseClause = ts.Debug.deprecate(ts.factory.createCaseClause, factoryDeprecation); + /** @deprecated Use `factory.updateCaseClause` or the factory supplied by your transformation context instead. */ + ts.updateCaseClause = ts.Debug.deprecate(ts.factory.updateCaseClause, factoryDeprecation); + /** @deprecated Use `factory.createDefaultClause` or the factory supplied by your transformation context instead. */ + ts.createDefaultClause = ts.Debug.deprecate(ts.factory.createDefaultClause, factoryDeprecation); + /** @deprecated Use `factory.updateDefaultClause` or the factory supplied by your transformation context instead. */ + ts.updateDefaultClause = ts.Debug.deprecate(ts.factory.updateDefaultClause, factoryDeprecation); + /** @deprecated Use `factory.createHeritageClause` or the factory supplied by your transformation context instead. */ + ts.createHeritageClause = ts.Debug.deprecate(ts.factory.createHeritageClause, factoryDeprecation); + /** @deprecated Use `factory.updateHeritageClause` or the factory supplied by your transformation context instead. */ + ts.updateHeritageClause = ts.Debug.deprecate(ts.factory.updateHeritageClause, factoryDeprecation); + /** @deprecated Use `factory.createCatchClause` or the factory supplied by your transformation context instead. */ + ts.createCatchClause = ts.Debug.deprecate(ts.factory.createCatchClause, factoryDeprecation); + /** @deprecated Use `factory.updateCatchClause` or the factory supplied by your transformation context instead. */ + ts.updateCatchClause = ts.Debug.deprecate(ts.factory.updateCatchClause, factoryDeprecation); + /** @deprecated Use `factory.createPropertyAssignment` or the factory supplied by your transformation context instead. */ + ts.createPropertyAssignment = ts.Debug.deprecate(ts.factory.createPropertyAssignment, factoryDeprecation); + /** @deprecated Use `factory.updatePropertyAssignment` or the factory supplied by your transformation context instead. */ + ts.updatePropertyAssignment = ts.Debug.deprecate(ts.factory.updatePropertyAssignment, factoryDeprecation); + /** @deprecated Use `factory.createShorthandPropertyAssignment` or the factory supplied by your transformation context instead. */ + ts.createShorthandPropertyAssignment = ts.Debug.deprecate(ts.factory.createShorthandPropertyAssignment, factoryDeprecation); + /** @deprecated Use `factory.updateShorthandPropertyAssignment` or the factory supplied by your transformation context instead. */ + ts.updateShorthandPropertyAssignment = ts.Debug.deprecate(ts.factory.updateShorthandPropertyAssignment, factoryDeprecation); + /** @deprecated Use `factory.createSpreadAssignment` or the factory supplied by your transformation context instead. */ + ts.createSpreadAssignment = ts.Debug.deprecate(ts.factory.createSpreadAssignment, factoryDeprecation); + /** @deprecated Use `factory.updateSpreadAssignment` or the factory supplied by your transformation context instead. */ + ts.updateSpreadAssignment = ts.Debug.deprecate(ts.factory.updateSpreadAssignment, factoryDeprecation); + /** @deprecated Use `factory.createEnumMember` or the factory supplied by your transformation context instead. */ + ts.createEnumMember = ts.Debug.deprecate(ts.factory.createEnumMember, factoryDeprecation); + /** @deprecated Use `factory.updateEnumMember` or the factory supplied by your transformation context instead. */ + ts.updateEnumMember = ts.Debug.deprecate(ts.factory.updateEnumMember, factoryDeprecation); + /** @deprecated Use `factory.updateSourceFile` or the factory supplied by your transformation context instead. */ + ts.updateSourceFileNode = ts.Debug.deprecate(ts.factory.updateSourceFile, factoryDeprecation); + /** @deprecated Use `factory.createNotEmittedStatement` or the factory supplied by your transformation context instead. */ + ts.createNotEmittedStatement = ts.Debug.deprecate(ts.factory.createNotEmittedStatement, factoryDeprecation); + /** @deprecated Use `factory.createPartiallyEmittedExpression` or the factory supplied by your transformation context instead. */ + ts.createPartiallyEmittedExpression = ts.Debug.deprecate(ts.factory.createPartiallyEmittedExpression, factoryDeprecation); + /** @deprecated Use `factory.updatePartiallyEmittedExpression` or the factory supplied by your transformation context instead. */ + ts.updatePartiallyEmittedExpression = ts.Debug.deprecate(ts.factory.updatePartiallyEmittedExpression, factoryDeprecation); + /** @deprecated Use `factory.createCommaList` or the factory supplied by your transformation context instead. */ + ts.createCommaList = ts.Debug.deprecate(ts.factory.createCommaListExpression, factoryDeprecation); + /** @deprecated Use `factory.updateCommaList` or the factory supplied by your transformation context instead. */ + ts.updateCommaList = ts.Debug.deprecate(ts.factory.updateCommaListExpression, factoryDeprecation); + /** @deprecated Use `factory.createBundle` or the factory supplied by your transformation context instead. */ + ts.createBundle = ts.Debug.deprecate(ts.factory.createBundle, factoryDeprecation); + /** @deprecated Use `factory.updateBundle` or the factory supplied by your transformation context instead. */ + ts.updateBundle = ts.Debug.deprecate(ts.factory.updateBundle, factoryDeprecation); + /** @deprecated Use `factory.createImmediatelyInvokedFunctionExpression` or the factory supplied by your transformation context instead. */ + ts.createImmediatelyInvokedFunctionExpression = ts.Debug.deprecate(ts.factory.createImmediatelyInvokedFunctionExpression, factoryDeprecation); + /** @deprecated Use `factory.createImmediatelyInvokedArrowFunction` or the factory supplied by your transformation context instead. */ + ts.createImmediatelyInvokedArrowFunction = ts.Debug.deprecate(ts.factory.createImmediatelyInvokedArrowFunction, factoryDeprecation); + /** @deprecated Use `factory.createVoidZero` or the factory supplied by your transformation context instead. */ + ts.createVoidZero = ts.Debug.deprecate(ts.factory.createVoidZero, factoryDeprecation); + /** @deprecated Use `factory.createExportDefault` or the factory supplied by your transformation context instead. */ + ts.createExportDefault = ts.Debug.deprecate(ts.factory.createExportDefault, factoryDeprecation); + /** @deprecated Use `factory.createExternalModuleExport` or the factory supplied by your transformation context instead. */ + ts.createExternalModuleExport = ts.Debug.deprecate(ts.factory.createExternalModuleExport, factoryDeprecation); + /** @deprecated Use `factory.createNamespaceExport` or the factory supplied by your transformation context instead. */ + ts.createNamespaceExport = ts.Debug.deprecate(ts.factory.createNamespaceExport, factoryDeprecation); + /** @deprecated Use `factory.updateNamespaceExport` or the factory supplied by your transformation context instead. */ + ts.updateNamespaceExport = ts.Debug.deprecate(ts.factory.updateNamespaceExport, factoryDeprecation); + /** @deprecated Use `factory.createToken` or the factory supplied by your transformation context instead. */ + ts.createToken = ts.Debug.deprecate(function createToken(kind) { + return ts.factory.createToken(kind); + }, factoryDeprecation); + /** @deprecated Use `factory.createIdentifier` or the factory supplied by your transformation context instead. */ + ts.createIdentifier = ts.Debug.deprecate(function createIdentifier(text) { + return ts.factory.createIdentifier(text, /*typeArguments*/ undefined, /*originalKeywordKind*/ undefined); + }, factoryDeprecation); + /** @deprecated Use `factory.createTempVariable` or the factory supplied by your transformation context instead. */ + ts.createTempVariable = ts.Debug.deprecate(function createTempVariable(recordTempVariable) { + return ts.factory.createTempVariable(recordTempVariable, /*reserveInNestedScopes*/ undefined); + }, factoryDeprecation); + /** @deprecated Use `factory.getGeneratedNameForNode` or the factory supplied by your transformation context instead. */ + ts.getGeneratedNameForNode = ts.Debug.deprecate(function getGeneratedNameForNode(node) { + return ts.factory.getGeneratedNameForNode(node, /*flags*/ undefined); + }, factoryDeprecation); + /** @deprecated Use `factory.createUniqueName(text, GeneratedIdentifierFlags.Optimistic)` or the factory supplied by your transformation context instead. */ + ts.createOptimisticUniqueName = ts.Debug.deprecate(function createOptimisticUniqueName(text) { + return ts.factory.createUniqueName(text, 16 /* Optimistic */); + }, factoryDeprecation); + /** @deprecated Use `factory.createUniqueName(text, GeneratedIdentifierFlags.Optimistic | GeneratedIdentifierFlags.FileLevel)` or the factory supplied by your transformation context instead. */ + ts.createFileLevelUniqueName = ts.Debug.deprecate(function createFileLevelUniqueName(text) { + return ts.factory.createUniqueName(text, 16 /* Optimistic */ | 32 /* FileLevel */); + }, factoryDeprecation); + /** @deprecated Use `factory.createIndexSignature` or the factory supplied by your transformation context instead. */ + ts.createIndexSignature = ts.Debug.deprecate(function createIndexSignature(decorators, modifiers, parameters, type) { + return ts.factory.createIndexSignature(decorators, modifiers, parameters, type); + }, factoryDeprecation); + /** @deprecated Use `factory.createTypePredicateNode` or the factory supplied by your transformation context instead. */ + ts.createTypePredicateNode = ts.Debug.deprecate(function createTypePredicateNode(parameterName, type) { + return ts.factory.createTypePredicateNode(/*assertsModifier*/ undefined, parameterName, type); + }, factoryDeprecation); + /** @deprecated Use `factory.updateTypePredicateNode` or the factory supplied by your transformation context instead. */ + ts.updateTypePredicateNode = ts.Debug.deprecate(function updateTypePredicateNode(node, parameterName, type) { + return ts.factory.updateTypePredicateNode(node, /*assertsModifier*/ undefined, parameterName, type); + }, factoryDeprecation); + /** @deprecated Use `factory.createStringLiteral`, `factory.createStringLiteralFromNode`, `factory.createNumericLiteral`, `factory.createBigIntLiteral`, `factory.createTrue`, `factory.createFalse`, or the factory supplied by your transformation context instead. */ + ts.createLiteral = ts.Debug.deprecate(function createLiteral(value) { + if (typeof value === "number") { + return ts.factory.createNumericLiteral(value); + } + // eslint-disable-next-line no-in-operator + if (typeof value === "object" && "base10Value" in value) { // PseudoBigInt + return ts.factory.createBigIntLiteral(value); + } + if (typeof value === "boolean") { + return value ? ts.factory.createTrue() : ts.factory.createFalse(); + } + if (typeof value === "string") { + return ts.factory.createStringLiteral(value, /*isSingleQuote*/ undefined); + } + return ts.factory.createStringLiteralFromNode(value); + }, { since: "4.0", warnAfter: "4.1", message: "Use `factory.createStringLiteral`, `factory.createStringLiteralFromNode`, `factory.createNumericLiteral`, `factory.createBigIntLiteral`, `factory.createTrue`, `factory.createFalse`, or the factory supplied by your transformation context instead." }); + /** @deprecated Use `factory.createMethodSignature` or the factory supplied by your transformation context instead. */ + ts.createMethodSignature = ts.Debug.deprecate(function createMethodSignature(typeParameters, parameters, type, name, questionToken) { + return ts.factory.createMethodSignature(/*modifiers*/ undefined, name, questionToken, typeParameters, parameters, type); + }, factoryDeprecation); + /** @deprecated Use `factory.updateMethodSignature` or the factory supplied by your transformation context instead. */ + ts.updateMethodSignature = ts.Debug.deprecate(function updateMethodSignature(node, typeParameters, parameters, type, name, questionToken) { + return ts.factory.updateMethodSignature(node, node.modifiers, name, questionToken, typeParameters, parameters, type); + }, factoryDeprecation); + /** @deprecated Use `factory.createTypeOperatorNode` or the factory supplied by your transformation context instead. */ + ts.createTypeOperatorNode = ts.Debug.deprecate(function createTypeOperatorNode(operatorOrType, type) { + var operator; + if (type) { + operator = operatorOrType; + } + else { + type = operatorOrType; + operator = 137 /* KeyOfKeyword */; + } + return ts.factory.createTypeOperatorNode(operator, type); + }, factoryDeprecation); + /** @deprecated Use `factory.createTaggedTemplate` or the factory supplied by your transformation context instead. */ + ts.createTaggedTemplate = ts.Debug.deprecate(function createTaggedTemplate(tag, typeArgumentsOrTemplate, template) { + var typeArguments; + if (template) { + typeArguments = typeArgumentsOrTemplate; + } + else { + template = typeArgumentsOrTemplate; + } + return ts.factory.createTaggedTemplateExpression(tag, typeArguments, template); + }, factoryDeprecation); + /** @deprecated Use `factory.updateTaggedTemplate` or the factory supplied by your transformation context instead. */ + ts.updateTaggedTemplate = ts.Debug.deprecate(function updateTaggedTemplate(node, tag, typeArgumentsOrTemplate, template) { + var typeArguments; + if (template) { + typeArguments = typeArgumentsOrTemplate; + } + else { + template = typeArgumentsOrTemplate; + } + return ts.factory.updateTaggedTemplateExpression(node, tag, typeArguments, template); + }, factoryDeprecation); + /** @deprecated Use `factory.updateBinary` or the factory supplied by your transformation context instead. */ + ts.updateBinary = ts.Debug.deprecate(function updateBinary(node, left, right, operator) { + if (operator === void 0) { operator = node.operatorToken; } + if (typeof operator === "number") { + operator = operator === node.operatorToken.kind ? node.operatorToken : ts.factory.createToken(operator); + } + return ts.factory.updateBinaryExpression(node, left, operator, right); + }, factoryDeprecation); + /** @deprecated Use `factory.createConditional` or the factory supplied by your transformation context instead. */ + ts.createConditional = ts.Debug.deprecate(function createConditional(condition, questionTokenOrWhenTrue, whenTrueOrWhenFalse, colonToken, whenFalse) { + return arguments.length === 5 ? ts.factory.createConditionalExpression(condition, questionTokenOrWhenTrue, whenTrueOrWhenFalse, colonToken, whenFalse) : + arguments.length === 3 ? ts.factory.createConditionalExpression(condition, ts.factory.createToken(57 /* QuestionToken */), questionTokenOrWhenTrue, ts.factory.createToken(58 /* ColonToken */), whenTrueOrWhenFalse) : + ts.Debug.fail("Argument count mismatch"); + }, factoryDeprecation); + /** @deprecated Use `factory.createYield` or the factory supplied by your transformation context instead. */ + ts.createYield = ts.Debug.deprecate(function createYield(asteriskTokenOrExpression, expression) { + var asteriskToken; + if (expression) { + asteriskToken = asteriskTokenOrExpression; + } + else { + expression = asteriskTokenOrExpression; + } + return ts.factory.createYieldExpression(asteriskToken, expression); + }, factoryDeprecation); + /** @deprecated Use `factory.createClassExpression` or the factory supplied by your transformation context instead. */ + ts.createClassExpression = ts.Debug.deprecate(function createClassExpression(modifiers, name, typeParameters, heritageClauses, members) { + return ts.factory.createClassExpression(/*decorators*/ undefined, modifiers, name, typeParameters, heritageClauses, members); + }, factoryDeprecation); + /** @deprecated Use `factory.updateClassExpression` or the factory supplied by your transformation context instead. */ + ts.updateClassExpression = ts.Debug.deprecate(function updateClassExpression(node, modifiers, name, typeParameters, heritageClauses, members) { + return ts.factory.updateClassExpression(node, /*decorators*/ undefined, modifiers, name, typeParameters, heritageClauses, members); + }, factoryDeprecation); + /** @deprecated Use `factory.createPropertySignature` or the factory supplied by your transformation context instead. */ + ts.createPropertySignature = ts.Debug.deprecate(function createPropertySignature(modifiers, name, questionToken, type, initializer) { + var node = ts.factory.createPropertySignature(modifiers, name, questionToken, type); + node.initializer = initializer; + return node; + }, factoryDeprecation); + /** @deprecated Use `factory.updatePropertySignature` or the factory supplied by your transformation context instead. */ + ts.updatePropertySignature = ts.Debug.deprecate(function updatePropertySignature(node, modifiers, name, questionToken, type, initializer) { + var updated = ts.factory.updatePropertySignature(node, modifiers, name, questionToken, type); + if (node.initializer !== initializer) { + if (updated === node) { + updated = ts.factory.cloneNode(node); + } + updated.initializer = initializer; + } + return updated; + }, factoryDeprecation); + /** @deprecated Use `factory.createExpressionWithTypeArguments` or the factory supplied by your transformation context instead. */ + ts.createExpressionWithTypeArguments = ts.Debug.deprecate(function createExpressionWithTypeArguments(typeArguments, expression) { + return ts.factory.createExpressionWithTypeArguments(expression, typeArguments); + }, factoryDeprecation); + /** @deprecated Use `factory.updateExpressionWithTypeArguments` or the factory supplied by your transformation context instead. */ + ts.updateExpressionWithTypeArguments = ts.Debug.deprecate(function updateExpressionWithTypeArguments(node, typeArguments, expression) { + return ts.factory.updateExpressionWithTypeArguments(node, expression, typeArguments); + }, factoryDeprecation); + /** @deprecated Use `factory.createArrowFunction` or the factory supplied by your transformation context instead. */ + ts.createArrowFunction = ts.Debug.deprecate(function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanTokenOrBody, body) { + return arguments.length === 6 ? ts.factory.createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanTokenOrBody, body) : + arguments.length === 5 ? ts.factory.createArrowFunction(modifiers, typeParameters, parameters, type, /*equalsGreaterThanToken*/ undefined, equalsGreaterThanTokenOrBody) : + ts.Debug.fail("Argument count mismatch"); + }, factoryDeprecation); + /** @deprecated Use `factory.updateArrowFunction` or the factory supplied by your transformation context instead. */ + ts.updateArrowFunction = ts.Debug.deprecate(function updateArrowFunction(node, modifiers, typeParameters, parameters, type, equalsGreaterThanTokenOrBody, body) { + return arguments.length === 7 ? ts.factory.updateArrowFunction(node, modifiers, typeParameters, parameters, type, equalsGreaterThanTokenOrBody, body) : + arguments.length === 6 ? ts.factory.updateArrowFunction(node, modifiers, typeParameters, parameters, type, node.equalsGreaterThanToken, equalsGreaterThanTokenOrBody) : + ts.Debug.fail("Argument count mismatch"); + }, factoryDeprecation); + /** @deprecated Use `factory.createVariableDeclaration` or the factory supplied by your transformation context instead. */ + ts.createVariableDeclaration = ts.Debug.deprecate(function createVariableDeclaration(name, exclamationTokenOrType, typeOrInitializer, initializer) { + return arguments.length === 4 ? ts.factory.createVariableDeclaration(name, exclamationTokenOrType, typeOrInitializer, initializer) : + arguments.length >= 1 && arguments.length <= 3 ? ts.factory.createVariableDeclaration(name, /*exclamationToken*/ undefined, exclamationTokenOrType, typeOrInitializer) : + ts.Debug.fail("Argument count mismatch"); + }, factoryDeprecation); + /** @deprecated Use `factory.updateVariableDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateVariableDeclaration = ts.Debug.deprecate(function updateVariableDeclaration(node, name, exclamationTokenOrType, typeOrInitializer, initializer) { + return arguments.length === 5 ? ts.factory.updateVariableDeclaration(node, name, exclamationTokenOrType, typeOrInitializer, initializer) : + arguments.length === 4 ? ts.factory.updateVariableDeclaration(node, name, node.exclamationToken, exclamationTokenOrType, typeOrInitializer) : + ts.Debug.fail("Argument count mismatch"); + }, factoryDeprecation); + /** @deprecated Use `factory.createImportClause` or the factory supplied by your transformation context instead. */ + ts.createImportClause = ts.Debug.deprecate(function createImportClause(name, namedBindings, isTypeOnly) { + if (isTypeOnly === void 0) { isTypeOnly = false; } + return ts.factory.createImportClause(isTypeOnly, name, namedBindings); + }, factoryDeprecation); + /** @deprecated Use `factory.updateImportClause` or the factory supplied by your transformation context instead. */ + ts.updateImportClause = ts.Debug.deprecate(function updateImportClause(node, name, namedBindings, isTypeOnly) { + return ts.factory.updateImportClause(node, isTypeOnly, name, namedBindings); + }, factoryDeprecation); + /** @deprecated Use `factory.createExportDeclaration` or the factory supplied by your transformation context instead. */ + ts.createExportDeclaration = ts.Debug.deprecate(function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier, isTypeOnly) { + if (isTypeOnly === void 0) { isTypeOnly = false; } + return ts.factory.createExportDeclaration(decorators, modifiers, isTypeOnly, exportClause, moduleSpecifier); + }, factoryDeprecation); + /** @deprecated Use `factory.updateExportDeclaration` or the factory supplied by your transformation context instead. */ + ts.updateExportDeclaration = ts.Debug.deprecate(function updateExportDeclaration(node, decorators, modifiers, exportClause, moduleSpecifier, isTypeOnly) { + return ts.factory.updateExportDeclaration(node, decorators, modifiers, isTypeOnly, exportClause, moduleSpecifier); + }, factoryDeprecation); + /** @deprecated Use `factory.createJSDocParameterTag` or the factory supplied by your transformation context instead. */ + ts.createJSDocParamTag = ts.Debug.deprecate(function createJSDocParamTag(name, isBracketed, typeExpression, comment) { + return ts.factory.createJSDocParameterTag(/*tagName*/ undefined, name, isBracketed, typeExpression, /*isNameFirst*/ false, comment); + }, factoryDeprecation); + /** @deprecated Use `factory.createComma` or the factory supplied by your transformation context instead. */ + ts.createComma = ts.Debug.deprecate(function createComma(left, right) { + return ts.factory.createComma(left, right); + }, factoryDeprecation); + /** @deprecated Use `factory.createLessThan` or the factory supplied by your transformation context instead. */ + ts.createLessThan = ts.Debug.deprecate(function createLessThan(left, right) { + return ts.factory.createLessThan(left, right); + }, factoryDeprecation); + /** @deprecated Use `factory.createAssignment` or the factory supplied by your transformation context instead. */ + ts.createAssignment = ts.Debug.deprecate(function createAssignment(left, right) { + return ts.factory.createAssignment(left, right); + }, factoryDeprecation); + /** @deprecated Use `factory.createStrictEquality` or the factory supplied by your transformation context instead. */ + ts.createStrictEquality = ts.Debug.deprecate(function createStrictEquality(left, right) { + return ts.factory.createStrictEquality(left, right); + }, factoryDeprecation); + /** @deprecated Use `factory.createStrictInequality` or the factory supplied by your transformation context instead. */ + ts.createStrictInequality = ts.Debug.deprecate(function createStrictInequality(left, right) { + return ts.factory.createStrictInequality(left, right); + }, factoryDeprecation); + /** @deprecated Use `factory.createAdd` or the factory supplied by your transformation context instead. */ + ts.createAdd = ts.Debug.deprecate(function createAdd(left, right) { + return ts.factory.createAdd(left, right); + }, factoryDeprecation); + /** @deprecated Use `factory.createSubtract` or the factory supplied by your transformation context instead. */ + ts.createSubtract = ts.Debug.deprecate(function createSubtract(left, right) { + return ts.factory.createSubtract(left, right); + }, factoryDeprecation); + /** @deprecated Use `factory.createLogicalAnd` or the factory supplied by your transformation context instead. */ + ts.createLogicalAnd = ts.Debug.deprecate(function createLogicalAnd(left, right) { + return ts.factory.createLogicalAnd(left, right); + }, factoryDeprecation); + /** @deprecated Use `factory.createLogicalOr` or the factory supplied by your transformation context instead. */ + ts.createLogicalOr = ts.Debug.deprecate(function createLogicalOr(left, right) { + return ts.factory.createLogicalOr(left, right); + }, factoryDeprecation); + /** @deprecated Use `factory.createPostfixIncrement` or the factory supplied by your transformation context instead. */ + ts.createPostfixIncrement = ts.Debug.deprecate(function createPostfixIncrement(operand) { + return ts.factory.createPostfixIncrement(operand); + }, factoryDeprecation); + /** @deprecated Use `factory.createLogicalNot` or the factory supplied by your transformation context instead. */ + ts.createLogicalNot = ts.Debug.deprecate(function createLogicalNot(operand) { + return ts.factory.createLogicalNot(operand); + }, factoryDeprecation); + /** @deprecated Use an appropriate `factory` method instead. */ + ts.createNode = ts.Debug.deprecate(function createNode(kind, pos, end) { + if (pos === void 0) { pos = 0; } + if (end === void 0) { end = 0; } + return ts.setTextRangePosEnd(kind === 294 /* SourceFile */ ? ts.parseBaseNodeFactory.createBaseSourceFileNode(kind) : + kind === 78 /* Identifier */ ? ts.parseBaseNodeFactory.createBaseIdentifierNode(kind) : + kind === 79 /* PrivateIdentifier */ ? ts.parseBaseNodeFactory.createBasePrivateIdentifierNode(kind) : + !ts.isNodeKind(kind) ? ts.parseBaseNodeFactory.createBaseTokenNode(kind) : + ts.parseBaseNodeFactory.createBaseNode(kind), pos, end); + }, { since: "4.0", warnAfter: "4.1", message: "Use an appropriate `factory` method instead." }); + /** + * Creates a shallow, memberwise clone of a node ~for mutation~ with its `pos`, `end`, and `parent` set. + * + * NOTE: It is unsafe to change any properties of a `Node` that relate to its AST children, as those changes won't be + * captured with respect to transformations. + * + * @deprecated Use `factory.cloneNode` instead and use `setCommentRange` or `setSourceMapRange` and avoid setting `parent`. + */ + ts.getMutableClone = ts.Debug.deprecate(function getMutableClone(node) { + var clone = ts.factory.cloneNode(node); + ts.setTextRange(clone, node); + ts.setParent(clone, node.parent); + return clone; + }, { since: "4.0", warnAfter: "4.1", message: "Use `factory.cloneNode` instead and use `setCommentRange` or `setSourceMapRange` and avoid setting `parent`." }); + // #endregion Node Factory top-level exports + // DEPRECATION: Renamed node tests + // DEPRECATION PLAN: + // - soft: 4.0 + // - warn: 4.1 + // - error: TBD + // #region Renamed node Tests + /** @deprecated Use `isTypeAssertionExpression` instead. */ + ts.isTypeAssertion = ts.Debug.deprecate(function isTypeAssertion(node) { + return node.kind === 203 /* TypeAssertionExpression */; + }, { + since: "4.0", + warnAfter: "4.1", + message: "Use `isTypeAssertionExpression` instead." + }); + // #endregion +})(ts || (ts = {})); //# sourceMappingURL=typescript.js.map diff --git a/std/_util/deep_assign.ts b/std/_util/deep_assign.ts index ca1f0aba11..43606daa3f 100644 --- a/std/_util/deep_assign.ts +++ b/std/_util/deep_assign.ts @@ -1,16 +1,31 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. import { assert } from "../_util/assert.ts"; +export function deepAssign(target: T, source: U): T & U; +export function deepAssign( + target: T, + source1: U, + source2: V, +): T & U & V; +export function deepAssign( + target: T, + source1: U, + source2: V, + source3: W, +): T & U & V & W; export function deepAssign( - target: Record, - ...sources: object[] -): object | undefined { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + target: Record, + // eslint-disable-next-line @typescript-eslint/no-explicit-any + ...sources: any[] +): // eslint-disable-next-line @typescript-eslint/ban-types +object | undefined { for (let i = 0; i < sources.length; i++) { const source = sources[i]; if (!source || typeof source !== `object`) { return; } - Object.entries(source).forEach(([key, value]: [string, unknown]): void => { + Object.entries(source).forEach(([key, value]): void => { if (value instanceof Date) { target[key] = new Date(value); return; diff --git a/std/encoding/_yaml/dumper/dumper.ts b/std/encoding/_yaml/dumper/dumper.ts index e1f1a142ad..ec517ffb25 100644 --- a/std/encoding/_yaml/dumper/dumper.ts +++ b/std/encoding/_yaml/dumper/dumper.ts @@ -499,7 +499,9 @@ function writeScalar( return `'${string.replace(/'/g, "''")}'`; case STYLE_LITERAL: return `|${blockHeader(string, state.indent)}${ - dropEndingNewline(indentString(string, indent)) + dropEndingNewline( + indentString(string, indent), + ) }`; case STYLE_FOLDED: return `>${blockHeader(string, state.indent)}${ @@ -867,7 +869,10 @@ function inspectNode( } } -function getDuplicateReferences(object: object, state: DumperState): void { +function getDuplicateReferences( + object: Record, + state: DumperState, +): void { const objects: Any[] = [], duplicatesIndexes: number[] = []; diff --git a/std/encoding/_yaml/example/sample_document.ts b/std/encoding/_yaml/example/sample_document.ts index f66b3c417e..8ef714d42f 100644 --- a/std/encoding/_yaml/example/sample_document.ts +++ b/std/encoding/_yaml/example/sample_document.ts @@ -7,7 +7,8 @@ import { parse } from "../../yaml.ts"; const yml = Deno.readFileSync(`${Deno.cwd()}/example/sample_document.yml`); const document = new TextDecoder().decode(yml); - const obj = parse(document) as object; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const obj = parse(document) as Record; console.log(obj); let i = 0; diff --git a/std/encoding/_yaml/loader/loader.ts b/std/encoding/_yaml/loader/loader.ts index 216e315f2e..18bab93f5d 100644 --- a/std/encoding/_yaml/loader/loader.ts +++ b/std/encoding/_yaml/loader/loader.ts @@ -813,7 +813,7 @@ function readFlowCollection(state: LoaderState, nodeIndent: number): boolean { valueNode, ); } else if (isPair) { - (result as Array<{}>).push( + (result as ArrayObject[]).push( storeMappingPair( state, null, diff --git a/std/encoding/_yaml/loader/loader_state.ts b/std/encoding/_yaml/loader/loader_state.ts index 60a7ccabc4..81edeb28d9 100644 --- a/std/encoding/_yaml/loader/loader_state.ts +++ b/std/encoding/_yaml/loader/loader_state.ts @@ -22,7 +22,8 @@ export interface LoaderStateOptions { onWarning?(this: null, e?: YAMLError): void; } -export type ResultType = [] | {} | string; +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export type ResultType = any[] | Record | string; export class LoaderState extends State { public documents: Any[] = []; diff --git a/std/encoding/_yaml/stringify.ts b/std/encoding/_yaml/stringify.ts index 9b3b5a80ec..ed7b82d847 100644 --- a/std/encoding/_yaml/stringify.ts +++ b/std/encoding/_yaml/stringify.ts @@ -13,6 +13,9 @@ export type DumpOptions = DumperStateOptions; * * You can disable exceptions by setting the skipInvalid option to true. */ -export function stringify(obj: object, options?: DumpOptions): string { +export function stringify( + obj: Record, + options?: DumpOptions, +): string { return dump(obj, options); } diff --git a/std/encoding/_yaml/type.ts b/std/encoding/_yaml/type.ts index 18dee338c3..89a91106ba 100644 --- a/std/encoding/_yaml/type.ts +++ b/std/encoding/_yaml/type.ts @@ -17,7 +17,7 @@ interface TypeOptions { resolve?: (data: Any) => boolean; construct?: (data: string) => Any; instanceOf?: Any; - predicate?: (data: object) => boolean; + predicate?: (data: Record) => boolean; represent?: RepresentFn | ArrayObject; defaultStyle?: StyleVariant; styleAliases?: ArrayObject; @@ -31,7 +31,7 @@ export class Type { public tag: string; public kind: KindType | null = null; public instanceOf: Any; - public predicate?: (data: object) => boolean; + public predicate?: (data: Record) => boolean; public represent?: RepresentFn | ArrayObject; public defaultStyle?: StyleVariant; public styleAliases?: ArrayObject; diff --git a/std/encoding/_yaml/utils.ts b/std/encoding/_yaml/utils.ts index e009ae3cf2..3d4e487715 100644 --- a/std/encoding/_yaml/utils.ts +++ b/std/encoding/_yaml/utils.ts @@ -38,7 +38,7 @@ export function isUndefined(value: unknown): value is undefined { return value === undefined; } -export function isObject(value: unknown): value is object { +export function isObject(value: unknown): value is Record { return value !== null && typeof value === "object"; } diff --git a/std/encoding/toml.ts b/std/encoding/toml.ts index 121459dbfc..212c14bdc9 100644 --- a/std/encoding/toml.ts +++ b/std/encoding/toml.ts @@ -124,10 +124,14 @@ class Parser { } this.tomlLines = merged; } - _unflat(keys: string[], values: object = {}, cObj: object = {}): object { + _unflat( + keys: string[], + values: Record | unknown[] = {}, + cObj: Record | unknown[] = {}, + ): Record { const out: Record = {}; if (keys.length === 0) { - return cObj; + return cObj as Record; } else { if (Object.keys(cObj).length === 0) { cObj = values; @@ -398,7 +402,7 @@ class Parser { const shift = pathDeclaration.shift(); if (shift) { k = shift.replace(/"/g, ""); - v = this._unflat(pathDeclaration, v as object); + v = this._unflat(pathDeclaration, v as Record); } } else { k = k.replace(/"/g, ""); @@ -411,7 +415,7 @@ class Parser { } } } - parse(): object { + parse(): Record { this._sanitize(); this._parseLines(); this._cleanOutput(); @@ -433,9 +437,9 @@ function joinKeys(keys: string[]): string { class Dumper { maxPad = 0; - srcObject: object; + srcObject: Record; output: string[] = []; - constructor(srcObjc: object) { + constructor(srcObjc: Record) { this.srcObject = srcObjc; } dump(): string[] { @@ -592,11 +596,11 @@ class Dumper { } } -export function stringify(srcObj: object): string { +export function stringify(srcObj: Record): string { return new Dumper(srcObj).dump().join("\n"); } -export function parse(tomlString: string): object { +export function parse(tomlString: string): Record { // File is potentially using EOL CRLF tomlString = tomlString.replace(/\r\n/g, "\n").replace(/\\\n/g, "\n"); return new Parser(tomlString).parse(); diff --git a/std/encoding/toml_test.ts b/std/encoding/toml_test.ts index 565fe1eebd..9b5e1a56b7 100644 --- a/std/encoding/toml_test.ts +++ b/std/encoding/toml_test.ts @@ -6,7 +6,7 @@ import { parse, stringify } from "./toml.ts"; const testFilesDir = path.resolve("encoding", "testdata"); -function parseFile(filePath: string): object { +function parseFile(filePath: string): Record { if (!existsSync(filePath)) { throw new Error(`File not found: ${filePath}`); } @@ -254,7 +254,6 @@ Deno.test({ Deno.test({ name: "[TOML] Cargo", fn(): void { - /* eslint-disable @typescript-eslint/camelcase */ const expected = { workspace: { members: ["./", "core"] }, bin: [{ name: "deno", path: "cli/main.rs" }], @@ -291,7 +290,6 @@ Deno.test({ }, target: { "cfg(windows)": { dependencies: { winapi: "0.3.6" } } }, }; - /* eslint-enable @typescript-eslint/camelcase */ const actual = parseFile(path.join(testFilesDir, "cargo.toml")); assertEquals(actual, expected); }, diff --git a/std/examples/catj.ts b/std/examples/catj.ts index 6013a8ac63..513ae52351 100644 --- a/std/examples/catj.ts +++ b/std/examples/catj.ts @@ -13,14 +13,16 @@ import * as colors from "../fmt/colors.ts"; const decoder = new TextDecoder(); // eslint-disable-next-line @typescript-eslint/no-explicit-any -function isObject(arg: any): arg is object { +function isObject(arg: any): arg is Record { return !!arg && arg.constructor === Object; } function isValidIdentifier(value: string): boolean { // eslint-disable-next-line max-len return /^(?!(?:do|if|in|for|let|new|try|var|case|else|enum|eval|null|this|true|void|with|break|catch|class|const|false|super|throw|while|yield|delete|export|import|public|return|static|switch|typeof|default|extends|finally|package|private|continue|debugger|function|arguments|interface|protected|implements|instanceof)$)[\x24A-Z\x5Fa-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F0\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC][\x240-9A-Z\x5Fa-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0\u08A2-\u08AC\u08E4-\u08FE\u0900-\u0963\u0966-\u096F\u0971-\u0977\u0979-\u097F\u0981-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C01-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C82\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D02\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F0\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191C\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1D00-\u1DE6\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA697\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A\uAA7B\uAA80-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE26\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]*$/ - .test(value); + .test( + value, + ); } function printValue(value: unknown, path: string): void { @@ -35,8 +37,7 @@ function printValue(value: unknown, path: string): void { console.log(path + " = " + value); } -// eslint-disable-next-line @typescript-eslint/no-explicit-any -function printObject(obj: { [key: string]: any }, path: string): void { +function printObject(obj: Record, path: string): void { for (const key of Object.keys(obj)) { const value = obj[key]; let nodePath = path + colors.cyan(".") + key; @@ -64,7 +65,7 @@ function printArray(array: unknown[], path: string): void { if (Array.isArray(value)) { printArray(value, nodePath); } else if (isObject(value)) { - printObject(value as object, nodePath); + printObject(value, nodePath); } else { printValue(value, nodePath); } @@ -72,7 +73,7 @@ function printArray(array: unknown[], path: string): void { } // eslint-disable-next-line @typescript-eslint/no-explicit-any -function print(data: any): void { +function print(data: any[] | Record): void { if (Array.isArray(data)) { printArray(data, ""); } else { diff --git a/std/fmt/printf.ts b/std/fmt/printf.ts index 36b6dddb01..2fb8acc0b3 100644 --- a/std/fmt/printf.ts +++ b/std/fmt/printf.ts @@ -659,7 +659,7 @@ class Printf { } } - fmtV(val: object): string { + fmtV(val: Record): string { if (this.flags.sharp) { const options = this.flags.precision !== -1 ? { depth: this.flags.precision } diff --git a/std/hash/_sha3/sha3.ts b/std/hash/_sha3/sha3.ts index 393889210b..05b9d82e32 100644 --- a/std/hash/_sha3/sha3.ts +++ b/std/hash/_sha3/sha3.ts @@ -3,8 +3,6 @@ import { Sponge } from "./sponge.ts"; import { keccakf } from "./keccakf.ts"; -/* eslint-disable @typescript-eslint/camelcase, @typescript-eslint/class-name-casing */ - /** Sha3-224 hash */ export class Sha3_224 extends Sponge { constructor() { diff --git a/std/hash/sha3.ts b/std/hash/sha3.ts index b5154fbdff..33ae4a8d04 100644 --- a/std/hash/sha3.ts +++ b/std/hash/sha3.ts @@ -1,6 +1,5 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -/* eslint-disable-next-line @typescript-eslint/camelcase */ export { Sha3_224, Sha3_256, Sha3_384, Sha3_512 } from "./_sha3/sha3.ts"; export { Keccak224, Keccak256, Keccak384, Keccak512 } from "./_sha3/keccak.ts"; export { Shake128, Shake256 } from "./_sha3/shake.ts"; diff --git a/std/hash/sha3_test.ts b/std/hash/sha3_test.ts index b5936f960e..4ff0ec63e1 100644 --- a/std/hash/sha3_test.ts +++ b/std/hash/sha3_test.ts @@ -1,5 +1,5 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -/* eslint-disable @typescript-eslint/camelcase */ + import { assertEquals, assertThrows } from "../testing/asserts.ts"; import { Keccak224, diff --git a/std/log/logger.ts b/std/log/logger.ts index d1e1d97555..c00ab78ece 100644 --- a/std/log/logger.ts +++ b/std/log/logger.ts @@ -1,12 +1,11 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. -import { - LogLevels, - getLevelByName, - getLevelName, -} from "./levels.ts"; +import { LogLevels, getLevelByName, getLevelName } from "./levels.ts"; import type { LevelName } from "./levels.ts"; import type { BaseHandler } from "./handlers.ts"; +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export type GenericFunction = (...args: any[]) => any; + export interface LogRecordOptions { msg: string; args: unknown[]; @@ -91,7 +90,7 @@ export class Logger { */ private _log( level: number, - msg: (T extends Function ? never : T) | (() => T), + msg: (T extends GenericFunction ? never : T) | (() => T), ...args: unknown[] ): T | undefined { if (this.level > level) { @@ -139,45 +138,48 @@ export class Logger { } debug(msg: () => T, ...args: unknown[]): T | undefined; - debug(msg: T extends Function ? never : T, ...args: unknown[]): T; + debug(msg: T extends GenericFunction ? never : T, ...args: unknown[]): T; debug( - msg: (T extends Function ? never : T) | (() => T), + msg: (T extends GenericFunction ? never : T) | (() => T), ...args: unknown[] ): T | undefined { return this._log(LogLevels.DEBUG, msg, ...args); } info(msg: () => T, ...args: unknown[]): T | undefined; - info(msg: T extends Function ? never : T, ...args: unknown[]): T; + info(msg: T extends GenericFunction ? never : T, ...args: unknown[]): T; info( - msg: (T extends Function ? never : T) | (() => T), + msg: (T extends GenericFunction ? never : T) | (() => T), ...args: unknown[] ): T | undefined { return this._log(LogLevels.INFO, msg, ...args); } warning(msg: () => T, ...args: unknown[]): T | undefined; - warning(msg: T extends Function ? never : T, ...args: unknown[]): T; + warning(msg: T extends GenericFunction ? never : T, ...args: unknown[]): T; warning( - msg: (T extends Function ? never : T) | (() => T), + msg: (T extends GenericFunction ? never : T) | (() => T), ...args: unknown[] ): T | undefined { return this._log(LogLevels.WARNING, msg, ...args); } error(msg: () => T, ...args: unknown[]): T | undefined; - error(msg: T extends Function ? never : T, ...args: unknown[]): T; + error(msg: T extends GenericFunction ? never : T, ...args: unknown[]): T; error( - msg: (T extends Function ? never : T) | (() => T), + msg: (T extends GenericFunction ? never : T) | (() => T), ...args: unknown[] ): T | undefined { return this._log(LogLevels.ERROR, msg, ...args); } critical(msg: () => T, ...args: unknown[]): T | undefined; - critical(msg: T extends Function ? never : T, ...args: unknown[]): T; critical( - msg: (T extends Function ? never : T) | (() => T), + msg: T extends GenericFunction ? never : T, + ...args: unknown[] + ): T; + critical( + msg: (T extends GenericFunction ? never : T) | (() => T), ...args: unknown[] ): T | undefined { return this._log(LogLevels.CRITICAL, msg, ...args); diff --git a/std/log/mod.ts b/std/log/mod.ts index 10feb04b1c..512de534bf 100644 --- a/std/log/mod.ts +++ b/std/log/mod.ts @@ -1,5 +1,6 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. import { Logger } from "./logger.ts"; +import type { GenericFunction } from "./logger.ts"; import { BaseHandler, ConsoleHandler, @@ -76,11 +77,11 @@ export function getLogger(name?: string): Logger { export function debug(msg: () => T, ...args: unknown[]): T | undefined; export function debug( - msg: T extends Function ? never : T, + msg: T extends GenericFunction ? never : T, ...args: unknown[] ): T; export function debug( - msg: (T extends Function ? never : T) | (() => T), + msg: (T extends GenericFunction ? never : T) | (() => T), ...args: unknown[] ): T | undefined { // Assist TS compiler with pass-through generic type @@ -92,11 +93,11 @@ export function debug( export function info(msg: () => T, ...args: unknown[]): T | undefined; export function info( - msg: T extends Function ? never : T, + msg: T extends GenericFunction ? never : T, ...args: unknown[] ): T; export function info( - msg: (T extends Function ? never : T) | (() => T), + msg: (T extends GenericFunction ? never : T) | (() => T), ...args: unknown[] ): T | undefined { // Assist TS compiler with pass-through generic type @@ -108,11 +109,11 @@ export function info( export function warning(msg: () => T, ...args: unknown[]): T | undefined; export function warning( - msg: T extends Function ? never : T, + msg: T extends GenericFunction ? never : T, ...args: unknown[] ): T; export function warning( - msg: (T extends Function ? never : T) | (() => T), + msg: (T extends GenericFunction ? never : T) | (() => T), ...args: unknown[] ): T | undefined { // Assist TS compiler with pass-through generic type @@ -124,11 +125,11 @@ export function warning( export function error(msg: () => T, ...args: unknown[]): T | undefined; export function error( - msg: T extends Function ? never : T, + msg: T extends GenericFunction ? never : T, ...args: unknown[] ): T; export function error( - msg: (T extends Function ? never : T) | (() => T), + msg: (T extends GenericFunction ? never : T) | (() => T), ...args: unknown[] ): T | undefined { // Assist TS compiler with pass-through generic type @@ -140,11 +141,11 @@ export function error( export function critical(msg: () => T, ...args: unknown[]): T | undefined; export function critical( - msg: T extends Function ? never : T, + msg: T extends GenericFunction ? never : T, ...args: unknown[] ): T; export function critical( - msg: (T extends Function ? never : T) | (() => T), + msg: (T extends GenericFunction ? never : T) | (() => T), ...args: unknown[] ): T | undefined { // Assist TS compiler with pass-through generic type diff --git a/std/node/_fs/_fs_access.ts b/std/node/_fs/_fs_access.ts index df84eac9c4..8fb8cc7e6a 100644 --- a/std/node/_fs/_fs_access.ts +++ b/std/node/_fs/_fs_access.ts @@ -8,9 +8,9 @@ import { notImplemented } from "../_utils.ts"; //TODO - 'path' can also be a Buffer. Neither of these polyfills //is available yet. See https://github.com/denoland/deno/issues/3403 export function access( - path: string | URL, // eslint-disable-line @typescript-eslint/no-unused-vars - modeOrCallback: number | Function, // eslint-disable-line @typescript-eslint/no-unused-vars - callback?: CallbackWithError, // eslint-disable-line @typescript-eslint/no-unused-vars + _path: string | URL, + _modeOrCallback: number | ((...args: unknown[]) => void), + _callback?: CallbackWithError, ): void { notImplemented("Not yet available"); } diff --git a/std/node/_fs/_fs_common.ts b/std/node/_fs/_fs_common.ts index 165b9aeca8..5d3f02a5df 100644 --- a/std/node/_fs/_fs_common.ts +++ b/std/node/_fs/_fs_common.ts @@ -47,7 +47,13 @@ export function isFileOptions( } export function getEncoding( - optOrCallback?: FileOptions | WriteFileOptions | Function | Encodings | null, + optOrCallback?: + | FileOptions + | WriteFileOptions + // eslint-disable-next-line @typescript-eslint/no-explicit-any + | ((...args: any[]) => any) + | Encodings + | null, ): Encodings | null { if (!optOrCallback || typeof optOrCallback === "function") { return null; diff --git a/std/node/_fs/_fs_dir.ts b/std/node/_fs/_fs_dir.ts index 7f2085b3b1..20239d4f32 100644 --- a/std/node/_fs/_fs_dir.ts +++ b/std/node/_fs/_fs_dir.ts @@ -17,7 +17,8 @@ export default class Dir { return this.dirPath; } - read(callback?: Function): Promise { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + read(callback?: (...args: any[]) => void): Promise { return new Promise((resolve, reject) => { if (!this.asyncIterator) { this.asyncIterator = Deno.readDir(this.path)[Symbol.asyncIterator](); @@ -55,7 +56,8 @@ export default class Dir { * directories, and therefore does not need to close directories when * finished reading. */ - close(callback?: Function): Promise { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + close(callback?: (...args: any[]) => void): Promise { return new Promise((resolve, reject) => { try { if (callback) { diff --git a/std/node/_util/_util_promisify.ts b/std/node/_util/_util_promisify.ts index 03ebeba041..6aeee8ecfe 100644 --- a/std/node/_util/_util_promisify.ts +++ b/std/node/_util/_util_promisify.ts @@ -56,7 +56,11 @@ class NodeInvalidArgTypeError extends TypeError { } } -export function promisify(original: Function): Function { +export function promisify( + // eslint-disable-next-line @typescript-eslint/no-explicit-any + original: (...args: any[]) => void, + // eslint-disable-next-line @typescript-eslint/no-explicit-any +): (...args: any[]) => Promise { if (typeof original !== "function") { throw new NodeInvalidArgTypeError("original", "Function", original); } diff --git a/std/node/_util/_util_promisify_test.ts b/std/node/_util/_util_promisify_test.ts index 67ca6af580..6271a8581a 100644 --- a/std/node/_util/_util_promisify_test.ts +++ b/std/node/_util/_util_promisify_test.ts @@ -29,6 +29,9 @@ import { import { promisify } from "./_util_promisify.ts"; import * as fs from "../fs.ts"; +// eslint-disable-next-line @typescript-eslint/no-explicit-any +type VoidFunction = (...args: any[]) => void; + const readFile = promisify(fs.readFile); const customPromisifyArgs = Symbol.for("nodejs.util.promisify.customArgs"); @@ -87,7 +90,7 @@ Deno.test("Custom promisify args", async function testPromisifyCustomArgs() { const firstValue = 5; const secondValue = 17; - function fn(callback: Function): void { + function fn(callback: VoidFunction): void { callback(null, firstValue, secondValue); } @@ -101,7 +104,7 @@ Deno.test("Custom promisify args", async function testPromisifyCustomArgs() { Deno.test( "Multiple callback args without custom promisify args", async function testPromisifyWithoutCustomArgs() { - function fn(callback: Function): void { + function fn(callback: VoidFunction): void { callback(null, "foo", "bar"); } const value = await promisify(fn)(); @@ -112,7 +115,7 @@ Deno.test( Deno.test( "Undefined resolved value", async function testPromisifyWithUndefinedResolvedValue() { - function fn(callback: Function): void { + function fn(callback: VoidFunction): void { callback(null); } const value = await promisify(fn)(); @@ -123,7 +126,7 @@ Deno.test( Deno.test( "Undefined resolved value II", async function testPromisifyWithUndefinedResolvedValueII() { - function fn(callback: Function): void { + function fn(callback: VoidFunction): void { callback(); } const value = await promisify(fn)(); @@ -134,7 +137,7 @@ Deno.test( Deno.test( "Resolved value: number", async function testPromisifyWithNumberResolvedValue() { - function fn(err: Error | null, val: number, callback: Function): void { + function fn(err: Error | null, val: number, callback: VoidFunction): void { callback(err, val); } const value = await promisify(fn)(null, 42); @@ -145,7 +148,7 @@ Deno.test( Deno.test( "Rejected value", async function testPromisifyWithNumberRejectedValue() { - function fn(err: Error | null, val: null, callback: Function): void { + function fn(err: Error | null, val: null, callback: VoidFunction): void { callback(err, val); } await assertThrowsAsync( @@ -157,9 +160,8 @@ Deno.test( ); Deno.test("Rejected value", async function testPromisifyWithAsObjectMethod() { - const o: { fn?: Function } = {}; - const fn = promisify(function (cb: Function): void { - // @ts-expect-error TypeScript + const o: { fn?: VoidFunction } = {}; + const fn = promisify(function (this: unknown, cb: VoidFunction): void { cb(null, this === o); }); @@ -177,7 +179,7 @@ Deno.test( ); const stack = err.stack; - const fn = promisify(function (cb: Function): void { + const fn = promisify(function (cb: VoidFunction): void { cb(null); cb(err); }); @@ -203,7 +205,7 @@ Deno.test("Test error", async function testInvalidArguments() { a: number, b: number, c: number, - cb: Function, + cb: VoidFunction, ): void { errToThrow = new Error(`${a}-${b}-${c}-${cb}`); throw errToThrow; diff --git a/std/node/buffer.ts b/std/node/buffer.ts index 7656803d95..c88d7f8b73 100644 --- a/std/node/buffer.ts +++ b/std/node/buffer.ts @@ -94,7 +94,9 @@ export default class Buffer extends Uint8Array { if (typeof fill === "string") { encoding = checkEncoding(encoding); if ( - typeof fill === "string" && fill.length === 1 && encoding === "utf8" + typeof fill === "string" && + fill.length === 1 && + encoding === "utf8" ) { buf.fill(fill.charCodeAt(0)); } else bufFill = Buffer.from(fill, encoding); @@ -221,7 +223,7 @@ export default class Buffer extends Uint8Array { /** * Returns true if obj is a Buffer, false otherwise. */ - static isBuffer(obj: object): obj is Buffer { + static isBuffer(obj: unknown): obj is Buffer { return obj instanceof Buffer; } @@ -408,7 +410,7 @@ export default class Buffer extends Uint8Array { * Returns a JSON representation of buf. JSON.stringify() implicitly calls * this function when stringifying a Buffer instance. */ - toJSON(): object { + toJSON(): Record { return { type: "Buffer", data: Array.from(this) }; } diff --git a/std/node/events.ts b/std/node/events.ts index b267852aa2..bc27731ca2 100644 --- a/std/node/events.ts +++ b/std/node/events.ts @@ -24,8 +24,11 @@ import { validateIntegerRange } from "./util.ts"; import { assert } from "../_util/assert.ts"; +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export type GenericFunction = (...args: any[]) => any; + export interface WrappedFunction extends Function { - listener: Function; + listener: GenericFunction; } /** @@ -35,7 +38,10 @@ export default class EventEmitter { public static defaultMaxListeners = 10; public static errorMonitor = Symbol("events.errorMonitor"); private maxListeners: number | undefined; - private _events: Map>; + private _events: Map< + string | symbol, + Array + >; public constructor() { this._events = new Map(); @@ -43,13 +49,13 @@ export default class EventEmitter { private _addListener( eventName: string | symbol, - listener: Function | WrappedFunction, + listener: GenericFunction | WrappedFunction, prepend: boolean, ): this { this.emit("newListener", eventName, listener); if (this._events.has(eventName)) { const listeners = this._events.get(eventName) as Array< - Function | WrappedFunction + GenericFunction | WrappedFunction >; if (prepend) { listeners.unshift(listener); @@ -76,7 +82,7 @@ export default class EventEmitter { /** Alias for emitter.on(eventName, listener). */ public addListener( eventName: string | symbol, - listener: Function | WrappedFunction, + listener: GenericFunction | WrappedFunction, ): this { return this._addListener(eventName, listener, false); } @@ -96,7 +102,9 @@ export default class EventEmitter { ) { this.emit(EventEmitter.errorMonitor, ...args); } - const listeners = (this._events.get(eventName) as Function[]).slice(); // We copy with slice() so array is not mutated during emit + const listeners = (this._events.get( + eventName, + ) as GenericFunction[]).slice(); // We copy with slice() so array is not mutated during emit for (const listener of listeners) { try { listener.apply(this, args); @@ -138,7 +146,7 @@ export default class EventEmitter { */ public listenerCount(eventName: string | symbol): number { if (this._events.has(eventName)) { - return (this._events.get(eventName) as Function[]).length; + return (this._events.get(eventName) as GenericFunction[]).length; } else { return 0; } @@ -148,21 +156,19 @@ export default class EventEmitter { target: EventEmitter, eventName: string | symbol, unwrap: boolean, - ): Function[] { + ): GenericFunction[] { if (!target._events.has(eventName)) { return []; } - const eventListeners: Function[] = target._events.get( - eventName, - ) as Function[]; + const eventListeners = target._events.get(eventName) as GenericFunction[]; return unwrap ? this.unwrapListeners(eventListeners) : eventListeners.slice(0); } - private unwrapListeners(arr: Function[]): Function[] { - const unwrappedListeners: Function[] = new Array(arr.length) as Function[]; + private unwrapListeners(arr: GenericFunction[]): GenericFunction[] { + const unwrappedListeners = new Array(arr.length) as GenericFunction[]; for (let i = 0; i < arr.length; i++) { // eslint-disable-next-line @typescript-eslint/no-explicit-any unwrappedListeners[i] = (arr[i] as any)["listener"] || arr[i]; @@ -171,7 +177,7 @@ export default class EventEmitter { } /** Returns a copy of the array of listeners for the event named eventName.*/ - public listeners(eventName: string | symbol): Function[] { + public listeners(eventName: string | symbol): GenericFunction[] { return this._listeners(this, eventName, true); } @@ -181,12 +187,12 @@ export default class EventEmitter { */ public rawListeners( eventName: string | symbol, - ): Array { + ): Array { return this._listeners(this, eventName, false); } /** Alias for emitter.removeListener(). */ - public off(eventName: string | symbol, listener: Function): this { + public off(eventName: string | symbol, listener: GenericFunction): this { return this.removeListener(eventName, listener); } @@ -199,7 +205,7 @@ export default class EventEmitter { */ public on( eventName: string | symbol, - listener: Function | WrappedFunction, + listener: GenericFunction | WrappedFunction, ): this { return this.addListener(eventName, listener); } @@ -208,7 +214,7 @@ export default class EventEmitter { * Adds a one-time listener function for the event named eventName. The next * time eventName is triggered, this listener is removed and then invoked. */ - public once(eventName: string | symbol, listener: Function): this { + public once(eventName: string | symbol, listener: GenericFunction): this { const wrapped: WrappedFunction = this.onceWrap(eventName, listener); this.on(eventName, wrapped); return this; @@ -217,19 +223,22 @@ export default class EventEmitter { // Wrapped function that calls EventEmitter.removeListener(eventName, self) on execution. private onceWrap( eventName: string | symbol, - listener: Function, + listener: GenericFunction, ): WrappedFunction { const wrapper = function ( this: { eventName: string | symbol; - listener: Function; - rawListener: Function; + listener: GenericFunction; + rawListener: GenericFunction | WrappedFunction; context: EventEmitter; }, // eslint-disable-next-line @typescript-eslint/no-explicit-any ...args: any[] ): void { - this.context.removeListener(this.eventName, this.rawListener); + this.context.removeListener( + this.eventName, + this.rawListener as GenericFunction, + ); this.listener.apply(this.context, args); }; const wrapperContext = { @@ -255,7 +264,7 @@ export default class EventEmitter { */ public prependListener( eventName: string | symbol, - listener: Function | WrappedFunction, + listener: GenericFunction | WrappedFunction, ): this { return this._addListener(eventName, listener, true); } @@ -267,7 +276,7 @@ export default class EventEmitter { */ public prependOnceListener( eventName: string | symbol, - listener: Function, + listener: GenericFunction, ): this { const wrapped: WrappedFunction = this.onceWrap(eventName, listener); this.prependListener(eventName, wrapped); @@ -283,7 +292,7 @@ export default class EventEmitter { if (eventName) { if (this._events.has(eventName)) { const listeners = (this._events.get(eventName) as Array< - Function | WrappedFunction + GenericFunction | WrappedFunction >).slice(); // Create a copy; We use it AFTER it's deleted. this._events.delete(eventName); for (const listener of listeners) { @@ -304,10 +313,13 @@ export default class EventEmitter { * Removes the specified listener from the listener array for the event * named eventName. */ - public removeListener(eventName: string | symbol, listener: Function): this { + public removeListener( + eventName: string | symbol, + listener: GenericFunction, + ): this { if (this._events.has(eventName)) { const arr: - | Array + | Array | undefined = this._events.get(eventName); assert(arr); @@ -382,7 +394,7 @@ export function once( } resolve(args); }; - let errorListener: Function; + let errorListener: GenericFunction; // Adding an error listener is not optional because // if an error is thrown on an event emitter we cannot diff --git a/std/node/events_test.ts b/std/node/events_test.ts index 62b20594c0..adeae5b93f 100644 --- a/std/node/events_test.ts +++ b/std/node/events_test.ts @@ -6,7 +6,7 @@ import { } from "../testing/asserts.ts"; import EventEmitter, { WrappedFunction, once, on } from "./events.ts"; -const shouldNeverBeEmitted: Function = () => { +const shouldNeverBeEmitted = () => { fail("Should never be called"); }; diff --git a/std/node/process.ts b/std/node/process.ts index ce5f828c07..a05a423fd5 100644 --- a/std/node/process.ts +++ b/std/node/process.ts @@ -42,6 +42,7 @@ export const process = { /** https://nodejs.org/api/process.html#process_process_events */ // on is not exported by node, it is only available within process: // node --input-type=module -e "import { on } from 'process'; console.log(on)" + // eslint-disable-next-line @typescript-eslint/ban-types on(_event: string, _callback: Function): void { // TODO(rsp): to be implemented notImplemented(); diff --git a/std/node/querystring.ts b/std/node/querystring.ts index 4e3c728c12..35dfbbc86c 100644 --- a/std/node/querystring.ts +++ b/std/node/querystring.ts @@ -107,7 +107,8 @@ export function encodeStr( } export function stringify( - obj: object, + // eslint-disable-next-line @typescript-eslint/no-explicit-any + obj: Record, sep = "&", eq = "=", { encodeURIComponent = escape }: StringifyOptions = {}, diff --git a/std/testing/asserts_test.ts b/std/testing/asserts_test.ts index 65645b06bc..13dba756de 100644 --- a/std/testing/asserts_test.ts +++ b/std/testing/asserts_test.ts @@ -301,7 +301,9 @@ const createHeader = (): string[] => [ "", "", ` ${gray(bold("[Diff]"))} ${red(bold("Actual"))} / ${ - green(bold("Expected")) + green( + bold("Expected"), + ) }`, "", "", @@ -484,10 +486,7 @@ Deno.test({ Deno.test({ name: "strictly unequal fail case", fn(): void { - assertThrows( - () => assertNotStrictEquals(1, 1), - AssertionError, - ); + assertThrows(() => assertNotStrictEquals(1, 1), AssertionError); }, }); @@ -499,6 +498,7 @@ Deno.test({ assertArrayContains([true, false], [true]); const value = { x: 1 }; assertStrictEquals(value, value); + // eslint-disable-next-line @typescript-eslint/ban-types assertNotStrictEquals(value, { x: 1 }); }, }); diff --git a/std/testing/bench.ts b/std/testing/bench.ts index b8bf40a9b5..e1d3c86c9b 100644 --- a/std/testing/bench.ts +++ b/std/testing/bench.ts @@ -1,4 +1,5 @@ // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. +import { assert } from "../_util/assert.ts"; import { deepAssign } from "../_util/deep_assign.ts"; interface BenchmarkClock { @@ -70,11 +71,11 @@ export interface BenchmarkRunResult { /** Defines the current progress during the run of `runBenchmarks` */ export interface BenchmarkRunProgress extends BenchmarkRunResult { /** List of the queued benchmarks to run with their name and their run count */ - queued: Array<{ name: string; runsCount: number }>; + queued?: Array<{ name: string; runsCount: number }>; /** The currently running benchmark with its name, run count and the already finished measurements in milliseconds */ running?: { name: string; runsCount: number; measuredRunsMs: number[] }; /** Indicates in which state benchmarking currently is */ - state: ProgressState; + state?: ProgressState; } /** Defines the states `BenchmarkRunProgress` can be in */ @@ -232,6 +233,7 @@ export async function runBenchmarks( clock.for = name; // Remove benchmark from queued + assert(progress.queued); const queueIndex = progress.queued.findIndex( (queued) => queued.name === name && queued.runsCount === runs, ); diff --git a/std/testing/bench_test.ts b/std/testing/bench_test.ts index 97a923ac2e..e4eada453d 100644 --- a/std/testing/bench_test.ts +++ b/std/testing/bench_test.ts @@ -255,6 +255,7 @@ Deno.test({ let pc = 0; // Assert initial progress before running let progress = progressCallbacks[pc++]; + assert(progress.queued); assertEquals(progress.state, ProgressState.BenchmarkingStart); assertEquals(progress.filtered, 1); assertEquals(progress.queued.length, 2); @@ -265,6 +266,7 @@ Deno.test({ progress = progressCallbacks[pc++]; assertEquals(progress.state, ProgressState.BenchStart); assertEquals(progress.filtered, 1); + assert(progress.queued); assertEquals(progress.queued.length, 1); assert(!!progress.queued.find(({ name }) => name == "multiple")); assertEquals(progress.running, { @@ -277,6 +279,7 @@ Deno.test({ // Assert running result of bench "single" progress = progressCallbacks[pc++]; assertEquals(progress.state, ProgressState.BenchPartialResult); + assert(progress.queued); assertEquals(progress.queued.length, 1); assertEquals(progress.running!.measuredRunsMs.length, 1); assertEquals(progress.results.length, 0); @@ -284,6 +287,7 @@ Deno.test({ // Assert result of bench "single" progress = progressCallbacks[pc++]; assertEquals(progress.state, ProgressState.BenchResult); + assert(progress.queued); assertEquals(progress.queued.length, 1); assertEquals(progress.running, undefined); assertEquals(progress.results.length, 1); @@ -292,6 +296,7 @@ Deno.test({ // Assert start of bench "multiple" progress = progressCallbacks[pc++]; assertEquals(progress.state, ProgressState.BenchStart); + assert(progress.queued); assertEquals(progress.queued.length, 0); assertEquals(progress.running, { name: "multiple", @@ -303,6 +308,7 @@ Deno.test({ // Assert first result of bench "multiple" progress = progressCallbacks[pc++]; assertEquals(progress.state, ProgressState.BenchPartialResult); + assert(progress.queued); assertEquals(progress.queued.length, 0); assertEquals(progress.running!.measuredRunsMs.length, 1); assertEquals(progress.results.length, 1); @@ -310,6 +316,7 @@ Deno.test({ // Assert second result of bench "multiple" progress = progressCallbacks[pc++]; assertEquals(progress.state, ProgressState.BenchPartialResult); + assert(progress.queued); assertEquals(progress.queued.length, 0); assertEquals(progress.running!.measuredRunsMs.length, 2); assertEquals(progress.results.length, 1); @@ -317,6 +324,7 @@ Deno.test({ // Assert finish of bench "multiple" progress = progressCallbacks[pc++]; assertEquals(progress.state, ProgressState.BenchResult); + assert(progress.queued); assertEquals(progress.queued.length, 0); assertEquals(progress.running, undefined); assertEquals(progress.results.length, 2); diff --git a/third_party b/third_party index 581cc9d4f6..e80050929a 160000 --- a/third_party +++ b/third_party @@ -1 +1 @@ -Subproject commit 581cc9d4f63b0a9032adb8f0617cf64a75b1e4a5 +Subproject commit e80050929aec91d594d68fc01f3919de70a1dc3d