chore: fix comments

taiga-family · Jan 9, 2025 · 526aa65 · 526aa65
1 parent d5de61c
commit 526aa65
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 31 deletions.
diff --git a/projects/cdk/schematics/ng-update/steps/replace-package-name.ts b/projects/cdk/schematics/ng-update/steps/replace-package-name.ts
@@ -7,7 +7,6 @@ import {
 } from 'ng-morph';
 
 import {ALL_TS_FILES} from '../../constants';
-import {swapNamedImports} from '../../utils/swap-named-imports';
 import {getFileSystem} from '../utils/get-file-system';
 import {replaceText} from '../utils/replace-text';
 
@@ -18,7 +17,6 @@ export function replacePackageName(
 ): void {
     const fileSystem = getFileSystem(tree);
 
-    swapNamedImports(oldPackage, newPackage.name);
     replaceText([{from: oldPackage, to: newPackage.name}], ALL_TS_FILES);
 
     const old = getPackageJsonDependency(tree, oldPackage);

diff --git a/projects/cdk/schematics/ng-update/v4/steps/migrate-root.ts b/projects/cdk/schematics/ng-update/v4/steps/migrate-root.ts
@@ -2,6 +2,7 @@ import type {DevkitFileSystem} from 'ng-morph';
 import {
     addProviderToNgModule,
     getActiveProject,
+    getImports,
     getNgModules,
     getPackageJsonDependency,
     infoLog,
@@ -98,7 +99,13 @@ function addProviders({
         addProviderToNgModule(module, 'NG_EVENT_PLUGINS', {unique: true});
     }
 
-    if (providersArray || module) {
+    const shouldAddImport =
+        (providersArray || module) &&
+        !getImports(path).find((name) =>
+            name.getText().includes('@tinkoff/ng-event-plugins'),
+        );
+
+    if (shouldAddImport) {
         addUniqueImport(path, 'NG_EVENT_PLUGINS', '@taiga-ui/event-plugins');
     }
 

diff --git a/projects/cdk/schematics/ng-update/v4/tests/replace-modules-with-providers.spec.ts b/projects/cdk/schematics/ng-update/v4/tests/replace-modules-with-providers.spec.ts
@@ -41,8 +41,8 @@ const MODULE_AFTER = `import { newProvider } from "@namespace/new";
 import { tuiProvideMobileCalendar } from "@taiga-ui/addon-mobile";
 import { TuiAvatar } from "@taiga-ui/kit";
 import { TBANK_PROVIDERS } from "@taiga-ui/proprietary";
-import { NG_EVENT_PLUGINS } from "@taiga-ui/event-plugins";
 import { TuiRoot } from "@taiga-ui/core";
+import { NG_EVENT_PLUGINS } from '@taiga-ui/event-plugins';
 
 @NgModule({
     imports: [TuiRoot, TuiAvatar],

diff --git a/projects/cdk/schematics/ng-update/v4/tests/schematic-migrate-addon-editor.spec.ts b/projects/cdk/schematics/ng-update/v4/tests/schematic-migrate-addon-editor.spec.ts
@@ -59,10 +59,12 @@ export class Test {
 }`;
 
 const COMPONENT_AFTER = `import { TUI_SANITIZER } from "@taiga-ui/legacy";
-import { TuiEditor, TuiEditorSocket, TUI_EDITOR_DEFAULT_EXTENSIONS, TUI_EDITOR_DEFAULT_TOOLS, TuiEditorTool, TUI_EDITOR_EXTENSIONS } from "@taiga-ui/editor";
+import { TuiEditor, TuiEditorSocket, TUI_EDITOR_DEFAULT_EXTENSIONS, TUI_EDITOR_DEFAULT_TOOLS } from "@taiga-ui/editor";
 
 import { TuiRoot, TuiAlert, TuiDialog } from '@taiga-ui/core';
 import {NgDompurifySanitizer} from '@taiga-ui/dompurify';
+import {TUI_EDITOR_EXTENSIONS} from '@taiga-ui/editor';
+import {TuiEditorTool} from '@taiga-ui/editor';
 
 @Component({
     standalone: true,

diff --git a/projects/cdk/schematics/ng-update/v4/tests/schematic-migrate-tinkoff-editor.spec.ts b/projects/cdk/schematics/ng-update/v4/tests/schematic-migrate-tinkoff-editor.spec.ts
@@ -58,10 +58,11 @@ export class Test {
 }`;
 
 const COMPONENT_AFTER = `import { TUI_SANITIZER } from "@taiga-ui/legacy";
-import { TuiEditor, TuiEditorSocket, TUI_EDITOR_DEFAULT_EXTENSIONS, TUI_EDITOR_EXTENSIONS } from "@taiga-ui/editor";
+import { TuiEditor, TuiEditorSocket, TUI_EDITOR_DEFAULT_EXTENSIONS } from "@taiga-ui/editor";
 
 import { TuiRoot, TuiAlert, TuiDialog } from '@taiga-ui/core';
 import {NgDompurifySanitizer} from '@taiga-ui/dompurify';
+import {TUI_EDITOR_EXTENSIONS} from '@taiga-ui/editor';
 import {TuiEditorTool} from '@taiga-ui/editor';
 
 @Component({

diff --git a/projects/cdk/schematics/utils/swap-named-imports.ts b/projects/cdk/schematics/utils/swap-named-imports.ts