@taiga-ui/cdk 4.2.0 → 4.4.0-canary.6e6e993

package/schematics/migration.json

@@ -3,17 +3,22 @@
     "schematics": {
         "migrateCssVarsV4": {
             "description": "Migrate Taiga UI css variables",
-            "version": "4.0.0-rc.1",
+            "version": "4.0.0",
             "factory": "./ng-update/v4/migrate-css-vars/index#migrateCssVars"
         },
         "migrateIconsV4": {
             "description": "Migrate Taiga UI icons to a new format",
-            "version": "4.0.0-rc.1",
+            "version": "4.0.0",
             "factory": "./ng-update/v4/migrate-icons/index#migrateIcons"
         },
+        "migrateAddonDocV4": {
+            "description": "Migrate Taiga UI addon doc",
+            "version": "4.0.0",
+            "factory": "./ng-update/v4/migrate-addon-doc/index#migrateAddonDoc"
+        },
         "updateToV4": {
             "description": "Updates Taiga UI packages to v4",
-            "version": "4.0.0-rc.1",
+            "version": "4.0.0",
             "factory": "./ng-update/v4/index#updateToV4"
         }
     }

package/schematics/ng-add/index.js

@@ -11,6 +11,7 @@ function addDependencies(tree, options) {
         (0, ng_morph_1.addPackageJsonDependency)(tree, {
             name: `@taiga-ui/${pack}`,
             version: versions_1.TAIGA_VERSION,
+            type: ng_morph_1.NodeDependencyType.Default,
         });
     });
     removeTaigaSchematicsPackage(tree);
@@ -18,6 +19,7 @@ function addDependencies(tree, options) {
         (0, ng_morph_1.addPackageJsonDependency)(tree, {
             name: '@taiga-ui/styles',
             version: versions_1.TAIGA_VERSION,
+            type: ng_morph_1.NodeDependencyType.Default,
         });
     }
     if (packages.includes('addon-table') || packages.includes('addon-mobile')) {
@@ -35,6 +37,7 @@ function addAngularCdkDep(tree) {
         (0, ng_morph_1.addPackageJsonDependency)(tree, {
             name: '@angular/cdk',
             version: `^${majorVersionArr[0]}.0.0`,
+            type: ng_morph_1.NodeDependencyType.Default,
         });
     }
 }

package/schematics/ng-add/steps/add-taiga-modules.js

@@ -97,7 +97,9 @@ function addTaigaModules(options) {
         }
         else {
             const mainClass = (0, ng_morph_1.getMainModule)(mainFilePath);
-            addTuiModules({ mainClass, options, context });
+            if (mainClass) {
+                addTuiModules({ mainClass, options, context });
+            }
         }
         (0, ng_morph_1.saveActiveProject)();
     });

package/schematics/ng-add/steps/wrap-with-tui-root.js

@@ -33,12 +33,15 @@ function getAppTemplatePath(mainPath) {
     if (standaloneBootstrapFunction) {
         const [componentIdentifier] = standaloneBootstrapFunction.getArguments();
         const component = (0, get_component_from_identifier_1.getComponentFromIdentifier)(componentIdentifier);
-        return component && getTemplatePathFromComponent(component);
+        return (component && getTemplatePathFromComponent(component)) || '';
     }
     const mainModule = (0, ng_morph_1.getMainModule)(mainPath);
+    if (!mainModule) {
+        return '';
+    }
     const mainInitializer = getTemplateInitializer(mainModule, 'NgModule', 'declarations');
-    if (!ng_morph_1.Node.isArrayLiteralExpression(mainInitializer)) {
-        return;
+    if (!mainInitializer || !ng_morph_1.Node.isArrayLiteralExpression(mainInitializer)) {
+        return '';
     }
     const appIdentifier = mainInitializer.getElements()[0];
     const appComponent = appIdentifier.getDefinitionNodes()[0];
@@ -52,19 +55,20 @@ function getTemplatePathFromComponent(component) {
         .join('/')}/${templateInitializer === null || templateInitializer === void 0 ? void 0 : templateInitializer.getText().replaceAll(/['"]/g, '')}`;
 }
 function getTemplateInitializer(classDeclaration, decoratorName, propertyName) {
+    var _a;
     const decorator = classDeclaration.getDecorator(decoratorName);
     if (!decorator) {
-        return;
+        return null;
     }
     const [metadata] = decorator.getArguments();
     if (!ng_morph_1.Node.isObjectLiteralExpression(metadata)) {
-        return;
+        return null;
     }
     const property = metadata.getProperty(propertyName);
     if (!ng_morph_1.Node.isPropertyAssignment(property)) {
-        return;
+        return null;
     }
-    return property.getInitializer();
+    return (_a = property.getInitializer()) !== null && _a !== void 0 ? _a : null;
 }
 function wrapWithTuiRoot(options) {
     return (tree, context) => tslib_1.__awaiter(this, void 0, void 0, function* () {

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

@@ -8,9 +8,10 @@ const replace_text_1 = require("../utils/replace-text");
 function replacePackageName(oldPackage, newPackage, tree) {
     const fileSystem = (0, get_file_system_1.getFileSystem)(tree);
     (0, replace_text_1.replaceText)([{ from: oldPackage, to: newPackage.name }], constants_1.ALL_TS_FILES);
-    if ((0, ng_morph_1.getPackageJsonDependency)(tree, oldPackage)) {
+    const old = (0, ng_morph_1.getPackageJsonDependency)(tree, oldPackage);
+    if (old) {
         (0, ng_morph_1.removePackageJsonDependency)(tree, oldPackage);
-        (0, ng_morph_1.addPackageJsonDependency)(tree, newPackage);
+        (0, ng_morph_1.addPackageJsonDependency)(tree, Object.assign(Object.assign({}, newPackage), { type: old.type }));
     }
     fileSystem.commitEdits();
     (0, ng_morph_1.saveActiveProject)();

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

@@ -42,6 +42,7 @@ function main(options) {
         (0, steps_1.showWarnings)(context, constants_1.MIGRATION_WARNINGS);
         fileSystem.commitEdits();
         (0, ng_morph_1.saveActiveProject)();
+        (0, steps_2.removeDuplicates)(options);
         (0, steps_2.migrateStyles)();
         (0, steps_2.migrateProprietary)(fileSystem, options);
         (0, steps_2.updatePackages)(fileSystem, options);

package/schematics/ng-update/v4/migrate-addon-doc/index.d.ts

@@ -0,0 +1,3 @@
+import type { Rule } from '@angular-devkit/schematics';
+import type { TuiSchema } from '../../../ng-add/schema';
+export declare function migrateAddonDoc(options: TuiSchema): Rule;

package/schematics/ng-update/v4/migrate-addon-doc/index.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateAddonDoc = void 0;
+const schematics_1 = require("@angular-devkit/schematics");
+const steps_1 = require("@taiga-ui/cdk/schematics/ng-update/steps");
+const ng_morph_1 = require("ng-morph");
+const file_globs_1 = require("../../../constants/file-globs");
+const colored_log_1 = require("../../../utils/colored-log");
+const remove_module_1 = require("../../steps/remove-module");
+const get_file_system_1 = require("../../utils/get-file-system");
+const replace_symbols_1 = require("./replace-symbols");
+function migrateAddonDoc(options) {
+    return (0, schematics_1.chain)([
+        (tree, _context) => {
+            const fileSystem = (0, get_file_system_1.getFileSystem)(tree);
+            if (!(0, ng_morph_1.getPackageJsonDependency)(fileSystem.tree, '@taiga-ui/addon-doc')) {
+                return;
+            }
+            !options['skip-logs'] &&
+                (0, colored_log_1.infoLog)(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} replacing...`);
+            (0, remove_module_1.removeModules)(options, [
+                {
+                    name: 'tuiGenerateRoutes',
+                    moduleSpecifier: '@taiga-ui/addon-doc',
+                },
+            ]);
+            (0, steps_1.renameTypes)(options, [
+                {
+                    from: 'TuiDocExample',
+                    to: 'Record<string, TuiRawLoaderContent>',
+                    moduleSpecifier: ['@taiga-ui/addon-doc'],
+                    removeImport: true,
+                    newImports: [
+                        {
+                            name: 'TuiRawLoaderContent',
+                            moduleSpecifier: '@taiga-ui/addon-doc',
+                        },
+                    ],
+                },
+            ]);
+            (0, ng_morph_1.getSourceFiles)(file_globs_1.ALL_TS_FILES).forEach((file) => file.replaceWithText(file
+                .getFullText()
+                .replaceAll(/RouterModule\.forChild\(tuiGenerateRoutes\(\w+\)\)/g, 'RouterModule')));
+            (0, steps_1.replaceIdentifiers)(options, replace_symbols_1.DOC_SYMBOLS_TO_REPLACE);
+            fileSystem.commitEdits();
+            (0, ng_morph_1.saveActiveProject)();
+            !options['skip-logs'] &&
+                (0, colored_log_1.titleLog)(`${colored_log_1.FINISH_SYMBOL} addon-doc successfully migrated \n`);
+        },
+    ]);
+}
+exports.migrateAddonDoc = migrateAddonDoc;

package/schematics/ng-update/v4/migrate-addon-doc/replace-symbols.d.ts

@@ -0,0 +1,2 @@
+import type { ReplacementIdentifierMulti } from '../../interfaces/replacement-identifier';
+export declare const DOC_SYMBOLS_TO_REPLACE: ReplacementIdentifierMulti[];

package/schematics/ng-update/v4/migrate-addon-doc/replace-symbols.js

@@ -0,0 +1,139 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DOC_SYMBOLS_TO_REPLACE = void 0;
+exports.DOC_SYMBOLS_TO_REPLACE = [
+    {
+        from: {
+            name: 'DocumentationPropertyType',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+        to: {
+            name: 'TuiDocumentationPropertyType',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+    },
+    {
+        from: {
+            name: 'RawContentLoader',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+        to: {
+            name: 'TuiRawContentLoader',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+    },
+    {
+        from: {
+            name: 'TuiDocCopyModule',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+        to: {
+            name: 'TuiDocCopy',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+    },
+    {
+        from: {
+            name: 'TuiScrollIntoViewLinkModule',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+        to: {
+            name: 'TuiDocScrollIntoViewLink',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+    },
+    {
+        from: {
+            name: 'TuiTextCodeModule',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+        to: {
+            name: 'TuiDocText',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+    },
+    {
+        from: {
+            name: 'TuiDocDocumentationModule',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+        to: {
+            name: 'TuiAddonDoc',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+            spreadInModule: true,
+        },
+    },
+    {
+        from: {
+            name: 'TuiDocPage',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+        to: {
+            name: 'TuiDocRoutePage',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+    },
+    {
+        from: [
+            {
+                name: 'TuiDocCodeModule',
+                moduleSpecifier: '@taiga-ui/addon-doc',
+            },
+            {
+                name: 'TuiDocDemoModule',
+                moduleSpecifier: '@taiga-ui/addon-doc',
+            },
+            {
+                name: 'TuiDocMainModule',
+                moduleSpecifier: '@taiga-ui/addon-doc',
+            },
+            {
+                name: 'TuiDocNavigationModule',
+                moduleSpecifier: '@taiga-ui/addon-doc',
+            },
+            {
+                name: 'TuiDocPageModule',
+                moduleSpecifier: '@taiga-ui/addon-doc',
+            },
+            {
+                name: 'TuiAddonDocModule',
+                moduleSpecifier: '@taiga-ui/addon-doc',
+            },
+        ],
+        to: {
+            name: 'TuiAddonDoc',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+            spreadInModule: true,
+        },
+    },
+    {
+        from: {
+            name: 'TuiDocPage',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+        to: {
+            name: 'TuiDocRoutePage',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+    },
+    {
+        from: {
+            name: 'TuiDocPages',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+        to: {
+            name: 'TuiDocRoutePages',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+    },
+    {
+        from: {
+            name: 'TuiDeepPartial',
+            moduleSpecifier: '@taiga-ui/cdk',
+        },
+        to: {
+            name: 'TuiDeepPartial',
+            moduleSpecifier: '@taiga-ui/addon-doc',
+        },
+    },
+];

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

@@ -28,5 +28,6 @@ function migrateIcons(options) {
 }
 exports.migrateIcons = migrateIcons;
 function hasProprietaryIcons(tree) {
-    return !!(0, ng_morph_1.getPackageJsonDependency)(tree, '@taiga-ui/proprietary-icons');
+    return (!!(0, ng_morph_1.getPackageJsonDependency)(tree, '@taiga-ui/proprietary-icons') ||
+        !!(0, ng_morph_1.getPackageJsonDependency)(tree, '@taiga-ui/proprietary'));
 }

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

@@ -8,16 +8,17 @@ function renameProprietaryIcons({ logger }, pattern = constants_1.ALL_FILES) {
     sourceFiles.forEach((file) => {
         let text = file.getFullText();
         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}`;

package/schematics/ng-update/v4/steps/constants/identifiers-to-replace.js

@@ -492,26 +492,6 @@ exports.IDENTIFIERS_TO_REPLACE = [
         from: { name: 'ArrayElement', moduleSpecifier: '@taiga-ui/kit' },
         to: { name: 'TuiArrayElement', moduleSpecifier: '@taiga-ui/kit' },
     },
-    {
-        from: {
-            name: 'DocumentationPropertyType',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-        to: {
-            name: 'TuiDocumentationPropertyType',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-    },
-    {
-        from: {
-            name: 'RawContentLoader',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-        to: {
-            name: 'TuiRawContentLoader',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-    },
     {
         from: {
             name: 'TuiContextWithImplicit',
@@ -1286,16 +1266,6 @@ exports.IDENTIFIERS_TO_REPLACE = [
             moduleSpecifier: '@taiga-ui/addon-charts',
         },
     },
-    {
-        from: {
-            name: 'TuiDocCopyModule',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-        to: {
-            name: 'TuiDocCopy',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-    },
     {
         from: {
             name: 'TuiPromptData',
@@ -1439,26 +1409,6 @@ exports.IDENTIFIERS_TO_REPLACE = [
             spreadInModule: true,
         },
     },
-    {
-        from: {
-            name: 'TuiScrollIntoViewLinkModule',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-        to: {
-            name: 'TuiDocScrollIntoViewLink',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-    },
-    {
-        from: {
-            name: 'TuiTextCodeModule',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-        to: {
-            name: 'TuiDocText',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-    },
     {
         from: {
             name: 'TuiPreviewDialogModule',
@@ -1557,59 +1507,6 @@ exports.IDENTIFIERS_TO_REPLACE = [
             spreadInModule: true,
         },
     },
-    {
-        from: {
-            name: 'TuiDocDocumentationModule',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-        to: {
-            name: 'TuiAddonDoc',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-            spreadInModule: true,
-        },
-    },
-    {
-        from: {
-            name: 'TuiDocPage',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-        to: {
-            name: 'TuiDocRoutePage',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-    },
-    {
-        from: [
-            {
-                name: 'TuiDocCodeModule',
-                moduleSpecifier: '@taiga-ui/addon-doc',
-            },
-            {
-                name: 'TuiDocDemoModule',
-                moduleSpecifier: '@taiga-ui/addon-doc',
-            },
-            {
-                name: 'TuiDocMainModule',
-                moduleSpecifier: '@taiga-ui/addon-doc',
-            },
-            {
-                name: 'TuiDocNavigationModule',
-                moduleSpecifier: '@taiga-ui/addon-doc',
-            },
-            {
-                name: 'TuiDocPageModule',
-                moduleSpecifier: '@taiga-ui/addon-doc',
-            },
-            {
-                name: 'TuiAddonDocModule',
-                moduleSpecifier: '@taiga-ui/addon-doc',
-            },
-        ],
-        to: {
-            name: 'TuiAddonDoc',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-    },
     {
         from: {
             name: 'TuiLegendItemModule',
@@ -2498,26 +2395,6 @@ exports.IDENTIFIERS_TO_REPLACE = [
             moduleSpecifier: '@taiga-ui/legacy',
         },
     },
-    {
-        from: {
-            name: 'TuiDocPage',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-        to: {
-            name: 'TuiDocRoutePage',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-    },
-    {
-        from: {
-            name: 'TuiDocPages',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-        to: {
-            name: 'TuiDocRoutePages',
-            moduleSpecifier: '@taiga-ui/addon-doc',
-        },
-    },
     {
         from: [
             {
@@ -2653,10 +2530,6 @@ exports.IDENTIFIERS_TO_REPLACE = [
         from: { name: 'TUI_DATE_FORMAT', moduleSpecifier: '@taiga-ui/cdk' },
         to: { name: 'TUI_DATE_FORMAT', moduleSpecifier: '@taiga-ui/core' },
     },
-    {
-        from: { name: 'TuiDeepPartial', moduleSpecifier: '@taiga-ui/cdk' },
-        to: { name: 'TuiDeepPartial', moduleSpecifier: '@taiga-ui/addon-doc' },
-    },
     {
         from: { name: 'TUI_FOCUSABLE_ITEM_ACCESSOR', moduleSpecifier: '@taiga-ui/cdk' },
         to: { name: 'TUI_FOCUSABLE_ITEM_ACCESSOR', moduleSpecifier: '@taiga-ui/legacy' },

package/schematics/ng-update/v4/steps/constants/types.js

@@ -2,15 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TYPES_TO_RENAME = void 0;
 exports.TYPES_TO_RENAME = [
-    {
-        from: 'TuiDocExample',
-        to: 'Record<string, TuiRawLoaderContent>',
-        moduleSpecifier: ['@taiga-ui/addon-doc'],
-        removeImport: true,
-        newImports: [
-            { name: 'TuiRawLoaderContent', moduleSpecifier: '@taiga-ui/addon-doc' },
-        ],
-    },
     {
         from: 'TuiBrightness',
         to: "'onDark' | 'onLight'",

package/schematics/ng-update/v4/steps/index.d.ts

@@ -7,6 +7,7 @@ export * from './migrate-number-format-settings';
 export * from './migrate-option-providers';
 export * from './migrate-proprietary';
 export * from './migrate-templates';
+export * from './remove-duplicates';
 export * from './restore-tui-mapper';
 export * from './restore-tui-matcher';
 export * from './styles';

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

@@ -10,6 +10,7 @@ tslib_1.__exportStar(require("./migrate-number-format-settings"), exports);
 tslib_1.__exportStar(require("./migrate-option-providers"), exports);
 tslib_1.__exportStar(require("./migrate-proprietary"), exports);
 tslib_1.__exportStar(require("./migrate-templates"), exports);
+tslib_1.__exportStar(require("./remove-duplicates"), exports);
 tslib_1.__exportStar(require("./restore-tui-mapper"), exports);
 tslib_1.__exportStar(require("./restore-tui-matcher"), exports);
 tslib_1.__exportStar(require("./styles"), exports);

package/schematics/ng-update/v4/steps/migrate-alert-service.js

@@ -53,21 +53,19 @@ function migrateAlertService(options) {
         .map((x) => { var _a; return (_a = x.getFirstAncestorByKind(ng_morph_1.SyntaxKind.Parameter)) === null || _a === void 0 ? void 0 : _a.findReferencesAsNodes(); })
         .flat()
         .map(toAlertServiceOpenCallExpression);
-    const inlineAlertOptions = [
-        ...viaDirectInjects,
-        ...viaClassProperty,
-        ...viaConstructorParam,
-    ]
-        .map((callExpression) => {
+    const inlineAlertOptions = [];
+    [...viaDirectInjects, ...viaClassProperty, ...viaConstructorParam].forEach((callExpression) => {
         if (!callExpression || callExpression.wasForgotten()) {
             return;
         }
         const [, arg] = callExpression.getArguments();
-        return (arg === null || arg === void 0 ? void 0 : arg.isKind(ng_morph_1.SyntaxKind.PropertyAccessExpression))
+        const expression = (arg === null || arg === void 0 ? void 0 : arg.isKind(ng_morph_1.SyntaxKind.PropertyAccessExpression))
             ? findOptionsInitializer(arg)
             : arg;
-    })
-        .filter(ng_morph_1.Node.isObjectLiteralExpression);
+        if (ng_morph_1.Node.isObjectLiteralExpression(expression)) {
+            inlineAlertOptions.push(expression);
+        }
+    });
     const standaloneAlertOptions = (0, get_named_import_references_1.getNamedImportReferences)('TuiAlertOptions', '@taiga-ui/core')
         .map((n) => {
         const type = n.getFirstAncestorByKind(ng_morph_1.SyntaxKind.TypeReference);

package/schematics/ng-update/v4/steps/migrate-destroy-service.js

@@ -75,7 +75,8 @@ function migrateDestroyService(options) {
             const constructor = possibleTakeUntil.getFirstAncestorByKind(ng_morph_1.SyntaxKind.Constructor);
             if (constructor) {
                 // we are definitely inside an injection context
-                return possibleTakeUntil.replaceWithText('takeUntilDestroyed()');
+                possibleTakeUntil.replaceWithText('takeUntilDestroyed()');
+                return;
             }
             // other cases when we are not sure if we are inside an injection context
             (0, add_unique_import_1.addUniqueImport)(possibleTakeUntil.getSourceFile().getFilePath(), 'DestroyRef', '@angular/core');
@@ -88,9 +89,10 @@ function migrateDestroyService(options) {
                         initializer: 'inject(DestroyRef)',
                         isReadonly: true,
                     });
-                return possibleTakeUntil.replaceWithText('takeUntilDestroyed(this.destroyRef)');
+                possibleTakeUntil.replaceWithText('takeUntilDestroyed(this.destroyRef)');
+                return;
             }
-            return nodesForComments.push(node);
+            nodesForComments.push(node);
         });
     });
     /**

package/schematics/ng-update/v4/steps/migrate-proprietary.js

@@ -5,10 +5,10 @@ const ng_morph_1 = require("ng-morph");
 const version_1 = require("../../../../constants/version");
 const colored_log_1 = require("../../../utils/colored-log");
 function migrateProprietary(fileSystem, options) {
-    var _a;
     try {
-        const hasProprietary = !!((_a = (0, ng_morph_1.getPackageJsonDependency)(fileSystem.tree, '@taiga-ui/proprietary-core')) === null || _a === void 0 ? void 0 : _a.version);
-        if (!hasProprietary) {
+        const proprietary = (0, ng_morph_1.getPackageJsonDependency)(fileSystem.tree, '@taiga-ui/proprietary-core') ||
+            (0, ng_morph_1.getPackageJsonDependency)(fileSystem.tree, '@taiga-ui/proprietary');
+        if (!proprietary) {
             return;
         }
         !options['skip-logs'] &&
@@ -16,10 +16,15 @@ function migrateProprietary(fileSystem, options) {
         replaceScopePackages();
         replaceProprietaryIconPath();
         removeProprietaryPackages(fileSystem);
+        (0, ng_morph_1.addPackageJsonDependency)(fileSystem.tree, {
+            name: '@taiga-ui/proprietary',
+            version: version_1.TUI_VERSION,
+            type: proprietary.type,
+        });
         fileSystem.commitEdits();
         (0, ng_morph_1.saveActiveProject)();
     }
-    catch (_b) { }
+    catch (_a) { }
 }
 exports.migrateProprietary = migrateProprietary;
 function replaceScopePackages() {
@@ -57,9 +62,5 @@ function removeProprietaryPackages(fileSystem) {
         '@taiga-ui/proprietary-tds-icons',
         '@taiga-ui/proprietary-tds-palette',
     ].forEach((name) => (0, ng_morph_1.removePackageJsonDependency)(fileSystem.tree, name));
-    (0, ng_morph_1.addPackageJsonDependency)(fileSystem.tree, {
-        name: '@taiga-ui/proprietary',
-        version: version_1.TUI_VERSION,
-    });
 }
 exports.removeProprietaryPackages = removeProprietaryPackages;