@taiga-ui/cdk 2.51.0 → 2.51.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taiga-ui/cdk",
-  "version": "2.51.0",
+  "version": "2.51.1",
   "description": "Base library for creating Angular components and applications using Taiga UI principles regarding of actual visual appearance",
   "keywords": [
     "angular",

package/schematics/ng-update/constants/templates.js

@@ -51,6 +51,7 @@ exports.ATTRS_TO_REPLACE = [
         from: {
             attrName: '[quantum]',
             withAttrsNames: ['tuiSlider'],
+            withTagNames: ['tui-slider'],
         },
         to: {
             attrName: '[step]',

package/schematics/ng-update/index.js

@@ -15,23 +15,52 @@ const remove_module_1 = require("./steps/remove-module");
 const miscellaneous_1 = require("./steps/miscellaneous");
 const replace_functions_1 = require("./steps/replace-functions");
 const migrate_progress_1 = require("./steps/migrate-progress");
+const colored_log_1 = require("../utils/colored-log");
 function updateToV3(_) {
     return (tree, context) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-        context.logger.info(`taiga packages will be updated to ${versions_1.TAIGA_VERSION}`);
-        ng_morph_1.setActiveProject(ng_morph_1.createProject(tree, '/', '**/**'));
+        console.info('\x1b[35m', `taiga packages will be updated to ${versions_1.TAIGA_VERSION}`);
+        const fileSystem = getFileSystem(tree);
+        colored_log_1.infoLog('replacing deep imports...');
         replace_deep_import_1.replaceDeepImports();
+        colored_log_1.successLog('deep imports replaced');
+        colored_log_1.infoLog('replacing enums imports...');
         replace_enums_1.replaceEnums();
+        colored_log_1.successLog('enums replaced');
+        colored_log_1.infoLog('renaming types...');
         rename_types_1.renameTypes();
+        colored_log_1.successLog('types renamed');
+        colored_log_1.infoLog('replacing consts...');
         replace_const_1.replaceConsts();
+        colored_log_1.successLog('constants replaced');
+        colored_log_1.infoLog('replacing services...');
         replace_services_1.replaceServices();
+        colored_log_1.successLog('services replaced');
         show_warnings_1.showWarnings(context);
-        migrate_templates_1.migrateTemplates(tree);
-        migrate_sliders_1.migrateSliders(tree);
-        migrate_progress_1.migrateProgress(tree);
+        colored_log_1.infoLog('migrating templates...');
+        migrate_templates_1.migrateTemplates(fileSystem);
+        colored_log_1.successLog('templates migrated');
+        fileSystem.commitEdits();
+        ng_morph_1.saveActiveProject();
+        const updatedFileSystem = getFileSystem(tree);
+        colored_log_1.infoLog('migrating sliders...');
+        migrate_sliders_1.migrateSliders(updatedFileSystem);
+        colored_log_1.successLog('sliders migrated');
+        colored_log_1.infoLog('migrating progress bars');
+        migrate_progress_1.migrateProgress(updatedFileSystem);
+        colored_log_1.successLog('progress bars migrated');
+        colored_log_1.infoLog('removing modules...');
         remove_module_1.removeModules();
+        colored_log_1.successLog('modules removed');
+        colored_log_1.infoLog('miscellaneous migrating...');
         replace_functions_1.replaceFunctions();
         miscellaneous_1.miscellaneousMigrations();
+        colored_log_1.successLog('miscellaneous migrated');
         ng_morph_1.saveActiveProject();
     });
 }
 exports.updateToV3 = updateToV3;
+function getFileSystem(tree) {
+    const project = ng_morph_1.createProject(tree, '/', '**/**.{html,ts}');
+    ng_morph_1.setActiveProject(project);
+    return project.getFileSystem().fs;
+}

package/schematics/ng-update/steps/migrate-progress.d.ts

@@ -1,3 +1,3 @@
-import { Tree } from '@angular-devkit/schematics';
+import { DevkitFileSystem } from 'ng-morph/project/classes/devkit-file-system';
 export declare const DEPRECATED_PROGRESS_PIPES_REG: RegExp;
-export declare function migrateProgress(tree: Tree): void;
+export declare function migrateProgress(fileSystem: DevkitFileSystem): void;

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

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ng_morph_1 = require("ng-morph");
-const devkit_file_system_1 = require("ng-morph/project/classes/devkit-file-system");
 const get_component_templates_1 = require("../../utils/templates/get-component-templates");
 const elements_1 = require("../../utils/templates/elements");
 const template_resource_1 = require("../../utils/templates/template-resource");
 exports.DEPRECATED_PROGRESS_PIPES_REG = /\s*\|\s*tuiProgressColorSegments(Async\s*\|\s*async)?/gi;
 const PROPERTY_FOR_DEPRECATED_PIPES = '[color]';
-function migrateProgress(tree) {
-    const fileSystem = new devkit_file_system_1.DevkitFileSystem(tree);
+function migrateProgress(fileSystem) {
     const templateResources = get_component_templates_1.getComponentTemplates('**/**');
     for (const templateResource of templateResources) {
         replaceProgressColorSegmentsPipe(templateResource, fileSystem);

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

@@ -1,2 +1,2 @@
-import { Tree } from '@angular-devkit/schematics';
-export declare function migrateSliders(tree: Tree): void;
+import { DevkitFileSystem } from 'ng-morph/project/classes/devkit-file-system';
+export declare function migrateSliders(fileSystem: DevkitFileSystem): void;

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const migrate_input_slider_1 = require("./migrate-input-slider");
 const migrate_input_range_1 = require("./migrate-input-range");
-function migrateSliders(tree) {
-    migrate_input_slider_1.migrateInputSlider(tree);
-    migrate_input_range_1.migrateInputRange(tree);
+function migrateSliders(fileSystem) {
+    migrate_input_slider_1.migrateInputSlider(fileSystem);
+    migrate_input_range_1.migrateInputRange(fileSystem);
 }
 exports.migrateSliders = migrateSliders;

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

@@ -1,2 +1,2 @@
-import { Tree } from '@angular-devkit/schematics';
-export declare function migrateInputRange(tree: Tree): void;
+import { DevkitFileSystem } from 'ng-morph/project/classes/devkit-file-system';
+export declare function migrateInputRange(fileSystem: DevkitFileSystem): void;

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_file_system_1 = require("ng-morph/project/classes/devkit-file-system");
 const get_component_templates_1 = require("../../../utils/templates/get-component-templates");
 const ng_component_input_manipulations_1 = require("../../../utils/templates/ng-component-input-manipulations");
 const ng_morph_1 = require("ng-morph");
@@ -8,8 +7,7 @@ const ng_component_1 = require("../../../utils/angular/ng-component");
 const add_unique_import_1 = require("../../../utils/add-unique-import");
 const MIN_LABELS_MIGRATION_METHOD_NAME = 'tuiMigrationInputRangeMinLabel';
 const MAX_LABELS_MIGRATION_METHOD_NAME = 'tuiMigrationInputRangeMaxLabel';
-function migrateInputRange(tree) {
-    const fileSystem = new devkit_file_system_1.DevkitFileSystem(tree);
+function migrateInputRange(fileSystem) {
     const templateResources = get_component_templates_1.getComponentTemplates('**/**');
     const COMPONENTS_WITH_MIN_LABELS = new Set();
     const COMPONENTS_WITH_MAX_LABELS = new Set();

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

@@ -1,2 +1,2 @@
-import { Tree } from '@angular-devkit/schematics';
-export declare function migrateInputSlider(tree: Tree): void;
+import { DevkitFileSystem } from 'ng-morph/project/classes/devkit-file-system';
+export declare function migrateInputSlider(fileSystem: DevkitFileSystem): void;

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

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ng_morph_1 = require("ng-morph");
-const devkit_file_system_1 = require("ng-morph/project/classes/devkit-file-system");
 const ng_component_input_manipulations_1 = require("../../../utils/templates/ng-component-input-manipulations");
 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");
-function migrateInputSlider(tree) {
-    const fileSystem = new devkit_file_system_1.DevkitFileSystem(tree);
+function migrateInputSlider(fileSystem) {
     const templateResources = get_component_templates_1.getComponentTemplates('**/**');
     const COMPONENTS_WITH_MIN_MAX_LABELS = new Set();
     for (const templateResource of templateResources) {

package/schematics/ng-update/steps/migrate-templates.d.ts

@@ -1,2 +1,2 @@
-import { Tree } from '@angular-devkit/schematics';
-export declare function migrateTemplates(tree: Tree): void;
+import { DevkitFileSystem } from 'ng-morph/project/classes/devkit-file-system';
+export declare function migrateTemplates(fileSystem: DevkitFileSystem): void;

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

@@ -3,15 +3,15 @@ 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 devkit_file_system_1 = require("ng-morph/project/classes/devkit-file-system");
 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 START_TAG_OFFSET = 1;
 const END_TAG_OFFSET = 2;
-function migrateTemplates(tree) {
-    const fileSystem = new devkit_file_system_1.DevkitFileSystem(tree);
-    const componentWithTemplatesPaths = get_component_templates_1.getComponentTemplates('**/**').map(({ componentPath }) => componentPath);
+function migrateTemplates(fileSystem) {
+    const componentWithTemplatesPaths = get_component_templates_1.getComponentTemplates('**/**');
     const actions = [
         replaceTags,
         replaceAttrs,
@@ -19,28 +19,17 @@ function migrateTemplates(tree) {
         replaceBreadcrumbs,
         replaceFieldError,
         addHTMLCommentTags,
+        addEditorProviders,
     ];
-    actions.forEach(action => {
-        componentWithTemplatesPaths.forEach(componentPath => {
-            // get updated version of template after the previous action
-            const [resource] = get_component_templates_1.getComponentTemplates(componentPath);
-            const path = fileSystem.resolve(template_resource_1.getPathFromTemplateResource(resource));
-            const recorder = fileSystem.edit(path);
+    componentWithTemplatesPaths.forEach(resource => {
+        const path = fileSystem.resolve(template_resource_1.getPathFromTemplateResource(resource));
+        const recorder = fileSystem.edit(path);
+        actions.forEach(action => {
             action({ resource, fileSystem, recorder });
         });
-        save(fileSystem);
     });
 }
 exports.migrateTemplates = migrateTemplates;
-/**
- * We should update virtual file tree
- * otherwise all following ng-morph commands will overwrite all previous template manipulations
- * */
-function save(fileSystem) {
-    fileSystem.commitEdits();
-    ng_morph_1.saveActiveProject();
-    ng_morph_1.setActiveProject(ng_morph_1.createProject(fileSystem.tree, '/', '**/**'));
-}
 function replaceAttrsByDirective({ resource, fileSystem, }) {
     templates_1.ATTR_TO_DIRECTIVE.forEach(({ componentSelector, directiveModule, directive, inputProperty }) => {
         ng_component_input_manipulations_1.replaceInputPropertyByDirective({
@@ -62,7 +51,7 @@ function replaceAttrs({ resource, recorder, fileSystem, }) {
             ...elements_1.findAttributeOnElementWithAttrs(template, from.attrName, from.withAttrsNames || []),
         ];
         offsets.forEach(offset => {
-            recorder.remove(offset + templateOffset, from.attrName.length + (to.attrName.length ? 0 : 1));
+            recorder.remove(offset + templateOffset, from.attrName.length);
             recorder.insertRight(offset + templateOffset, to.attrName);
         });
     });
@@ -147,3 +136,17 @@ function replaceTag(recorder, sourceCodeLocation, from, to, templateOffset = 0,
     recorder.remove(startTagOffset + templateOffset + START_TAG_OFFSET, from.length);
     recorder.insertRight(startTagOffset + templateOffset + START_TAG_OFFSET, `${to} ${addAttributes.join(' ')}`);
 }
+function addEditorProviders({ resource, fileSystem, }) {
+    const template = template_resource_1.getTemplateFromTemplateResource(resource, fileSystem);
+    const elements = elements_1.findElementsByTagName(template, 'tui-editor').filter(element => !elements_1.hasElementAttribute(element, 'new'));
+    if (elements.length) {
+        const componentPath = resource.componentPath;
+        const componentClass = ng_component_1.getNgComponents(componentPath);
+        ng_morph_1.addProviderToComponent(componentClass[0], `{
+            provide: TUI_EDITOR_EXTENSIONS,
+            useValue: defaultEditorExtensions
+        }`, { unique: true });
+        add_unique_import_1.addUniqueImport(componentPath, 'TUI_EDITOR_EXTENSIONS', '@taiga-ui/addon-editor');
+        add_unique_import_1.addUniqueImport(componentPath, 'defaultEditorExtensions', '@taiga-ui/addon-editor');
+    }
+}

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

@@ -6,7 +6,10 @@ const ng_morph_1 = require("ng-morph");
 const import_manipulations_1 = require("../../utils/import-manipulations");
 const add_unique_import_1 = require("../../utils/add-unique-import");
 function replaceServices() {
-    services_1.SERVICES_TO_REPLACE.forEach(service => replaceService(service));
+    services_1.SERVICES_TO_REPLACE.forEach(service => {
+        console.info('\x1b[34m', `replacing ${service.from.name}`);
+        replaceService(service);
+    });
 }
 exports.replaceServices = replaceServices;
 function replaceService({ from, to, replaceMethods }) {

package/schematics/utils/colored-log.d.ts

@@ -0,0 +1,2 @@
+export declare function successLog(message: string): void;
+export declare function infoLog(message: string): void;

package/schematics/utils/colored-log.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function successLog(message) {
+    console.info('\x1B[32m%s\x1B[0m', message, '\u2713');
+}
+exports.successLog = successLog;
+function infoLog(message) {
+    console.info('\x1B[34m%s\x1B[0m', message);
+}
+exports.infoLog = infoLog;