@taiga-ui/cdk 4.0.0-rc.1 → 4.0.0-rc.10

package/schematics/ng-update/interfaces/replacement-type.d.ts

@@ -3,4 +3,9 @@ export interface ReplacementType {
     readonly moduleSpecifier?: string[] | string;
     readonly preserveGenerics?: boolean;
     readonly to?: string;
+    readonly removeImport?: boolean;
+    readonly newImports?: Array<{
+        name: string;
+        moduleSpecifier: string;
+    }>;
 }

package/schematics/ng-update/steps/icons/replace-imports.js

@@ -13,15 +13,15 @@ function replaceImports(replaceable, options) {
         total: replaceable.length,
     });
     replaceable.forEach(({ from, to }) => {
-        const importDeclarations = allImports.filter(declaration => !declaration.wasForgotten() &&
+        const importDeclarations = allImports.filter((declaration) => !declaration.wasForgotten() &&
             declaration.getModuleSpecifierValue() === from.moduleSpecifier &&
             declaration
                 .getNamedImports()
-                .some(specifier => specifier.getName() === from.name));
-        const namedImports = importDeclarations.map(declaration => declaration
+                .some((specifier) => specifier.getName() === from.name));
+        const namedImports = importDeclarations.map((declaration) => declaration
             .getNamedImports()
-            .find(specifier => specifier.getName() === from.name));
-        namedImports.forEach(namedImport => {
+            .find((specifier) => specifier.getName() === from.name));
+        namedImports.forEach((namedImport) => {
             if (ng_morph_1.Node.isImportSpecifier(namedImport) && !namedImport.wasForgotten()) {
                 (0, import_manipulations_1.removeImport)(namedImport);
                 (0, add_unique_import_1.addUniqueImport)(namedImport.getSourceFile().getFilePath(), to.namedImport || to.name, to.moduleSpecifier);

package/schematics/ng-update/steps/index.d.ts

@@ -3,4 +3,5 @@ export * from './rename-types';
 export * from './replace-deep-import';
 export * from './replace-enums';
 export * from './replace-identifier';
+export * from './replace-package-name';
 export * from './show-warnings';

package/schematics/ng-update/steps/index.js

@@ -6,4 +6,5 @@ tslib_1.__exportStar(require("./rename-types"), exports);
 tslib_1.__exportStar(require("./replace-deep-import"), exports);
 tslib_1.__exportStar(require("./replace-enums"), exports);
 tslib_1.__exportStar(require("./replace-identifier"), exports);
+tslib_1.__exportStar(require("./replace-package-name"), exports);
 tslib_1.__exportStar(require("./show-warnings"), exports);

package/schematics/ng-update/steps/remove-module.js

@@ -15,7 +15,7 @@ function removeModules(options, modules) {
 exports.removeModules = removeModules;
 function removeModule(name, moduleSpecifier) {
     const references = (0, get_named_import_references_1.getNamedImportReferences)(name, moduleSpecifier);
-    references.forEach(ref => {
+    references.forEach((ref) => {
         if (ref.wasForgotten()) {
             return;
         }
@@ -24,7 +24,7 @@ function removeModule(name, moduleSpecifier) {
             (0, import_manipulations_1.removeImport)(parent);
         }
         else if (ng_morph_1.Node.isArrayLiteralExpression(parent)) {
-            const index = parent.getElements().findIndex(el => el.getText() === name);
+            const index = parent.getElements().findIndex((el) => el.getText() === name);
             parent.removeElement(index);
         }
     });

package/schematics/ng-update/steps/rename-types.js

@@ -2,29 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renameTypes = void 0;
 const ng_morph_1 = require("ng-morph");
+const add_unique_import_1 = require("../../utils/add-unique-import");
 const colored_log_1 = require("../../utils/colored-log");
 const get_named_import_references_1 = require("../../utils/get-named-import-references");
 const import_manipulations_1 = require("../../utils/import-manipulations");
-function renameType(from, to, moduleSpecifier, preserveGenerics = false) {
+function renameType({ from, to, moduleSpecifier, preserveGenerics = false, removeImport = false, newImports = [], }) {
     const references = (0, get_named_import_references_1.getNamedImportReferences)(from, moduleSpecifier);
-    references.forEach(ref => {
+    references.forEach((ref) => {
         if (ref.wasForgotten()) {
             return;
         }
         const parent = ref.getParent();
         if (ng_morph_1.Node.isImportSpecifier(parent)) {
-            processImport(parent, from, to);
+            processImport(parent, from, to, removeImport);
         }
         else if (ng_morph_1.Node.isTypeReference(parent)) {
             const targetType = preserveGenerics && to ? addGeneric(to, parent.getTypeArguments()) : to;
             parent.replaceWithText(targetType || 'any');
+            newImports.forEach(({ name, moduleSpecifier }) => {
+                (0, add_unique_import_1.addUniqueImport)(parent.getSourceFile().getFilePath(), name, moduleSpecifier);
+            });
         }
     });
 }
-function processImport(node, from, to) {
+function processImport(node, from, to, remove) {
     const filePath = node.getSourceFile().getFilePath();
     const targetImportAlreadyExists = Boolean((0, ng_morph_1.getImports)(filePath, { namedImports: to }).length);
-    if (to && !targetImportAlreadyExists) {
+    if (to && !targetImportAlreadyExists && !remove) {
         (0, import_manipulations_1.renameImport)(node, removeGeneric(to), removeGeneric(from));
     }
     else {
@@ -35,14 +39,14 @@ function removeGeneric(type) {
     return type.replaceAll(/<.*>$/gi, '');
 }
 function addGeneric(typeName, generics) {
-    const typeArgs = generics.map(t => t.getType().getText());
+    const typeArgs = generics.map((t) => t.getType().getText());
     const genericType = typeArgs.length ? `<${typeArgs.join(', ')}>` : '';
     return typeName + genericType;
 }
 function renameTypes(options, types) {
     !options['skip-logs'] &&
         (0, colored_log_1.infoLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} renaming types...`);
-    types.forEach(({ from, to, moduleSpecifier, preserveGenerics }) => renameType(from, to, moduleSpecifier, preserveGenerics));
+    types.forEach(renameType);
     !options['skip-logs'] &&
         (0, colored_log_1.successLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SUCCESS_SYMBOL} types renamed \n`);
 }

package/schematics/ng-update/steps/replace-deep-import.js

@@ -11,8 +11,8 @@ function replaceDeepImports(options) {
     }
     !options['skip-logs'] &&
         (0, colored_log_1.infoLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} replacing deep imports...`);
-    const deepImports = (0, ng_morph_1.getImports)(constants_1.ALL_TS_FILES).filter(imp => DEEP_REGEX.test(imp.getModuleSpecifier().getLiteralValue()));
-    (0, ng_morph_1.editImports)(deepImports, deepImport => {
+    const deepImports = (0, ng_morph_1.getImports)(constants_1.ALL_TS_FILES).filter((imp) => DEEP_REGEX.test(imp.getModuleSpecifier().getLiteralValue()));
+    (0, ng_morph_1.editImports)(deepImports, (deepImport) => {
         const specifier = deepImport.moduleSpecifier.replace(DEEP_REGEX, '$1');
         return { moduleSpecifier: specifier };
     });

package/schematics/ng-update/steps/replace-enums.js

@@ -25,7 +25,7 @@ function replaceEnumWithString(enumName, replaceValues, keepAsType = true) {
         if (!ng_morph_1.Node.isPropertyAccessExpression(parent)) {
             continue;
         }
-        const key = Object.keys(replaceValues).find(key => parent.getName() === key);
+        const key = Object.keys(replaceValues).find((key) => parent.getName() === key);
         if (key) {
             parent.replaceWithText(`'${replaceValues[key]}'`);
         }
@@ -35,7 +35,7 @@ function containTypeRef(node) {
     return node
         .getNameNode()
         .findReferencesAsNodes()
-        .some(ref => ng_morph_1.Node.isTypeReference(ref.getParent()));
+        .some((ref) => ng_morph_1.Node.isTypeReference(ref.getParent()));
 }
 function replaceEnums(options, enums) {
     !options['skip-logs'] &&

package/schematics/ng-update/steps/replace-identifier.js

@@ -6,17 +6,30 @@ const add_unique_import_1 = require("../../utils/add-unique-import");
 const colored_log_1 = require("../../utils/colored-log");
 const get_named_import_references_1 = require("../../utils/get-named-import-references");
 const import_manipulations_1 = require("../../utils/import-manipulations");
+const progress_1 = require("../../utils/progress");
 function replaceIdentifiers(options, constants) {
     !options['skip-logs'] &&
         (0, colored_log_1.infoLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} replacing identifiers...`);
-    constants.forEach(replaceIdentifier);
+    const progressLog = (0, progress_1.setupProgressLogger)({
+        total: constants.length,
+    });
+    constants.forEach(({ from, to }) => {
+        toArray(from).forEach((x) => replaceIdentifier({ from: x, to }));
+        !options['skip-logs'] &&
+            progressLog(toArray(from)
+                .map((x) => x.name)
+                .join(', '));
+    });
     !options['skip-logs'] &&
         (0, colored_log_1.successLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SUCCESS_SYMBOL} identifiers replaced \n`);
 }
 exports.replaceIdentifiers = replaceIdentifiers;
 function replaceIdentifier({ from, to }) {
-    const references = (0, get_named_import_references_1.getNamedImportReferences)(from.name, from.moduleSpecifier);
-    references.forEach(ref => {
+    const references = toArray(from)
+        .map(({ name, moduleSpecifier }) => (0, get_named_import_references_1.getNamedImportReferences)(name, moduleSpecifier))
+        .flat();
+    references.forEach((ref) => {
+        var _a;
         if (ref.wasForgotten()) {
             return;
         }
@@ -26,15 +39,24 @@ function replaceIdentifier({ from, to }) {
             addImports(to, parent.getSourceFile().getFilePath());
         }
         else {
-            ref === null || ref === void 0 ? void 0 : ref.replaceWithText(Array.isArray(to) ? to.map(({ name }) => name).join(', ') : to.name);
+            const decorator = ref.getParentWhile((node) => node.getKindName() !== 'Decorator');
+            const inModule = ((_a = decorator === null || decorator === void 0 ? void 0 : decorator.getFirstChildIfKind(ng_morph_1.ts.SyntaxKind.Identifier)) === null || _a === void 0 ? void 0 : _a.getText()) ===
+                'NgModule';
+            ref.replaceWithText(getReplacementText(to, !!inModule));
         }
     });
 }
 exports.replaceIdentifier = replaceIdentifier;
 function addImports(identifier, filePath) {
-    Array.isArray(identifier)
-        ? identifier.forEach(({ name, namedImport, moduleSpecifier }) => {
-            (0, add_unique_import_1.addUniqueImport)(filePath, namedImport || name, moduleSpecifier);
-        })
-        : (0, add_unique_import_1.addUniqueImport)(filePath, identifier.namedImport || identifier.name, identifier.moduleSpecifier);
+    toArray(identifier).forEach(({ name, namedImport, moduleSpecifier }) => {
+        (0, add_unique_import_1.addUniqueImport)(filePath, namedImport || name, moduleSpecifier);
+    });
+}
+function getReplacementText(to, inModule) {
+    return toArray(to)
+        .map(({ name, spreadInModule }) => spreadInModule && inModule ? `...${name}` : name)
+        .join(', ');
+}
+function toArray(x) {
+    return Array.isArray(x) ? x : [x];
 }

package/schematics/ng-update/steps/replace-package-name.d.ts

@@ -0,0 +1,5 @@
+import type { Tree } from '@angular-devkit/schematics';
+export declare function replacePackageName(oldPackage: string, newPackage: {
+    name: string;
+    version: string;
+}, tree: Tree): void;

package/schematics/ng-update/steps/replace-package-name.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.replacePackageName = void 0;
+const ng_morph_1 = require("ng-morph");
+const constants_1 = require("../../constants");
+const get_file_system_1 = require("../utils/get-file-system");
+const replace_text_1 = require("../utils/replace-text");
+function replacePackageName(oldPackage, newPackage, tree) {
+    const fileSystem = (0, get_file_system_1.getFileSystem)(tree);
+    (0, replace_text_1.replaceText)([{ from: oldPackage, to: newPackage.name }], constants_1.ALL_TS_FILES);
+    if ((0, ng_morph_1.getPackageJsonDependency)(tree, oldPackage)) {
+        (0, ng_morph_1.removePackageJsonDependency)(tree, oldPackage);
+        (0, ng_morph_1.addPackageJsonDependency)(tree, newPackage);
+    }
+    fileSystem.commitEdits();
+    (0, ng_morph_1.saveActiveProject)();
+}
+exports.replacePackageName = replacePackageName;

package/schematics/ng-update/steps/replace-services.js

@@ -10,7 +10,7 @@ function replaceService({ from, to, replaceMethods }, options) {
     !options['skip-logs'] &&
         (0, colored_log_1.processLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.PROCESSING_SYMBOL}replacing ${from.name}...`);
     const references = (0, get_named_import_references_1.getNamedImportReferences)(from.name, from.moduleSpecifier);
-    references.forEach(ref => {
+    references.forEach((ref) => {
         if (ref.wasForgotten()) {
             return;
         }
@@ -29,7 +29,7 @@ function replaceService({ from, to, replaceMethods }, options) {
 function replaceProperties(parent, replaceProperties) {
     const statement = parent.getParent();
     const identifier = statement.getChildrenOfKind(ng_morph_1.SyntaxKind.Identifier)[0];
-    identifier === null || identifier === void 0 ? void 0 : identifier.findReferencesAsNodes().forEach(ref => {
+    identifier === null || identifier === void 0 ? void 0 : identifier.findReferencesAsNodes().forEach((ref) => {
         let parent = ref.getParent();
         if ((ng_morph_1.Node.isPropertyAccessExpression(parent) &&
             parent.getText().startsWith('this.')) ||
@@ -43,8 +43,8 @@ function replaceProperties(parent, replaceProperties) {
 }
 function replaceProperty(node, properties) {
     const identifiers = node.getChildrenOfKind(ng_morph_1.SyntaxKind.Identifier);
-    identifiers.forEach(identifier => {
-        const property = properties === null || properties === void 0 ? void 0 : properties.find(property => property.from === identifier.getText());
+    identifiers.forEach((identifier) => {
+        const property = properties === null || properties === void 0 ? void 0 : properties.find((property) => property.from === identifier.getText());
         if (property) {
             identifier.replaceWithText(property.to);
         }
@@ -53,7 +53,7 @@ function replaceProperty(node, properties) {
 function replaceServices(options, services) {
     !options['skip-logs'] &&
         (0, colored_log_1.infoLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} replacing services...`);
-    services.forEach(service => replaceService(service, options));
+    services.forEach((service) => replaceService(service, options));
     !options['skip-logs'] &&
         (0, colored_log_1.successLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SUCCESS_SYMBOL} services replaced \n`);
 }

package/schematics/ng-update/steps/show-warnings.js

@@ -8,14 +8,14 @@ function showWarning({ name, message, moduleSpecifier = '**/**' }, { logger }) {
         moduleSpecifier,
         namedImports: [name],
     })
-        .map(i => {
+        .map((i) => {
         var _a;
         return (_a = i
             .getNamedImports()
-            .find(namedImport => namedImport.getName() === name)) === null || _a === void 0 ? void 0 : _a.getNameNode();
+            .find((namedImport) => namedImport.getName() === name)) === null || _a === void 0 ? void 0 : _a.getNameNode();
     })
         .filter((namedImport) => Boolean(namedImport));
-    const referencesMeta = references.map(ref => {
+    const referencesMeta = references.map((ref) => {
         const sourceFile = ref.getSourceFile();
         return {
             sourceFile,
@@ -34,6 +34,6 @@ function showWarning({ name, message, moduleSpecifier = '**/**' }, { logger }) {
     });
 }
 function showWarnings(context, warnings) {
-    warnings.forEach(warning => showWarning(warning, context));
+    warnings.forEach((warning) => showWarning(warning, context));
 }
 exports.showWarnings = showWarnings;

package/schematics/ng-update/utils/replace-text.js

@@ -5,7 +5,7 @@ const ng_morph_1 = require("ng-morph");
 const constants_1 = require("../../constants");
 function replaceText(replaceable, pattern = constants_1.ALL_FILES) {
     const sourceFiles = (0, ng_morph_1.getSourceFiles)(pattern);
-    sourceFiles.forEach(file => {
+    sourceFiles.forEach((file) => {
         let text = file.getFullText();
         replaceable.forEach(({ from, to }) => {
             const regexp = new RegExp(from, 'g');

package/schematics/ng-update/utils/templates/replace-attr-values.js

@@ -1,30 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceAttrValues = void 0;
+const add_import_to_closest_module_1 = require("../../../utils/add-import-to-closest-module");
 const elements_1 = require("../../../utils/templates/elements");
 const template_resource_1 = require("../../../utils/templates/template-resource");
 function replaceAttrValues({ resource, recorder, fileSystem, data, }) {
     const template = (0, template_resource_1.getTemplateFromTemplateResource)(resource, fileSystem);
     const templateOffset = (0, template_resource_1.getTemplateOffset)(resource);
-    data.forEach(({ attrNames, values, withTagNames, filterFn, newAttrName }) => {
+    data.forEach(({ attrNames, valueReplacer, withTagNames, filterFn, newAttrName, directiveModule, }) => {
         const elements = [
             ...(0, elements_1.findElementsWithAttributeOnTag)(template, attrNames, withTagNames, filterFn),
         ];
-        elements.forEach(element => {
-            const { name, value } = element.attrs.find(attr => attrNames.map(name => name.toLowerCase()).includes(attr.name)) || {};
+        elements.forEach((element) => {
+            const { name, value } = element.attrs.find((attr) => attrNames.map((name) => name.toLowerCase()).includes(attr.name)) || {};
             if (!name || !value) {
                 return;
             }
-            const attributeName = attrNames.find(attrName => attrName.toLowerCase() === name);
-            values.forEach(({ from, to }) => {
-                var _a, _b;
-                if (value === from) {
-                    const { startOffset, endOffset } = ((_b = (_a = element.sourceCodeLocation) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b[name]) || { startOffset: 0, endOffset: 0 };
-                    recorder.remove(templateOffset + startOffset, endOffset - startOffset);
-                    recorder.insertRight(templateOffset + startOffset, `${newAttrName || attributeName}="${to}"`);
-                }
-            });
+            const attributeName = attrNames.find((attrName) => attrName.toLowerCase() === name) || '';
+            if (Array.isArray(valueReplacer)) {
+                valueReplacer.forEach(({ from, to }) => {
+                    if (value === from) {
+                        replaceValue({
+                            element,
+                            recorder,
+                            templateOffset,
+                            attrName: name,
+                            attrNewName: newAttrName || attributeName,
+                            attrValue: to,
+                        });
+                    }
+                });
+            }
+            else {
+                replaceValue({
+                    element,
+                    recorder,
+                    templateOffset,
+                    attrName: name,
+                    attrNewName: newAttrName || attributeName,
+                    attrValue: valueReplacer(value),
+                });
+            }
+            if (directiveModule) {
+                (0, add_import_to_closest_module_1.addImportToClosestModule)(resource.componentPath, directiveModule.name, directiveModule.moduleSpecifier);
+            }
         });
     });
 }
 exports.replaceAttrValues = replaceAttrValues;
+function replaceValue({ element, recorder, templateOffset, attrName, attrNewName, attrValue, }) {
+    var _a, _b;
+    const { startOffset, endOffset } = ((_b = (_a = element.sourceCodeLocation) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b[attrName]) || {
+        startOffset: 0,
+        endOffset: 0,
+    };
+    recorder.remove(templateOffset + startOffset, endOffset - startOffset);
+    recorder.insertRight(templateOffset + startOffset, `${attrNewName}="${attrValue}"`);
+}

package/schematics/ng-update/utils/templates/replace-attrs.js

@@ -11,7 +11,7 @@ function replaceAttrs({ resource, recorder, fileSystem, data, }) {
             ...(0, elements_1.findAttributeOnElementWithTag)(template, from.attrName, from.withTagNames || [], from.filterFn),
             ...(0, elements_1.findAttributeOnElementWithAttrs)(template, from.attrName, from.withAttrsNames || [], from.filterFn),
         ];
-        offsets.forEach(offset => {
+        offsets.forEach((offset) => {
             recorder.remove(offset + templateOffset, from.attrName.length);
             recorder.insertRight(offset + templateOffset, to.attrName);
         });

package/schematics/ng-update/utils/templates/template-comments.js

@@ -7,12 +7,20 @@ const template_resource_1 = require("../../../utils/templates/template-resource"
 function addHTMLCommentTags({ resource, recorder, fileSystem, data, }) {
     const template = (0, template_resource_1.getTemplateFromTemplateResource)(resource, fileSystem);
     const templateOffset = (0, template_resource_1.getTemplateOffset)(resource);
-    data.forEach(({ comment, tag, withAttrs }) => {
+    data.forEach(({ comment, tag, withAttrs, pattern }) => {
+        if (pattern && template.match(pattern)) {
+            recorder.insertRight(templateOffset && templateOffset + 1, `<!-- ${insert_todo_1.TODO_MARK} ${comment} -->\n`);
+        }
+        if (!tag || !withAttrs) {
+            return;
+        }
         const elementStartOffsets = [
             ...(0, elements_1.findElementsWithAttributeOnTag)(template, withAttrs, [tag]),
-            ...(0, elements_1.findElementsWithAttributeOnTag)(template, withAttrs.map(attr => `[${attr}]`), [tag]),
+            ...(withAttrs.length
+                ? (0, elements_1.findElementsWithAttributeOnTag)(template, withAttrs.map((attr) => `[${attr}]`), [tag])
+                : []),
         ].map(({ sourceCodeLocation }) => ((sourceCodeLocation === null || sourceCodeLocation === void 0 ? void 0 : sourceCodeLocation.startOffset) || 0) + templateOffset);
-        elementStartOffsets.forEach(offset => {
+        elementStartOffsets.forEach((offset) => {
             recorder.insertLeft(offset, `<!-- ${insert_todo_1.TODO_MARK} ${comment} -->\n`);
         });
     });

package/schematics/ng-update/v4/index.js

@@ -9,29 +9,42 @@ const versions_1 = require("../../ng-add/constants/versions");
 const colored_log_1 = require("../../utils/colored-log");
 const get_execution_time_1 = require("../../utils/get-execution-time");
 const steps_1 = require("../steps");
+const replace_services_1 = require("../steps/replace-services");
 const get_file_system_1 = require("../utils/get-file-system");
 const enums_1 = require("../v4/steps/constants/enums");
 const steps_2 = require("./steps");
 const constants_1 = require("./steps/constants");
-const migrate_option_providers_1 = require("./steps/migrate-option-providers");
-const migrate_proprietary_1 = require("./steps/migrate-proprietary");
-const migrate_styles_1 = require("./steps/migrate-styles");
+const modules_to_replace_1 = require("./steps/constants/modules-to-replace");
+const types_1 = require("./steps/constants/types");
+const migrate_root_1 = require("./steps/migrate-root");
+const replace_modules_with_providers_1 = require("./steps/utils/replace-modules-with-providers");
 function main(options) {
     return (tree, context) => {
         const fileSystem = (0, get_file_system_1.getFileSystem)(tree);
+        (0, steps_1.replaceEnums)(options, enums_1.ENUMS_TO_REPLACE);
+        (0, migrate_root_1.migrateRoot)(fileSystem, options);
+        (0, replace_services_1.replaceServices)(options, constants_1.SERVICES_TO_REPLACE);
         (0, steps_1.replaceIdentifiers)(options, constants_1.IDENTIFIERS_TO_REPLACE);
         (0, steps_1.removeModules)(options, constants_1.MODULES_TO_REMOVE);
+        (0, replace_modules_with_providers_1.replaceModulesWithProviders)(options, modules_to_replace_1.MODULES_TO_REPLACE_WITH_PROVIDERS);
+        (0, steps_1.renameTypes)(options, types_1.TYPES_TO_RENAME);
         (0, steps_2.restoreTuiMapper)(options);
         (0, steps_2.restoreTuiMatcher)(options);
         (0, steps_2.migrateLegacyMask)(options);
         (0, steps_2.migrateDestroyService)(options);
-        (0, migrate_option_providers_1.migrateOptionProviders)(options);
+        (0, steps_2.migrateOptionProviders)(options);
         (0, steps_2.migrateAllCountryIsoCodes)(options);
-        (0, steps_1.replaceEnums)(options, enums_1.ENUMS_TO_REPLACE);
+        (0, steps_2.migrateAlertService)(options);
+        (0, steps_2.migrateNumberFormatSettings)(options);
+        (0, steps_2.migrateMonthContext)(options);
+        (0, ng_morph_1.saveActiveProject)();
         (0, steps_2.migrateTemplates)(fileSystem, options);
-        (0, migrate_styles_1.migrateStyles)();
         (0, steps_1.showWarnings)(context, constants_1.MIGRATION_WARNINGS);
-        (0, migrate_proprietary_1.migrateProprietary)(fileSystem, options);
+        fileSystem.commitEdits();
+        (0, ng_morph_1.saveActiveProject)();
+        (0, steps_2.migrateStyles)();
+        (0, steps_2.migrateProprietary)(fileSystem, options);
+        (0, steps_2.updatePackages)(fileSystem, options);
         fileSystem.commitEdits();
         (0, ng_morph_1.saveActiveProject)();
         context.addTask(new tasks_1.NodePackageInstallTask());

package/schematics/ng-update/v4/migrate-css-vars/palette.d.ts

@@ -55,8 +55,6 @@ export declare const DEPRECATED_VARS: {
     '--tui-positive-hover': string;
     '--tui-negative': string;
     '--tui-negative-hover': string;
-    '--tui-support-': string;
-    '--tui-chart-': string;
     '--tui-clear-inverse': string;
     '--tui-clear-inverse-hover': string;
     '--tui-clear-inverse-active': string;
@@ -84,6 +82,17 @@ export declare const DEPRECATED_VARS: {
     '--tui-positive-night-hover': string;
     '--tui-negative-night': string;
     '--tui-negative-night-hover': string;
+    '--tui-shadow': string;
+    '--tui-shadow-hover': string;
+    '--tui-shadow-dropdown': string;
+    '--tui-shadow-modal': string;
+    '--tui-shadow-sidebar': string;
+    '--tui-shadow-navigation': string;
+    '--tui-shadow-sheet': string;
+};
+export declare const DEPRECATED_NUMERIC_VARS: {
+    '--tui-chart-': string;
+    '--tui-support-': string;
 };
 export declare const NIGHT_VAR_COMMENT = "TODO: use tuiTheme=\"dark\" on an element to switch colors to dark theme";
 export declare const DEPRECATE_VARS_WITH_COMMENT: string[];

package/schematics/ng-update/v4/migrate-css-vars/palette.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEPRECATE_VARS_WITH_COMMENT = exports.NIGHT_VAR_COMMENT = exports.DEPRECATED_VARS = void 0;
+exports.DEPRECATE_VARS_WITH_COMMENT = exports.NIGHT_VAR_COMMENT = exports.DEPRECATED_NUMERIC_VARS = exports.DEPRECATED_VARS = void 0;
 exports.DEPRECATED_VARS = {
     '--tui-font-text-l-2': '--tui-font-text-ui-l',
     '--tui-font-text-m-2': '--tui-font-text-ui-m',
@@ -26,7 +26,7 @@ exports.DEPRECATED_VARS = {
     '--tui-accent-hover': '--tui-background-accent-2-hover',
     '--tui-accent-active': '--tui-background-accent-2-pressed',
     '--tui-accent-text': '--tui-text-primary-on-accent-2',
-    '--tui-selection': '--tui-service-selected-text',
+    '--tui-selection': '--tui-service-selection-background',
     '--tui-focus': '--tui-border-focus',
     '--tui-clear': '--tui-background-neutral-1',
     '--tui-clear-disabled': '--tui-background-neutral-1',
@@ -54,12 +54,10 @@ exports.DEPRECATED_VARS = {
     '--tui-text-03': '--tui-text-tertiary',
     '--tui-link': '--tui-text-action',
     '--tui-link-hover': '--tui-text-action-hover',
-    '--tui-positive': '--tui-status-positive',
-    '--tui-positive-hover': '--tui-status-positive',
-    '--tui-negative': '--tui-status-negative',
-    '--tui-negative-hover': '--tui-status-negative',
-    '--tui-support-': '--tui-chart-categorical-',
-    '--tui-chart-': '--tui-chart-categorical-0',
+    '--tui-positive': '--tui-text-positive',
+    '--tui-positive-hover': '--tui-text-positive-hover',
+    '--tui-negative': '--tui-text-negative',
+    '--tui-negative-hover': '--tui-text-negative-hover',
     '--tui-clear-inverse': '--tui-background-neutral-1',
     '--tui-clear-inverse-hover': '--tui-background-neutral-1-hover',
     '--tui-clear-inverse-active': '--tui-background-neutral-1-pressed',
@@ -87,6 +85,18 @@ exports.DEPRECATED_VARS = {
     '--tui-positive-night-hover': '--tui-status-positive',
     '--tui-negative-night': '--tui-status-negative',
     '--tui-negative-night-hover': '--tui-status-negative',
+    '--tui-shadow': 'var(--tui-shadow-small)',
+    '--tui-shadow-hover': 'var(--tui-shadow-small-hover)',
+    '--tui-shadow-dropdown': 'var(--tui-shadow-medium)',
+    '--tui-shadow-modal': 'var(--tui-shadow-popup)',
+    '--tui-shadow-sidebar': 'var(--tui-shadow-medium)',
+    '--tui-shadow-navigation': 'var(--tui-shadow-small)',
+    '--tui-shadow-sheet': 'var(--tui-shadow-popup)',
+};
+// warning: order is important
+exports.DEPRECATED_NUMERIC_VARS = {
+    '--tui-chart-': '--tui-chart-categorical-0',
+    '--tui-support-': '--tui-chart-categorical-',
 };
 exports.NIGHT_VAR_COMMENT = 'TODO: use tuiTheme="dark" on an element to switch colors to dark theme';
 exports.DEPRECATE_VARS_WITH_COMMENT = [

package/schematics/ng-update/v4/migrate-css-vars/rename-css-vars.js

@@ -7,11 +7,11 @@ const constants_1 = require("../../../constants");
 const palette_1 = require("./palette");
 function renameCssVars(pattern = constants_1.ALL_FILES) {
     const sourceFiles = (0, ng_morph_1.getSourceFiles)(pattern);
-    sourceFiles.forEach(file => {
+    sourceFiles.forEach((file) => {
         let text = file.getFullText();
         // leave comments
         if (!file.getFilePath().endsWith('html')) {
-            palette_1.DEPRECATE_VARS_WITH_COMMENT.forEach(variable => {
+            palette_1.DEPRECATE_VARS_WITH_COMMENT.forEach((variable) => {
                 const wordRegex = new RegExp(`(^|\\n)(?=[^\\n]*\\b${variable}\\b)`, 'g');
                 text = text.replaceAll(wordRegex, `$1// ${palette_1.NIGHT_VAR_COMMENT}\n`);
             });
@@ -25,6 +25,14 @@ function renameCssVars(pattern = constants_1.ALL_FILES) {
             .forEach(({ from, to }) => {
             text = text.replaceAll(from, to);
         });
+        Object.entries(palette_1.DEPRECATED_NUMERIC_VARS)
+            .map(([from, to]) => ({
+            from: new RegExp(`${from}`, 'g'),
+            to,
+        }))
+            .forEach(({ from, to }) => {
+            text = text.replaceAll(from, to);
+        });
         file.replaceWithText(text);
     });
 }

package/schematics/ng-update/v4/migrate-icons/index.js

@@ -6,17 +6,19 @@ const ng_morph_1 = require("ng-morph");
 const colored_log_1 = require("../../../utils/colored-log");
 const get_file_system_1 = require("../../utils/get-file-system");
 const rename_icons_1 = require("./rename-icons");
+const rename_proprietary_icons_1 = require("./rename-proprietary-icons");
 function migrateIcons(options) {
     return (0, schematics_1.chain)([
-        (tree, _) => {
-            if (hasProprietaryIcons(tree)) {
-                // TODO: add proprietary-icons migration
-                return;
-            }
+        (tree, context) => {
             const fileSystem = (0, get_file_system_1.getFileSystem)(tree);
             !options['skip-logs'] &&
-                (0, colored_log_1.infoLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} replacing strings...`);
-            (0, rename_icons_1.renameIcons)();
+                (0, colored_log_1.infoLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} replacing icons...`);
+            if (hasProprietaryIcons(tree)) {
+                (0, rename_proprietary_icons_1.renameProprietaryIcons)(context);
+            }
+            else {
+                (0, rename_icons_1.renameIcons)();
+            }
             fileSystem.commitEdits();
             (0, ng_morph_1.saveActiveProject)();
             !options['skip-logs'] &&