@schematics/angular 14.0.0-next.1 → 14.0.0-next.12

package/migrations/update-14/replace-default-collection-option.js

@@ -0,0 +1,32 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@angular-devkit/core");
+const workspace_1 = require("../../utility/workspace");
+/** Migration to replace 'defaultCollection' option in angular.json. */
+function default_1() {
+    return (0, workspace_1.updateWorkspace)((workspace) => {
+        // workspace level
+        replaceDefaultCollection(workspace.extensions['cli']);
+        // Project level
+        for (const project of workspace.projects.values()) {
+            replaceDefaultCollection(project.extensions['cli']);
+        }
+    });
+}
+exports.default = default_1;
+function replaceDefaultCollection(cliExtension) {
+    if (cliExtension && (0, core_1.isJsonObject)(cliExtension) && cliExtension['defaultCollection']) {
+        // If `schematicsCollection` defined `defaultCollection` is ignored hence no need to warn.
+        if (!cliExtension['schematicCollections']) {
+            cliExtension['schematicCollections'] = [cliExtension['defaultCollection']];
+        }
+        delete cliExtension['defaultCollection'];
+    }
+}

package/module/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -37,8 +41,8 @@ const workspace_1 = require("../utility/workspace");
 const schema_1 = require("./schema");
 function buildRelativeModulePath(options, modulePath) {
     const importModulePath = (0, core_1.normalize)(`/${options.path}/` +
-        (options.flat ? '' : core_1.strings.dasherize(options.name) + '/') +
-        core_1.strings.dasherize(options.name) +
+        (options.flat ? '' : schematics_1.strings.dasherize(options.name) + '/') +
+        schematics_1.strings.dasherize(options.name) +
         '.module');
     return (0, find_module_1.buildRelativePath)(modulePath, importModulePath);
 }
@@ -48,14 +52,10 @@ function addDeclarationToNgModule(options) {
             return host;
         }
         const modulePath = options.module;
-        const text = host.read(modulePath);
-        if (text === null) {
-            throw new schematics_1.SchematicsException(`File ${modulePath} does not exist.`);
-        }
-        const sourceText = text.toString();
+        const sourceText = host.readText(modulePath);
         const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
         const relativePath = buildRelativeModulePath(options, modulePath);
-        const changes = (0, ast_utils_1.addImportToModule)(source, modulePath, core_1.strings.classify(`${options.name}Module`), relativePath);
+        const changes = (0, ast_utils_1.addImportToModule)(source, modulePath, schematics_1.strings.classify(`${options.name}Module`), relativePath);
         const recorder = host.beginUpdate(modulePath);
         for (const change of changes) {
             if (change instanceof change_1.InsertChange) {
@@ -81,11 +81,7 @@ function addRouteDeclarationToNgModule(options, routingModulePath) {
         else {
             path = options.module;
         }
-        const text = host.read(path);
-        if (!text) {
-            throw new Error(`Couldn't find the module nor its routing module.`);
-        }
-        const sourceText = text.toString();
+        const sourceText = host.readText(path);
         const addDeclaration = (0, ast_utils_1.addRouteDeclarationToModule)(ts.createSourceFile(path, sourceText, ts.ScriptTarget.Latest, true), path, buildRoute(options, options.module));
         const recorder = host.beginUpdate(path);
         recorder.insertLeft(addDeclaration.pos, addDeclaration.toAdd);
@@ -101,7 +97,7 @@ function getRoutingModulePath(host, modulePath) {
 }
 function buildRoute(options, modulePath) {
     const relativeModulePath = buildRelativeModulePath(options, modulePath);
-    const moduleName = `${core_1.strings.classify(options.name)}Module`;
+    const moduleName = `${schematics_1.strings.classify(options.name)}Module`;
     const loadChildren = `() => import('${relativeModulePath}').then(m => m.${moduleName})`;
     return `{ path: '${options.route}', loadChildren: ${loadChildren} }`;
 }
@@ -127,7 +123,7 @@ function default_1(options) {
                 ? (0, schematics_1.noop)()
                 : (0, schematics_1.filter)((path) => !path.endsWith('-routing.module.ts.template')),
             (0, schematics_1.applyTemplates)({
-                ...core_1.strings,
+                ...schematics_1.strings,
                 'if-flat': (s) => (options.flat ? '' : s),
                 lazyRoute: isLazyLoadedModuleGen,
                 lazyRouteWithoutRouteModule: isLazyLoadedModuleGen && !routingModulePath,
@@ -136,7 +132,7 @@ function default_1(options) {
             }),
             (0, schematics_1.move)(parsedPath.path),
         ]);
-        const moduleDasherized = core_1.strings.dasherize(options.name);
+        const moduleDasherized = schematics_1.strings.dasherize(options.name);
         const modulePath = `${!options.flat ? moduleDasherized + '/' : ''}${moduleDasherized}.module.ts`;
         const componentOptions = {
             module: modulePath,

package/ng-new/index.js

@@ -12,7 +12,7 @@ const tasks_1 = require("@angular-devkit/schematics/tasks");
 function default_1(options) {
     if (!options.directory) {
         // If scoped project (i.e. "@foo/bar"), convert directory to "foo/bar".
-        options.directory = options.name.startsWith('@') ? options.name.substr(1) : options.name;
+        options.directory = options.name.startsWith('@') ? options.name.slice(1) : options.name;
     }
     const workspaceOptions = {
         name: options.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "14.0.0-next.1",
+  "version": "14.0.0-next.12",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -15,8 +15,8 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "14.0.0-next.1",
-    "@angular-devkit/schematics": "14.0.0-next.1",
+    "@angular-devkit/core": "14.0.0-next.12",
+    "@angular-devkit/schematics": "14.0.0-next.12",
     "jsonc-parser": "3.0.0"
   },
   "repository": {
@@ -24,7 +24,7 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": "^12.20.0 || ^14.15.0 || >=16.10.0",
+    "node": "^14.15.0 || >=16.10.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   },

package/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template

@@ -1,7 +1,8 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
-  name: '<%= camelize(name) %>'
+  name: '<%= camelize(name) %>'<% if(standalone) {%>,
+  standalone: true<%}%>
 })
 export class <%= classify(name) %>Pipe implements PipeTransform {
 

package/pipe/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -26,7 +30,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const ast_utils_1 = require("../utility/ast-utils");
@@ -36,22 +39,18 @@ const parse_name_1 = require("../utility/parse-name");
 const workspace_1 = require("../utility/workspace");
 function addDeclarationToNgModule(options) {
     return (host) => {
-        if (options.skipImport || !options.module) {
+        if (options.skipImport || options.standalone || !options.module) {
             return host;
         }
         const modulePath = options.module;
-        const text = host.read(modulePath);
-        if (text === null) {
-            throw new schematics_1.SchematicsException(`File ${modulePath} does not exist.`);
-        }
-        const sourceText = text.toString('utf-8');
+        const sourceText = host.readText(modulePath);
         const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
         const pipePath = `/${options.path}/` +
-            (options.flat ? '' : core_1.strings.dasherize(options.name) + '/') +
-            core_1.strings.dasherize(options.name) +
+            (options.flat ? '' : schematics_1.strings.dasherize(options.name) + '/') +
+            schematics_1.strings.dasherize(options.name) +
             '.pipe';
         const relativePath = (0, find_module_1.buildRelativePath)(modulePath, pipePath);
-        const changes = (0, ast_utils_1.addDeclarationToModule)(source, modulePath, core_1.strings.classify(`${options.name}Pipe`), relativePath);
+        const changes = (0, ast_utils_1.addDeclarationToModule)(source, modulePath, schematics_1.strings.classify(`${options.name}Pipe`), relativePath);
         const recorder = host.beginUpdate(modulePath);
         for (const change of changes) {
             if (change instanceof change_1.InsertChange) {
@@ -60,14 +59,10 @@ function addDeclarationToNgModule(options) {
         }
         host.commitUpdate(recorder);
         if (options.export) {
-            const text = host.read(modulePath);
-            if (text === null) {
-                throw new schematics_1.SchematicsException(`File ${modulePath} does not exist.`);
-            }
-            const sourceText = text.toString('utf-8');
+            const sourceText = host.readText(modulePath);
             const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
             const exportRecorder = host.beginUpdate(modulePath);
-            const exportChanges = (0, ast_utils_1.addExportToModule)(source, modulePath, core_1.strings.classify(`${options.name}Pipe`), relativePath);
+            const exportChanges = (0, ast_utils_1.addExportToModule)(source, modulePath, schematics_1.strings.classify(`${options.name}Pipe`), relativePath);
             for (const change of exportChanges) {
                 if (change instanceof change_1.InsertChange) {
                     exportRecorder.insertLeft(change.pos, change.toAdd);
@@ -90,7 +85,7 @@ function default_1(options) {
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
             options.skipTests ? (0, schematics_1.filter)((path) => !path.endsWith('.spec.ts.template')) : (0, schematics_1.noop)(),
             (0, schematics_1.applyTemplates)({
-                ...core_1.strings,
+                ...schematics_1.strings,
                 'if-flat': (s) => (options.flat ? '' : s),
                 ...options,
             }),

package/pipe/schema.d.ts

@@ -34,4 +34,8 @@ export interface Schema {
      * Do not create "spec.ts" test files for the new pipe.
      */
     skipTests?: boolean;
+    /**
+     * Whether the generated pipe is standalone.
+     */
+    standalone?: boolean;
 }

package/pipe/schema.json

@@ -45,6 +45,12 @@
       "description": "Do not import this pipe into the owning NgModule.",
       "x-user-analytics": 18
     },
+    "standalone": {
+      "description": "Whether the generated pipe is standalone.",
+      "type": "boolean",
+      "default": false,
+      "x-user-analytics": 15
+    },
     "module": {
       "type": "string",
       "description": "The declaring NgModule.",

package/service-worker/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -89,11 +93,11 @@ function updateAppModule(mainPath) {
                 host.commitUpdate(recorder);
             }
         }
-        // register SW in app module
+        // register SW in application module
         const importText = core_1.tags.stripIndent `
       ServiceWorkerModule.register('ngsw-worker.js', {
         enabled: ${importModule}.production,
-        // Register the ServiceWorker as soon as the app is stable
+        // Register the ServiceWorker as soon as the application is stable
         // or after 30 seconds (whichever comes first).
         registrationStrategy: 'registerWhenStable:30000'
       })
@@ -109,11 +113,7 @@ function updateAppModule(mainPath) {
     };
 }
 function getTsSourceFile(host, path) {
-    const buffer = host.read(path);
-    if (!buffer) {
-        throw new schematics_1.SchematicsException(`Could not read file (${path}).`);
-    }
-    const content = buffer.toString();
+    const content = host.readText(path);
     const source = ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
     return source;
 }

package/third_party/github.com/Microsoft/TypeScript/BUILD.bazel

@@ -1,7 +1,12 @@
 load("//tools:defaults.bzl", "ts_library")
 
-# files fetched on 2021-12-10 from
-# https://github.com/microsoft/TypeScript/releases/tag/v4.5.2
+# files fetched on 2022-03-10 from
+# https://github.com/microsoft/TypeScript/releases/tag/v4.6.2
+
+# Commands to download:
+# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.6.2/lib/typescript.d.ts -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
+# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.6.2/lib/typescript.js -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
+
 licenses(["notice"])  # Apache 2.0
 
 exports_files([

package/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts

@@ -14,7 +14,7 @@ and limitations under the License.
 ***************************************************************************** */
 
 declare namespace ts {
-    const versionMajorMinor = "4.5";
+    const versionMajorMinor = "4.6";
     /** The version of the TypeScript compiler release */
     const version: string;
     /**
@@ -572,7 +572,7 @@ declare namespace ts {
     }
     export interface JSDocContainer {
     }
-    export type HasJSDoc = ParameterDeclaration | CallSignatureDeclaration | ClassStaticBlockDeclaration | ConstructSignatureDeclaration | MethodSignature | PropertySignature | ArrowFunction | ParenthesizedExpression | SpreadAssignment | ShorthandPropertyAssignment | PropertyAssignment | FunctionExpression | EmptyStatement | DebuggerStatement | Block | VariableStatement | ExpressionStatement | IfStatement | DoStatement | WhileStatement | ForStatement | ForInStatement | ForOfStatement | BreakStatement | ContinueStatement | ReturnStatement | WithStatement | SwitchStatement | LabeledStatement | ThrowStatement | TryStatement | FunctionDeclaration | ConstructorDeclaration | MethodDeclaration | VariableDeclaration | PropertyDeclaration | AccessorDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | EnumMember | EnumDeclaration | ModuleDeclaration | ImportEqualsDeclaration | ImportDeclaration | NamespaceExportDeclaration | ExportAssignment | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | ExportDeclaration | NamedTupleMember | EndOfFileToken;
+    export type HasJSDoc = ParameterDeclaration | CallSignatureDeclaration | ClassStaticBlockDeclaration | ConstructSignatureDeclaration | MethodSignature | PropertySignature | ArrowFunction | ParenthesizedExpression | SpreadAssignment | ShorthandPropertyAssignment | PropertyAssignment | FunctionExpression | EmptyStatement | DebuggerStatement | Block | VariableStatement | ExpressionStatement | IfStatement | DoStatement | WhileStatement | ForStatement | ForInStatement | ForOfStatement | BreakStatement | ContinueStatement | ReturnStatement | WithStatement | SwitchStatement | LabeledStatement | ThrowStatement | TryStatement | FunctionDeclaration | ConstructorDeclaration | MethodDeclaration | VariableDeclaration | PropertyDeclaration | AccessorDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | EnumMember | EnumDeclaration | ModuleDeclaration | ImportEqualsDeclaration | ImportDeclaration | NamespaceExportDeclaration | ExportAssignment | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | ExportDeclaration | NamedTupleMember | ExportSpecifier | 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;
@@ -897,7 +897,7 @@ declare namespace ts {
     export interface TypePredicateNode extends TypeNode {
         readonly kind: SyntaxKind.TypePredicate;
         readonly parent: SignatureDeclaration | JSDocTypeExpression;
-        readonly assertsModifier?: AssertsToken;
+        readonly assertsModifier?: AssertsKeyword;
         readonly parameterName: Identifier | ThisTypeNode;
         readonly type?: TypeNode;
     }
@@ -968,7 +968,7 @@ declare namespace ts {
     }
     export interface MappedTypeNode extends TypeNode, Declaration {
         readonly kind: SyntaxKind.MappedType;
-        readonly readonlyToken?: ReadonlyToken | PlusToken | MinusToken;
+        readonly readonlyToken?: ReadonlyKeyword | PlusToken | MinusToken;
         readonly typeParameter: TypeParameterDeclaration;
         readonly nameType?: TypeNode;
         readonly questionToken?: QuestionToken | PlusToken | MinusToken;
@@ -1465,7 +1465,7 @@ declare namespace ts {
     }
     export interface ForOfStatement extends IterationStatement {
         readonly kind: SyntaxKind.ForOfStatement;
-        readonly awaitModifier?: AwaitKeywordToken;
+        readonly awaitModifier?: AwaitKeyword;
         readonly initializer: ForInitializer;
         readonly expression: Expression;
     }
@@ -1652,7 +1652,7 @@ declare namespace ts {
         readonly kind: SyntaxKind.AssertEntry;
         readonly parent: AssertClause;
         readonly name: AssertionKey;
-        readonly value: StringLiteral;
+        readonly value: Expression;
     }
     export interface AssertClause extends Node {
         readonly kind: SyntaxKind.AssertClause;
@@ -1702,7 +1702,7 @@ declare namespace ts {
         readonly name: Identifier;
         readonly isTypeOnly: boolean;
     }
-    export interface ExportSpecifier extends NamedDeclaration {
+    export interface ExportSpecifier extends NamedDeclaration, JSDocContainer {
         readonly kind: SyntaxKind.ExportSpecifier;
         readonly parent: NamedExports;
         readonly isTypeOnly: boolean;
@@ -1720,19 +1720,23 @@ declare namespace ts {
         readonly parent: ImportClause & {
             readonly isTypeOnly: true;
         };
-    } | ImportSpecifier & {
+    } | ImportSpecifier & ({
+        readonly isTypeOnly: true;
+    } | {
         readonly parent: NamedImports & {
             readonly parent: ImportClause & {
                 readonly isTypeOnly: true;
             };
         };
-    } | ExportSpecifier & {
+    }) | ExportSpecifier & ({
+        readonly isTypeOnly: true;
+    } | {
         readonly parent: NamedExports & {
             readonly parent: ExportDeclaration & {
                 readonly isTypeOnly: true;
             };
         };
-    };
+    });
     /**
      * This is either an `export =` or an `export default` declaration.
      * Unless `isExportEquals` is set, this node was parsed as an `export default`.
@@ -3078,6 +3082,7 @@ declare namespace ts {
         ES2019 = 6,
         ES2020 = 7,
         ES2021 = 8,
+        ES2022 = 9,
         ESNext = 99,
         JSON = 100,
         Latest = 99
@@ -3343,7 +3348,7 @@ declare namespace ts {
         createTrue(): TrueLiteral;
         createFalse(): FalseLiteral;
         createModifier<T extends ModifierSyntaxKind>(kind: T): ModifierToken<T>;
-        createModifiersFromModifierFlags(flags: ModifierFlags): Modifier[];
+        createModifiersFromModifierFlags(flags: ModifierFlags): Modifier[] | undefined;
         createQualifiedName(left: EntityName, right: string | Identifier): QualifiedName;
         updateQualifiedName(node: QualifiedName, left: EntityName, right: Identifier): QualifiedName;
         createComputedPropertyName(expression: Expression): ComputedPropertyName;
@@ -3575,8 +3580,8 @@ declare namespace ts {
         updateImportClause(node: ImportClause, isTypeOnly: boolean, name: Identifier | undefined, namedBindings: NamedImportBindings | undefined): ImportClause;
         createAssertClause(elements: NodeArray<AssertEntry>, multiLine?: boolean): AssertClause;
         updateAssertClause(node: AssertClause, elements: NodeArray<AssertEntry>, multiLine?: boolean): AssertClause;
-        createAssertEntry(name: AssertionKey, value: StringLiteral): AssertEntry;
-        updateAssertEntry(node: AssertEntry, name: AssertionKey, value: StringLiteral): AssertEntry;
+        createAssertEntry(name: AssertionKey, value: Expression): AssertEntry;
+        updateAssertEntry(node: AssertEntry, name: AssertionKey, value: Expression): AssertEntry;
         createNamespaceImport(name: Identifier): NamespaceImport;
         updateNamespaceImport(node: NamespaceImport, name: Identifier): NamespaceImport;
         createNamespaceExport(name: Identifier): NamespaceExport;
@@ -5351,7 +5356,11 @@ declare namespace ts {
         traceResolution?: boolean;
         [option: string]: CompilerOptionsValue | undefined;
     }
-    type ReportEmitErrorSummary = (errorCount: number) => void;
+    type ReportEmitErrorSummary = (errorCount: number, filesInError: (ReportFileInError | undefined)[]) => void;
+    interface ReportFileInError {
+        fileName: string;
+        line: number;
+    }
     interface SolutionBuilderHostBase<T extends BuilderProgram> extends ProgramHost<T> {
         createDirectory?(path: string): void;
         /**
@@ -5559,6 +5568,7 @@ declare namespace ts {
         isTypeParameter(): this is TypeParameter;
         isClassOrInterface(): this is InterfaceType;
         isClass(): this is InterfaceType;
+        isIndexType(): this is IndexType;
     }
     interface TypeReference {
         typeArguments?: readonly Type[];
@@ -5567,6 +5577,7 @@ declare namespace ts {
         getDeclaration(): SignatureDeclaration;
         getTypeParameters(): TypeParameter[] | undefined;
         getParameters(): Symbol[];
+        getTypeParameterAtPosition(pos: number): Type;
         getReturnType(): Type;
         getDocumentationComment(typeChecker: TypeChecker | undefined): SymbolDisplayPart[];
         getJsDocTags(): JSDocTagInfo[];
@@ -5753,8 +5764,9 @@ declare namespace ts {
          * @param position A zero-based index of the character where you want the entries
          * @param options An object describing how the request was triggered and what kinds
          * of code actions can be returned with the completions.
+         * @param formattingSettings settings needed for calling formatting functions.
          */
-        getCompletionsAtPosition(fileName: string, position: number, options: GetCompletionsAtPositionOptions | undefined): WithMetadata<CompletionInfo> | undefined;
+        getCompletionsAtPosition(fileName: string, position: number, options: GetCompletionsAtPositionOptions | undefined, formattingSettings?: FormatCodeSettings): WithMetadata<CompletionInfo> | undefined;
         /**
          * Gets the extended details for a completion entry retrieved from `getCompletionsAtPosition`.
          *
@@ -6586,6 +6598,7 @@ declare namespace ts {
         externalModuleName = "external module name",
         /**
          * <JsxTagName attribute1 attribute2={0} />
+         * @deprecated
          */
         jsxAttribute = "JSX attribute",
         /** String literal */
@@ -6855,7 +6868,7 @@ declare namespace ts {
     /** @deprecated Use `factory.createModifier` or the factory supplied by your transformation context instead. */
     const createModifier: <T extends ModifierSyntaxKind>(kind: T) => ModifierToken<T>;
     /** @deprecated Use `factory.createModifiersFromModifierFlags` or the factory supplied by your transformation context instead. */
-    const createModifiersFromModifierFlags: (flags: ModifierFlags) => Modifier[];
+    const createModifiersFromModifierFlags: (flags: ModifierFlags) => Modifier[] | undefined;
     /** @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. */