chore: check proprietary using two packages (#8685)

taiga-family · Aug 26, 2024 · f28acd1 · f28acd1
1 parent 6529962
commit f28acd1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/projects/cdk/schematics/ng-update/v4/migrate-icons/index.ts b/projects/cdk/schematics/ng-update/v4/migrate-icons/index.ts
@@ -38,5 +38,8 @@ export function migrateIcons(options: TuiSchema): Rule {
 }
 
 function hasProprietaryIcons(tree: Tree): boolean {
-    return !!getPackageJsonDependency(tree, '@taiga-ui/proprietary-icons');
+    return (
+        !!getPackageJsonDependency(tree, '@taiga-ui/proprietary-icons') ||
+        !!getPackageJsonDependency(tree, '@taiga-ui/proprietary')
+    );
 }
diff --git a/projects/cdk/schematics/ng-update/v4/migrate-icons/rename-proprietary-icons.ts b/projects/cdk/schematics/ng-update/v4/migrate-icons/rename-proprietary-icons.ts
@@ -15,22 +15,23 @@ export function renameProprietaryIcons(
 
         const regex = /['"`]tuiIcon(?!Button\b)[A-Z][a-zA-Z0-9]*\b/g;
 
+        const invalidIcons = new Set();
+
         text = text.replaceAll(regex, (icon) => {
             if (icon.match(/['"`]tuiIcon(?!Tds)\w*/)) {
                 logger.warn(
                     `[WARNING] in ${file.getSourceFile().getFilePath()}: Invalid icon name ${icon}. Please select an icon from the proprietary pack.`,
                 );
+                invalidIcons.add(icon.slice(1));
 
                 return icon;
             }
 
             return convertString(icon);
         });
 
-        const invalidIcons = [...new Set(text.match(/\b(tuiIcon(?!Tds|Button)\w*)\b/g))];
-
-        if (invalidIcons.length) {
-            const message = `TODO (Taiga UI migration): invalid icons ${invalidIcons.join(', ')}. Please select an icon from the proprietary pack`;
+        if (invalidIcons.size > 0) {
+            const message = `TODO (Taiga UI migration): invalid icons ${Array.from(invalidIcons).join(', ')}. Please select an icon from the proprietary pack`;
             const todo = file.getFilePath().endsWith('html')
                 ? `<!-- ${message} -->`
                 : `// ${message}`;

diff --git a/projects/cdk/schematics/ng-update/v4/steps/migrate-proprietary.ts b/projects/cdk/schematics/ng-update/v4/steps/migrate-proprietary.ts
@@ -17,10 +17,9 @@ export function migrateProprietary(
     options: TuiSchema,
 ): void {
     try {
-        const hasProprietary = !!getPackageJsonDependency(
-            fileSystem.tree,
-            '@taiga-ui/proprietary-core',
-        )?.version;
+        const hasProprietary =
+            !!getPackageJsonDependency(fileSystem.tree, '@taiga-ui/proprietary-core') ||
+            !!getPackageJsonDependency(fileSystem.tree, '@taiga-ui/proprietary');
 
         if (!hasProprietary) {
             return;

diff --git a/projects/cdk/schematics/ng-update/v4/steps/migrate-root.ts b/projects/cdk/schematics/ng-update/v4/steps/migrate-root.ts
@@ -82,10 +82,9 @@ function addProviders(callExpression: Node, fileSystem: DevkitFileSystem): void
     );
 
     getActiveProject();
-    const proprietary = getPackageJsonDependency(
-        fileSystem.tree,
-        '@taiga-ui/proprietary-core',
-    );
+    const proprietary =
+        getPackageJsonDependency(fileSystem.tree, '@taiga-ui/proprietary-core') ||
+        getPackageJsonDependency(fileSystem.tree, '@taiga-ui/proprietary');
 
     if (proprietary) {
         array.addElement('TBANK_PROVIDERS');

diff --git a/projects/cdk/schematics/ng-update/v4/tests/schematic-migrate-icons.spec.ts b/projects/cdk/schematics/ng-update/v4/tests/schematic-migrate-icons.spec.ts
@@ -60,7 +60,7 @@ export class Test {
    icon = iconsName.tuiIconStart;
 }`;
 
-const PROPR_COMPONENT_AFTER = `// TODO (Taiga UI migration): invalid icons tuiIconStar, tuiIconArrowDown, tuiIconStart. Please select an icon from the proprietary pack
+const PROPR_COMPONENT_AFTER = `// TODO (Taiga UI migration): invalid icons tuiIconStar, tuiIconArrowDown. Please select an icon from the proprietary pack
 import { Component } from "@angular/core";
 
 const iconsMap = {

diff --git a/projects/cdk/schematics/ng-update/v4/tests/schematic-migrate-proprietary.spec.ts b/projects/cdk/schematics/ng-update/v4/tests/schematic-migrate-proprietary.spec.ts
@@ -60,7 +60,7 @@ export class Test {
     @Input() illustration: string | null = null;
 
     readonly operationIcon: TuiFeedItemIcon = {
-        icon: '@tui.tds-transport-auto-ruble-medium',
+        icon: '@tui.fancy.medium.transport-auto-ruble',
         color: '#428BF9',
         background: '#428bf91f',
     };