@taiga-ui/cdk 3.51.0-canary.2b8d4a0 → 3.51.0-canary.6291033

package/schematics/ng-update/v4/steps/replace-thumbnail-card.js

@@ -1,58 +1,86 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceThumbnailCard = void 0;
-const ng_morph_1 = require("ng-morph");
+exports.replaceReferenceTypes = exports.replaceThumbnailCard = void 0;
 const constants_1 = require("../../../constants");
 const colored_log_1 = require("../../../utils/colored-log");
-const project_root_1 = require("../../../utils/project-root");
-const replace_tag_1 = require("../../../utils/replace-tag");
 const elements_1 = require("../../../utils/templates/elements");
 const get_component_templates_1 = require("../../../utils/templates/get-component-templates");
 const template_resource_1 = require("../../../utils/templates/template-resource");
-const get_file_system_1 = require("../../utils/get-file-system");
-const replace_text_1 = require("../../utils/replace-text");
-function replaceThumbnailCard(options) {
-    return (tree, _) => {
-        const fileSystem = get_file_system_1.getFileSystem(tree);
-        replaceCardTag(options, fileSystem);
-        replaceReferenceTypes(options, fileSystem);
-        !options[`skip-logs`] && colored_log_1.titleLog(`${colored_log_1.FINISH_SYMBOL} successfully migrated \n`);
-    };
+const replace_identifier_1 = require("../../steps/replace-identifier");
+const remove_inputs_1 = require("../../utils/templates/remove-inputs");
+const replace_tags_1 = require("../../utils/templates/replace-tags");
+function replaceThumbnailCard(options, fileSystem) {
+    replaceCardTemplate(options, fileSystem);
+    replaceReferenceTypes(options);
+    !options[`skip-logs`] && colored_log_1.titleLog(`${colored_log_1.FINISH_SYMBOL} successfully migrated \n`);
 }
 exports.replaceThumbnailCard = replaceThumbnailCard;
-function replaceCardTag(options, fileSystem) {
+function replaceCardTemplate(options, fileSystem) {
     !options[`skip-logs`] &&
         colored_log_1.infoLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} replacing <tui-card /> to <tui-thumbnail-card />`);
     const templateResources = get_component_templates_1.getComponentTemplates(constants_1.ALL_TS_FILES);
     for (const resource of templateResources) {
         const template = template_resource_1.getTemplateFromTemplateResource(resource, fileSystem);
-        const elements = elements_1.findElementsByTagName(template, `tui-card`);
+        const templateOffset = template_resource_1.getTemplateOffset(resource);
         const path = fileSystem.resolve(template_resource_1.getPathFromTemplateResource(resource));
         const recorder = fileSystem.edit(path);
-        elements.forEach(({ sourceCodeLocation }) => {
-            if (sourceCodeLocation) {
-                replace_tag_1.replaceTag(recorder, sourceCodeLocation, `tui-card`, `tui-thumbnail-card`);
-            }
+        replace_tags_1.replaceTags({
+            resource,
+            recorder,
+            fileSystem,
+            replaceableItems: [{ from: `tui-card`, to: `tui-thumbnail-card` }],
+        });
+        replaceCardInputs({ template, recorder, templateOffset });
+        remove_inputs_1.removeInputs({
+            resource,
+            recorder,
+            fileSystem,
+            replaceableItems: [
+                { inputName: `active`, tags: [`tui-card`, `tui-thumbnail-card`] },
+            ],
         });
     }
-    fileSystem.commitEdits();
-    ng_morph_1.saveActiveProject();
-    ng_morph_1.setActiveProject(ng_morph_1.createProject(fileSystem.tree, project_root_1.projectRoot(), constants_1.ALL_FILES));
 }
-function replaceReferenceTypes(options, fileSystem) {
-    !options[`skip-logs`] &&
-        colored_log_1.infoLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} replacing TuiCard(Module|Component) to TuiThumbnailCard(Module|Component)`);
-    replace_text_1.replaceText([
+function replaceCardInputs({ template, recorder, templateOffset, }) {
+    const attrsToReplace = [
         {
-            from: `TuiCardModule`,
-            to: `TuiThumbnailCardModule`,
+            from: {
+                attrName: `brandLogo`,
+                withTagNames: [`tui-card`, `tui-thumbnail-card`],
+            },
+            to: { attrName: `iconLeft` },
         },
         {
-            from: `TuiCardComponent`,
-            to: `TuiThumbnailCardComponent`,
+            from: {
+                attrName: `[brandLogo]`,
+                withTagNames: [`tui-card`, `tui-thumbnail-card`],
+            },
+            to: { attrName: `[iconLeft]` },
+        },
+    ];
+    for (const { from, to } of attrsToReplace) {
+        const offsets = [
+            ...elements_1.findAttributeOnElementWithTag(template, from.attrName, from.withTagNames || []),
+        ];
+        offsets.forEach(offset => {
+            recorder.remove(offset + templateOffset, from.attrName.length);
+            recorder.insertRight(offset + templateOffset, to.attrName);
+        });
+    }
+}
+function replaceReferenceTypes(options) {
+    !options[`skip-logs`] &&
+        colored_log_1.infoLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} replacing TuiCard(Module|Component) to TuiThumbnailCard(Module|Component)`);
+    replace_identifier_1.replaceIdentifier({
+        from: { name: `TuiCardModule`, moduleSpecifier: `@taiga-ui/addon-commerce` },
+        to: { name: `TuiThumbnailCardModule`, moduleSpecifier: `@taiga-ui/addon-commerce` },
+    });
+    replace_identifier_1.replaceIdentifier({
+        from: { name: `TuiCardComponent`, moduleSpecifier: `@taiga-ui/addon-commerce` },
+        to: {
+            name: `TuiThumbnailCardComponent`,
+            moduleSpecifier: `@taiga-ui/addon-commerce`,
         },
-    ]);
-    fileSystem.commitEdits();
-    ng_morph_1.saveActiveProject();
-    ng_morph_1.setActiveProject(ng_morph_1.createProject(fileSystem.tree, project_root_1.projectRoot(), constants_1.ALL_FILES));
+    });
 }
+exports.replaceReferenceTypes = replaceReferenceTypes;

package/schematics/ng-update/v4/steps/restore-tui-mapper.d.ts

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

package/schematics/ng-update/v4/steps/restore-tui-mapper.js

@@ -2,83 +2,39 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.restoreTuiMapper = void 0;
 const ng_morph_1 = require("ng-morph");
-const ts_morph_1 = require("ts-morph");
-const constants_1 = require("../../../constants");
 const colored_log_1 = require("../../../utils/colored-log");
-const project_root_1 = require("../../../utils/project-root");
-const get_file_system_1 = require("../../utils/get-file-system");
-const replace_substrings_1 = require("./utils/replace-substrings");
+const get_named_import_references_1 = require("../../../utils/get-named-import-references");
+const replace_identifier_1 = require("../../steps/replace-identifier");
 function restoreTuiMapper(options) {
-    return (tree, _) => {
-        const fileSystem = get_file_system_1.getFileSystem(tree);
-        updateTuiMapper(options, fileSystem);
-        renameTuiTypedMapper(options, fileSystem);
-        !options[`skip-logs`] && colored_log_1.titleLog(`${colored_log_1.FINISH_SYMBOL} successfully migrated \n`);
-    };
+    updateTuiMapper(options);
+    renameTuiTypedMapper(options);
+    !options[`skip-logs`] && colored_log_1.titleLog(`${colored_log_1.FINISH_SYMBOL} successfully migrated \n`);
 }
 exports.restoreTuiMapper = restoreTuiMapper;
-function updateTuiMapper(options, fileSystem) {
+function updateTuiMapper(options) {
     !options[`skip-logs`] &&
         colored_log_1.infoLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} updating TuiMapper typing to the typed version`);
-    ng_morph_1.getSourceFiles(constants_1.ALL_TS_FILES).forEach(sourceFile => {
-        const replacements = findTuiMapperFirstTypeArgReplacements(sourceFile);
-        const sourceText = sourceFile.getFullText();
-        const transformed = replace_substrings_1.replaceSubstrings(sourceText, replacements);
-        sourceFile.replaceWithText(transformed);
-    });
-    fileSystem.commitEdits();
-    ng_morph_1.saveActiveProject();
-    ng_morph_1.setActiveProject(ng_morph_1.createProject(fileSystem.tree, project_root_1.projectRoot(), constants_1.ALL_FILES));
-}
-function findTuiMapperFirstTypeArgReplacements(sourceFile) {
-    const replacements = [];
-    sourceFile.transform(traversal => {
-        const node = traversal.visitChildren();
-        if (!ts_morph_1.ts.isTypeReferenceNode(node) || node.typeName.getText() !== `TuiMapper`) {
-            return node;
+    const refs = get_named_import_references_1.getNamedImportReferences(`TuiMapper`, `@taiga-ui/cdk`);
+    for (const ref of refs) {
+        if (ref.wasForgotten()) {
+            return;
         }
-        const typeArguments = node.typeArguments;
-        if (!typeArguments || typeArguments.length !== 2) {
-            return node;
+        const parent = ref.getParent();
+        if (ng_morph_1.Node.isTypeReference(parent)) {
+            const typeArguments = parent.getTypeArguments();
+            if (!typeArguments || typeArguments.length !== 2) {
+                return;
+            }
+            const [inputType] = typeArguments;
+            inputType.replaceWithText(`[${inputType.getText()}, ...any]`);
         }
-        const [inputType] = typeArguments;
-        replacements.push({
-            start: inputType.getStart(),
-            from: inputType.getText(),
-            to: `[${inputType.getText()}, ...any]`,
-        });
-        return node;
-    });
-    return replacements;
+    }
 }
-function renameTuiTypedMapper(options, fileSystem) {
+function renameTuiTypedMapper(options) {
     !options[`skip-logs`] &&
         colored_log_1.infoLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} renaming TuiTypedMapper to TuiMapper`);
-    ng_morph_1.getSourceFiles(constants_1.ALL_TS_FILES).forEach(sourceFile => {
-        const replacements = findTuiTypedMapperReplacements(sourceFile);
-        const sourceText = sourceFile.getFullText();
-        const transformed = replace_substrings_1.replaceSubstrings(sourceText, replacements);
-        sourceFile.replaceWithText(transformed);
-        sourceFile.organizeImports();
-    });
-    fileSystem.commitEdits();
-    ng_morph_1.saveActiveProject();
-    ng_morph_1.setActiveProject(ng_morph_1.createProject(fileSystem.tree, project_root_1.projectRoot(), constants_1.ALL_FILES));
-}
-function findTuiTypedMapperReplacements(sourceFile) {
-    const replacements = [];
-    sourceFile.transform(traversal => {
-        const node = traversal.visitChildren();
-        if (!ts_morph_1.ts.isTypeReferenceNode(node) ||
-            node.typeName.getText() !== `TuiTypedMapper`) {
-            return node;
-        }
-        replacements.push({
-            start: node.getStart(),
-            from: `TuiTypedMapper`,
-            to: `TuiMapper`,
-        });
-        return node;
+    replace_identifier_1.replaceIdentifier({
+        from: { name: `TuiTypedMapper`, moduleSpecifier: `@taiga-ui/cdk` },
+        to: { name: `TuiMapper`, moduleSpecifier: `@taiga-ui/cdk` },
     });
-    return replacements;
 }

package/schematics/ng-update/v4/steps/restore-tui-matcher.d.ts

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

package/schematics/ng-update/v4/steps/restore-tui-matcher.js

@@ -2,83 +2,39 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.restoreTuiMatcher = void 0;
 const ng_morph_1 = require("ng-morph");
-const ts_morph_1 = require("ts-morph");
-const constants_1 = require("../../../constants");
 const colored_log_1 = require("../../../utils/colored-log");
-const project_root_1 = require("../../../utils/project-root");
-const get_file_system_1 = require("../../utils/get-file-system");
-const replace_substrings_1 = require("./utils/replace-substrings");
+const get_named_import_references_1 = require("../../../utils/get-named-import-references");
+const replace_identifier_1 = require("../../steps/replace-identifier");
 function restoreTuiMatcher(options) {
-    return (tree, _) => {
-        const fileSystem = get_file_system_1.getFileSystem(tree);
-        updateTuiMatcher(options, fileSystem);
-        renameTuiTypedMatcher(options, fileSystem);
-        !options[`skip-logs`] && colored_log_1.titleLog(`${colored_log_1.FINISH_SYMBOL} successfully migrated \n`);
-    };
+    updateTuiMatcher(options);
+    renameTuiTypedMatcher(options);
+    !options[`skip-logs`] && colored_log_1.titleLog(`${colored_log_1.FINISH_SYMBOL} successfully migrated \n`);
 }
 exports.restoreTuiMatcher = restoreTuiMatcher;
-function updateTuiMatcher(options, fileSystem) {
+function updateTuiMatcher(options) {
     !options[`skip-logs`] &&
         colored_log_1.infoLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} updating TuiMatcher typing to the typed version`);
-    ng_morph_1.getSourceFiles(constants_1.ALL_TS_FILES).forEach(sourceFile => {
-        const replacements = findTuiMatcherFirstTypeArgReplacements(sourceFile);
-        const sourceText = sourceFile.getFullText();
-        const transformed = replace_substrings_1.replaceSubstrings(sourceText, replacements);
-        sourceFile.replaceWithText(transformed);
-    });
-    fileSystem.commitEdits();
-    ng_morph_1.saveActiveProject();
-    ng_morph_1.setActiveProject(ng_morph_1.createProject(fileSystem.tree, project_root_1.projectRoot(), constants_1.ALL_FILES));
-}
-function findTuiMatcherFirstTypeArgReplacements(sourceFile) {
-    const replacements = [];
-    sourceFile.transform(traversal => {
-        const node = traversal.visitChildren();
-        if (!ts_morph_1.ts.isTypeReferenceNode(node) || node.typeName.getText() !== `TuiMatcher`) {
-            return node;
+    const refs = get_named_import_references_1.getNamedImportReferences(`TuiMatcher`, `@taiga-ui/cdk`);
+    for (const ref of refs) {
+        if (ref.wasForgotten()) {
+            return;
         }
-        const typeArguments = node.typeArguments;
-        if (!typeArguments || typeArguments.length !== 1) {
-            return node;
+        const parent = ref.getParent();
+        if (ng_morph_1.Node.isTypeReference(parent)) {
+            const typeArguments = parent.getTypeArguments();
+            if (!typeArguments || typeArguments.length !== 1) {
+                return;
+            }
+            const [inputType] = typeArguments;
+            inputType.replaceWithText(`[${inputType.getText()}, ...any]`);
         }
-        const [inputType] = typeArguments;
-        replacements.push({
-            start: inputType.getStart(),
-            from: inputType.getText(),
-            to: `[${inputType.getText()}, ...any]`,
-        });
-        return node;
-    });
-    return replacements;
+    }
 }
-function renameTuiTypedMatcher(options, fileSystem) {
+function renameTuiTypedMatcher(options) {
     !options[`skip-logs`] &&
         colored_log_1.infoLog(`${colored_log_1.SMALL_TAB_SYMBOL}${colored_log_1.REPLACE_SYMBOL} renaming TuiTypedMatcher to TuiMatcher`);
-    ng_morph_1.getSourceFiles(constants_1.ALL_TS_FILES).forEach(sourceFile => {
-        const replacements = findTuiTypedMatcherReplacements(sourceFile);
-        const sourceText = sourceFile.getFullText();
-        const transformed = replace_substrings_1.replaceSubstrings(sourceText, replacements);
-        sourceFile.replaceWithText(transformed);
-        sourceFile.organizeImports();
-    });
-    fileSystem.commitEdits();
-    ng_morph_1.saveActiveProject();
-    ng_morph_1.setActiveProject(ng_morph_1.createProject(fileSystem.tree, project_root_1.projectRoot(), constants_1.ALL_FILES));
-}
-function findTuiTypedMatcherReplacements(sourceFile) {
-    const replacements = [];
-    sourceFile.transform(traversal => {
-        const node = traversal.visitChildren();
-        if (!ts_morph_1.ts.isTypeReferenceNode(node) ||
-            node.typeName.getText() !== `TuiTypedMatcher`) {
-            return node;
-        }
-        replacements.push({
-            start: node.getStart(),
-            from: `TuiTypedMatcher`,
-            to: `TuiMatcher`,
-        });
-        return node;
+    replace_identifier_1.replaceIdentifier({
+        from: { name: `TuiTypedMatcher`, moduleSpecifier: `@taiga-ui/cdk` },
+        to: { name: `TuiMatcher`, moduleSpecifier: `@taiga-ui/cdk` },
     });
-    return replacements;
 }

package/schematics/utils/add-import-to-component.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addImportToComponent = void 0;
-const push_to_array_property_1 = require("ng-morph/ng/helpers/push-to-array-property");
+const ng_morph_1 = require("ng-morph");
 function addImportToComponent(classDeclaration, moduleName, { unique = true } = {}) {
-    push_to_array_property_1.pushToArrayProperty(classDeclaration, `Component`, `imports`, moduleName, {
+    ng_morph_1.pushToDecoratorArrayProperty(classDeclaration, `Component`, `imports`, moduleName, {
         unique,
         forceToArray: true,
     });

package/types/mapper.d.ts

@@ -1 +1,2 @@
-export declare type TuiMapper<T extends unknown[], G> = (...args: T) => G;
+export declare type TuiMapper<T, G> = (item: T, ...args: any[]) => G;
+export declare type TuiTypedMapper<T extends unknown[], G> = (...args: T) => G;

package/types/matcher.d.ts

@@ -1,5 +1,6 @@
 import { TuiStringHandler } from './handler';
-import { TuiMapper } from './mapper';
-export declare type TuiMatcher<I extends unknown[]> = TuiMapper<I, boolean>;
+import { TuiMapper, TuiTypedMapper } from './mapper';
+export declare type TuiMatcher<I> = TuiMapper<I, boolean>;
+export declare type TuiTypedMatcher<I extends unknown[]> = TuiTypedMapper<I, boolean>;
 export declare type TuiStringMatcher<I> = (item: I, matchValue: string, stringify: TuiStringHandler<I>) => boolean;
 export declare type TuiIdentityMatcher<I> = (item1: I, item2: I) => boolean;