@taiga-ui/cdk 2.49.0 → 2.49.1

package/schematics/ng-update/steps/migrate-templates.js

@@ -2,42 +2,52 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const get_component_templates_1 = require("../../utils/templates/get-component-templates");
 const templates_1 = require("../constants/templates");
-const schematics_1 = require("@angular/cdk/schematics");
 const elements_1 = require("../../utils/templates/elements");
 const devkit_file_system_1 = require("ng-morph/project/classes/devkit-file-system");
+const ng_component_input_manipulations_1 = require("../../utils/templates/ng-component-input-manipulations");
+const template_resource_1 = require("../../utils/templates/template-resource");
 const START_TAG_OFFSET = 1;
 const END_TAG_OFFSET = 2;
 function migrateTemplates(tree) {
     const templateResources = get_component_templates_1.getComponentTemplates('**/**');
     const fileSystem = new devkit_file_system_1.DevkitFileSystem(tree);
     templateResources.forEach((resource) => {
-        if ('template' in resource) {
-            const template = resource.template;
-            const path = fileSystem.resolve(resource.componentPath);
-            const recorder = fileSystem.edit(path);
-            processTemplateUrl(template, recorder, resource.offset);
-        }
-        else {
-            const path = fileSystem.resolve(resource.templatePath);
-            const template = fileSystem.read(path);
-            const recorder = fileSystem.edit(path);
-            processTemplateUrl(template, recorder);
-        }
+        const path = fileSystem.resolve(template_resource_1.getPathFromTemplateResource(resource));
+        const template = template_resource_1.getTemplateFromTemplateResource(resource, fileSystem);
+        const recorder = fileSystem.edit(path);
+        const offset = template_resource_1.getTemplateOffset(resource);
+        replaceTags(template, recorder, offset);
+        replaceAttrs(template, recorder, offset);
+        replaceAttrsByDirective(fileSystem, resource);
         fileSystem.commitEdits();
     });
 }
 exports.migrateTemplates = migrateTemplates;
-function processTemplateUrl(template, recorder, templateOffset = 0) {
+function replaceAttrsByDirective(fileSystem, templateResource) {
+    templates_1.ATTR_TO_DIRECTIVE.forEach(({ componentSelector, directiveModule, directive, inputProperty }) => {
+        ng_component_input_manipulations_1.replaceInputPropertyByDirective({
+            componentSelector,
+            directiveModule,
+            directive,
+            inputProperty,
+            fileSystem,
+            templateResource,
+        });
+    });
+}
+function replaceAttrs(template, recorder, templateOffset = 0) {
     templates_1.ATTRS_TO_REPLACE.forEach(({ from, to }) => {
         const offsets = [
-            ...schematics_1.findAttributeOnElementWithTag(template, from.attrName, from.withTagNames || []),
-            ...schematics_1.findAttributeOnElementWithAttrs(template, from.attrName, from.withAttrsNames || []),
+            ...elements_1.findAttributeOnElementWithTag(template, from.attrName, from.withTagNames || []),
+            ...elements_1.findAttributeOnElementWithAttrs(template, from.attrName, from.withAttrsNames || []),
         ];
         offsets.forEach(offset => {
             recorder.remove(offset + templateOffset, from.attrName.length + (to.attrName.length ? 0 : 1));
             recorder.insertRight(offset + templateOffset, to.attrName);
         });
     });
+}
+function replaceTags(template, recorder, templateOffset = 0) {
     templates_1.TAGS_TO_REPLACE.forEach(({ from, to, addAttributes }) => {
         const elements = elements_1.findElementsByTagName(template, from);
         elements.forEach(({ sourceCodeLocation }) => {

package/schematics/ng-update/steps/remove-module.d.ts

@@ -0,0 +1,2 @@
+export declare function removeModules(): void;
+export declare function removeModule(name: string, moduleSpecifier: string): void;

package/schematics/ng-update/steps/remove-module.js

@@ -0,0 +1,24 @@
+"use strict";
+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 import_manipulations_1 = require("../../utils/import-manipulations");
+const modules_1 = require("../constants/modules");
+function removeModules() {
+    modules_1.REMOVED_MODULES.forEach(({ name, moduleSpecifier }) => removeModule(name, moduleSpecifier));
+}
+exports.removeModules = removeModules;
+function removeModule(name, moduleSpecifier) {
+    const references = get_named_import_references_1.getNamedImportReferences(name, moduleSpecifier);
+    references.forEach(ref => {
+        const parent = ref.getParent();
+        if (ng_morph_1.Node.isImportSpecifier(parent)) {
+            import_manipulations_1.removeImport(parent);
+        }
+        else if (ng_morph_1.Node.isArrayLiteralExpression(parent)) {
+            const index = parent.getElements().findIndex(el => el.getText() === name);
+            parent.removeElement(index);
+        }
+    });
+}
+exports.removeModule = removeModule;

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

@@ -11,7 +11,7 @@ function replaceConsts() {
 exports.replaceConsts = replaceConsts;
 function replaceConst({ from, to }) {
     const references = get_named_import_references_1.getNamedImportReferences(from.name, from.moduleSpecifier);
-    for (let ref of references) {
+    references.forEach(ref => {
         const parent = ref.getParent();
         if (ng_morph_1.Node.isImportSpecifier(parent)) {
             import_manipulations_1.removeImport(parent);
@@ -20,6 +20,6 @@ function replaceConst({ from, to }) {
         else {
             ref === null || ref === void 0 ? void 0 : ref.replaceWithText(to.name);
         }
-    }
+    });
 }
 exports.replaceConst = replaceConst;

package/schematics/utils/add-unique-import.js

@@ -16,7 +16,7 @@ function addUniqueImport(filePath, namedImport, moduleSpecifier) {
         const modules = existingDeclaration[0]
             .getNamedImports()
             .map(namedImport => namedImport.getText());
-        ng_morph_1.editImports(existingDeclaration, () => ({
+        ng_morph_1.editImports(existingDeclaration[0], () => ({
             namedImports: [...modules, namedImport],
         }));
         return;

package/schematics/utils/templates/elements.d.ts

@@ -1,2 +1,19 @@
 import { Element } from 'parse5';
 export declare function findElementsByTagName(html: string, tagName: string): Element[];
+/**
+ * Parses a HTML fragment and traverses all AST nodes in order find elements that
+ * include the specified attribute.
+ */
+export declare function findElementsWithAttribute(html: string, attributeName: string): Element[];
+/**
+ * Finds elements with explicit tag names that also contain the specified attribute. Returns the
+ * attribute start offset based on the specified HTML.
+ */
+export declare function findAttributeOnElementWithTag(html: string, name: string, tagNames: string[]): number[];
+/**
+ * Finds elements that contain the given attribute and contain at least one of the other
+ * specified attributes. Returns the primary attribute's start offset based on the specified HTML.
+ */
+export declare function findAttributeOnElementWithAttrs(html: string, name: string, attrs: string[]): number[];
+/** Gets the start offset of the given attribute from a Parse5 element. */
+export declare function getStartOffsetOfAttribute(element: Element, attributeName: string): number;

package/schematics/utils/templates/elements.js

@@ -19,3 +19,58 @@ function findElementsByTagName(html, tagName) {
     return elements;
 }
 exports.findElementsByTagName = findElementsByTagName;
+/**
+ * Parses a HTML fragment and traverses all AST nodes in order find elements that
+ * include the specified attribute.
+ */
+function findElementsWithAttribute(html, attributeName) {
+    const document = parse5_1.parseFragment(html, { sourceCodeLocationInfo: true });
+    const elements = [];
+    const visitNodes = (nodes) => {
+        nodes.forEach(n => {
+            var _a;
+            const node = n;
+            if (node.childNodes) {
+                visitNodes(node.childNodes);
+            }
+            if ((_a = node.attrs) === null || _a === void 0 ? void 0 : _a.some(attr => attr.name === attributeName.toLowerCase())) {
+                elements.push(node);
+            }
+        });
+    };
+    visitNodes(document.childNodes);
+    return elements;
+}
+exports.findElementsWithAttribute = findElementsWithAttribute;
+/**
+ * Finds elements with explicit tag names that also contain the specified attribute. Returns the
+ * attribute start offset based on the specified HTML.
+ */
+function findAttributeOnElementWithTag(html, name, tagNames) {
+    return findElementsWithAttribute(html, name)
+        .filter(element => tagNames.includes(element.tagName))
+        .map(element => getStartOffsetOfAttribute(element, name));
+}
+exports.findAttributeOnElementWithTag = findAttributeOnElementWithTag;
+/**
+ * Finds elements that contain the given attribute and contain at least one of the other
+ * specified attributes. Returns the primary attribute's start offset based on the specified HTML.
+ */
+function findAttributeOnElementWithAttrs(html, name, attrs) {
+    return findElementsWithAttribute(html, name)
+        .filter(element => attrs.some(attr => hasElementAttribute(element, attr)))
+        .map(element => getStartOffsetOfAttribute(element, name));
+}
+exports.findAttributeOnElementWithAttrs = findAttributeOnElementWithAttrs;
+/** Shorthand function that checks if the specified element contains the given attribute. */
+function hasElementAttribute(element, attributeName) {
+    return (element.attrs &&
+        element.attrs.some(attr => attr.name === attributeName.toLowerCase()));
+}
+/** Gets the start offset of the given attribute from a Parse5 element. */
+function getStartOffsetOfAttribute(element, attributeName) {
+    var _a, _b;
+    return ((((_a = element.sourceCodeLocation) === null || _a === void 0 ? void 0 : _a.attrs) && ((_b = element.sourceCodeLocation.attrs[attributeName.toLowerCase()]) === null || _b === void 0 ? void 0 : _b.startOffset)) ||
+        0);
+}
+exports.getStartOffsetOfAttribute = getStartOffsetOfAttribute;

package/schematics/utils/templates/ng-component-input-manipulations.d.ts

@@ -28,14 +28,14 @@ import { TemplateResource } from '../../ng-update/interfaces/template-resourse';
 export declare function replaceInputProperty({ templateResource, fileSystem, componentSelector, from, to, }: {
     templateResource: TemplateResource;
     fileSystem: DevkitFileSystem;
-    componentSelector: string;
+    componentSelector: string | string[];
     from: string;
     to: string;
 }): boolean;
 export declare function replaceInputPropertyByDirective({ templateResource, fileSystem, componentSelector, inputProperty, directive, directiveModule, }: {
     templateResource: TemplateResource;
     fileSystem: DevkitFileSystem;
-    componentSelector: string;
+    componentSelector: string | string[];
     inputProperty: string;
     directive: string;
     directiveModule?: {

package/schematics/utils/templates/ng-component-input-manipulations.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const schematics_1 = require("@angular/cdk/schematics");
 const template_resource_1 = require("./template-resource");
 const ng_component_1 = require("../angular/ng-component");
 const ng_module_1 = require("../angular/ng-module");
 const ng_morph_1 = require("ng-morph");
 const add_unique_import_1 = require("../add-unique-import");
+const elements_1 = require("./elements");
 /**
  * Replace component input property by new value
  * ___
@@ -36,12 +36,17 @@ function replaceInputProperty({ templateResource, fileSystem, componentSelector,
     const path = fileSystem.resolve(template_resource_1.getPathFromTemplateResource(templateResource));
     const recorder = fileSystem.edit(path);
     const templateOffset = template_resource_1.getTemplateOffset(templateResource);
-    const stringProperties = schematics_1.findAttributeOnElementWithTag(template, from, [
-        componentSelector,
-    ]);
-    const propertyBindings = schematics_1.findAttributeOnElementWithTag(template, `[${from}]`, [
-        componentSelector,
-    ]);
+    const selector = Array.isArray(componentSelector)
+        ? componentSelector
+        : [componentSelector];
+    const stringProperties = [
+        ...elements_1.findAttributeOnElementWithTag(template, from, selector),
+        ...elements_1.findAttributeOnElementWithAttrs(template, from, selector),
+    ];
+    const propertyBindings = [
+        ...elements_1.findAttributeOnElementWithTag(template, `[${from}]`, selector),
+        ...elements_1.findAttributeOnElementWithAttrs(template, `[${from}]`, selector),
+    ];
     if (!stringProperties.length && !propertyBindings.length) {
         return false;
     }