@taiga-ui/cdk 2.47.0 → 2.48.0

package/schematics/ng-update/index.js

@@ -8,6 +8,7 @@ const rename_types_1 = require("./steps/rename-types");
 const replace_const_1 = require("./steps/replace-const");
 const replace_deep_import_1 = require("./steps/replace-deep-import");
 const show_warnings_1 = require("./steps/show-warnings");
+const replace_services_1 = require("./steps/replace-services");
 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}`);
@@ -16,6 +17,7 @@ function updateToV3(_) {
         replace_enums_1.replaceEnums();
         rename_types_1.renameTypes();
         replace_const_1.replaceConsts();
+        replace_services_1.replaceServices();
         show_warnings_1.showWarnings(context);
         ng_morph_1.saveActiveProject();
     });

package/schematics/ng-update/steps/rename-types.js

@@ -1,34 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const get_named_import_references_1 = require("../../utils/get-named-import-references");
 const ng_morph_1 = require("ng-morph");
+const get_named_import_references_1 = require("../../utils/get-named-import-references");
 const types_1 = require("../constants/types");
-const remove_import_1 = require("../../utils/remove-import");
+const import_manipulations_1 = require("../../utils/import-manipulations");
 function renameTypes() {
-    types_1.TYPES_TO_RENAME.forEach(({ from, to, moduleSpecifier }) => {
-        renameType(from, to, moduleSpecifier);
+    types_1.TYPES_TO_RENAME.forEach(({ from, to, moduleSpecifier, preserveGenerics }) => {
+        renameType(from, to, moduleSpecifier, preserveGenerics);
     });
 }
 exports.renameTypes = renameTypes;
-function renameType(from, to, moduleSpecifier) {
+function renameType(from, to, moduleSpecifier, preserveGenerics = false) {
     const references = get_named_import_references_1.getNamedImportReferences(from, moduleSpecifier);
     references.forEach(ref => {
         const parent = ref.getParent();
-        if (ng_morph_1.Node.isImportSpecifier(parent) && to) {
-            renameImport(parent, to, from);
-        }
-        else if (ng_morph_1.Node.isImportSpecifier(parent) && !to) {
-            remove_import_1.removeImport(parent);
+        if (ng_morph_1.Node.isImportSpecifier(parent)) {
+            processImport(parent, from, to);
         }
         else if (ng_morph_1.Node.isTypeReferenceNode(parent)) {
-            parent.replaceWithText(to || 'any');
+            const targetType = preserveGenerics && to ? addGeneric(to, parent.getTypeArguments()) : to;
+            parent.replaceWithText(targetType || 'any');
         }
     });
 }
-function renameImport(specifier, to, from) {
-    const namedImport = specifier
-        .getImportDeclaration()
-        .getNamedImports()
-        .find(specifier => specifier.getName() === from);
-    namedImport === null || namedImport === void 0 ? void 0 : namedImport.replaceWithText(to);
+function processImport(node, from, to) {
+    const filePath = node.getSourceFile().getFilePath();
+    const targetImportAlreadyExists = Boolean(ng_morph_1.getImports(filePath, { namedImports: to }).length);
+    if (to && !targetImportAlreadyExists) {
+        import_manipulations_1.renameImport(node, removeGeneric(to), removeGeneric(from));
+    }
+    else {
+        import_manipulations_1.removeImport(node);
+    }
+}
+function removeGeneric(type) {
+    return type.replace(/<.*>$/gi, '');
+}
+function addGeneric(typeName, generics) {
+    const typeArgs = generics.map(t => t.getType().getText());
+    const genericType = typeArgs.length ? `<${typeArgs.join(', ')}>` : '';
+    return typeName + genericType;
 }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const get_named_import_references_1 = require("../../utils/get-named-import-references");
 const ng_morph_1 = require("ng-morph");
-const remove_import_1 = require("../../utils/remove-import");
+const import_manipulations_1 = require("../../utils/import-manipulations");
 const add_unique_import_1 = require("../../utils/add-unique-import");
 const consts_1 = require("../constants/consts");
 function replaceConsts() {
@@ -14,7 +14,7 @@ function replaceConst({ from, to }) {
     for (let ref of references) {
         const parent = ref.getParent();
         if (ng_morph_1.Node.isImportSpecifier(parent)) {
-            remove_import_1.removeImport(parent);
+            import_manipulations_1.removeImport(parent);
             add_unique_import_1.addUniqueImport(parent.getSourceFile().getFilePath(), to.namedImport || to.name, to.moduleSpecifier);
         }
         else {

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ng_morph_1 = require("ng-morph");
 const get_named_import_references_1 = require("../../utils/get-named-import-references");
 const enums_1 = require("../constants/enums");
-const remove_import_1 = require("../../utils/remove-import");
+const import_manipulations_1 = require("../../utils/import-manipulations");
 function replaceEnums() {
     enums_1.ENUMS_TO_REPLACE.forEach(({ name, replaceValues, keepAsType }) => {
         replaceEnumWithString(name, replaceValues, keepAsType);
@@ -15,7 +15,7 @@ function replaceEnumWithString(enumName, replaceValues, keepAsType = true) {
     for (let ref of references) {
         const parent = ref.getParent();
         if (ng_morph_1.Node.isImportSpecifier(parent) && !(keepAsType && containTypeRef(parent))) {
-            remove_import_1.removeImport(parent);
+            import_manipulations_1.removeImport(parent);
             continue;
         }
         if (ng_morph_1.Node.isTypeReferenceNode(parent) && !keepAsType) {

package/schematics/ng-update/steps/replace-services.d.ts

@@ -0,0 +1 @@
+export declare function replaceServices(): void;

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

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const services_1 = require("../constants/services");
+const get_named_import_references_1 = require("../../utils/get-named-import-references");
+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));
+}
+exports.replaceServices = replaceServices;
+function replaceService({ from, to, replaceMethods }) {
+    const references = get_named_import_references_1.getNamedImportReferences(from.name, from.moduleSpecifier);
+    references.forEach(ref => {
+        const parent = ref.getParent();
+        if (ng_morph_1.Node.isImportSpecifier(parent)) {
+            import_manipulations_1.removeImport(parent);
+            add_unique_import_1.addUniqueImport(parent.getSourceFile().getFilePath(), to.namedImport || to.name, to.moduleSpecifier);
+            return;
+        }
+        if (ng_morph_1.Node.isTypeReferenceNode(parent) && (replaceMethods === null || replaceMethods === void 0 ? void 0 : replaceMethods.length)) {
+            replaceProperties(parent, replaceMethods);
+        }
+        ref.replaceWithText(to.name);
+    });
+}
+function replaceProperties(parent, replaceProperties) {
+    const statement = parent.getParent();
+    const identifier = statement.getChildrenOfKind(ng_morph_1.SyntaxKind.Identifier)[0];
+    identifier.findReferencesAsNodes().forEach(ref => {
+        let parent = ref.getParent();
+        if ((ng_morph_1.Node.isPropertyAccessExpression(parent) &&
+            parent.getText().startsWith('this.')) ||
+            ng_morph_1.Node.isCallExpression(parent)) {
+            parent = parent.getParentIfKind(ng_morph_1.SyntaxKind.PropertyAccessExpression);
+        }
+        if (ng_morph_1.Node.isPropertyAccessExpression(parent)) {
+            replaceProperty(parent, replaceProperties);
+            return;
+        }
+    });
+}
+function replaceProperty(node, properties) {
+    const identifiers = node.getChildrenOfKind(ng_morph_1.SyntaxKind.Identifier);
+    identifiers.forEach(identifier => {
+        const property = properties === null || properties === void 0 ? void 0 : properties.find(property => property.from === identifier.getText());
+        if (property) {
+            identifier.replaceWithText(property.to);
+        }
+    });
+}

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

@@ -1,18 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const ng_morph_1 = require("ng-morph");
 const warnings_1 = require("../constants/warnings");
-const get_named_import_references_1 = require("../../utils/get-named-import-references");
 function showWarnings(context) {
     warnings_1.MIGRATION_WARNINGS.forEach(warning => showWarning(warning, context));
 }
 exports.showWarnings = showWarnings;
-function showWarning({ name, message, moduleSpecifier }, { logger }) {
-    const references = get_named_import_references_1.getNamedImportReferences(name, moduleSpecifier);
-    references.forEach(reference => {
-        const file = reference.getSourceFile().getFilePath();
-        const { line, column } = reference
-            .getSourceFile()
-            .getLineAndColumnAtPos(reference.getStart());
-        logger.warn(`[WARNING]: in ${file} at line ${line}, col ${column}:  ${message}`);
+function showWarning({ name, message, moduleSpecifier = '**/**' }, { logger }) {
+    const references = ng_morph_1.getImports('**/**', {
+        moduleSpecifier,
+        namedImports: [name],
+    })
+        .map(i => { var _a; return (_a = i
+        .getNamedImports()
+        .find(namedImport => namedImport.getName() === name)) === null || _a === void 0 ? void 0 : _a.getNameNode(); })
+        .filter((namedImport) => Boolean(namedImport));
+    const referencesMeta = references.map(ref => {
+        const sourceFile = ref.getSourceFile();
+        return {
+            sourceFile,
+            filePath: sourceFile.getFilePath().toString(),
+            startLinePos: ref.getStartLinePos(),
+        };
+    });
+    /**
+     * We have to twice iterate array with refs because otherwise we get error:
+     * > Attempted to get information from a node that was removed or forgotten.
+     * See this {@link https://ts-morph.com/manipulation/#strongwarningstrong warning}
+     */
+    referencesMeta.forEach(({ sourceFile, filePath, startLinePos }) => {
+        logger.warn(`[WARNING] in ${filePath}: ${message}`);
+        sourceFile.insertText(startLinePos, `// TODO: ${message}\n`);
     });
 }

package/schematics/utils/{remove-import.d.ts → import-manipulations.d.ts}

@@ -1,2 +1,3 @@
 import { ImportSpecifier } from 'ng-morph';
 export declare function removeImport(specifier: ImportSpecifier): void;
+export declare function renameImport(specifier: ImportSpecifier, to: string, from: string): void;

package/schematics/utils/import-manipulations.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function removeImport(specifier) {
+    if (specifier.getImportDeclaration().getNamedImports().length === 1) {
+        specifier.getImportDeclaration().remove();
+    }
+    else {
+        specifier.remove();
+    }
+}
+exports.removeImport = removeImport;
+function renameImport(specifier, to, from) {
+    const namedImport = specifier
+        .getImportDeclaration()
+        .getNamedImports()
+        .find(specifier => specifier.getName() === from);
+    namedImport === null || namedImport === void 0 ? void 0 : namedImport.replaceWithText(to);
+}
+exports.renameImport = renameImport;

package/schematics/utils/remove-import.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function removeImport(specifier) {
-    if (specifier.getImportDeclaration().getNamedImports().length === 1) {
-        specifier.getImportDeclaration().remove();
-    }
-    else {
-        specifier.remove();
-    }
-}
-exports.removeImport = removeImport;