@taiga-ui/cdk 2.60.0 → 2.61.0

package/schematics/ng-update/steps/migrate-date-time.js

@@ -4,14 +4,19 @@ const ng_morph_1 = require("ng-morph");
 const get_named_import_references_1 = require("../../utils/get-named-import-references");
 const insert_todo_1 = require("../../utils/insert-todo");
 const colored_log_1 = require("../../utils/colored-log");
+const get_execution_time_1 = require("../../utils/get-execution-time");
 function dateTimeMigrations() {
     colored_log_1.infoLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} migrating taiga date/time...`);
+    let start = performance.now();
     migrateProperty({
         namedImport: 'TuiDay',
         moduleSpecifier: '@taiga-ui/cdk',
         from: 'formattedDay',
         callback: node => node.replaceWithText(node.getText().replace('formattedDay', 'getFormattedDay("DMY", ".")')),
     });
+    colored_log_1.processLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.PROCESSING_SYMBOL}TuiDay.formattedDay ` +
+        `(${get_execution_time_1.getExecutionTime(start, performance.now())})`);
+    start = performance.now();
     migrateProperty({
         namedImport: 'TuiDayRange',
         moduleSpecifier: '@taiga-ui/cdk',
@@ -20,6 +25,9 @@ function dateTimeMigrations() {
             .getText()
             .replace('formattedDayRange', 'getFormattedDayRange("DMY", ".")')),
     });
+    colored_log_1.processLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.PROCESSING_SYMBOL}TuiDayRange.formattedDayRange ` +
+        `(${get_execution_time_1.getExecutionTime(start, performance.now())})`);
+    start = performance.now();
     migrateProperty({
         namedImport: 'TuiDayRange',
         moduleSpecifier: '@taiga-ui/cdk',
@@ -31,6 +39,8 @@ function dateTimeMigrations() {
             }
         },
     });
+    colored_log_1.processLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.PROCESSING_SYMBOL}TuiDayRange.normalizeParse ` +
+        `(${get_execution_time_1.getExecutionTime(start, performance.now())})`);
     [
         {
             namedImport: 'TuiMonthRange',
@@ -68,12 +78,15 @@ function dateTimeMigrations() {
             message: 'weeksRowsCount has been removed in 3.0. If you need this utils check out this pipe https://github.com/Tinkoff/taiga-ui/tree/main/projects/core/pipes/calendar-sheet',
         },
     ].forEach(({ namedImport, field, message }) => {
+        start = performance.now();
         migrateProperty({
             namedImport,
             moduleSpecifier: '@taiga-ui/cdk',
             from: field,
             callback: node => insertTodoBeforeNode(node, message),
         });
+        colored_log_1.processLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.PROCESSING_SYMBOL}${namedImport}.${field} ` +
+            `(${get_execution_time_1.getExecutionTime(start, performance.now())})`);
     });
     colored_log_1.successLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SUCCESS_SYMBOL} date/time migrated \n`);
 }
@@ -117,12 +130,39 @@ function replaceIdentifier(node, from, callback) {
     }
 }
 function replaceIdentifierReferences(identifier, from, callback) {
-    identifier.findReferencesAsNodes().forEach(ref => {
+    identifier
+        .findReferencesAsNodes()
+        /**
+         * `findReferencesAsNodes` has strange behavior.
+         * Imagine schematics run on the following file:
+         * ```
+         * class Dummy {
+         *  var = 5;
+         *  method1() {
+         *      const {var} = this; // (1)
+         *      return var; // (2)
+         *  }
+         *  method2() {
+         *      const {var} = this; // (3)
+         *  }
+         * }
+         * ```
+         * If `identifier` is equal to `var` from `method1` (1),
+         * then `identifier.findReferencesAsNodes` will return array with 2 references: (2) and (3).
+         */
+        .filter(ref => !areBothObjectDestructuring(ref, identifier))
+        .forEach(ref => {
+        if (ref.wasForgotten()) {
+            return;
+        }
         let parent = ref.getParent();
         if ((parent === null || parent === void 0 ? void 0 : parent.getText()) === `this.${identifier.getText()}` ||
             (parent === null || parent === void 0 ? void 0 : parent.getText()) === identifier.getText()) {
             replaceIdentifier(parent, from, callback);
         }
+        if (parent === null || parent === void 0 ? void 0 : parent.wasForgotten()) {
+            return;
+        }
         if (parent === null || parent === void 0 ? void 0 : parent.getText().startsWith('this')) {
             parent = parent === null || parent === void 0 ? void 0 : parent.getParent();
         }
@@ -153,3 +193,7 @@ function insertTodoBeforeNode(node, message) {
         insert_todo_1.insertTodo(identifier, message);
     }
 }
+function areBothObjectDestructuring(ref, identifier) {
+    return Boolean(identifier.getFirstAncestorByKind(ng_morph_1.SyntaxKind.BindingElement) &&
+        ref.getFirstAncestorByKind(ng_morph_1.SyntaxKind.BindingElement));
+}

package/schematics/ng-update/steps/migrate-progress.js

@@ -5,11 +5,12 @@ const get_component_templates_1 = require("../../utils/templates/get-component-t
 const elements_1 = require("../../utils/templates/elements");
 const template_resource_1 = require("../../utils/templates/template-resource");
 const colored_log_1 = require("../../utils/colored-log");
+const constants_1 = require("../../constants");
 exports.DEPRECATED_PROGRESS_PIPES_REG = /\s*\|\s*tuiProgressColorSegments(Async\s*\|\s*async)?/gi;
 const PROPERTY_FOR_DEPRECATED_PIPES = '[color]';
 function migrateProgress(fileSystem) {
     colored_log_1.infoLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} migrating progress bars...`);
-    const templateResources = get_component_templates_1.getComponentTemplates('**/**.ts');
+    const templateResources = get_component_templates_1.getComponentTemplates(constants_1.ALL_TS_FILES);
     for (const templateResource of templateResources) {
         replaceProgressColorSegmentsPipe(templateResource, fileSystem);
     }

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

@@ -5,7 +5,9 @@ const migrate_input_range_1 = require("./migrate-input-range");
 const colored_log_1 = require("../../../utils/colored-log");
 function migrateSliders(fileSystem) {
     colored_log_1.infoLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} migrating sliders...`);
+    colored_log_1.processLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.PROCESSING_SYMBOL}InputSlider...`);
     migrate_input_slider_1.migrateInputSlider(fileSystem);
+    colored_log_1.processLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.PROCESSING_SYMBOL}InputRange...`);
     migrate_input_range_1.migrateInputRange(fileSystem);
     colored_log_1.successLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.SUCCESS_SYMBOL} sliders migrated \n`);
 }

package/schematics/ng-update/steps/migrate-sliders/migrate-input-range.js

@@ -5,10 +5,11 @@ const ng_component_input_manipulations_1 = require("../../../utils/templates/ng-
 const ng_morph_1 = require("ng-morph");
 const ng_component_1 = require("../../../utils/angular/ng-component");
 const add_unique_import_1 = require("../../../utils/add-unique-import");
+const constants_1 = require("../../../constants");
 const MIN_LABELS_MIGRATION_METHOD_NAME = 'tuiMigrationInputRangeMinLabel';
 const MAX_LABELS_MIGRATION_METHOD_NAME = 'tuiMigrationInputRangeMaxLabel';
 function migrateInputRange(fileSystem) {
-    const templateResources = get_component_templates_1.getComponentTemplates('**/**.ts');
+    const templateResources = get_component_templates_1.getComponentTemplates(constants_1.ALL_TS_FILES);
     const COMPONENTS_WITH_MIN_LABELS = new Set();
     const COMPONENTS_WITH_MAX_LABELS = new Set();
     for (const templateResource of templateResources) {
@@ -16,7 +17,7 @@ function migrateInputRange(fileSystem) {
         replaceMaxLabel(templateResource, fileSystem, COMPONENTS_WITH_MAX_LABELS);
     }
     save(fileSystem);
-    for (const componentPath of COMPONENTS_WITH_MIN_LABELS) {
+    for (const componentPath of Array.from(COMPONENTS_WITH_MIN_LABELS)) {
         addMinMaxLabelMethod(componentPath, MIN_LABELS_MIGRATION_METHOD_NAME, [
             'const currentValue = context.$implicit;',
             'const minValue = 0; // TODO: (Taiga UI migration) replace with the MIN value of the input-range',
@@ -25,7 +26,7 @@ function migrateInputRange(fileSystem) {
             'return String(currentValue);',
         ]);
     }
-    for (const componentPath of COMPONENTS_WITH_MAX_LABELS) {
+    for (const componentPath of Array.from(COMPONENTS_WITH_MAX_LABELS)) {
         addMinMaxLabelMethod(componentPath, MAX_LABELS_MIGRATION_METHOD_NAME, [
             'const currentValue = context.$implicit;',
             'const maxValue = 100; // TODO: (Taiga UI migration) replace with the MAX value of the input',

package/schematics/ng-update/steps/migrate-sliders/migrate-input-slider.js

@@ -6,8 +6,9 @@ const ng_component_1 = require("../../../utils/angular/ng-component");
 const add_unique_import_1 = require("../../../utils/add-unique-import");
 const get_component_templates_1 = require("../../../utils/templates/get-component-templates");
 const elements_1 = require("../../../utils/templates/elements");
+const constants_1 = require("../../../constants");
 function migrateInputSlider(fileSystem) {
-    const templateResources = get_component_templates_1.getComponentTemplates('**/**.ts');
+    const templateResources = get_component_templates_1.getComponentTemplates(constants_1.ALL_TS_FILES);
     const COMPONENTS_WITH_MIN_MAX_LABELS = new Set();
     for (const templateResource of templateResources) {
         replaceMinMaxLabels(templateResource, fileSystem, COMPONENTS_WITH_MIN_MAX_LABELS);
@@ -19,7 +20,7 @@ function migrateInputSlider(fileSystem) {
     fileSystem.commitEdits();
     ng_morph_1.saveActiveProject();
     ng_morph_1.setActiveProject(ng_morph_1.createProject(fileSystem.tree, '/', '**/**'));
-    for (const componentPath of COMPONENTS_WITH_MIN_MAX_LABELS) {
+    for (const componentPath of Array.from(COMPONENTS_WITH_MIN_MAX_LABELS)) {
         addMinMaxLabelMethod(componentPath);
     }
 }

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

@@ -3,17 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const get_component_templates_1 = require("../../utils/templates/get-component-templates");
 const templates_1 = require("../constants/templates");
 const elements_1 = require("../../utils/templates/elements");
+const ng_morph_1 = require("ng-morph");
 const ng_component_input_manipulations_1 = require("../../utils/templates/ng-component-input-manipulations");
 const template_resource_1 = require("../../utils/templates/template-resource");
-const ng_morph_1 = require("ng-morph");
 const ng_component_1 = require("../../utils/angular/ng-component");
 const add_unique_import_1 = require("../../utils/add-unique-import");
 const colored_log_1 = require("../../utils/colored-log");
+const constants_1 = require("../../constants");
+const progress_1 = require("../../utils/progress");
 const START_TAG_OFFSET = 1;
 const END_TAG_OFFSET = 2;
 function migrateTemplates(fileSystem) {
     colored_log_1.infoLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} migrating templates...`);
-    const componentWithTemplatesPaths = get_component_templates_1.getComponentTemplates('**/**');
+    const componentWithTemplatesPaths = get_component_templates_1.getComponentTemplates(constants_1.ALL_TS_FILES);
     const actions = [
         replaceTags,
         replaceAttrs,
@@ -25,10 +27,14 @@ function migrateTemplates(fileSystem) {
         migrateTuiHideSelectedPipe,
         removeInputs,
     ];
-    componentWithTemplatesPaths.forEach(resource => {
+    componentWithTemplatesPaths.forEach((resource, templateIndex, templates) => {
         const path = fileSystem.resolve(template_resource_1.getPathFromTemplateResource(resource));
         const recorder = fileSystem.edit(path);
-        actions.forEach(action => {
+        const isLastTemplate = templateIndex === templates.length - 1;
+        actions.forEach((action, actionIndex) => {
+            const isLastAction = actionIndex === actions.length - 1;
+            const progressLog = `${templateIndex + 1} / ${templates.length} (${action.name}...)`;
+            progress_1.printProgress(`${colored_log_1.SMALL_TAB_SYMBOL.repeat(2)}${progressLog}`, isLastTemplate && isLastAction);
             action({ resource, fileSystem, recorder });
         });
     });

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

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ng_morph_1 = require("ng-morph");
 const colored_log_1 = require("../../utils/colored-log");
+const constants_1 = require("../../constants");
 const DEEP_REGEX = /(@taiga-ui\/\w+)\/.*/;
 function replaceDeepImports() {
     colored_log_1.infoLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} replacing deep imports...`);
-    const deepImports = ng_morph_1.getImports('**/**.ts').filter(imp => DEEP_REGEX.test(imp.getModuleSpecifier().getLiteralValue()));
+    const deepImports = ng_morph_1.getImports(constants_1.ALL_TS_FILES).filter(imp => DEEP_REGEX.test(imp.getModuleSpecifier().getLiteralValue()));
     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

@@ -12,6 +12,7 @@ function replaceEnums() {
 }
 exports.replaceEnums = replaceEnums;
 function replaceEnumWithString(enumName, replaceValues, keepAsType = true) {
+    var _a;
     const references = get_named_import_references_1.getNamedImportReferences(enumName);
     for (let ref of references) {
         const parent = ref.getParent();
@@ -21,7 +22,7 @@ function replaceEnumWithString(enumName, replaceValues, keepAsType = true) {
         }
         if (ng_morph_1.Node.isTypeReferenceNode(parent) && !keepAsType) {
             const declaration = parent.getParent();
-            declaration.removeType();
+            (_a = declaration.removeType) === null || _a === void 0 ? void 0 : _a.call(declaration);
             continue;
         }
         if (!ng_morph_1.Node.isPropertyAccessExpression(parent)) {

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

@@ -20,7 +20,7 @@ function replaceDeprecatedFunction() {
         get_named_import_references_1.getNamedImportReferences(from, moduleSpecifier).forEach(ref => {
             const parent = ref.getParent();
             if (ng_morph_1.Node.isImportSpecifier(parent) || ng_morph_1.Node.isCallExpression(parent)) {
-                parent === null || parent === void 0 ? void 0 : parent.replaceWithText(parent === null || parent === void 0 ? void 0 : parent.getFullText().trim().replace(from, to !== null && to !== void 0 ? to : from));
+                parent === null || parent === void 0 ? void 0 : parent.replaceWithText(parent === null || parent === void 0 ? void 0 : parent.getText({ includeJsDocComments: false }).trim().replace(from, to !== null && to !== void 0 ? to : from));
             }
         });
     });
@@ -46,7 +46,11 @@ function replaceClosestElement(references) {
         }
         else if (ng_morph_1.Node.isCallExpression(parent)) {
             const [firstArg, secondArg] = parent.getArguments();
-            parent.replaceWithText(`${firstArg.getText()}.closest(${secondArg.getText()})`);
+            const firstArgText = firstArg.getText();
+            const element = firstArgText.includes(' as ') // e.g, `getClosestElement(el as Element, ...)`
+                ? `(${firstArgText})`
+                : firstArgText;
+            parent.replaceWithText(`${element}.closest(${secondArg.getText()})`);
         }
     });
 }

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

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ng_morph_1 = require("ng-morph");
 const warnings_1 = require("../constants/warnings");
+const constants_1 = require("../../constants");
 function showWarnings(context) {
     warnings_1.MIGRATION_WARNINGS.forEach(warning => showWarning(warning, context));
 }
 exports.showWarnings = showWarnings;
 function showWarning({ name, message, moduleSpecifier = '**/**' }, { logger }) {
-    const references = ng_morph_1.getImports('**/**', {
+    const references = ng_morph_1.getImports(constants_1.ALL_TS_FILES, {
         moduleSpecifier,
         namedImports: [name],
     })

package/schematics/utils/angular/ng-module.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ng_morph_1 = require("ng-morph");
+const constants_1 = require("../../constants");
 function getNgModules(pattern, query) {
     return ng_morph_1.getClasses(pattern, query).filter(declaration => !!declaration.getDecorator('NgModule'));
 }
@@ -9,7 +10,7 @@ exports.getNgModules = getNgModules;
  * Find NgModule where the component was declared.
  */
 function findNgModule(ngComponent) {
-    const allNgModules = getNgModules('**/**.ts');
+    const allNgModules = getNgModules(constants_1.ALL_TS_FILES);
     return (allNgModules.find(module => {
         const moduleFile = module.getSourceFile();
         const imports = ng_morph_1.getImports(moduleFile.getFilePath(), {

package/schematics/utils/get-execution-time.d.ts

@@ -0,0 +1 @@
+export declare function getExecutionTime(t0: number, t1: number): string;

package/schematics/utils/get-execution-time.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function getExecutionTime(t0, t1) {
+    const sum = t1 - t0;
+    return sum > 1000 ? `${(sum / 1000).toFixed(2)} sec` : `${sum.toFixed(2)} ms`;
+}
+exports.getExecutionTime = getExecutionTime;

package/schematics/utils/get-named-import-references.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ng_morph_1 = require("ng-morph");
+const constants_1 = require("../constants");
 function getNamedImportReferences(namedImport, moduleSpecifier = '**/**') {
-    const importDeclarations = ng_morph_1.getImports('**/**', {
+    const importDeclarations = ng_morph_1.getImports(constants_1.ALL_TS_FILES, {
         namedImports: [namedImport],
         moduleSpecifier: moduleSpecifier,
     });

package/schematics/utils/progress.d.ts

@@ -0,0 +1 @@
+export declare function printProgress(progressLog: string, isLastLog?: boolean): void;

package/schematics/utils/progress.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const readline_1 = require("readline");
+function printProgress(progressLog, isLastLog = false) {
+    readline_1.clearLine(process.stdout, 0);
+    readline_1.cursorTo(process.stdout, 0);
+    process.stdout.write(progressLog);
+    if (isLastLog) {
+        process.stdout.write('\n');
+    }
+}
+exports.printProgress = printProgress;

package/schematics/utils/templates/get-component-templates.js

@@ -17,7 +17,7 @@ function decoratorToTemplateResource(decorator) {
     const template = metadata.getProperty('template');
     const componentPath = decorator.getSourceFile().getFilePath();
     if (templateUrl) {
-        const templatePath = path.parse(((_a = templateUrl === null || templateUrl === void 0 ? void 0 : templateUrl.getInitializer()) === null || _a === void 0 ? void 0 : _a.getText().replace(/['"]/g, '')) || '');
+        const templatePath = path.parse(((_a = templateUrl === null || templateUrl === void 0 ? void 0 : templateUrl.getInitializer()) === null || _a === void 0 ? void 0 : _a.getText().replace(/['"`]/g, '')) || '');
         return {
             componentPath,
             templatePath: getFullTemplatePath(templatePath, path.parse(componentPath)),