@taiga-ui/cdk 4.0.0-rc.2 → 4.0.0-rc.3

package/schematics/ng-update/v3/steps/migrate-templates.js

@@ -52,9 +52,9 @@ function addHTMLCommentTags({ resource, recorder, fileSystem, }) {
             ...(0, elements_1.findElementsWithAttribute)(template, withAttr),
             ...(0, elements_1.findElementsWithAttribute)(template, `[${withAttr}]`),
         ]
-            .filter(el => el.tagName === tag)
-            .map(el => { var _a; return (((_a = el.sourceCodeLocation) === null || _a === void 0 ? void 0 : _a.startOffset) || 0) + templateOffset; });
-        elementStartOffsets.forEach(offset => {
+            .filter((el) => el.tagName === tag)
+            .map((el) => { var _a; return (((_a = el.sourceCodeLocation) === null || _a === void 0 ? void 0 : _a.startOffset) || 0) + templateOffset; });
+        elementStartOffsets.forEach((offset) => {
             recorder.insertRight(offset, `<!-- ${insert_todo_1.TODO_MARK} ${comment} -->\n`);
         });
     });
@@ -63,9 +63,9 @@ function replaceBreadcrumbs({ resource, recorder, fileSystem, }) {
     const template = (0, template_resource_1.getTemplateFromTemplateResource)(resource, fileSystem);
     const templateOffset = (0, template_resource_1.getTemplateOffset)(resource);
     const elements = (0, elements_1.findElementsByTagName)(template, 'tui-breadcrumbs');
-    elements.forEach(element => {
+    elements.forEach((element) => {
         var _a, _b, _c, _d, _e;
-        const itemsAttr = element.attrs.find(attr => attr.name === '[items]');
+        const itemsAttr = element.attrs.find((attr) => attr.name === '[items]');
         const itemsValue = itemsAttr === null || itemsAttr === void 0 ? void 0 : itemsAttr.value;
         const insertTo = (_c = (_b = (_a = element === null || element === void 0 ? void 0 : element.sourceCodeLocation) === null || _a === void 0 ? void 0 : _a.startTag) === null || _b === void 0 ? void 0 : _b.endOffset) !== null && _c !== void 0 ? _c : 0;
         if (!itemsValue || !insertTo) {
@@ -90,9 +90,9 @@ function replaceFieldError({ resource, recorder, fileSystem, }) {
     const template = (0, template_resource_1.getTemplateFromTemplateResource)(resource, fileSystem);
     const templateOffset = (0, template_resource_1.getTemplateOffset)(resource);
     const elements = (0, elements_1.findElementsByTagName)(template, 'tui-field-error');
-    elements.forEach(element => {
+    elements.forEach((element) => {
         var _a, _b;
-        const orderAttr = element.attrs.find(attr => attr.name === '[order]');
+        const orderAttr = element.attrs.find((attr) => attr.name === '[order]');
         const orderVal = orderAttr === null || orderAttr === void 0 ? void 0 : orderAttr.value;
         if (orderAttr) {
             const { startOffset = 0, endOffset = 0 } = ((_b = (_a = element.sourceCodeLocation) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b['[order]']) || {};
@@ -107,7 +107,7 @@ function replaceFieldError({ resource, recorder, fileSystem, }) {
 }
 function addEditorProviders({ resource, fileSystem, }) {
     const template = (0, template_resource_1.getTemplateFromTemplateResource)(resource, fileSystem);
-    const elements = (0, elements_1.findElementsByTagName)(template, 'tui-editor').filter(element => !(0, elements_1.hasElementAttribute)(element, 'new'));
+    const elements = (0, elements_1.findElementsByTagName)(template, 'tui-editor').filter((element) => !(0, elements_1.hasElementAttribute)(element, 'new'));
     if (elements.length) {
         const componentPath = resource.componentPath;
         const componentClass = (0, ng_morph_1.getNgComponents)(componentPath);
@@ -123,10 +123,10 @@ const HIDE_SELECTED_PIPE_WITH_ARGS_REG = /\|\s*tuiHideSelected(\s*:\s*[^|'"]*)?/
 function migrateTuiHideSelectedPipe({ resource, fileSystem, recorder, }) {
     const template = (0, template_resource_1.getTemplateFromTemplateResource)(resource, fileSystem);
     const templateOffset = (0, template_resource_1.getTemplateOffset)(resource);
-    const elementsWithPipe = (0, elements_1.findElementsInTemplateByFn)(template, el => { var _a; return (_a = el.attrs) === null || _a === void 0 ? void 0 : _a.some(attr => attr.value.match(HIDE_SELECTED_PIPE_WITH_ARGS_REG)); });
-    elementsWithPipe.forEach(el => {
+    const elementsWithPipe = (0, elements_1.findElementsInTemplateByFn)(template, (el) => { var _a; return (_a = el.attrs) === null || _a === void 0 ? void 0 : _a.some((attr) => attr.value.match(HIDE_SELECTED_PIPE_WITH_ARGS_REG)); });
+    elementsWithPipe.forEach((el) => {
         var _a;
-        const { name, value: oldValue } = el.attrs.find(attr => attr.value.match(HIDE_SELECTED_PIPE_WITH_ARGS_REG)) ||
+        const { name, value: oldValue } = el.attrs.find((attr) => attr.value.match(HIDE_SELECTED_PIPE_WITH_ARGS_REG)) ||
             {};
         const attrLocations = (_a = el.sourceCodeLocation) === null || _a === void 0 ? void 0 : _a.attrs;
         if (!name || !oldValue || !attrLocations) {
@@ -142,12 +142,12 @@ function migrateTuiHideSelectedPipe({ resource, fileSystem, recorder, }) {
 function migrateBinaryAttributes({ resource, fileSystem, recorder, }) {
     const template = (0, template_resource_1.getTemplateFromTemplateResource)(resource, fileSystem);
     const templateOffset = (0, template_resource_1.getTemplateOffset)(resource);
-    templates_1.TRUTHY_BOOLEAN_INPUT_TO_HTML_BINARY_ATTRIBUTE.forEach(attrName => {
-        const elements = (0, elements_1.findElementsInTemplateByFn)(template, el => {
+    templates_1.TRUTHY_BOOLEAN_INPUT_TO_HTML_BINARY_ATTRIBUTE.forEach((attrName) => {
+        const elements = (0, elements_1.findElementsInTemplateByFn)(template, (el) => {
             var _a;
-            return (_a = el.attrs) === null || _a === void 0 ? void 0 : _a.some(attr => attr.value === 'true' && attr.name.includes(attrName.toLowerCase()));
+            return (_a = el.attrs) === null || _a === void 0 ? void 0 : _a.some((attr) => attr.value === 'true' && attr.name.includes(attrName.toLowerCase()));
         });
-        elements.forEach(el => {
+        elements.forEach((el) => {
             var _a;
             const attrLocations = (_a = el.sourceCodeLocation) === null || _a === void 0 ? void 0 : _a.attrs;
             if (!attrLocations) {
@@ -201,7 +201,7 @@ function migrateTemplates(fileSystem, options) {
     const progressLog = (0, progress_1.setupProgressLogger)({
         total: componentWithTemplatesPaths.length,
     });
-    componentWithTemplatesPaths.forEach(resource => {
+    componentWithTemplatesPaths.forEach((resource) => {
         const path = fileSystem.resolve((0, template_resource_1.getPathFromTemplateResource)(resource));
         const recorder = fileSystem.edit(path);
         actions.forEach((action, actionIndex) => {

package/schematics/ng-update/v3/steps/migrate-textfield-controller.js

@@ -34,11 +34,11 @@ const ATTRS_MAP = {
     '[tuitextfieldtype]': '[attr.type]',
     '[tuitextfieldexampletext]': '[attr.placeholder]',
 };
-const CONTROLLER_ITEMS = Object.keys(ATTRS_MAP).map(attr => attr.toLowerCase());
+const CONTROLLER_ITEMS = Object.keys(ATTRS_MAP).map((attr) => attr.toLowerCase());
 function insertTuiTextfieldInput({ element, attrs, recorder, templateOffset, }) {
     var _a, _b;
     const newAttrs = attrs
-        .map(attr => `${ATTRS_MAP[attr.name]}="${attr.value}"`)
+        .map((attr) => `${ATTRS_MAP[attr.name]}="${attr.value}"`)
         .join('\n');
     const content = element.tagName === 'tui-text-area'
         ? `<textarea tuiTextfield ${newAttrs}></textarea> `
@@ -49,7 +49,7 @@ function insertTuiTextfieldInput({ element, attrs, recorder, templateOffset, })
     }
 }
 function addAttrToExistingInput({ existingInput, attrs, recorder, templateOffset, }) {
-    attrs.forEach(attr => {
+    attrs.forEach((attr) => {
         var _a, _b, _c;
         const insertTo = (_c = (_b = (_a = existingInput.sourceCodeLocation) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.tuitextfield) === null || _c === void 0 ? void 0 : _c.endOffset;
         if (insertTo) {
@@ -58,14 +58,14 @@ function addAttrToExistingInput({ existingInput, attrs, recorder, templateOffset
     });
 }
 function removeOldInputs(recorder, template, templateOffset) {
-    const offsets = (0, ng_morph_1.arrayFlat)(CONTROLLER_ITEMS.map(item => (0, ng_component_input_manipulations_1.getInputPropertyOffsets)(template, item, getTagsToRemove(item))));
+    const offsets = (0, ng_morph_1.arrayFlat)(CONTROLLER_ITEMS.map((item) => (0, ng_component_input_manipulations_1.getInputPropertyOffsets)(template, item, getTagsToRemove(item))));
     offsets.forEach(([start, end]) => {
         recorder.remove(start + templateOffset, end - start);
     });
 }
 function getTagsToRemove(attrName) {
     return ['[tuitextfieldmaxlength]', 'tuitextfieldmaxlength'].includes(attrName)
-        ? TEXTFIELDS.filter(tag => tag !== 'tui-text-area')
+        ? TEXTFIELDS.filter((tag) => tag !== 'tui-text-area')
         : TEXTFIELDS;
 }
 const excludedAttrs = {
@@ -79,12 +79,12 @@ function migrateTextfieldController({ resource, fileSystem, recorder, }) {
     const template = (0, template_resource_1.getTemplateFromTemplateResource)(resource, fileSystem);
     const templateOffset = (0, template_resource_1.getTemplateOffset)(resource);
     const elements = (0, elements_1.findElementsByTagNames)(template, TEXTFIELDS);
-    elements.forEach(element => {
-        const attrs = element.attrs.filter(attr => CONTROLLER_ITEMS.includes(attr.name) && !exclusion(element, attr.name));
+    elements.forEach((element) => {
+        const attrs = element.attrs.filter((attr) => CONTROLLER_ITEMS.includes(attr.name) && !exclusion(element, attr.name));
         if (!attrs.length) {
             return;
         }
-        const existingInput = (0, elements_1.findElementsByFn)(element.childNodes, el => (el.tagName === 'input' || el.tagName === 'textarea') &&
+        const existingInput = (0, elements_1.findElementsByFn)(element.childNodes, (el) => (el.tagName === 'input' || el.tagName === 'textarea') &&
             (0, elements_1.hasElementAttribute)(el, 'tuiTextfield'))[0];
         if (existingInput) {
             addAttrToExistingInput({ existingInput, attrs, recorder, templateOffset });

package/schematics/ng-update/v3/steps/miscellaneous.js

@@ -7,7 +7,7 @@ const get_named_import_references_1 = require("../../../utils/get-named-import-r
 const insert_todo_1 = require("../../../utils/insert-todo");
 function addWarningToMethod(className, method, message) {
     const references = (0, get_named_import_references_1.getNamedImportReferences)(className);
-    references.forEach(ref => {
+    references.forEach((ref) => {
         const parent = ref.getParent();
         if (ng_morph_1.Node.isTypeReference(parent)) {
             checkMethod(parent, method, message);
@@ -16,12 +16,12 @@ function addWarningToMethod(className, method, message) {
 }
 function replaceEnumProperty({ enumName, from, to, }) {
     const references = (0, get_named_import_references_1.getNamedImportReferences)(enumName);
-    references.forEach(ref => {
+    references.forEach((ref) => {
         const parent = ref.getParent();
         if (!ng_morph_1.Node.isPropertyAccessExpression(parent)) {
             return;
         }
-        parent.getChildren().forEach(node => {
+        parent.getChildren().forEach((node) => {
             if (node.getText() === from) {
                 node.replaceWithText(to);
             }
@@ -31,7 +31,7 @@ function replaceEnumProperty({ enumName, from, to, }) {
 function checkMethod(node, method, message) {
     const statement = node.getParent();
     const identifier = statement.getChildrenOfKind(ng_morph_1.SyntaxKind.Identifier)[0];
-    identifier.findReferencesAsNodes().forEach(ref => {
+    identifier.findReferencesAsNodes().forEach((ref) => {
         let parent = ref.getParent();
         if ((ng_morph_1.Node.isPropertyAccessExpression(parent) &&
             parent.getText().startsWith('this.')) ||
@@ -39,7 +39,7 @@ function checkMethod(node, method, message) {
             parent = parent.getParentIfKind(ng_morph_1.SyntaxKind.PropertyAccessExpression);
         }
         if (ng_morph_1.Node.isPropertyAccessExpression(parent)) {
-            parent.getChildrenOfKind(ng_morph_1.SyntaxKind.Identifier).forEach(identifier => {
+            parent.getChildrenOfKind(ng_morph_1.SyntaxKind.Identifier).forEach((identifier) => {
                 if (identifier.getText() === method) {
                     (0, insert_todo_1.insertTodo)(identifier, message);
                 }

package/schematics/ng-update/v3/steps/replace-functions.js

@@ -8,7 +8,7 @@ const import_manipulations_1 = require("../../../utils/import-manipulations");
 const deprecated_functions_1 = require("../constants/deprecated-functions");
 function replaceDeprecatedFunction() {
     deprecated_functions_1.DEPRECATED_FUNCTIONS.forEach(({ from, to, moduleSpecifier }) => {
-        (0, get_named_import_references_1.getNamedImportReferences)(from, moduleSpecifier).forEach(ref => {
+        (0, get_named_import_references_1.getNamedImportReferences)(from, moduleSpecifier).forEach((ref) => {
             if (ref.wasForgotten()) {
                 return;
             }
@@ -20,7 +20,7 @@ function replaceDeprecatedFunction() {
     });
 }
 function replacePadStart(references) {
-    references.forEach(ref => {
+    references.forEach((ref) => {
         var _a;
         const parent = ref.getParent();
         if (ng_morph_1.Node.isImportSpecifier(parent)) {
@@ -33,7 +33,7 @@ function replacePadStart(references) {
     });
 }
 function replaceNativeFocused(references) {
-    references.forEach(ref => {
+    references.forEach((ref) => {
         const parent = ref.getParent();
         if (ng_morph_1.Node.isImportSpecifier(parent)) {
             (0, import_manipulations_1.removeImport)(parent);
@@ -48,7 +48,7 @@ function replaceNativeFocused(references) {
     });
 }
 function replaceClosestElement(references) {
-    references.forEach(ref => {
+    references.forEach((ref) => {
         const parent = ref.getParent();
         if (ng_morph_1.Node.isImportSpecifier(parent)) {
             (0, import_manipulations_1.removeImport)(parent);
@@ -64,7 +64,7 @@ function replaceClosestElement(references) {
     });
 }
 function replaceCustomEvent(references) {
-    references.forEach(ref => {
+    references.forEach((ref) => {
         const parent = ref.getParent();
         if (ng_morph_1.Node.isImportSpecifier(parent)) {
             (0, import_manipulations_1.removeImport)(parent);
@@ -76,7 +76,7 @@ function replaceCustomEvent(references) {
     });
 }
 function replaceFallbackValue(references) {
-    references.forEach(ref => {
+    references.forEach((ref) => {
         const parent = ref.getParent();
         if (ng_morph_1.Node.isImportSpecifier(parent)) {
             (0, import_manipulations_1.removeImport)(parent);
@@ -92,12 +92,12 @@ function modifyFormatNumberArgs() {
         ...(0, get_named_import_references_1.getNamedImportReferences)('formatNumber', '@taiga-ui/core'),
         ...(0, get_named_import_references_1.getNamedImportReferences)('tuiFormatNumber', '@taiga-ui/core'),
     ]
-        .map(ref => ref.getParent())
+        .map((ref) => ref.getParent())
         .filter(ng_morph_1.Node.isCallExpression)
-        .forEach(fn => {
+        .forEach((fn) => {
         const args = fn.getArguments();
         if (args.length > 1) {
-            const [value, decimalLimit = 'Infinity', decimalSeparator = "','", thousandSeparator = "'\u00A0'", zeroPadding = true,] = args.map(arg => arg.getText());
+            const [value, decimalLimit = 'Infinity', decimalSeparator = "','", thousandSeparator = "'\u00A0'", zeroPadding = true,] = args.map((arg) => arg.getText());
             const notNullDecimalLimit = decimalLimit === 'null' ? 'Infinity' : decimalLimit;
             const conditionalDecimalLimit = !Number.isNaN(Number(notNullDecimalLimit))
                 ? notNullDecimalLimit
@@ -108,12 +108,12 @@ function modifyFormatNumberArgs() {
 }
 function modifyClosestFocusable() {
     (0, get_named_import_references_1.getNamedImportReferences)('tuiGetClosestFocusable', '@taiga-ui/cdk')
-        .map(ref => ref.getParent())
+        .map((ref) => ref.getParent())
         .filter(ng_morph_1.Node.isCallExpression)
-        .forEach(fn => {
+        .forEach((fn) => {
         const args = fn.getArguments();
         if (args.length > 1) {
-            const [initial, prev = false, root, keyboard = true] = args.map(arg => arg.getText());
+            const [initial, prev = false, root, keyboard = true] = args.map((arg) => arg.getText());
             fn.replaceWithText(`tuiGetClosestFocusable({initial: ${initial}, root: ${root}, previous: ${prev}, keyboard: ${keyboard}})`);
         }
     });

package/schematics/ng-update/v3/steps/replace-styles.js

@@ -10,7 +10,7 @@ exports.TUI_WARNING_NORMALIZE = `
 exports.TUI_WARNING_WRAPPER_MIXINS = '// TODO: (Taiga UI migration): use mixins to customize tuiWrapper. See https://taiga-ui.dev/wrapper';
 function replaceStyles() {
     var _a;
-    (_a = (0, ng_morph_1.getActiveProject)()) === null || _a === void 0 ? void 0 : _a.getSourceFiles('**/**.less').forEach(sourceFile => {
+    (_a = (0, ng_morph_1.getActiveProject)()) === null || _a === void 0 ? void 0 : _a.getSourceFiles('**/**.less').forEach((sourceFile) => {
         let fullText = sourceFile.getFullText();
         if (fullText.includes('taiga-ui')) {
             breakpoints_1.DEPRECATED_BREAKPOINTS.forEach(({ from, to }) => {
@@ -26,7 +26,7 @@ function replaceStyles() {
             .replace('--tui-color-link', '--tui-link')
             .replaceAll("@import '~@taiga-ui", "@import '@taiga-ui")
             .replaceAll("@import '@taiga-ui/core/styles/taiga-ui-global", `${exports.TUI_WARNING_NORMALIZE}\n@import '@taiga-ui/styles/taiga-ui-global`)
-            .replaceAll(/@import '@taiga-ui\/.+(.less)?';/g, val => `${val.replace("';", '')}.less';`.replace('.less.less', '.less'));
+            .replaceAll(/@import '@taiga-ui\/.+(.less)?';/g, (val) => `${val.replace("';", '')}.less';`.replace('.less.less', '.less'));
         sourceFile.replaceWithText(fullText);
     });
 }

package/schematics/ng-update/v3-36/index.js

@@ -2,31 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateToV3_36 = void 0;
 const tasks_1 = require("@angular-devkit/schematics/tasks");
-const ng_morph_1 = require("ng-morph");
-const constants_1 = require("../../constants");
 const colored_log_1 = require("../../utils/colored-log");
-const get_file_system_1 = require("../utils/get-file-system");
-const replace_text_1 = require("../utils/replace-text");
+const steps_1 = require("../steps");
 const OLD_PACKAGE = '@taiga-ui/addon-editor';
-const NEW_PACKAGE = '@tinkoff/tui-editor';
-const NEW_PACKAGE_VERSION = '^1.0.1';
+const NEW_PACKAGE = '@taiga-ui/editor';
+const NEW_PACKAGE_VERSION = '^2.0.0';
 // TODO: drop in v4.x
 function updateToV3_36(options) {
     return (tree, context) => {
-        if (!(0, ng_morph_1.getPackageJsonDependency)(tree, OLD_PACKAGE)) {
-            !options['skip-logs'] &&
-                (0, colored_log_1.titleLog)(`${colored_log_1.FINISH_SYMBOL} No migrations required for ${OLD_PACKAGE}\n`);
-            return;
-        }
-        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 imports for ${OLD_PACKAGE}...`);
-        (0, replace_text_1.replaceText)([{ from: OLD_PACKAGE, to: NEW_PACKAGE }], constants_1.ALL_TS_FILES);
-        (0, ng_morph_1.removePackageJsonDependency)(tree, OLD_PACKAGE);
-        (0, ng_morph_1.addPackageJsonDependency)(tree, { name: NEW_PACKAGE, version: NEW_PACKAGE_VERSION });
+        (0, steps_1.replacePackageName)(OLD_PACKAGE, {
+            name: NEW_PACKAGE,
+            version: NEW_PACKAGE_VERSION,
+        }, tree);
         context.addTask(new tasks_1.NodePackageInstallTask());
-        fileSystem.commitEdits();
-        (0, ng_morph_1.saveActiveProject)();
         !options['skip-logs'] && (0, colored_log_1.titleLog)(`${colored_log_1.FINISH_SYMBOL} successfully migrated \n`);
     };
 }

package/schematics/ng-update/v3-40/index.js

@@ -14,7 +14,7 @@ const replace_tag_1 = require("../utils/templates/replace-tag");
 function replaceTextareaTag(options, fileSystem) {
     !options['skip-logs'] &&
         (0, colored_log_1.infoLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} replacing <tui-text-area /> to <tui-textarea />`);
-    (0, get_component_templates_1.getComponentTemplates)(constants_1.ALL_TS_FILES).forEach(resource => {
+    (0, get_component_templates_1.getComponentTemplates)(constants_1.ALL_TS_FILES).forEach((resource) => {
         const template = (0, template_resource_1.getTemplateFromTemplateResource)(resource, fileSystem);
         const elements = (0, elements_1.findElementsByTagName)(template, 'tui-text-area');
         const path = fileSystem.resolve((0, template_resource_1.getPathFromTemplateResource)(resource));

package/schematics/ng-update/v3-5/steps/migrate-expand-templates.js

@@ -11,13 +11,13 @@ function migrateExpand({ resource, recorder, fileSystem, }) {
     const template = (0, template_resource_1.getTemplateFromTemplateResource)(resource, fileSystem);
     const templateOffset = (0, template_resource_1.getTemplateOffset)(resource);
     const elements = (0, elements_1.findElementsByTagName)(template, 'tui-expand');
-    elements.forEach(element => {
+    elements.forEach((element) => {
         var _a, _b, _c;
-        const templateElement = (0, elements_1.findElementsByFn)(element.childNodes, el => el.tagName === 'ng-template')[0];
+        const templateElement = (0, elements_1.findElementsByFn)(element.childNodes, (el) => el.tagName === 'ng-template')[0];
         if (!templateElement) {
             return;
         }
-        const tuiExpandAttr = templateElement.attrs.find(attr => attr.name === 'tuiexpandcontent');
+        const tuiExpandAttr = templateElement.attrs.find((attr) => attr.name === 'tuiexpandcontent');
         const insertTo = (_c = (_b = (_a = templateElement === null || templateElement === void 0 ? void 0 : templateElement.sourceCodeLocation) === null || _a === void 0 ? void 0 : _a.startTag) === null || _b === void 0 ? void 0 : _b.endOffset) !== null && _c !== void 0 ? _c : 0;
         if (!insertTo || tuiExpandAttr) {
             return;
@@ -32,7 +32,7 @@ function migrateExpandTemplates(fileSystem, options) {
     const progressLog = (0, progress_1.setupProgressLogger)({
         total: componentWithTemplatesPaths.length,
     });
-    componentWithTemplatesPaths.forEach(resource => {
+    componentWithTemplatesPaths.forEach((resource) => {
         const path = fileSystem.resolve((0, template_resource_1.getPathFromTemplateResource)(resource));
         const recorder = fileSystem.edit(path);
         !options['skip-logs'] && progressLog('expand migration', true);

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

@@ -13,27 +13,30 @@ 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 modules_to_replace_1 = require("./steps/constants/modules-to-replace");
 const types_1 = require("./steps/constants/types");
-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 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.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.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;
-            }
             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)();
+            }
+            else {
+                (0, rename_icons_1.renameIcons)();
+            }
             fileSystem.commitEdits();
             (0, ng_morph_1.saveActiveProject)();
             !options['skip-logs'] &&

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

@@ -20,7 +20,7 @@ const CHANGED_ICONS = [
 ];
 function renameIcons(pattern = constants_1.ALL_FILES) {
     const sourceFiles = (0, ng_morph_1.getSourceFiles)(pattern);
-    sourceFiles.forEach(file => {
+    sourceFiles.forEach((file) => {
         let text = file.getFullText();
         CHANGED_ICONS.map(({ from, to }) => ({
             from: new RegExp(`\\b${from}\\b`, 'g'),
@@ -29,7 +29,7 @@ function renameIcons(pattern = constants_1.ALL_FILES) {
             text = text.replaceAll(from, to);
         });
         const regex = /\btuiIcon(?!Button\b)[A-Z][a-zA-Z0-9]*\b/g;
-        text = text.replaceAll(regex, match => convertString(match));
+        text = text.replaceAll(regex, (match) => convertString(match));
         file.replaceWithText(text);
     });
 }

package/schematics/ng-update/v4/migrate-icons/rename-proprietary-icons.d.ts

@@ -0,0 +1,2 @@
+/// <reference lib="es2021" />
+export declare function renameProprietaryIcons(pattern?: import("ng-morph").Pattern): void;

package/schematics/ng-update/v4/migrate-icons/rename-proprietary-icons.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renameProprietaryIcons = void 0;
+/// <reference lib="es2021" />
+const ng_morph_1 = require("ng-morph");
+const constants_1 = require("../../../constants");
+function renameProprietaryIcons(pattern = constants_1.ALL_FILES) {
+    const sourceFiles = (0, ng_morph_1.getSourceFiles)(pattern);
+    sourceFiles.forEach((file) => {
+        let text = file.getFullText();
+        const regex = /\btuiIcon(?!Button\b)[A-Z][a-zA-Z0-9]*\b/g;
+        text = text.replaceAll(regex, (match) => convertString(match));
+        file.replaceWithText(text);
+    });
+}
+exports.renameProprietaryIcons = renameProprietaryIcons;
+function convertString(input) {
+    const result = input
+        .replace(/^tuiIconTds/, '')
+        .replace(/SmallPragmatic$/, '')
+        .replace(/MediumPragmatic$/, '')
+        .replace(/Small$/, '')
+        .replace(/Medium$/, '')
+        .replace(/Flags$/, '')
+        .replace(/Service$/, '')
+        .replace(/Logo$/, '')
+        .replace(/LogoSiteheader$/, '')
+        .replace(/LogoSquare$/, '')
+        .replaceAll(/([A-Z0-9])/g, '-$1')
+        .toLowerCase();
+    const pack = extractPackName(input);
+    const subfolder = extractSubfolder(input);
+    return `@tui.${pack}${subfolder ? `.${subfolder}` : ''}.${result.startsWith('-') ? result.slice(1) : result}`;
+}
+function extractPackName(input) {
+    if (input.endsWith('Pragmatic')) {
+        return 'pragmatic';
+    }
+    if (input.endsWith('Service')) {
+        return 'service';
+    }
+    if (input.endsWith('Logo') ||
+        input.endsWith('LogoSquare') ||
+        input.endsWith('LogoSiteheader')) {
+        return 'logo';
+    }
+    if (input.endsWith('Flags')) {
+        return 'flags';
+    }
+    return 'fancy';
+}
+function extractSubfolder(input) {
+    if (input.includes('Medium')) {
+        return 'medium';
+    }
+    if (input.includes('Small')) {
+        return 'small';
+    }
+    if (input.includes('LogoSquare')) {
+        return 'square';
+    }
+    if (input.includes('LogoSiteheader')) {
+        return 'siteheader';
+    }
+    return null;
+}