@skyux/packages 12.24.0 → 12.26.0

package/collection.json

@@ -16,6 +16,11 @@
       "factory": "./src/schematics/ag-grid-migrate/ag-grid-migrate.schematic",
       "schema": "./src/schematics/ag-grid-migrate/schema.json"
     },
+    "convert-definition-list-to-description-list": {
+      "description": "Convert <sky-definition-list> components to <sky-description-list> components.",
+      "factory": "./src/schematics/ng-generate/convert-definition-list-to-description-list/convert-definition-list-to-description-list.schematic",
+      "schema": "./src/schematics/ng-generate/convert-definition-list-to-description-list/schema.json"
+    },
     "polyfills": {
       "description": "Add @skyux/packages/polyfills to project config.",
       "factory": "./src/schematics/ng-generate/polyfills/polyfills.schematic",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyux/packages",
-  "version": "12.24.0",
+  "version": "12.26.0",
   "author": "Blackbaud, Inc.",
   "description": "Handles the `ng update` command for SKY UX component libraries.",
   "keywords": [
@@ -35,68 +35,68 @@
   "ng-update": {
     "migrations": "./src/schematics/migrations/migration-collection.json",
     "packageGroup": {
-      "@skyux/packages": "12.24.0",
+      "@skyux/packages": "12.26.0",
       "@blackbaud/angular-tree-component": "^1.0.0",
-      "@skyux-sdk/eslint-config": "12.24.0",
-      "@skyux-sdk/eslint-schematics": "12.24.0",
-      "@skyux-sdk/prettier-schematics": "12.24.0",
-      "@skyux-sdk/stylelint-schematics": "12.24.0",
-      "@skyux-sdk/testing": "12.24.0",
-      "@skyux/a11y": "12.24.0",
-      "@skyux/action-bars": "12.24.0",
-      "@skyux/ag-grid": "12.24.0",
-      "@skyux/angular-tree-component": "12.24.0",
-      "@skyux/animations": "12.24.0",
-      "@skyux/assets": "12.24.0",
-      "@skyux/autonumeric": "12.24.0",
-      "@skyux/avatar": "12.24.0",
-      "@skyux/code-examples": "12.24.0",
-      "@skyux/colorpicker": "12.24.0",
-      "@skyux/config": "12.24.0",
-      "@skyux/core": "12.24.0",
-      "@skyux/data-manager": "12.24.0",
-      "@skyux/datetime": "12.24.0",
-      "@skyux/docs-tools": "12.24.0",
-      "@skyux/errors": "12.24.0",
-      "@skyux/flyout": "12.24.0",
-      "@skyux/forms": "12.24.0",
-      "@skyux/grids": "12.24.0",
-      "@skyux/help-inline": "12.24.0",
-      "@skyux/i18n": "12.24.0",
-      "@skyux/icon": "12.24.0",
-      "@skyux/icons": "^8.2.0",
-      "@skyux/indicators": "12.24.0",
-      "@skyux/inline-form": "12.24.0",
-      "@skyux/layout": "12.24.0",
-      "@skyux/list-builder": "12.24.0",
-      "@skyux/list-builder-common": "12.24.0",
-      "@skyux/list-builder-view-checklist": "12.24.0",
-      "@skyux/list-builder-view-grids": "12.24.0",
-      "@skyux/lists": "12.24.0",
-      "@skyux/lookup": "12.24.0",
-      "@skyux/manifest": "12.24.0",
-      "@skyux/modals": "12.24.0",
-      "@skyux/navbar": "12.24.0",
-      "@skyux/pages": "12.24.0",
-      "@skyux/phone-field": "12.24.0",
-      "@skyux/popovers": "12.24.0",
-      "@skyux/progress-indicator": "12.24.0",
-      "@skyux/router": "12.24.0",
-      "@skyux/select-field": "12.24.0",
-      "@skyux/split-view": "12.24.0",
-      "@skyux/tabs": "12.24.0",
-      "@skyux/text-editor": "12.24.0",
-      "@skyux/theme": "12.24.0",
-      "@skyux/tiles": "12.24.0",
-      "@skyux/toast": "12.24.0",
-      "@skyux/validation": "12.24.0",
+      "@skyux-sdk/eslint-config": "12.26.0",
+      "@skyux-sdk/eslint-schematics": "12.26.0",
+      "@skyux-sdk/prettier-schematics": "12.26.0",
+      "@skyux-sdk/stylelint-schematics": "12.26.0",
+      "@skyux-sdk/testing": "12.26.0",
+      "@skyux/a11y": "12.26.0",
+      "@skyux/action-bars": "12.26.0",
+      "@skyux/ag-grid": "12.26.0",
+      "@skyux/angular-tree-component": "12.26.0",
+      "@skyux/animations": "12.26.0",
+      "@skyux/assets": "12.26.0",
+      "@skyux/autonumeric": "12.26.0",
+      "@skyux/avatar": "12.26.0",
+      "@skyux/code-examples": "12.26.0",
+      "@skyux/colorpicker": "12.26.0",
+      "@skyux/config": "12.26.0",
+      "@skyux/core": "12.26.0",
+      "@skyux/data-manager": "12.26.0",
+      "@skyux/datetime": "12.26.0",
+      "@skyux/docs-tools": "12.26.0",
+      "@skyux/errors": "12.26.0",
+      "@skyux/flyout": "12.26.0",
+      "@skyux/forms": "12.26.0",
+      "@skyux/grids": "12.26.0",
+      "@skyux/help-inline": "12.26.0",
+      "@skyux/i18n": "12.26.0",
+      "@skyux/icon": "12.26.0",
+      "@skyux/icons": "^9.0.0",
+      "@skyux/indicators": "12.26.0",
+      "@skyux/inline-form": "12.26.0",
+      "@skyux/layout": "12.26.0",
+      "@skyux/list-builder": "12.26.0",
+      "@skyux/list-builder-common": "12.26.0",
+      "@skyux/list-builder-view-checklist": "12.26.0",
+      "@skyux/list-builder-view-grids": "12.26.0",
+      "@skyux/lists": "12.26.0",
+      "@skyux/lookup": "12.26.0",
+      "@skyux/manifest": "12.26.0",
+      "@skyux/modals": "12.26.0",
+      "@skyux/navbar": "12.26.0",
+      "@skyux/pages": "12.26.0",
+      "@skyux/phone-field": "12.26.0",
+      "@skyux/popovers": "12.26.0",
+      "@skyux/progress-indicator": "12.26.0",
+      "@skyux/router": "12.26.0",
+      "@skyux/select-field": "12.26.0",
+      "@skyux/split-view": "12.26.0",
+      "@skyux/tabs": "12.26.0",
+      "@skyux/text-editor": "12.26.0",
+      "@skyux/theme": "12.26.0",
+      "@skyux/tiles": "12.26.0",
+      "@skyux/toast": "12.26.0",
+      "@skyux/validation": "12.26.0",
       "ag-grid-angular": "^33.3.2",
       "ag-grid-community": "^33.3.2",
       "ag-grid-enterprise": "^32.1.0",
       "autonumeric": "^4.10.5",
-      "eslint-config-skyux": "12.24.0",
-      "skyux-stylelint": "12.24.0",
-      "stylelint-config-skyux": "12.24.0"
+      "eslint-config-skyux": "12.26.0",
+      "skyux-stylelint": "12.26.0",
+      "stylelint-config-skyux": "12.26.0"
     }
   },
   "peerDependencies": {

package/src/schematics/migrations/migration-collection.json

@@ -1,7 +1,7 @@
 {
   "schematics": {
     "noop": {
-      "version": "12.24.0",
+      "version": "12.26.0",
       "factory": "./noop/noop.schematic",
       "description": "Update all SKY UX component packages"
     },

package/src/schematics/ng-generate/convert-definition-list-to-description-list/convert-definition-list-to-description-list.schematic.d.ts

@@ -0,0 +1,6 @@
+import { Rule } from '@angular-devkit/schematics';
+import { Schema } from './schema';
+/**
+ * Converts `<sky-definition-list>` to `<sky-description-list>`.
+ */
+export default function convertDefinitionListToDescriptionListSchematic(options: Schema): Rule;

package/src/schematics/ng-generate/convert-definition-list-to-description-list/convert-definition-list-to-description-list.schematic.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = convertDefinitionListToDescriptionListSchematic;
+const convert_definition_list_to_description_list_1 = require("../../rules/convert-definition-list-to-description-list/convert-definition-list-to-description-list");
+const workspace_1 = require("../../utility/workspace");
+/**
+ * Converts `<sky-definition-list>` to `<sky-description-list>`.
+ */
+function convertDefinitionListToDescriptionListSchematic(options) {
+    return async (tree) => {
+        const { project } = await (0, workspace_1.getRequiredProject)(tree, options.project);
+        return (0, convert_definition_list_to_description_list_1.convertDefinitionListToDescriptionList)(project.root);
+    };
+}
+//# sourceMappingURL=convert-definition-list-to-description-list.schematic.js.map

package/src/schematics/ng-generate/convert-definition-list-to-description-list/convert-definition-list-to-description-list.schematic.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convert-definition-list-to-description-list.schematic.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/ng-generate/convert-definition-list-to-description-list/convert-definition-list-to-description-list.schematic.ts"],"names":[],"mappings":";;AAUA,kEAQC;AAhBD,qKAA6J;AAC7J,uDAA6D;AAI7D;;GAEG;AACH,SAAwB,+CAA+C,CACrE,OAAe;IAEf,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,8BAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEpE,OAAO,IAAA,oFAAsC,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC,CAAC;AACJ,CAAC"}

package/src/schematics/ng-generate/convert-definition-list-to-description-list/schema.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Represents options passed via Angular CLI.
+ */
+export interface Schema {
+    /**
+     * The name of the project to convert.
+     */
+    project?: string;
+}

package/src/schematics/ng-generate/convert-definition-list-to-description-list/schema.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=schema.js.map

package/src/schematics/ng-generate/convert-definition-list-to-description-list/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/ng-generate/convert-definition-list-to-description-list/schema.ts"],"names":[],"mappings":""}

package/src/schematics/ng-generate/convert-definition-list-to-description-list/schema.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      }
+    }
+  }
+}

package/src/schematics/rules/convert-definition-list-to-description-list/convert-definition-list-to-description-list.d.ts

@@ -0,0 +1,2 @@
+import { Rule } from '@angular-devkit/schematics';
+export declare function convertDefinitionListToDescriptionList(projectPath: string): Rule;

package/src/schematics/rules/convert-definition-list-to-description-list/convert-definition-list-to-description-list.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertDefinitionListToDescriptionList = convertDefinitionListToDescriptionList;
+const schematics_1 = require("@angular/cdk/schematics");
+const eol_1 = require("@schematics/angular/utility/eol");
+const template_1 = require("../../utility/template");
+const ng_ast_1 = require("../../utility/typescript/ng-ast");
+const swap_imported_class_1 = require("../../utility/typescript/swap-imported-class");
+const visit_project_files_1 = require("../../utility/visit-project-files");
+/**
+ * Description list does not use a heading element.
+ * Create a new `<h3>` element with the heading text.
+ */
+function moveHeading(definitionList, recorder, offset, eol) {
+    const heading = (0, template_1.getElementsByTagName)('sky-definition-list-heading', definitionList)[0];
+    if ((0, template_1.isParentNode)(heading)) {
+        const headingText = schematics_1.parse5.serialize(heading);
+        const indent = ' '.repeat(definitionList.sourceCodeLocation.startTag.startCol - 1);
+        recorder.insertLeft(offset + definitionList.sourceCodeLocation.startTag.startOffset, `<h3>${headingText}</h3>${eol}${indent}`);
+        recorder.remove(offset + heading.sourceCodeLocation.startOffset, heading.sourceCodeLocation.endOffset -
+            heading.sourceCodeLocation.startOffset);
+    }
+}
+const regexpEscape = (str) => str.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+const tags = {
+    'sky-definition-list': 'sky-description-list',
+    'sky-definition-list-content': 'sky-description-list-content',
+    'sky-definition-list-label': 'sky-description-list-term',
+    'sky-definition-list-value': 'sky-description-list-description',
+};
+function definitionListTagSwap(context) {
+    return (position, oldTag, node, content) => {
+        if (position === 'open') {
+            const attributesString = content.substring(node.sourceCodeLocation.startOffset + oldTag.length + 1, node.sourceCodeLocation.startTag.endOffset);
+            if (oldTag === 'sky-definition-list') {
+                let value = `<${tags[oldTag]} mode="longDescription"`;
+                // Copy over any other attributes that are not in the new tag.
+                for (const attr of node.attrs) {
+                    // eslint-disable-next-line @cspell/spellchecker
+                    if (['labelwidth', '[labelwidth]'].includes(attr.name)) {
+                        context.logger.warn(`The "labelWidth" attribute is not supported on the <${tags[oldTag]}> component. Please review the code to ensure it still works as expected.`);
+                    }
+                    else if (attr.name === 'defaultValue'.toLowerCase()) {
+                        value += ` defaultDescription="${attr.value}"`;
+                    }
+                    else if (attr.name === '[defaultValue]'.toLowerCase()) {
+                        value += ` [defaultDescription]="${attr.value}"`;
+                    }
+                    else if (!['defaultvalue', '[defaultvalue]', 'mode'].includes(attr.name)) {
+                        const attributeText = new RegExp(`(?<=\\s)${regexpEscape(attr.name)}(="[^"]*")?`, 'di')
+                            .exec(attributesString)
+                            ?.shift();
+                        if (attributeText) {
+                            value += ` ${attributeText}`;
+                        }
+                    }
+                }
+                value += '>';
+                return value;
+            }
+            return `<${tags[oldTag]}${attributesString}`;
+        }
+        return `</${tags[oldTag]}>`;
+    };
+}
+function convertTemplate(recorder, context, content, offset = 0) {
+    const eol = (0, eol_1.getEOL)(content);
+    const fragment = (0, template_1.parseTemplate)(content);
+    const definitionLists = (0, template_1.getElementsByTagName)('sky-definition-list', fragment);
+    for (const definitionList of definitionLists) {
+        moveHeading(definitionList, recorder, offset, eol);
+        (0, template_1.swapTags)(content, recorder, offset, Object.keys(tags), definitionListTagSwap(context), definitionList);
+    }
+}
+function convertHtmlFile(tree, filePath, context) {
+    const content = tree.readText(filePath);
+    if (content.includes('<sky-definition-list')) {
+        const recorder = tree.beginUpdate(filePath);
+        convertTemplate(recorder, context, content);
+        tree.commitUpdate(recorder);
+    }
+}
+function convertTypescriptFile(tree, filePath, context) {
+    const source = (0, schematics_1.parseSourceFile)(tree, filePath);
+    const templates = (0, ng_ast_1.getInlineTemplates)(source);
+    const recorder = tree.beginUpdate(filePath);
+    if (templates.length > 0) {
+        const content = tree.readText(filePath);
+        for (const template of templates) {
+            convertTemplate(recorder, context, content.slice(template.start, template.end), template.start);
+        }
+    }
+    if ((0, schematics_1.isImported)(source, 'SkyDefinitionListModule', '@skyux/layout')) {
+        (0, swap_imported_class_1.swapImportedClass)(recorder, filePath, source, [
+            {
+                classNames: {
+                    SkyDefinitionListModule: 'SkyDescriptionListModule',
+                },
+                moduleName: '@skyux/layout',
+            },
+        ]);
+    }
+    tree.commitUpdate(recorder);
+}
+function convertDefinitionListToDescriptionList(projectPath) {
+    return (tree, context) => {
+        (0, visit_project_files_1.visitProjectFiles)(tree, projectPath, (filePath) => {
+            if (filePath.endsWith('.html')) {
+                convertHtmlFile(tree, filePath, context);
+            }
+            else if (filePath.endsWith('.ts')) {
+                convertTypescriptFile(tree, filePath, context);
+            }
+        });
+    };
+}
+//# sourceMappingURL=convert-definition-list-to-description-list.js.map

package/src/schematics/rules/convert-definition-list-to-description-list/convert-definition-list-to-description-list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convert-definition-list-to-description-list.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/rules/convert-definition-list-to-description-list/convert-definition-list-to-description-list.ts"],"names":[],"mappings":";;AA6KA,wFAYC;AAnLD,wDAA8E;AAC9E,yDAAyD;AAEzD,qDAOgC;AAChC,4DAAqE;AACrE,sFAAiF;AACjF,2EAAsE;AAEtE;;;GAGG;AACH,SAAS,WAAW,CAClB,cAAmC,EACnC,QAAwB,EACxB,MAAc,EACd,GAAW;IAEX,MAAM,OAAO,GAAG,IAAA,+BAAoB,EAClC,6BAA6B,EAC7B,cAAc,CACf,CAAC,CAAC,CAAC,CAAC;IACL,IAAI,IAAA,uBAAY,EAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,MAAM,WAAW,GAAG,mBAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CACvB,cAAc,CAAC,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,GAAG,CAAC,CACxD,CAAC;QACF,QAAQ,CAAC,UAAU,CACjB,MAAM,GAAG,cAAc,CAAC,kBAAkB,CAAC,QAAQ,CAAC,WAAW,EAC/D,OAAO,WAAW,QAAQ,GAAG,GAAG,MAAM,EAAE,CACzC,CAAC;QACF,QAAQ,CAAC,MAAM,CACb,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,WAAW,EAC/C,OAAO,CAAC,kBAAkB,CAAC,SAAS;YAClC,OAAO,CAAC,kBAAkB,CAAC,WAAW,CACzC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,YAAY,GAAG,CAAC,GAAW,EAAU,EAAE,CAC3C,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;AAE/C,MAAM,IAAI,GAAG;IACX,qBAAqB,EAAE,sBAAsB;IAC7C,6BAA6B,EAAE,8BAA8B;IAC7D,2BAA2B,EAAE,2BAA2B;IACxD,2BAA2B,EAAE,kCAAkC;CACvD,CAAC;AACX,SAAS,qBAAqB,CAC5B,OAAyB;IAEzB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QACzC,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS,CACxC,IAAI,CAAC,kBAAkB,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EACvD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,SAAS,CAC3C,CAAC;YACF,IAAI,MAAM,KAAK,qBAAqB,EAAE,CAAC;gBACrC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC;gBACtD,8DAA8D;gBAC9D,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBAC9B,gDAAgD;oBAChD,IAAI,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;wBACvD,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,uDAAuD,IAAI,CAAC,MAAM,CAAC,2EAA2E,CAC/I,CAAC;oBACJ,CAAC;yBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC;wBACtD,KAAK,IAAI,wBAAwB,IAAI,CAAC,KAAK,GAAG,CAAC;oBACjD,CAAC;yBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,WAAW,EAAE,EAAE,CAAC;wBACxD,KAAK,IAAI,0BAA0B,IAAI,CAAC,KAAK,GAAG,CAAC;oBACnD,CAAC;yBAAM,IACL,CAAC,CAAC,cAAc,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAC/D,CAAC;wBACD,MAAM,aAAa,GAAG,IAAI,MAAM,CAC9B,WAAW,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAC/C,IAAI,CACL;6BACE,IAAI,CAAC,gBAAgB,CAAC;4BACvB,EAAE,KAAK,EAAE,CAAC;wBACZ,IAAI,aAAa,EAAE,CAAC;4BAClB,KAAK,IAAI,IAAI,aAAa,EAAE,CAAC;wBAC/B,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,KAAK,IAAI,GAAG,CAAC;gBACb,OAAO,KAAK,CAAC;YACf,CAAC;YACD,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,gBAAgB,EAAE,CAAC;QAC/C,CAAC;QACD,OAAO,KAAK,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,QAAwB,EACxB,OAAyB,EACzB,OAAe,EACf,MAAM,GAAG,CAAC;IAEV,MAAM,GAAG,GAAG,IAAA,YAAM,EAAC,OAAO,CAAC,CAAC;IAC5B,MAAM,QAAQ,GAAG,IAAA,wBAAa,EAAC,OAAO,CAAC,CAAC;IACxC,MAAM,eAAe,GAAG,IAAA,+BAAoB,EAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;IAC9E,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;QAC7C,WAAW,CAAC,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QACnD,IAAA,mBAAQ,EACN,OAAO,EACP,QAAQ,EACR,MAAM,EACN,MAAM,CAAC,IAAI,CAAC,IAAI,CAA0B,EAC1C,qBAAqB,CAAC,OAAO,CAAC,EAC9B,cAAc,CACf,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CACtB,IAAU,EACV,QAAgB,EAChB,OAAyB;IAEzB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACxC,IAAI,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,SAAS,qBAAqB,CAC5B,IAAU,EACV,QAAgB,EAChB,OAAyB;IAEzB,MAAM,MAAM,GAAG,IAAA,4BAAe,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAA,2BAAkB,EAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACxC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,eAAe,CACb,QAAQ,EACR,OAAO,EACP,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,EAC3C,QAAQ,CAAC,KAAK,CACf,CAAC;QACJ,CAAC;IACH,CAAC;IACD,IAAI,IAAA,uBAAU,EAAC,MAAM,EAAE,yBAAyB,EAAE,eAAe,CAAC,EAAE,CAAC;QACnE,IAAA,uCAAiB,EAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE;YAC5C;gBACE,UAAU,EAAE;oBACV,uBAAuB,EAAE,0BAA0B;iBACpD;gBACD,UAAU,EAAE,eAAe;aAC5B;SACF,CAAC,CAAC;IACL,CAAC;IACD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC;AAED,SAAgB,sCAAsC,CACpD,WAAmB;IAEnB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,IAAA,uCAAiB,EAAC,IAAI,EAAE,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE;YAChD,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC/B,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC3C,CAAC;iBAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;YACjD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}

package/src/schematics/utility/template.d.ts

@@ -0,0 +1,14 @@
+import { UpdateRecorder } from '@angular-devkit/schematics';
+import { Element, parse5 } from '@angular/cdk/schematics';
+export type ElementWithLocation = Element & {
+    sourceCodeLocation: Required<parse5.Token.ElementLocation>;
+};
+type ParentNode = parse5.DefaultTreeAdapterTypes.ParentNode & {
+    sourceCodeLocation: Required<parse5.Token.ElementLocation>;
+};
+export type SwapTagCallback<T extends string> = (position: 'open' | 'close', tag: T, node: ElementWithLocation, content: string) => string;
+export declare function isParentNode(node: unknown): node is ParentNode;
+export declare function getElementsByTagName(tagName: string, node: Element | ParentNode): ElementWithLocation[];
+export declare function parseTemplate(template: string): ParentNode;
+export declare function swapTags<T extends string>(content: string, recorder: UpdateRecorder, offset: number, oldTags: T[], callback: SwapTagCallback<T>, ...node: (ElementWithLocation | ParentNode)[]): void;
+export {};

package/src/schematics/utility/template.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isParentNode = isParentNode;
+exports.getElementsByTagName = getElementsByTagName;
+exports.parseTemplate = parseTemplate;
+exports.swapTags = swapTags;
+const schematics_1 = require("@angular/cdk/schematics");
+function isElement(node) {
+    return !!node && typeof node === 'object' && 'tagName' in node;
+}
+function isParentNode(node) {
+    return !!node && typeof node === 'object' && 'childNodes' in node;
+}
+function getElementsByTagName(tagName, node) {
+    const elements = [];
+    const nodeQueue = [node];
+    while (nodeQueue.length) {
+        const currentNode = nodeQueue.shift();
+        if (isElement(currentNode) &&
+            currentNode.tagName.toLowerCase() === tagName.toLowerCase()) {
+            elements.push(currentNode);
+        }
+        if (isParentNode(currentNode)) {
+            nodeQueue.push(...currentNode.childNodes.filter(isElement));
+        }
+    }
+    return elements;
+}
+function parseTemplate(template) {
+    const document = schematics_1.parse5.parseFragment(template, {
+        sourceCodeLocationInfo: true,
+    });
+    if (isParentNode(document)) {
+        return document;
+    }
+    return schematics_1.parse5.parseFragment('', {
+        sourceCodeLocationInfo: true,
+    });
+}
+function swapTags(content, recorder, offset, oldTags, callback, ...node) {
+    const nodeQueue = [...node];
+    while (nodeQueue.length) {
+        const currentNode = nodeQueue.shift();
+        if (isElement(currentNode)) {
+            const tagName = currentNode.tagName.toLowerCase();
+            if (oldTags.includes(tagName)) {
+                /* istanbul ignore if */
+                if (!currentNode.sourceCodeLocation?.startTag ||
+                    !currentNode.sourceCodeLocation?.endTag) {
+                    // Skip if source code location is not available
+                    continue;
+                }
+                recorder.remove(offset + currentNode.sourceCodeLocation.startTag.startOffset, currentNode.sourceCodeLocation.startTag.endOffset -
+                    currentNode.sourceCodeLocation.startTag.startOffset);
+                recorder.insertLeft(offset + currentNode.sourceCodeLocation.startTag.startOffset, callback('open', tagName, currentNode, content));
+                recorder.remove(offset + currentNode.sourceCodeLocation.endTag.startOffset, currentNode.sourceCodeLocation.endTag.endOffset -
+                    currentNode.sourceCodeLocation.endTag.startOffset);
+                recorder.insertLeft(offset + currentNode.sourceCodeLocation.endTag.startOffset, callback('close', tagName, currentNode, content));
+            }
+        }
+        if (isParentNode(currentNode)) {
+            nodeQueue.push(...currentNode.childNodes.filter(isElement));
+        }
+    }
+}
+//# sourceMappingURL=template.js.map

package/src/schematics/utility/template.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/utility/template.ts"],"names":[],"mappings":"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"}

package/src/schematics/utility/typescript/ng-ast.d.ts

@@ -0,0 +1,5 @@
+import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
+export declare function getInlineTemplates(sourceFile: ts.SourceFile): {
+    start: number;
+    end: number;
+}[];

package/src/schematics/utility/typescript/ng-ast.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInlineTemplates = getInlineTemplates;
+const tslib_1 = require("tslib");
+const schematics_1 = require("@angular/cdk/schematics");
+const typescript_1 = tslib_1.__importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+function getInlineTemplates(sourceFile) {
+    if ((0, schematics_1.isImported)(sourceFile, 'Component', '@angular/core')) {
+        const components = (0, schematics_1.getDecoratorMetadata)(sourceFile, 'Component', '@angular/core');
+        const templates = components
+            .filter((component) => typescript_1.default.isObjectLiteralExpression(component))
+            .flatMap((component) => (0, schematics_1.getMetadataField)(component, 'template'))
+            .filter((template) => typescript_1.default.isPropertyAssignment(template));
+        if (templates.length > 0) {
+            return templates
+                .map((template) => {
+                if (typescript_1.default.isStringLiteralLike(template.initializer) ||
+                    typescript_1.default.isNoSubstitutionTemplateLiteral(template.initializer)) {
+                    return {
+                        start: template.initializer.getStart() + 1,
+                        end: template.initializer.getEnd() - 1, // Exclude quotes
+                    };
+                }
+                return undefined;
+            })
+                .filter(Boolean);
+        }
+    }
+    return [];
+}
+//# sourceMappingURL=ng-ast.js.map

package/src/schematics/utility/typescript/ng-ast.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ng-ast.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/ng-ast.ts"],"names":[],"mappings":";;AAOA,gDA+BC;;AAtCD,wDAIiC;AACjC,wIAAgG;AAEhG,SAAgB,kBAAkB,CAChC,UAAyB;IAEzB,IAAI,IAAA,uBAAU,EAAC,UAAU,EAAE,WAAW,EAAE,eAAe,CAAC,EAAE,CAAC;QACzD,MAAM,UAAU,GAAG,IAAA,iCAAoB,EACrC,UAAU,EACV,WAAW,EACX,eAAe,CAChB,CAAC;QACF,MAAM,SAAS,GAAG,UAAU;aACzB,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,oBAAE,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;aAC9D,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAA,6BAAgB,EAAC,SAAS,EAAE,UAAU,CAAC,CAAC;aAC/D,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,oBAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3D,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,SAAS;iBACb,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAChB,IACE,oBAAE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,WAAW,CAAC;oBAC5C,oBAAE,CAAC,+BAA+B,CAAC,QAAQ,CAAC,WAAW,CAAC,EACxD,CAAC;oBACD,OAAO;wBACL,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC;wBAC1C,GAAG,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,iBAAiB;qBAC1D,CAAC;gBACJ,CAAC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC;iBACD,MAAM,CAAC,OAAO,CAAqC,CAAC;QACzD,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}

package/src/schematics/utility/typescript/remove-import.d.ts

@@ -1,7 +1,7 @@
-import { Tree } from '@angular-devkit/schematics';
+import { UpdateRecorder } from '@angular-devkit/schematics';
 import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
 export interface RemoveImportOptions {
     classNames: string[];
     moduleName: string;
 }
-export declare function removeImport(tree: Tree, projectPath: string, sourceFile: ts.SourceFile, options: RemoveImportOptions): void;
+export declare function removeImport(recorder: UpdateRecorder, sourceFile: ts.SourceFile, options: RemoveImportOptions): void;

package/src/schematics/utility/typescript/remove-import.js

@@ -4,8 +4,7 @@ exports.removeImport = removeImport;
 const tslib_1 = require("tslib");
 const typescript_1 = tslib_1.__importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
-function removeImport(tree, projectPath, sourceFile, options) {
-    const recorder = tree.beginUpdate(projectPath);
+function removeImport(recorder, sourceFile, options) {
     const importDeclarations = (0, ast_utils_1.findNodes)(sourceFile, typescript_1.default.SyntaxKind.ImportDeclaration).filter((node) => typescript_1.default.isImportDeclaration(node) &&
         typescript_1.default.isStringLiteral(node.moduleSpecifier) &&
         node.moduleSpecifier.text === options.moduleName);
@@ -29,7 +28,6 @@ function removeImport(tree, projectPath, sourceFile, options) {
                 }
             }
         }
-        tree.commitUpdate(recorder);
     }
 }
 //# sourceMappingURL=remove-import.js.map

package/src/schematics/utility/typescript/remove-import.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove-import.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/remove-import.ts"],"names":[],"mappings":";;AASA,oCA+CC;;AAvDD,wIAAgG;AAChG,qEAAkE;AAOlE,SAAgB,YAAY,CAC1B,IAAU,EACV,WAAmB,EACnB,UAAyB,EACzB,OAA4B;IAE5B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,kBAAkB,GAAG,IAAA,qBAAS,EAClC,UAAU,EACV,oBAAE,CAAC,UAAU,CAAC,iBAAiB,CAChC,CAAC,MAAM,CACN,CAAC,IAAI,EAAgC,EAAE,CACrC,oBAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC;QAC5B,oBAAE,CAAC,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC;QACxC,IAAI,CAAC,eAAe,CAAC,IAAI,KAAK,OAAO,CAAC,UAAU,CACnD,CAAC;IAEF,IAAI,kBAAkB,EAAE,CAAC;QACvB,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE,CAAC;YACnD,MAAM,gBAAgB,GAAG,IAAA,qBAAS,EAChC,iBAAiB,EACjB,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CACrC,CAAC;YACF,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,EAAE,CAC/D,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CACvD,CAAC;YACF,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAM,CAC1C,CAAC,eAAe,EAAE,EAAE,CAClB,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAC1D,CAAC;YACF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5B,YAAY,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;wBACvC,MAAM,WAAW,GAAG,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;wBACzD,MAAM,WAAW,GAAG,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;wBACzD,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,CAAC,CAAC,CAAC;oBAChD,CAAC,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,MAAM,WAAW,GAAG,iBAAiB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAC3D,MAAM,WAAW,GAAG,iBAAiB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAC3D,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC"}
+{"version":3,"file":"remove-import.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/remove-import.ts"],"names":[],"mappings":";;AASA,oCA2CC;;AAnDD,wIAAgG;AAChG,qEAAkE;AAOlE,SAAgB,YAAY,CAC1B,QAAwB,EACxB,UAAyB,EACzB,OAA4B;IAE5B,MAAM,kBAAkB,GAAG,IAAA,qBAAS,EAClC,UAAU,EACV,oBAAE,CAAC,UAAU,CAAC,iBAAiB,CAChC,CAAC,MAAM,CACN,CAAC,IAAI,EAAgC,EAAE,CACrC,oBAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC;QAC5B,oBAAE,CAAC,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC;QACxC,IAAI,CAAC,eAAe,CAAC,IAAI,KAAK,OAAO,CAAC,UAAU,CACnD,CAAC;IAEF,IAAI,kBAAkB,EAAE,CAAC;QACvB,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE,CAAC;YACnD,MAAM,gBAAgB,GAAG,IAAA,qBAAS,EAChC,iBAAiB,EACjB,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CACrC,CAAC;YACF,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,EAAE,CAC/D,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CACvD,CAAC;YACF,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAM,CAC1C,CAAC,eAAe,EAAE,EAAE,CAClB,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAC1D,CAAC;YACF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5B,YAAY,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;wBACvC,MAAM,WAAW,GAAG,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;wBACzD,MAAM,WAAW,GAAG,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;wBACzD,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,GAAG,CAAC,CAAC,CAAC;oBAChD,CAAC,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,MAAM,WAAW,GAAG,iBAAiB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAC3D,MAAM,WAAW,GAAG,iBAAiB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAC3D,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}

package/src/schematics/utility/typescript/swap-imported-class.d.ts

@@ -1,8 +1,8 @@
-import { Tree } from '@angular-devkit/schematics';
+import { UpdateRecorder } from '@angular-devkit/schematics';
 import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
 export interface SwapImportedClassOptions {
     classNames: Record<string, string>;
     moduleName: string;
     filter?: (node: ts.Identifier) => boolean;
 }
-export declare function swapImportedClass(tree: Tree, filePath: string, sourceFile: ts.SourceFile, options: SwapImportedClassOptions[]): void;
+export declare function swapImportedClass(recorder: UpdateRecorder, filePath: string, sourceFile: ts.SourceFile, options: SwapImportedClassOptions[]): void;

package/src/schematics/utility/typescript/swap-imported-class.js

@@ -15,14 +15,12 @@ function swapReference(recorder, reference, newClassName) {
     recorder.remove(start, reference.getWidth());
     recorder.insertRight(start, newClassName);
 }
-function swapImportedClass(tree, filePath, sourceFile, options) {
+function swapImportedClass(recorder, filePath, sourceFile, options) {
     const applicableOptions = options.filter((option) => Object.keys(option.classNames).some((className) => (0, schematics_1.isImported)(sourceFile, className, option.moduleName)));
     if (applicableOptions.length === 0) {
         return;
     }
     const endOfImports = (0, ast_utils_1.findNodes)(sourceFile, typescript_1.default.SyntaxKind.ImportDeclaration).reduce((max, node) => Math.max(max, node.getEnd()), 0);
-    const recorder = tree.beginUpdate(filePath);
-    const addImports = {};
     const removeImports = {};
     applicableOptions.forEach(({ classNames, moduleName, filter }) => {
         Object.entries(classNames).forEach(([oldClassName, newClassName]) => {
@@ -31,24 +29,35 @@ function swapImportedClass(tree, filePath, sourceFile, options) {
             referencesFiltered.forEach((reference) => {
                 swapReference(recorder, reference, newClassName);
             });
-            if (referencesFiltered.length > 0 &&
-                !(0, schematics_1.isImported)(sourceFile, newClassName, moduleName)) {
-                addImports[moduleName] ??= [];
-                addImports[moduleName].push(newClassName);
-            }
-            if (referencesFiltered.length === referencesInCode.length) {
-                removeImports[moduleName] ??= [];
-                removeImports[moduleName].push(oldClassName);
+            if (referencesFiltered.length > 0) {
+                const allReferencesToBeReplaced = referencesFiltered.length === referencesInCode.length;
+                if (!(0, schematics_1.isImported)(sourceFile, newClassName, moduleName)) {
+                    if (allReferencesToBeReplaced) {
+                        const referencesInImport = findReferences(sourceFile, oldClassName).filter((reference) => reference.getEnd() < endOfImports);
+                        /* istanbul ignore if */
+                        if (referencesInImport.length !== 1) {
+                            throw new Error(`Expected exactly one import for ${oldClassName} from ${moduleName}, found ${referencesInImport.length}.`);
+                        }
+                        swapReference(recorder, referencesInImport[0], newClassName);
+                    }
+                    else {
+                        (0, change_1.applyToUpdateRecorder)(recorder, [
+                            (0, ast_utils_1.insertImport)(sourceFile, filePath, newClassName, moduleName),
+                        ]);
+                    }
+                }
+                else {
+                    if (allReferencesToBeReplaced) {
+                        removeImports[moduleName] ??= [];
+                        removeImports[moduleName].push(oldClassName);
+                    }
+                }
             }
         });
     });
-    const changes = Object.entries(addImports).flatMap(([moduleName, classNames]) => classNames.map((className) => (0, ast_utils_1.insertImport)(sourceFile, filePath, className, moduleName)));
-    (0, change_1.applyToUpdateRecorder)(recorder, changes);
-    tree.commitUpdate(recorder);
     const removeImportEntries = Object.entries(removeImports);
     if (removeImportEntries.length > 0) {
-        const sourceFileAfterChanges = typescript_1.default.createSourceFile(filePath, tree.readText(filePath), typescript_1.default.ScriptTarget.Latest, true);
-        removeImportEntries.forEach(([moduleName, classNames]) => (0, remove_import_1.removeImport)(tree, filePath, sourceFileAfterChanges, {
+        removeImportEntries.forEach(([moduleName, classNames]) => (0, remove_import_1.removeImport)(recorder, sourceFile, {
             classNames,
             moduleName,
         }));

package/src/schematics/utility/typescript/swap-imported-class.js.map

@@ -1 +1 @@
-{"version":3,"file":"swap-imported-class.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/swap-imported-class.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"swap-imported-class.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/swap-imported-class.ts"],"names":[],"mappings":";;AAkCA,8CAwEC;;AAzGD,wDAAqD;AACrD,wIAAgG;AAChG,qEAAgF;AAChF,+DAA2E;AAE3E,mDAA+C;AAQ/C,SAAS,cAAc,CACrB,UAAyB,EACzB,SAAiB;IAEjB,OAAO,IAAA,qBAAS,EAAC,UAAU,EAAE,oBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,MAAM,CAC3D,CAAC,IAAI,EAAyB,EAAE,CAC9B,oBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CACnD,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CACpB,QAAwB,EACxB,SAAwB,EACxB,YAAoB;IAEpB,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;IACnC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7C,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;AAC5C,CAAC;AAED,SAAgB,iBAAiB,CAC/B,QAAwB,EACxB,QAAgB,EAChB,UAAyB,EACzB,OAAmC;IAEnC,MAAM,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAClD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAChD,IAAA,uBAAU,EAAC,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,CACrD,CACF,CAAC;IACF,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO;IACT,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,qBAAS,EAC5B,UAAU,EACV,oBAAE,CAAC,UAAU,CAAC,iBAAiB,CAChC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAEzD,MAAM,aAAa,GAA6B,EAAE,CAAC;IACnD,iBAAiB,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE;QAC/D,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,EAAE,YAAY,CAAC,EAAE,EAAE;YAClE,MAAM,gBAAgB,GAAG,cAAc,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,MAAM,CACtE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,YAAY,CACnD,CAAC;YACF,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,MAAM,CAChD,MAAM,IAAI,CAAC,GAAY,EAAE,CAAC,IAAI,CAAC,CAChC,CAAC;YACF,kBAAkB,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBACvC,aAAa,CAAC,QAAQ,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;YACH,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAClC,MAAM,yBAAyB,GAC7B,kBAAkB,CAAC,MAAM,KAAK,gBAAgB,CAAC,MAAM,CAAC;gBACxD,IAAI,CAAC,IAAA,uBAAU,EAAC,UAAU,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC;oBACtD,IAAI,yBAAyB,EAAE,CAAC;wBAC9B,MAAM,kBAAkB,GAAG,cAAc,CACvC,UAAU,EACV,YAAY,CACb,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,YAAY,CAAC,CAAC;wBAC3D,wBAAwB;wBACxB,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;4BACpC,MAAM,IAAI,KAAK,CACb,mCAAmC,YAAY,SAAS,UAAU,WAAW,kBAAkB,CAAC,MAAM,GAAG,CAC1G,CAAC;wBACJ,CAAC;wBACD,aAAa,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;oBAC/D,CAAC;yBAAM,CAAC;wBACN,IAAA,8BAAqB,EAAC,QAAQ,EAAE;4BAC9B,IAAA,wBAAY,EAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,CAAC;yBAC7D,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,IAAI,yBAAyB,EAAE,CAAC;wBAC9B,aAAa,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;wBACjC,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBAC/C,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1D,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,CACvD,IAAA,4BAAY,EAAC,QAAQ,EAAE,UAAU,EAAE;YACjC,UAAU;YACV,UAAU;SACX,CAAC,CACH,CAAC;IACJ,CAAC;AACH,CAAC"}

package/src/version.js

@@ -19,5 +19,5 @@ exports.Version = Version;
 /**
  * Represents the version of @skyux/core.
  */
-exports.VERSION = new Version('12.24.0');
+exports.VERSION = new Version('12.26.0');
 //# sourceMappingURL=version.js.map