@skyux/packages 12.30.0 → 12.32.0

package/collection.json

@@ -21,6 +21,11 @@
       "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"
     },
+    "convert-page-summary-to-page-header": {
+      "description": "Convert <sky-page-summary> components to <sky-page-header> components.",
+      "factory": "./src/schematics/ng-generate/convert-page-summary-to-page-header/convert-page-summary-to-page-header.schematic",
+      "schema": "./src/schematics/ng-generate/convert-page-summary-to-page-header/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.30.0",
+  "version": "12.32.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.30.0",
+      "@skyux/packages": "12.32.0",
       "@blackbaud/angular-tree-component": "^1.0.0",
-      "@skyux-sdk/eslint-config": "12.30.0",
-      "@skyux-sdk/eslint-schematics": "12.30.0",
-      "@skyux-sdk/prettier-schematics": "12.30.0",
-      "@skyux-sdk/stylelint-schematics": "12.30.0",
-      "@skyux-sdk/testing": "12.30.0",
-      "@skyux/a11y": "12.30.0",
-      "@skyux/action-bars": "12.30.0",
-      "@skyux/ag-grid": "12.30.0",
-      "@skyux/angular-tree-component": "12.30.0",
-      "@skyux/animations": "12.30.0",
-      "@skyux/assets": "12.30.0",
-      "@skyux/autonumeric": "12.30.0",
-      "@skyux/avatar": "12.30.0",
-      "@skyux/code-examples": "12.30.0",
-      "@skyux/colorpicker": "12.30.0",
-      "@skyux/config": "12.30.0",
-      "@skyux/core": "12.30.0",
-      "@skyux/data-manager": "12.30.0",
-      "@skyux/datetime": "12.30.0",
-      "@skyux/docs-tools": "12.30.0",
-      "@skyux/errors": "12.30.0",
-      "@skyux/flyout": "12.30.0",
-      "@skyux/forms": "12.30.0",
-      "@skyux/grids": "12.30.0",
-      "@skyux/help-inline": "12.30.0",
-      "@skyux/i18n": "12.30.0",
-      "@skyux/icon": "12.30.0",
+      "@skyux-sdk/eslint-config": "12.32.0",
+      "@skyux-sdk/eslint-schematics": "12.32.0",
+      "@skyux-sdk/prettier-schematics": "12.32.0",
+      "@skyux-sdk/stylelint-schematics": "12.32.0",
+      "@skyux-sdk/testing": "12.32.0",
+      "@skyux/a11y": "12.32.0",
+      "@skyux/action-bars": "12.32.0",
+      "@skyux/ag-grid": "12.32.0",
+      "@skyux/angular-tree-component": "12.32.0",
+      "@skyux/animations": "12.32.0",
+      "@skyux/assets": "12.32.0",
+      "@skyux/autonumeric": "12.32.0",
+      "@skyux/avatar": "12.32.0",
+      "@skyux/code-examples": "12.32.0",
+      "@skyux/colorpicker": "12.32.0",
+      "@skyux/config": "12.32.0",
+      "@skyux/core": "12.32.0",
+      "@skyux/data-manager": "12.32.0",
+      "@skyux/datetime": "12.32.0",
+      "@skyux/docs-tools": "12.32.0",
+      "@skyux/errors": "12.32.0",
+      "@skyux/flyout": "12.32.0",
+      "@skyux/forms": "12.32.0",
+      "@skyux/grids": "12.32.0",
+      "@skyux/help-inline": "12.32.0",
+      "@skyux/i18n": "12.32.0",
+      "@skyux/icon": "12.32.0",
       "@skyux/icons": "^9.0.0",
-      "@skyux/indicators": "12.30.0",
-      "@skyux/inline-form": "12.30.0",
-      "@skyux/layout": "12.30.0",
-      "@skyux/list-builder": "12.30.0",
-      "@skyux/list-builder-common": "12.30.0",
-      "@skyux/list-builder-view-checklist": "12.30.0",
-      "@skyux/list-builder-view-grids": "12.30.0",
-      "@skyux/lists": "12.30.0",
-      "@skyux/lookup": "12.30.0",
-      "@skyux/manifest": "12.30.0",
-      "@skyux/modals": "12.30.0",
-      "@skyux/navbar": "12.30.0",
-      "@skyux/pages": "12.30.0",
-      "@skyux/phone-field": "12.30.0",
-      "@skyux/popovers": "12.30.0",
-      "@skyux/progress-indicator": "12.30.0",
-      "@skyux/router": "12.30.0",
-      "@skyux/select-field": "12.30.0",
-      "@skyux/split-view": "12.30.0",
-      "@skyux/tabs": "12.30.0",
-      "@skyux/text-editor": "12.30.0",
-      "@skyux/theme": "12.30.0",
-      "@skyux/tiles": "12.30.0",
-      "@skyux/toast": "12.30.0",
-      "@skyux/validation": "12.30.0",
+      "@skyux/indicators": "12.32.0",
+      "@skyux/inline-form": "12.32.0",
+      "@skyux/layout": "12.32.0",
+      "@skyux/list-builder": "12.32.0",
+      "@skyux/list-builder-common": "12.32.0",
+      "@skyux/list-builder-view-checklist": "12.32.0",
+      "@skyux/list-builder-view-grids": "12.32.0",
+      "@skyux/lists": "12.32.0",
+      "@skyux/lookup": "12.32.0",
+      "@skyux/manifest": "12.32.0",
+      "@skyux/modals": "12.32.0",
+      "@skyux/navbar": "12.32.0",
+      "@skyux/pages": "12.32.0",
+      "@skyux/phone-field": "12.32.0",
+      "@skyux/popovers": "12.32.0",
+      "@skyux/progress-indicator": "12.32.0",
+      "@skyux/router": "12.32.0",
+      "@skyux/select-field": "12.32.0",
+      "@skyux/split-view": "12.32.0",
+      "@skyux/tabs": "12.32.0",
+      "@skyux/text-editor": "12.32.0",
+      "@skyux/theme": "12.32.0",
+      "@skyux/tiles": "12.32.0",
+      "@skyux/toast": "12.32.0",
+      "@skyux/validation": "12.32.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.30.0",
-      "skyux-stylelint": "12.30.0",
-      "stylelint-config-skyux": "12.30.0"
+      "eslint-config-skyux": "12.32.0",
+      "skyux-stylelint": "12.32.0",
+      "stylelint-config-skyux": "12.32.0"
     }
   },
   "peerDependencies": {

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

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

package/src/schematics/ng-generate/convert-page-summary-to-page-header/convert-page-summary-to-page-header.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 convertPageSummaryToPageHeaderSchematic(options: Schema): Rule;

package/src/schematics/ng-generate/convert-page-summary-to-page-header/convert-page-summary-to-page-header.schematic.js

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

package/src/schematics/ng-generate/convert-page-summary-to-page-header/convert-page-summary-to-page-header.schematic.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convert-page-summary-to-page-header.schematic.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/ng-generate/convert-page-summary-to-page-header/convert-page-summary-to-page-header.schematic.ts"],"names":[],"mappings":";;AAUA,0DAQC;AAhBD,6IAAqI;AACrI,uDAA6D;AAI7D;;GAEG;AACH,SAAwB,uCAAuC,CAC7D,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,oEAA8B,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC,CAAC;AACJ,CAAC"}

package/src/schematics/ng-generate/convert-page-summary-to-page-header/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-page-summary-to-page-header/schema.js

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

package/src/schematics/ng-generate/convert-page-summary-to-page-header/schema.js.map

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

package/src/schematics/ng-generate/convert-page-summary-to-page-header/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-page-summary-to-page-header/convert-page-summary-to-page-header.d.ts

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

package/src/schematics/rules/convert-page-summary-to-page-header/convert-page-summary-to-page-header.js

@@ -0,0 +1,177 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertPageSummaryToPageHeader = convertPageSummaryToPageHeader;
+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");
+/**
+ * The page header component uses a `pageTitle` attribute for its title.
+ * Extracts the title from the `<sky-page-summary-title>` element and returns it
+ * as a string.
+ * If the title is anything more than a simple text node, an error is thrown.
+ */
+function getPageTitle(pageSummary) {
+    const heading = (0, template_1.getElementsByTagName)('sky-page-summary-title', pageSummary)[0];
+    if ((0, template_1.isParentNode)(heading) &&
+        heading.childNodes.length === 1 &&
+        heading.childNodes[0].nodeName === '#text') {
+        return heading.childNodes[0].value.trim();
+    }
+    else if (!heading) {
+        return '';
+    }
+    else {
+        // If the heading contains something other than a single text node,
+        // throw an error to indicate that the title cannot be converted.
+        throw new Error(`The '<sky-page-summary-title>' element contains additional markup that is not supported as a 'pageTitle' for the <sky-page-header> component.`);
+    }
+}
+/**
+ * Moves detail elements (subtitle, status, content, key info) from the
+ * <sky-page-summary> element to a <sky-page-header-details> element.
+ */
+function moveDetails(pageSummary, recorder, content, offset) {
+    const detailsContents = [
+        'sky-page-summary-subtitle',
+        'sky-page-summary-status',
+        'sky-page-summary-content',
+        'sky-page-summary-key-info',
+    ]
+        .flatMap((tag) => {
+        const elements = (0, template_1.getElementsByTagName)(tag, pageSummary);
+        return elements.map((element) => content
+            .substring(element.sourceCodeLocation.startTag.endOffset, element.sourceCodeLocation.endTag.startOffset)
+            .trim());
+    })
+        .filter(Boolean);
+    const indent = ' '.repeat(pageSummary.sourceCodeLocation.endTag.startCol);
+    const eol = (0, eol_1.getEOL)(content);
+    if (detailsContents.length === 1) {
+        recorder.insertLeft(pageSummary.sourceCodeLocation.endTag.startOffset + offset, [
+            `  <sky-page-header-details>`,
+            `${indent}  ${detailsContents[0].trim()}`,
+            `${indent}  </sky-page-header-details>`,
+            `${indent}`,
+        ].join(eol));
+    }
+    else if (detailsContents.length > 1) {
+        recorder.insertLeft(pageSummary.sourceCodeLocation.endTag.startOffset + offset, [
+            `  <sky-page-header-details>`,
+            detailsContents
+                .map((detailsContent) => [
+                `${indent}  <div class="sky-margin-stacked-md">`,
+                `${indent}    ${detailsContent.trim()}`,
+                `${indent}  </div>`,
+            ].join(eol))
+                .join(eol),
+            `${indent}  </sky-page-header-details>`,
+            `${indent}`,
+        ].join(eol));
+    }
+}
+/**
+ * Removes title and detail elements from the page summary, including
+ * <sky-page-summary-title>, <sky-page-summary-subtitle>, <sky-page-summary-status>,
+ * <sky-page-summary-content>, and <sky-page-summary-key-info>.
+ */
+function removeTitleAndDetailElements(pageSummary, recorder, content, offset) {
+    const tagsToRemove = [
+        'sky-page-summary-title',
+        'sky-page-summary-subtitle',
+        'sky-page-summary-status',
+        'sky-page-summary-content',
+        'sky-page-summary-key-info',
+    ];
+    const eol = (0, eol_1.getEOL)(content);
+    for (const tag of tagsToRemove) {
+        const elements = (0, template_1.getElementsByTagName)(tag, pageSummary);
+        elements.forEach((element) => {
+            const trailingLineBreak = content.indexOf(eol, offset + element.sourceCodeLocation.endOffset) ===
+                offset + element.sourceCodeLocation.endOffset;
+            recorder.remove(offset + element.sourceCodeLocation.startOffset, element.sourceCodeLocation.endOffset -
+                element.sourceCodeLocation.startOffset +
+                (trailingLineBreak ? eol.length : 0));
+        });
+    }
+}
+const tags = {
+    'sky-page-summary': 'sky-page-header',
+    'sky-page-summary-alert': 'sky-page-header-alerts',
+    'sky-page-summary-image': 'sky-page-header-avatar',
+};
+function pageSummaryTagSwap() {
+    return (position, oldTag, node, content) => {
+        if (position === 'open') {
+            if (oldTag === Object.keys(tags)[0]) {
+                return `<${tags[oldTag]} pageTitle="${getPageTitle(node)}">`;
+            }
+            return `<${tags[oldTag]}>`;
+        }
+        return `</${tags[oldTag]}>`;
+    };
+}
+function convertTemplate(recorder, content, offset = 0) {
+    const fragment = (0, template_1.parseTemplate)(content);
+    const pageSummaries = (0, template_1.getElementsByTagName)('sky-page-summary', fragment);
+    for (const pageSummary of pageSummaries) {
+        removeTitleAndDetailElements(pageSummary, recorder, content, offset);
+        moveDetails(pageSummary, recorder, content, offset);
+        (0, template_1.swapTags)(content, recorder, offset, Object.keys(tags), pageSummaryTagSwap(), pageSummary);
+    }
+}
+function convertHtmlFile(tree, filePath) {
+    const content = tree.readText(filePath);
+    if (content.includes('<sky-page-summary')) {
+        const recorder = tree.beginUpdate(filePath);
+        convertTemplate(recorder, content);
+        tree.commitUpdate(recorder);
+    }
+}
+function convertTypescriptFile(tree, filePath) {
+    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, content.slice(template.start, template.end), template.start);
+        }
+    }
+    if ((0, schematics_1.isImported)(source, 'SkyPageSummaryModule', '@skyux/layout')) {
+        (0, swap_imported_class_1.swapImportedClass)(recorder, filePath, source, [
+            {
+                classNames: {
+                    SkyPageSummaryModule: 'SkyPageModule',
+                },
+                moduleName: {
+                    old: '@skyux/layout',
+                    new: '@skyux/pages',
+                },
+            },
+        ]);
+    }
+    tree.commitUpdate(recorder);
+}
+function convertPageSummaryToPageHeader(projectPath) {
+    return (tree) => {
+        (0, visit_project_files_1.visitProjectFiles)(tree, projectPath, (filePath) => {
+            try {
+                if (filePath.endsWith('.html')) {
+                    convertHtmlFile(tree, filePath);
+                }
+                else if (filePath.endsWith('.ts')) {
+                    convertTypescriptFile(tree, filePath);
+                }
+            }
+            catch (error) {
+                /* istanbul ignore next */
+                const msg = error instanceof Error ? error.message : String(error);
+                throw new Error(`Error converting '${filePath}': ${msg}`);
+            }
+        });
+    };
+}
+//# sourceMappingURL=convert-page-summary-to-page-header.js.map

package/src/schematics/rules/convert-page-summary-to-page-header/convert-page-summary-to-page-header.js.map

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

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

@@ -2,7 +2,10 @@ 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;
+    moduleName: string | {
+        old: string;
+        new: string;
+    };
     filter?: (node: ts.Identifier) => boolean;
 }
 export declare function swapImportedClass(recorder: UpdateRecorder, filePath: string, sourceFile: ts.SourceFile, options: SwapImportedClassOptions[]): void;

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

@@ -6,6 +6,7 @@ const schematics_1 = require("@angular/cdk/schematics");
 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");
 const change_1 = require("@schematics/angular/utility/change");
+const eol_1 = require("@schematics/angular/utility/eol");
 const remove_import_1 = require("./remove-import");
 function findReferences(sourceFile, className) {
     return (0, ast_utils_1.findNodes)(sourceFile, typescript_1.default.SyntaxKind.Identifier).filter((node) => typescript_1.default.isIdentifier(node) && node.text === className);
@@ -15,14 +16,29 @@ function swapReference(recorder, reference, newClassName) {
     recorder.remove(start, reference.getWidth());
     recorder.insertRight(start, newClassName);
 }
+function shiftLineBreakForInsertedImport(change, eol) {
+    if (change.toAdd.startsWith(`;${eol}import `)) {
+        // If the import is added after a semicolon, we need to remove the semicolon.
+        change.toAdd = change.toAdd.substring(`;${eol}`.length) + `;${eol}`;
+        change.pos += `;${eol}`.length;
+    }
+}
+function getModuleName(moduleName, field) {
+    return typeof moduleName === 'object' ? moduleName[field] : moduleName;
+}
 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)));
+    const eol = (0, eol_1.getEOL)(sourceFile.text);
+    const applicableOptions = options.filter((option) => Object.keys(option.classNames).some((className) => typeof option.moduleName === 'object'
+        ? (0, schematics_1.isImported)(sourceFile, className, option.moduleName.old)
+        : (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 removeImports = {};
     applicableOptions.forEach(({ classNames, moduleName, filter }) => {
+        const oldModuleName = getModuleName(moduleName, 'old');
+        const newModuleName = getModuleName(moduleName, 'new');
         Object.entries(classNames).forEach(([oldClassName, newClassName]) => {
             const referencesInCode = findReferences(sourceFile, oldClassName).filter((reference) => reference.getStart() > endOfImports);
             const referencesFiltered = referencesInCode.filter(filter ?? (() => true));
@@ -31,25 +47,34 @@ function swapImportedClass(recorder, filePath, sourceFile, options) {
             });
             if (referencesFiltered.length > 0) {
                 const allReferencesToBeReplaced = referencesFiltered.length === referencesInCode.length;
-                if (!(0, schematics_1.isImported)(sourceFile, newClassName, moduleName)) {
+                if (!(0, schematics_1.isImported)(sourceFile, newClassName, newModuleName)) {
                     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}.`);
+                        if (oldModuleName === newModuleName) {
+                            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 ${oldModuleName}, found ${referencesInImport.length}.`);
+                            }
+                            swapReference(recorder, referencesInImport[0], newClassName);
+                        }
+                        else {
+                            const change = (0, ast_utils_1.insertImport)(sourceFile, filePath, newClassName, newModuleName);
+                            shiftLineBreakForInsertedImport(change, eol);
+                            (0, change_1.applyToUpdateRecorder)(recorder, [change]);
+                            removeImports[oldModuleName] ??= [];
+                            removeImports[oldModuleName].push(oldClassName);
                         }
-                        swapReference(recorder, referencesInImport[0], newClassName);
                     }
                     else {
                         (0, change_1.applyToUpdateRecorder)(recorder, [
-                            (0, ast_utils_1.insertImport)(sourceFile, filePath, newClassName, moduleName),
+                            (0, ast_utils_1.insertImport)(sourceFile, filePath, newClassName, newModuleName),
                         ]);
                     }
                 }
                 else {
                     if (allReferencesToBeReplaced) {
-                        removeImports[moduleName] ??= [];
-                        removeImports[moduleName].push(oldClassName);
+                        removeImports[oldModuleName] ??= [];
+                        removeImports[oldModuleName].push(oldClassName);
                     }
                 }
             }

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":"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"}

package/src/version.js

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

package/src/schematics/utility/typescript/imports.d.ts

@@ -1,11 +0,0 @@
-/**
- * The contents of this file are heavily inspired by Angular's source code.
- * @see https://github.com/angular/angular/blob/14.3.x/packages/core/schematics/utils/typescript/imports.ts
- */
-import * as ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
-export interface ImportUsage {
-    node: ts.Node;
-    importName: string;
-}
-export declare function getImports(sourceFile: ts.SourceFile, packages: Map<string, string[]>): ts.ImportSpecifier[];
-export declare function getUsages(sourceFile: ts.SourceFile, importSpecifier: ts.ImportSpecifier): ImportUsage[];

package/src/schematics/utility/typescript/imports.js

@@ -1,82 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getImports = getImports;
-exports.getUsages = getUsages;
-const tslib_1 = require("tslib");
-/**
- * The contents of this file are heavily inspired by Angular's source code.
- * @see https://github.com/angular/angular/blob/14.3.x/packages/core/schematics/utils/typescript/imports.ts
- */
-const ts = tslib_1.__importStar(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
-function getImports(sourceFile, packages) {
-    const importSpecifiers = [];
-    for (const [packageName, classes] of packages.entries()) {
-        for (const cc of classes) {
-            const specifiers = getImportSpecifiers(sourceFile, packageName, cc);
-            if (specifiers) {
-                importSpecifiers.push(...specifiers);
-            }
-        }
-    }
-    return importSpecifiers;
-}
-function getUsages(sourceFile, importSpecifier) {
-    const usages = [];
-    const visitNode = (node) => {
-        // Skip this node and all of its children; imports are a special case.
-        if (ts.isImportSpecifier(node)) {
-            return;
-        }
-        const importName = importSpecifier.getText(sourceFile);
-        if (ts.isIdentifier(node) && node.escapedText === importName) {
-            usages.push({ node, importName });
-        }
-        ts.forEachChild(node, visitNode);
-    };
-    ts.forEachChild(sourceFile, visitNode);
-    return usages;
-}
-/**
- * Gets top-level import specifiers with a specific name that is imported from a particular module.
- * E.g. given a file that looks like:
- *
- * ```
- * import { Component, Directive } from '@angular/core';
- * import { Foo } from './foo';
- * ```
- *
- * Calling `getImportSpecifiers(sourceFile, '@angular/core', 'Directive')` will yield the nodes
- * referring to `Directive` in the top import.
- *
- * @param sourceFile File in which to look for imports.
- * @param moduleName Name of the import's module.
- * @param specifierName Original name of the specifier to look for. Aliases will be resolved to
- *    their original name.
- */
-function getImportSpecifiers(sourceFile, moduleName, specifierName) {
-    const importSpecifiers = [];
-    for (const node of sourceFile.statements) {
-        if (ts.isImportDeclaration(node) &&
-            ts.isStringLiteral(node.moduleSpecifier) &&
-            node.moduleSpecifier.text === moduleName) {
-            const namedBindings = node.importClause && node.importClause.namedBindings;
-            if (namedBindings && ts.isNamedImports(namedBindings)) {
-                const match = findImportSpecifier(namedBindings.elements, specifierName);
-                if (match) {
-                    importSpecifiers.push(match);
-                }
-            }
-        }
-    }
-    return importSpecifiers;
-}
-/**
- * Finds an import specifier with a particular name.
- */
-function findImportSpecifier(nodes, specifierName) {
-    return nodes.find((element) => {
-        const { name, propertyName } = element;
-        return propertyName?.text === specifierName || name.text === specifierName;
-    });
-}
-//# sourceMappingURL=imports.js.map

package/src/schematics/utility/typescript/imports.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/imports.ts"],"names":[],"mappings":";;AAWA,gCAiBC;AAED,8BAwBC;;AAtDD;;;GAGG;AACH,2HAAqG;AAOrG,SAAgB,UAAU,CACxB,UAAyB,EACzB,QAA+B;IAE/B,MAAM,gBAAgB,GAAyB,EAAE,CAAC;IAElD,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;QACxD,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,mBAAmB,CAAC,UAAU,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;YAEpE,IAAI,UAAU,EAAE,CAAC;gBACf,gBAAgB,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAgB,SAAS,CACvB,UAAyB,EACzB,eAAmC;IAEnC,MAAM,MAAM,GAAkB,EAAE,CAAC;IAEjC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAQ,EAAE;QACxC,sEAAsE;QACtE,IAAI,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEvD,IAAI,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;YAC7D,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QACpC,CAAC;QAED,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACnC,CAAC,CAAC;IAEF,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAEvC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,SAAS,mBAAmB,CAC1B,UAAyB,EACzB,UAAkB,EAClB,aAAqB;IAErB,MAAM,gBAAgB,GAAyB,EAAE,CAAC;IAElD,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;QACzC,IACE,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC;YAC5B,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,IAAI,KAAK,UAAU,EACxC,CAAC;YACD,MAAM,aAAa,GACjB,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;YAEvD,IAAI,aAAa,IAAI,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,CAAC;gBACtD,MAAM,KAAK,GAAG,mBAAmB,CAC/B,aAAa,CAAC,QAAQ,EACtB,aAAa,CACd,CAAC;gBAEF,IAAI,KAAK,EAAE,CAAC;oBACV,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/B,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,SAAS,mBAAmB,CAC1B,KAAuC,EACvC,aAAqB;IAErB,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;QAC5B,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;QAEvC,OAAO,YAAY,EAAE,IAAI,KAAK,aAAa,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC;IAC7E,CAAC,CAAC,CAAC;AACL,CAAC"}

package/src/schematics/utility/typescript/source-file.d.ts

@@ -1,2 +0,0 @@
-import * as ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
-export declare function createSourceFile(filePath: string, fileContents: string): ts.SourceFile;

package/src/schematics/utility/typescript/source-file.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSourceFile = createSourceFile;
-const tslib_1 = require("tslib");
-const ts = tslib_1.__importStar(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
-function createSourceFile(filePath, fileContents) {
-    return ts.createSourceFile(filePath, fileContents, ts.ScriptTarget.Latest, false, ts.ScriptKind.TS);
-}
-//# sourceMappingURL=source-file.js.map

package/src/schematics/utility/typescript/source-file.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"source-file.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/source-file.ts"],"names":[],"mappings":";;AAEA,4CAWC;;AAbD,2HAAqG;AAErG,SAAgB,gBAAgB,CAC9B,QAAgB,EAChB,YAAoB;IAEpB,OAAO,EAAE,CAAC,gBAAgB,CACxB,QAAQ,EACR,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,KAAK,EACL,EAAE,CAAC,UAAU,CAAC,EAAE,CACjB,CAAC;AACJ,CAAC"}