@skyux/packages 15.0.0-alpha.4 → 15.0.0-alpha.6

package/migrations.json

@@ -1,34 +1,49 @@
 {
   "schematics": {
     "noop": {
-      "version": "15.0.0-alpha.4",
+      "version": "15.0.0-alpha.6",
       "factory": "./src/schematics/migrations/all/noop/noop.schematic",
       "description": "Update all SKY UX component packages"
     },
     "i18n-resources-module": {
-      "version": "15.0.0-alpha.4",
+      "version": "15.0.0-alpha.6",
       "factory": "./src/schematics/migrations/all/i18n-resources-module/i18n-resources-module.schematic",
       "description": "Regenerate i18n resources modules for libraries."
     },
     "remove-old-compat-stylesheets": {
-      "version": "15.0.0-alpha.4",
+      "version": "15.0.0-alpha.6",
       "factory": "./src/schematics/migrations/all/remove-old-compat-stylesheets/remove-old-compat-stylesheets.schematic",
       "description": "Remove backward compatible stylesheets for older versions of SKY UX."
     },
     "workspace-check": {
-      "version": "15.0.0-alpha.4",
+      "version": "15.0.0-alpha.6",
       "factory": "./src/schematics/migrations/all/workspace-check/workspace-check.schematic",
       "description": "Log warnings if the workspace is not configured correctly."
     },
     "migrate-dragula-polyfill": {
-      "version": "15.0.0-alpha.4",
+      "version": "15.0.0-alpha.6",
       "factory": "./src/schematics/migrations/all/migrate-dragula-polyfill/migrate-dragula-polyfill.schematic",
       "description": "Remove the @skyux/packages/polyfills entry from project config, replacing it with a local copy when Dragula is still installed."
     },
     "remove-timepicker-retain-invalid-values": {
-      "version": "15.0.0-alpha.4",
+      "version": "15.0.0-alpha.6",
       "factory": "./src/schematics/migrations/update-15/remove-timepicker-retain-invalid-values/remove-timepicker-retain-invalid-values.schematic",
       "description": "Remove the skyTimepickerRetainInvalidValues input from timepicker inputs since retaining invalid values is now the default behavior."
+    },
+    "add-compat-stylesheets": {
+      "version": "15.0.0-alpha.6",
+      "factory": "./src/schematics/migrations/update-15/add-compat-stylesheets/add-compat-stylesheet.schematic",
+      "description": "Add a backwards-compatible stylesheet with styles that have been removed from components in SKY UX 15."
+    },
+    "migrate-sdk-testing-imports": {
+      "version": "15.0.0-alpha.6",
+      "factory": "./src/schematics/migrations/update-15/migrate-sdk-testing-imports/migrate-sdk-testing-imports.schematic",
+      "description": "Move SkyAppTestUtility, SkyAppTestUtilityDomEventOptions, and SkyBy imports from the deprecated @skyux-sdk/testing package to @skyux/core/testing."
+    },
+    "legacy-i18n-services": {
+      "version": "15.0.0-alpha.6",
+      "factory": "./src/schematics/migrations/update-15/legacy-i18n-services/legacy-i18n-services.schematic",
+      "description": "Replace SkyAppResourcesService and SkyLibResourcesService with their legacy equivalents since the originals now emit whenever the locale changes."
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyux/packages",
-  "version": "15.0.0-alpha.4",
+  "version": "15.0.0-alpha.6",
   "author": "Blackbaud, Inc.",
   "description": "Handles the `ng update` command for SKY UX component libraries.",
   "keywords": [
@@ -32,80 +32,80 @@
   "ng-update": {
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@skyux/packages": "15.0.0-alpha.4",
+      "@skyux/packages": "15.0.0-alpha.6",
       "@blackbaud/angular-tree-component": "^1.0.0",
-      "@skyux-sdk/eslint-schematics": "15.0.0-alpha.4",
-      "@skyux-sdk/stylelint-schematics": "15.0.0-alpha.4",
-      "@skyux-sdk/testing": "15.0.0-alpha.4",
-      "@skyux-sdk/testing-schematics": "15.0.0-alpha.4",
-      "@skyux/a11y": "15.0.0-alpha.4",
-      "@skyux/action-bars": "15.0.0-alpha.4",
-      "@skyux/ag-grid": "15.0.0-alpha.4",
-      "@skyux/angular-tree-component": "15.0.0-alpha.4",
-      "@skyux/animations": "15.0.0-alpha.4",
-      "@skyux/assets": "15.0.0-alpha.4",
-      "@skyux/autonumeric": "15.0.0-alpha.4",
-      "@skyux/avatar": "15.0.0-alpha.4",
-      "@skyux/charts": "15.0.0-alpha.4",
-      "@skyux/code-examples": "15.0.0-alpha.4",
-      "@skyux/colorpicker": "15.0.0-alpha.4",
-      "@skyux/config": "15.0.0-alpha.4",
-      "@skyux/core": "15.0.0-alpha.4",
-      "@skyux/data-grid": "15.0.0-alpha.4",
-      "@skyux/data-manager": "15.0.0-alpha.4",
-      "@skyux/datetime": "15.0.0-alpha.4",
-      "@skyux/docs-tools": "15.0.0-alpha.4",
-      "@skyux/errors": "15.0.0-alpha.4",
-      "@skyux/filter-bar": "15.0.0-alpha.4",
-      "@skyux/flyout": "15.0.0-alpha.4",
-      "@skyux/forms": "15.0.0-alpha.4",
-      "@skyux/grids": "15.0.0-alpha.4",
-      "@skyux/help-inline": "15.0.0-alpha.4",
-      "@skyux/i18n": "15.0.0-alpha.4",
-      "@skyux/icon": "15.0.0-alpha.4",
-      "@skyux/icons": "^11.2.0",
-      "@skyux/indicators": "15.0.0-alpha.4",
-      "@skyux/inline-form": "15.0.0-alpha.4",
-      "@skyux/layout": "15.0.0-alpha.4",
-      "@skyux/list-builder": "15.0.0-alpha.4",
-      "@skyux/list-builder-common": "15.0.0-alpha.4",
-      "@skyux/list-builder-view-checklist": "15.0.0-alpha.4",
-      "@skyux/list-builder-view-grids": "15.0.0-alpha.4",
-      "@skyux/lists": "15.0.0-alpha.4",
-      "@skyux/lookup": "15.0.0-alpha.4",
-      "@skyux/manifest": "15.0.0-alpha.4",
-      "@skyux/modals": "15.0.0-alpha.4",
-      "@skyux/navbar": "15.0.0-alpha.4",
-      "@skyux/pages": "15.0.0-alpha.4",
-      "@skyux/phone-field": "15.0.0-alpha.4",
-      "@skyux/popovers": "15.0.0-alpha.4",
-      "@skyux/progress-indicator": "15.0.0-alpha.4",
-      "@skyux/router": "15.0.0-alpha.4",
-      "@skyux/select-field": "15.0.0-alpha.4",
-      "@skyux/split-view": "15.0.0-alpha.4",
-      "@skyux/tabs": "15.0.0-alpha.4",
-      "@skyux/text-editor": "15.0.0-alpha.4",
-      "@skyux/theme": "15.0.0-alpha.4",
-      "@skyux/tiles": "15.0.0-alpha.4",
-      "@skyux/toast": "15.0.0-alpha.4",
-      "@skyux/validation": "15.0.0-alpha.4",
-      "ag-grid-angular": "^36.0.2",
-      "ag-grid-community": "^36.0.2",
+      "@skyux-sdk/eslint-schematics": "15.0.0-alpha.6",
+      "@skyux-sdk/stylelint-schematics": "15.0.0-alpha.6",
+      "@skyux-sdk/testing": "15.0.0-alpha.6",
+      "@skyux-sdk/testing-schematics": "15.0.0-alpha.6",
+      "@skyux-sdk/vitest": "15.0.0-alpha.6",
+      "@skyux/a11y": "15.0.0-alpha.6",
+      "@skyux/action-bars": "15.0.0-alpha.6",
+      "@skyux/ag-grid": "15.0.0-alpha.6",
+      "@skyux/angular-tree-component": "15.0.0-alpha.6",
+      "@skyux/animations": "15.0.0-alpha.6",
+      "@skyux/assets": "15.0.0-alpha.6",
+      "@skyux/autonumeric": "15.0.0-alpha.6",
+      "@skyux/avatar": "15.0.0-alpha.6",
+      "@skyux/charts": "15.0.0-alpha.6",
+      "@skyux/code-examples": "15.0.0-alpha.6",
+      "@skyux/colorpicker": "15.0.0-alpha.6",
+      "@skyux/config": "15.0.0-alpha.6",
+      "@skyux/core": "15.0.0-alpha.6",
+      "@skyux/data-grid": "15.0.0-alpha.6",
+      "@skyux/data-manager": "15.0.0-alpha.6",
+      "@skyux/datetime": "15.0.0-alpha.6",
+      "@skyux/docs-tools": "15.0.0-alpha.6",
+      "@skyux/errors": "15.0.0-alpha.6",
+      "@skyux/filter-bar": "15.0.0-alpha.6",
+      "@skyux/flyout": "15.0.0-alpha.6",
+      "@skyux/forms": "15.0.0-alpha.6",
+      "@skyux/grids": "15.0.0-alpha.6",
+      "@skyux/help-inline": "15.0.0-alpha.6",
+      "@skyux/i18n": "15.0.0-alpha.6",
+      "@skyux/icon": "15.0.0-alpha.6",
+      "@skyux/icons": "^11.4.0",
+      "@skyux/indicators": "15.0.0-alpha.6",
+      "@skyux/inline-form": "15.0.0-alpha.6",
+      "@skyux/layout": "15.0.0-alpha.6",
+      "@skyux/list-builder": "15.0.0-alpha.6",
+      "@skyux/list-builder-common": "15.0.0-alpha.6",
+      "@skyux/list-builder-view-checklist": "15.0.0-alpha.6",
+      "@skyux/list-builder-view-grids": "15.0.0-alpha.6",
+      "@skyux/lists": "15.0.0-alpha.6",
+      "@skyux/lookup": "15.0.0-alpha.6",
+      "@skyux/manifest": "15.0.0-alpha.6",
+      "@skyux/modals": "15.0.0-alpha.6",
+      "@skyux/navbar": "15.0.0-alpha.6",
+      "@skyux/pages": "15.0.0-alpha.6",
+      "@skyux/phone-field": "15.0.0-alpha.6",
+      "@skyux/popovers": "15.0.0-alpha.6",
+      "@skyux/progress-indicator": "15.0.0-alpha.6",
+      "@skyux/router": "15.0.0-alpha.6",
+      "@skyux/split-view": "15.0.0-alpha.6",
+      "@skyux/tabs": "15.0.0-alpha.6",
+      "@skyux/text-editor": "15.0.0-alpha.6",
+      "@skyux/theme": "15.0.0-alpha.6",
+      "@skyux/tiles": "15.0.0-alpha.6",
+      "@skyux/toast": "15.0.0-alpha.6",
+      "@skyux/validation": "15.0.0-alpha.6",
+      "ag-grid-angular": "^36.1.0",
+      "ag-grid-community": "^36.1.0",
       "ag-grid-enterprise": "^36.0.2",
       "autonumeric": "^4.10.10",
-      "eslint-config-skyux": "15.0.0-alpha.4",
-      "skyux-eslint": "15.0.0-alpha.4",
-      "skyux-stylelint": "15.0.0-alpha.4",
-      "stylelint-config-skyux": "15.0.0-alpha.4"
+      "eslint-config-skyux": "15.0.0-alpha.6",
+      "skyux-eslint": "15.0.0-alpha.6",
+      "skyux-stylelint": "15.0.0-alpha.6",
+      "stylelint-config-skyux": "15.0.0-alpha.6"
     }
   },
   "peerDependencies": {
-    "@angular/cli": "^22.0.6",
-    "@angular/core": "^22.0.6",
+    "@angular/cli": "^22.1.4",
+    "@angular/core": "^22.1.2",
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@blackbaud/skyux-design-tokens": "7.0.0-alpha.1",
+    "@blackbaud/skyux-design-tokens": "7.0.0-alpha.3",
     "fs-extra": "11.3.6",
     "jsonc-parser": "3.3.1",
     "parse5": "7.3.0",

package/src/schematics/migrations/update-15/add-compat-stylesheets/add-compat-stylesheet.schematic.d.ts

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

package/src/schematics/migrations/update-15/add-compat-stylesheets/add-compat-stylesheet.schematic.js

@@ -0,0 +1,140 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const schematics_1 = require("@angular-devkit/schematics");
+const utility_1 = require("@schematics/angular/utility");
+const workspace_1 = require("@schematics/angular/utility/workspace");
+const version_1 = require("../../../../version");
+const tree_1 = require("../../../utility/tree");
+const workspace_2 = require("../../../utility/workspace");
+const COMPAT_CSS_FILE_NAME = `skyux${version_1.VERSION.major}-compat.css`;
+const compatStyles = {
+    libraries: [
+        {
+            name: '@skyux/theme',
+            components: [
+                {
+                    name: 'button',
+                    styles: [
+                        {
+                            css: `
+:root {
+  --sky-compat-btn-disabled-pointer-events: none;
+}
+`,
+                            instructions: `
+Pointer events are no longer disabled on elements with the "sky-btn-disabled" class or the "disabled" attribute. To address this change, remove this block of code, then either add the "disabled" attribute to the element (preferred) or update any click and keyboard handlers to ignore interaction while the element is disabled.`,
+                        },
+                    ],
+                },
+            ],
+        },
+    ],
+};
+function getProjectAppPath(project) {
+    return `${(0, workspace_2.getSourceRoot)(project)}/app`;
+}
+function buildCommentBlock(message) {
+    return `/${'*'.repeat(79)}
+ * ${message.replace(/(?![^\n]{1,75}$)([^\n]{1,75})\s/g, '$1\n * ')}
+ ${'*'.repeat(79)}/`;
+}
+function buildComponentCss(component) {
+    let contents = buildCommentBlock(`COMPONENT: ${component.name.toUpperCase()}`);
+    for (const style of component.styles) {
+        contents += `
+
+${buildCommentBlock(style.instructions.trim())}
+
+${style.css.trim()}
+`;
+    }
+    return contents;
+}
+function writeStylesheet(sourceRoot, contents) {
+    const filePath = `${sourceRoot}/${COMPAT_CSS_FILE_NAME}`;
+    return (tree) => {
+        if (tree.exists(filePath)) {
+            tree.overwrite(filePath, contents);
+        }
+        else {
+            tree.create(filePath, contents);
+        }
+    };
+}
+function addStylesheetToStylesArray(styles, filePath) {
+    if (styles && !styles.includes(filePath)) {
+        styles.push(filePath);
+    }
+}
+function addStylesheetToWorkspace() {
+    return () => (0, utility_1.updateWorkspace)((workspace) => {
+        for (const project of workspace.projects.values()) {
+            for (const targetName of ['build', 'test']) {
+                if (project.extensions['projectType'] === 'application') {
+                    const target = project.targets.get(targetName);
+                    const sourceRoot = getProjectAppPath(project);
+                    const filePath = `${sourceRoot}/${COMPAT_CSS_FILE_NAME}`;
+                    /* istanbul ignore else */
+                    if (target && target.options) {
+                        target.options['styles'] ??= [];
+                        addStylesheetToStylesArray(target.options['styles'], filePath);
+                        // A configuration's `styles` array replaces (rather than
+                        // merges with) the target's base `styles` array, so any
+                        // configuration that already declares its own `styles` needs
+                        // the compatibility stylesheet appended too.
+                        for (const configuration of Object.values(target.configurations ?? {})) {
+                            addStylesheetToStylesArray(configuration?.['styles'], filePath);
+                        }
+                    }
+                }
+            }
+        }
+    });
+}
+function getCompatStyles(tree) {
+    let contents = '';
+    const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
+    for (const library of compatStyles.libraries) {
+        if (packageJson.dependencies?.[library.name] ||
+            packageJson.devDependencies?.[library.name]) {
+            for (const component of library.components) {
+                contents += `
+${buildComponentCss(component)}`;
+            }
+        }
+    }
+    return contents
+        ? `${buildCommentBlock(`TODO: The following component libraries introduced visual breaking ` +
+            `changes in SKY UX ${version_1.VERSION.major}. Each block of CSS reintroduces ` +
+            `the styles that were changed or removed for backward compatibility. ` +
+            `You will need to do the following before migrating to the next major ` +
+            `version of SKY UX:
+- Address each of the changes by following the instructions
+  in each block of CSS, then remove the block.
+- Delete this file after all blocks have been addressed.
+- Remove each occurrence of this file in your project's
+  angular.json file.`)}
+${contents}`
+        : undefined;
+}
+function default_1() {
+    return async (tree) => {
+        const workspace = await (0, workspace_1.getWorkspace)(tree);
+        const styles = getCompatStyles(tree);
+        const rules = [];
+        for (const [, projectDefinition] of workspace.projects.entries()) {
+            if (projectDefinition.extensions['projectType'] === 'application') {
+                if (styles) {
+                    const sourcePath = getProjectAppPath(projectDefinition);
+                    rules.push(writeStylesheet(sourcePath, styles));
+                }
+            }
+        }
+        if (styles) {
+            rules.push(addStylesheetToWorkspace());
+        }
+        return (0, schematics_1.chain)(rules);
+    };
+}
+//# sourceMappingURL=add-compat-stylesheet.schematic.js.map

package/src/schematics/migrations/update-15/add-compat-stylesheets/add-compat-stylesheet.schematic.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-compat-stylesheet.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-15/add-compat-stylesheets/add-compat-stylesheet.schematic.ts"],"names":[],"mappings":";;AA6KA,4BAqBC;AAlMD,2DAA+D;AAC/D,yDAGqC;AACrC,qEAAqE;AAErE,iDAA8C;AAC9C,gDAAyD;AACzD,0DAA2D;AAE3D,MAAM,oBAAoB,GAAG,QAAQ,iBAAO,CAAC,KAAK,aAAa,CAAC;AAYhE,MAAM,YAAY,GAAgB;IAChC,SAAS,EAAE;QACT;YACE,IAAI,EAAE,cAAc;YACpB,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,QAAQ;oBACd,MAAM,EAAE;wBACN;4BACE,GAAG,EAAE;;;;CAIlB;4BACa,YAAY,EAAE;uUAC2S;yBAC1T;qBACF;iBACF;aACF;SACF;KACF;CACF,CAAC;AAEF,SAAS,iBAAiB,CAAC,OAA0B;IACnD,OAAO,GAAG,IAAA,yBAAa,EAAC,OAAO,CAAC,MAAM,CAAC;AACzC,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAe;IACxC,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;KACtB,OAAO,CAAC,OAAO,CAAC,kCAAkC,EAAE,SAAS,CAAC;GAChE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC;AACrB,CAAC;AAED,SAAS,iBAAiB,CAAC,SAG1B;IACC,IAAI,QAAQ,GAAG,iBAAiB,CAC9B,cAAc,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAC7C,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;QACrC,QAAQ,IAAI;;EAEd,iBAAiB,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;;EAE5C,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE;CACjB,CAAC;IACA,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,eAAe,CAAC,UAAkB,EAAE,QAAgB;IAC3D,MAAM,QAAQ,GAAG,GAAG,UAAU,IAAI,oBAAoB,EAAE,CAAC;IAEzD,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAClC,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CACjC,MAA4B,EAC5B,QAAgB;IAEhB,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC;AACH,CAAC;AAED,SAAS,wBAAwB;IAC/B,OAAO,GAAG,EAAE,CACV,IAAA,yBAAe,EAAC,CAAC,SAAS,EAAE,EAAE;QAC5B,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YAClD,KAAK,MAAM,UAAU,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;gBAC3C,IAAI,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,aAAa,EAAE,CAAC;oBACxD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;oBAC/C,MAAM,UAAU,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBAC9C,MAAM,QAAQ,GAAG,GAAG,UAAU,IAAI,oBAAoB,EAAE,CAAC;oBAEzD,0BAA0B;oBAC1B,IAAI,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;wBAC7B,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;wBAEhC,0BAA0B,CACxB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAa,EACpC,QAAQ,CACT,CAAC;wBAEF,yDAAyD;wBACzD,wDAAwD;wBACxD,6DAA6D;wBAC7D,6CAA6C;wBAC7C,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,MAAM,CACvC,MAAM,CAAC,cAAc,IAAI,EAAE,CAC5B,EAAE,CAAC;4BACF,0BAA0B,CACxB,aAAa,EAAE,CAAC,QAAQ,CAAyB,EACjD,QAAQ,CACT,CAAC;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,eAAe,CAAC,IAAU;IACjC,IAAI,QAAQ,GAAG,EAAE,CAAC;IAElB,MAAM,WAAW,GAGb,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;IAExD,KAAK,MAAM,OAAO,IAAI,YAAY,CAAC,SAAS,EAAE,CAAC;QAC7C,IACE,WAAW,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;YACxC,WAAW,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAC3C,CAAC;YACD,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;gBAC3C,QAAQ,IAAI;EAClB,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,QAAQ;QACb,CAAC,CAAC,GAAG,iBAAiB,CAClB,qEAAqE;YACnE,qBAAqB,iBAAO,CAAC,KAAK,mCAAmC;YACrE,sEAAsE;YACtE,uEAAuE;YACvE;;;;;qBAKW,CACd;EACL,QAAQ,EAAE;QACR,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED;IACE,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,KAAK,GAAW,EAAE,CAAC;QAEzB,KAAK,MAAM,CAAC,EAAE,iBAAiB,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YACjE,IAAI,iBAAiB,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,aAAa,EAAE,CAAC;gBAClE,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,UAAU,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;oBACxD,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;gBAClD,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC;AACJ,CAAC"}

package/src/schematics/migrations/update-15/legacy-i18n-services/legacy-i18n-services.schematic.d.ts

@@ -0,0 +1,7 @@
+import { Rule } from '@angular-devkit/schematics';
+/**
+ * Replaces the resources services with their "legacy" equivalents, which emit
+ * once and complete. The original services now emit again whenever the locale
+ * changes.
+ */
+export default function (): Rule;

package/src/schematics/migrations/update-15/legacy-i18n-services/legacy-i18n-services.schematic.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const tslib_1 = require("tslib");
+const workspace_1 = require("@schematics/angular/utility/workspace");
+const typescript_1 = tslib_1.__importDefault(require("typescript"));
+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");
+const MODULE_NAME = '@skyux/i18n';
+const CLASS_NAMES = {
+    SkyAppResourcesService: 'SkyAppResourcesLegacyService',
+    SkyLibResourcesService: 'SkyLibResourcesLegacyService',
+};
+/**
+ * Whether the reference is the `SkyLibResourcesService.addResources()` static
+ * call. Only the observables returned by the instance methods changed, so
+ * static calls -- which generated resources modules rely on -- are left alone.
+ */
+function isStaticAddResourcesReference(node) {
+    const parent = node.parent;
+    return (typescript_1.default.isPropertyAccessExpression(parent) &&
+        parent.expression === node &&
+        parent.name.text === 'addResources');
+}
+async function updateSourceFiles(tree) {
+    const workspace = await (0, workspace_1.getWorkspace)(tree);
+    workspace.projects.forEach((project) => {
+        (0, visit_project_files_1.visitProjectFiles)(tree, project.sourceRoot || project.root, (filePath) => {
+            if (!filePath.endsWith('.ts')) {
+                return;
+            }
+            const content = tree.readText(filePath);
+            if (!Object.keys(CLASS_NAMES).some((name) => content.includes(name))) {
+                return;
+            }
+            const recorder = tree.beginUpdate(filePath);
+            (0, swap_imported_class_1.swapImportedClass)(recorder, filePath, (0, ng_ast_1.parseSourceFile)(tree, filePath), [
+                {
+                    classNames: CLASS_NAMES,
+                    moduleName: MODULE_NAME,
+                    filter: (node) => !isStaticAddResourcesReference(node),
+                },
+            ]);
+            tree.commitUpdate(recorder);
+        });
+    });
+}
+/**
+ * Replaces the resources services with their "legacy" equivalents, which emit
+ * once and complete. The original services now emit again whenever the locale
+ * changes.
+ */
+function default_1() {
+    return async (tree) => {
+        await updateSourceFiles(tree);
+    };
+}
+//# sourceMappingURL=legacy-i18n-services.schematic.js.map

package/src/schematics/migrations/update-15/legacy-i18n-services/legacy-i18n-services.schematic.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy-i18n-services.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-15/legacy-i18n-services/legacy-i18n-services.schematic.ts"],"names":[],"mappings":";;AAkEA,4BAIC;;AArED,qEAAqE;AAErE,oEAA4B;AAE5B,+DAAqE;AACrE,yFAAoF;AACpF,8EAAyE;AAEzE,MAAM,WAAW,GAAG,aAAa,CAAC;AAElC,MAAM,WAAW,GAA2B;IAC1C,sBAAsB,EAAE,8BAA8B;IACtD,sBAAsB,EAAE,8BAA8B;CACvD,CAAC;AAEF;;;;GAIG;AACH,SAAS,6BAA6B,CAAC,IAAmB;IACxD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAE3B,OAAO,CACL,oBAAE,CAAC,0BAA0B,CAAC,MAAM,CAAC;QACrC,MAAM,CAAC,UAAU,KAAK,IAAI;QAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CACpC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,IAAU;IACzC,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;IAE3C,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACrC,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE;YACvE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9B,OAAO;YACT,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAExC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBACrE,OAAO;YACT,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAE5C,IAAA,uCAAiB,EAAC,QAAQ,EAAE,QAAQ,EAAE,IAAA,wBAAe,EAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;gBACrE;oBACE,UAAU,EAAE,WAAW;oBACvB,UAAU,EAAE,WAAW;oBACvB,MAAM,EAAE,CAAC,IAAI,EAAW,EAAE,CAAC,CAAC,6BAA6B,CAAC,IAAI,CAAC;iBAChE;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH;IACE,OAAO,KAAK,EAAE,IAAU,EAAiB,EAAE;QACzC,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC;AACJ,CAAC"}

package/src/schematics/migrations/update-15/migrate-sdk-testing-imports/migrate-sdk-testing-imports.schematic.d.ts

@@ -0,0 +1,8 @@
+import { Rule } from '@angular-devkit/schematics';
+/**
+ * Moves `SkyAppTestUtility`, `SkyAppTestUtilityDomEventOptions`, and `SkyBy`
+ * imports from the deprecated `@skyux-sdk/testing` package to
+ * `@skyux/core/testing`, and drops the deprecated dependency once nothing else
+ * in the workspace imports it.
+ */
+export default function (): Rule;

package/src/schematics/migrations/update-15/migrate-sdk-testing-imports/migrate-sdk-testing-imports.schematic.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const dependencies_1 = require("@schematics/angular/utility/dependencies");
+const workspace_1 = require("@schematics/angular/utility/workspace");
+const dependencies_2 = require("../../../utility/dependencies");
+const combine_imports_1 = require("../../../utility/typescript/combine-imports");
+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");
+const workspace_2 = require("../../../utility/workspace");
+const DEPRECATED_PACKAGE = '@skyux-sdk/testing';
+const SUPPORTED_PACKAGE = '@skyux/core/testing';
+const SWAP_OPTIONS = [
+    {
+        classNames: {
+            SkyAppTestUtility: 'SkyAppTestUtility',
+            SkyAppTestUtilityDomEventOptions: 'SkyAppTestUtilityDomEventOptions',
+            SkyBy: 'SkyBy',
+        },
+        moduleName: { old: DEPRECATED_PACKAGE, new: SUPPORTED_PACKAGE },
+    },
+];
+function migrateFile(tree, filePath) {
+    if (!tree.readText(filePath).includes(DEPRECATED_PACKAGE)) {
+        return;
+    }
+    const swapRecorder = tree.beginUpdate(filePath);
+    (0, swap_imported_class_1.swapImportedClass)(swapRecorder, filePath, (0, ng_ast_1.parseSourceFile)(tree, filePath), SWAP_OPTIONS);
+    tree.commitUpdate(swapRecorder);
+    // Runs against the swapped file so the moved imports are merged with any
+    // that the file already had.
+    const combineRecorder = tree.beginUpdate(filePath);
+    (0, combine_imports_1.combineImports)(combineRecorder, (0, ng_ast_1.parseSourceFile)(tree, filePath), SUPPORTED_PACKAGE);
+    tree.commitUpdate(combineRecorder);
+}
+/**
+ * Moves `SkyAppTestUtility`, `SkyAppTestUtilityDomEventOptions`, and `SkyBy`
+ * imports from the deprecated `@skyux-sdk/testing` package to
+ * `@skyux/core/testing`, and drops the deprecated dependency once nothing else
+ * in the workspace imports it.
+ */
+function default_1() {
+    return async (tree) => {
+        const workspace = await (0, workspace_1.getWorkspace)(tree);
+        for (const project of workspace.projects.values()) {
+            (0, visit_project_files_1.visitProjectFiles)(tree, (0, workspace_2.getSourceRoot)(project), (filePath) => {
+                if (filePath.endsWith('.ts') && !filePath.endsWith('.d.ts')) {
+                    migrateFile(tree, filePath);
+                }
+            });
+        }
+        if (!(await (0, dependencies_2.isPackageUsed)(tree, DEPRECATED_PACKAGE))) {
+            (0, dependencies_1.removePackageJsonDependency)(tree, DEPRECATED_PACKAGE);
+        }
+    };
+}
+//# sourceMappingURL=migrate-sdk-testing-imports.schematic.js.map

package/src/schematics/migrations/update-15/migrate-sdk-testing-imports/migrate-sdk-testing-imports.schematic.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-sdk-testing-imports.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-15/migrate-sdk-testing-imports/migrate-sdk-testing-imports.schematic.ts"],"names":[],"mappings":";;AA+DA,4BAgBC;AA9ED,2EAAuF;AACvF,qEAAqE;AAErE,gEAA8D;AAC9D,iFAA6E;AAC7E,+DAAqE;AACrE,yFAGyD;AACzD,8EAAyE;AACzE,0DAA2D;AAE3D,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAChD,MAAM,iBAAiB,GAAG,qBAAqB,CAAC;AAEhD,MAAM,YAAY,GAA+B;IAC/C;QACE,UAAU,EAAE;YACV,iBAAiB,EAAE,mBAAmB;YACtC,gCAAgC,EAAE,kCAAkC;YACpE,KAAK,EAAE,OAAO;SACf;QACD,UAAU,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,GAAG,EAAE,iBAAiB,EAAE;KAChE;CACF,CAAC;AAEF,SAAS,WAAW,CAAC,IAAU,EAAE,QAAgB;IAC/C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC1D,OAAO;IACT,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAEhD,IAAA,uCAAiB,EACf,YAAY,EACZ,QAAQ,EACR,IAAA,wBAAe,EAAC,IAAI,EAAE,QAAQ,CAAC,EAC/B,YAAY,CACb,CAAC;IAEF,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IAEhC,yEAAyE;IACzE,6BAA6B;IAC7B,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAEnD,IAAA,gCAAc,EACZ,eAAe,EACf,IAAA,wBAAe,EAAC,IAAI,EAAE,QAAQ,CAAC,EAC/B,iBAAiB,CAClB,CAAC;IAEF,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;AACrC,CAAC;AAED;;;;;GAKG;AACH;IACE,OAAO,KAAK,EAAE,IAAU,EAAiB,EAAE;QACzC,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAE3C,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YAClD,IAAA,uCAAiB,EAAC,IAAI,EAAE,IAAA,yBAAa,EAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAC3D,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC5D,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,CAAC,MAAM,IAAA,4BAAa,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC;YACrD,IAAA,0CAA2B,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QACxD,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/src/schematics/rules/convert-grid-to-data-grid/convert-grid-to-data-grid.js

@@ -535,7 +535,7 @@ function convertGridToDataGrid(projectPath) {
         },
         () => {
             if (anyConverted) {
-                return (0, utility_1.addDependency)('@skyux/data-grid', `15.0.0-alpha.4`, {
+                return (0, utility_1.addDependency)('@skyux/data-grid', `15.0.0-alpha.6`, {
                     existing: utility_1.ExistingBehavior.Skip,
                 });
             }

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

@@ -198,7 +198,7 @@ function convertPageSummaryToPageHeader(projectPath) {
                 }
             });
         },
-        (0, utility_1.addDependency)('@skyux/pages', `15.0.0-alpha.4`, {
+        (0, utility_1.addDependency)('@skyux/pages', `15.0.0-alpha.6`, {
             existing: utility_1.ExistingBehavior.Skip,
         }),
     ]);

package/src/schematics/rules/convert-progress-indicator-wizard-to-tab-wizard/convert-progress-indicator-wizard-to-tab-wizard.js

@@ -296,7 +296,7 @@ function convertProgressIndicatorWizardToTabWizard(options) {
                 });
             }
         },
-        (0, utility_1.addDependency)('@skyux/tabs', `15.0.0-alpha.4`, {
+        (0, utility_1.addDependency)('@skyux/tabs', `15.0.0-alpha.6`, {
             existing: utility_1.ExistingBehavior.Skip,
         }),
     ]);

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

@@ -0,0 +1,7 @@
+import { UpdateRecorder } from '@angular-devkit/schematics';
+import ts from 'typescript';
+/**
+ * Merges every named import of `moduleName` into the first such declaration,
+ * dropping specifiers that are imported more than once.
+ */
+export declare function combineImports(recorder: UpdateRecorder, sourceFile: ts.SourceFile, moduleName: string): void;

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

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.combineImports = combineImports;
+const imports_1 = require("./imports");
+function getCombinedSpecifiers(declarations, isTypeOnly) {
+    const seen = new Map();
+    const combined = [];
+    for (const declaration of declarations) {
+        for (const specifier of declaration.specifiers) {
+            const specifierIsTypeOnly = declaration.importClause.isTypeOnly || specifier.isTypeOnly;
+            const text = (0, imports_1.getSpecifierText)(specifier, !isTypeOnly && declaration.importClause.isTypeOnly);
+            const existing = seen.get(specifier.name.text);
+            if (!existing) {
+                seen.set(specifier.name.text, {
+                    index: combined.length,
+                    isTypeOnly: specifierIsTypeOnly,
+                });
+                combined.push(text);
+            }
+            else if (existing.isTypeOnly && !specifierIsTypeOnly) {
+                // A value import of the same name wins, otherwise merging would leave
+                // the name usable only as a type.
+                combined[existing.index] = text;
+                existing.isTypeOnly = false;
+            }
+        }
+    }
+    return combined;
+}
+/**
+ * Merges every named import of `moduleName` into the first such declaration,
+ * dropping specifiers that are imported more than once.
+ */
+function combineImports(recorder, sourceFile, moduleName) {
+    // Declarations with a default binding are left alone; the merged clause only
+    // carries named specifiers, so folding one in would drop its default.
+    const declarations = (0, imports_1.getNamedImportDeclarations)(sourceFile, moduleName).filter(({ importClause }) => !importClause.name);
+    if (declarations.length < 2) {
+        return;
+    }
+    const [first, ...rest] = declarations;
+    // The merged declaration can only stay `import type` if every source was.
+    const isTypeOnly = declarations.every(({ importClause }) => importClause.isTypeOnly);
+    const specifiers = getCombinedSpecifiers(declarations, isTypeOnly);
+    const start = first.importClause.getStart(sourceFile);
+    recorder.remove(start, first.importClause.getEnd() - start);
+    recorder.insertRight(start, `${isTypeOnly ? 'type ' : ''}{ ${specifiers.join(', ')} }`);
+    for (const { declaration } of rest) {
+        (0, imports_1.removeStatement)(recorder, sourceFile, declaration);
+    }
+}
+//# sourceMappingURL=combine-imports.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"combine-imports.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/combine-imports.ts"],"names":[],"mappings":";;AAmDA,wCAmCC;AAnFD,uCAKmB;AAEnB,SAAS,qBAAqB,CAC5B,YAAsC,EACtC,UAAmB;IAEnB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAkD,CAAC;IACvE,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,KAAK,MAAM,SAAS,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC;YAC/C,MAAM,mBAAmB,GACvB,WAAW,CAAC,YAAY,CAAC,UAAU,IAAI,SAAS,CAAC,UAAU,CAAC;YAE9D,MAAM,IAAI,GAAG,IAAA,0BAAgB,EAC3B,SAAS,EACT,CAAC,UAAU,IAAI,WAAW,CAAC,YAAY,CAAC,UAAU,CACnD,CAAC;YAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE/C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE;oBAC5B,KAAK,EAAE,QAAQ,CAAC,MAAM;oBACtB,UAAU,EAAE,mBAAmB;iBAChC,CAAC,CAAC;gBACH,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC;iBAAM,IAAI,QAAQ,CAAC,UAAU,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACvD,sEAAsE;gBACtE,kCAAkC;gBAClC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;gBAChC,QAAQ,CAAC,UAAU,GAAG,KAAK,CAAC;YAC9B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,SAAgB,cAAc,CAC5B,QAAwB,EACxB,UAAyB,EACzB,UAAkB;IAElB,6EAA6E;IAC7E,sEAAsE;IACtE,MAAM,YAAY,GAAG,IAAA,oCAA0B,EAC7C,UAAU,EACV,UAAU,CACX,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,OAAO;IACT,CAAC;IAED,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,YAAY,CAAC;IAEtC,0EAA0E;IAC1E,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CACnC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,UAAU,CAC9C,CAAC;IAEF,MAAM,UAAU,GAAG,qBAAqB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IACnE,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAEtD,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC;IAC5D,QAAQ,CAAC,WAAW,CAClB,KAAK,EACL,GAAG,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAC3D,CAAC;IAEF,KAAK,MAAM,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC;QACnC,IAAA,yBAAe,EAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACrD,CAAC;AACH,CAAC"}

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

@@ -0,0 +1,25 @@
+import { UpdateRecorder } from '@angular-devkit/schematics';
+import ts from 'typescript';
+export interface NamedImportDeclaration {
+    declaration: ts.ImportDeclaration;
+    importClause: ts.ImportClause;
+    namedBindings: ts.NamedImports;
+    specifiers: readonly ts.ImportSpecifier[];
+}
+/**
+ * Returns every `import { ... } from '<moduleName>'` declaration in the file.
+ * Namespace and default-only imports are skipped since they have no specifiers
+ * to operate on.
+ */
+export declare function getNamedImportDeclarations(sourceFile: ts.SourceFile, moduleName: string): NamedImportDeclaration[];
+/**
+ * Returns the text of a specifier, moving the declaration's `type` modifier
+ * onto the specifier so it survives being merged into a value import.
+ */
+export declare function getSpecifierText(specifier: ts.ImportSpecifier, isTypeOnly: boolean): string;
+export declare function replaceNode(recorder: UpdateRecorder, sourceFile: ts.SourceFile, node: ts.Node, text: string): void;
+/**
+ * Removes a statement along with the rest of the line it ends on, so deleting
+ * an import doesn't leave a blank line behind.
+ */
+export declare function removeStatement(recorder: UpdateRecorder, sourceFile: ts.SourceFile, node: ts.Node): void;

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

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNamedImportDeclarations = getNamedImportDeclarations;
+exports.getSpecifierText = getSpecifierText;
+exports.replaceNode = replaceNode;
+exports.removeStatement = removeStatement;
+const tslib_1 = require("tslib");
+const typescript_1 = tslib_1.__importDefault(require("typescript"));
+/**
+ * Returns every `import { ... } from '<moduleName>'` declaration in the file.
+ * Namespace and default-only imports are skipped since they have no specifiers
+ * to operate on.
+ */
+function getNamedImportDeclarations(sourceFile, moduleName) {
+    const declarations = [];
+    for (const statement of sourceFile.statements) {
+        if (!typescript_1.default.isImportDeclaration(statement) ||
+            !typescript_1.default.isStringLiteral(statement.moduleSpecifier) ||
+            statement.moduleSpecifier.text !== moduleName) {
+            continue;
+        }
+        const importClause = statement.importClause;
+        const namedBindings = importClause?.namedBindings;
+        if (!importClause || !namedBindings || !typescript_1.default.isNamedImports(namedBindings)) {
+            continue;
+        }
+        declarations.push({
+            declaration: statement,
+            importClause,
+            namedBindings,
+            specifiers: namedBindings.elements,
+        });
+    }
+    return declarations;
+}
+/**
+ * Returns the text of a specifier, moving the declaration's `type` modifier
+ * onto the specifier so it survives being merged into a value import.
+ */
+function getSpecifierText(specifier, isTypeOnly) {
+    const text = specifier.getText();
+    return isTypeOnly && !specifier.isTypeOnly ? `type ${text}` : text;
+}
+function replaceNode(recorder, sourceFile, node, text) {
+    const start = node.getStart(sourceFile);
+    recorder.remove(start, node.getEnd() - start);
+    recorder.insertRight(start, text);
+}
+/**
+ * Removes a statement along with the rest of the line it ends on, so deleting
+ * an import doesn't leave a blank line behind.
+ */
+function removeStatement(recorder, sourceFile, node) {
+    const start = node.getStart(sourceFile);
+    const end = node.getEnd();
+    const trailing = /^[^\S\n]*\n?/.exec(sourceFile.text.substring(end));
+    recorder.remove(start, end - start + (trailing ? trailing[0].length : 0));
+}
+//# sourceMappingURL=imports.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/imports.ts"],"names":[],"mappings":";;AAeA,gEA+BC;AAMD,4CAOC;AAED,kCAUC;AAMD,0CAUC;;AAtFD,oEAA4B;AAS5B;;;;GAIG;AACH,SAAgB,0BAA0B,CACxC,UAAyB,EACzB,UAAkB;IAElB,MAAM,YAAY,GAA6B,EAAE,CAAC;IAElD,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;QAC9C,IACE,CAAC,oBAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC;YAClC,CAAC,oBAAE,CAAC,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC;YAC9C,SAAS,CAAC,eAAe,CAAC,IAAI,KAAK,UAAU,EAC7C,CAAC;YACD,SAAS;QACX,CAAC;QAED,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;QAC5C,MAAM,aAAa,GAAG,YAAY,EAAE,aAAa,CAAC;QAElD,IAAI,CAAC,YAAY,IAAI,CAAC,aAAa,IAAI,CAAC,oBAAE,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,CAAC;YACzE,SAAS;QACX,CAAC;QAED,YAAY,CAAC,IAAI,CAAC;YAChB,WAAW,EAAE,SAAS;YACtB,YAAY;YACZ,aAAa;YACb,UAAU,EAAE,aAAa,CAAC,QAAQ;SACnC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAC9B,SAA6B,EAC7B,UAAmB;IAEnB,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;IAEjC,OAAO,UAAU,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACrE,CAAC;AAED,SAAgB,WAAW,CACzB,QAAwB,EACxB,UAAyB,EACzB,IAAa,EACb,IAAY;IAEZ,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAExC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC;IAC9C,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACpC,CAAC;AAED;;;GAGG;AACH,SAAgB,eAAe,CAC7B,QAAwB,EACxB,UAAyB,EACzB,IAAa;IAEb,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACxC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IAC1B,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAErE,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5E,CAAC"}

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

@@ -1,32 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeImport = removeImport;
-const tslib_1 = require("tslib");
-const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
-const typescript_1 = tslib_1.__importDefault(require("typescript"));
+const imports_1 = require("./imports");
+/**
+ * Removes specifiers from a named import, consuming the separating comma so the
+ * remaining specifiers stay well-formed. Contiguous specifiers are removed as a
+ * single range to keep the edits from overlapping.
+ */
+function removeSpecifiers(recorder, sourceFile, specifiers, isRemoved) {
+    for (let first = 0; first < specifiers.length; first++) {
+        if (!isRemoved(specifiers[first])) {
+            continue;
+        }
+        let last = first;
+        while (last + 1 < specifiers.length && isRemoved(specifiers[last + 1])) {
+            last++;
+        }
+        // A run takes the comma that precedes it or, when it starts the list, the
+        // comma that follows it. At least one specifier is retained here, so there
+        // is always a neighbor on one side.
+        const [start, end] = first > 0
+            ? [specifiers[first - 1].getEnd(), specifiers[last].getEnd()]
+            : [
+                specifiers[first].getStart(sourceFile),
+                specifiers[last + 1].getStart(sourceFile),
+            ];
+        recorder.remove(start, end - start);
+        first = last;
+    }
+}
 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);
-    if (importDeclarations) {
-        for (const importDeclaration of importDeclarations) {
-            const importSpecifiers = (0, ast_utils_1.findNodes)(importDeclaration, (node) => typescript_1.default.isImportSpecifier(node));
-            const classMatches = importSpecifiers.filter((importSpecifier) => options.classNames.includes(importSpecifier.name.text));
-            const otherMatches = importSpecifiers.filter((importSpecifier) => !options.classNames.includes(importSpecifier.getText()));
-            if (classMatches.length > 0) {
-                if (otherMatches.length > 0) {
-                    classMatches.forEach((importSpecifier) => {
-                        const importStart = importSpecifier.getStart(sourceFile);
-                        const importWidth = importSpecifier.getWidth(sourceFile);
-                        recorder.remove(importStart, importWidth + 1);
-                    });
-                }
-                else {
-                    const importStart = importDeclaration.getStart(sourceFile);
-                    const importWidth = importDeclaration.getWidth(sourceFile);
-                    recorder.remove(importStart, importWidth);
-                }
-            }
+    for (const { declaration, specifiers } of (0, imports_1.getNamedImportDeclarations)(sourceFile, options.moduleName)) {
+        const isRemoved = (specifier) => options.classNames.includes(specifier.name.text);
+        const removedCount = specifiers.filter(isRemoved).length;
+        if (removedCount === 0) {
+            continue;
+        }
+        if (removedCount === specifiers.length) {
+            (0, imports_1.removeStatement)(recorder, sourceFile, declaration);
+        }
+        else {
+            removeSpecifiers(recorder, sourceFile, specifiers, isRemoved);
         }
     }
 }

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,oCA2CC;;AAnDD,qEAAkE;AAClE,oEAA4B;AAO5B,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,IAAI,CAAC,IAAI,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"}
+{"version":3,"file":"remove-import.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/utility/typescript/remove-import.ts"],"names":[],"mappings":";;AAgDA,oCAwBC;AArED,uCAAwE;AAOxE;;;;GAIG;AACH,SAAS,gBAAgB,CACvB,QAAwB,EACxB,UAAyB,EACzB,UAAyC,EACzC,SAAqD;IAErD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACvD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAClC,SAAS;QACX,CAAC;QAED,IAAI,IAAI,GAAG,KAAK,CAAC;QAEjB,OAAO,IAAI,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,IAAI,EAAE,CAAC;QACT,CAAC;QAED,0EAA0E;QAC1E,2EAA2E;QAC3E,oCAAoC;QACpC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAChB,KAAK,GAAG,CAAC;YACP,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;YAC7D,CAAC,CAAC;gBACE,UAAU,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACtC,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;aAC1C,CAAC;QAER,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,CAAC,CAAC;QACpC,KAAK,GAAG,IAAI,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAgB,YAAY,CAC1B,QAAwB,EACxB,UAAyB,EACzB,OAA4B;IAE5B,KAAK,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,IAAA,oCAA0B,EAClE,UAAU,EACV,OAAO,CAAC,UAAU,CACnB,EAAE,CAAC;QACF,MAAM,SAAS,GAAG,CAAC,SAA6B,EAAW,EAAE,CAC3D,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEnD,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;QAEzD,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACvB,SAAS;QACX,CAAC;QAED,IAAI,YAAY,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YACvC,IAAA,yBAAe,EAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;AACH,CAAC"}

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.swapImportedClass = swapImportedClass;
 const tslib_1 = require("tslib");
 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 typescript_1 = tslib_1.__importDefault(require("typescript"));
 const ng_ast_1 = require("./ng-ast");
@@ -11,6 +10,43 @@ 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);
 }
+function getNamespaceImportNames(sourceFile) {
+    return (0, ast_utils_1.findNodes)(sourceFile, typescript_1.default.SyntaxKind.ImportDeclaration).flatMap((node) => {
+        if (!typescript_1.default.isImportDeclaration(node)) {
+            return [];
+        }
+        const clause = node.importClause;
+        const bindings = clause?.namedBindings;
+        return clause && bindings && typescript_1.default.isNamespaceImport(bindings)
+            ? [bindings.name.text]
+            : [];
+    });
+}
+function getLeftmostIdentifier(node) {
+    let current = node;
+    while (typescript_1.default.isPropertyAccessExpression(current) ||
+        typescript_1.default.isQualifiedName(current)) {
+        current = typescript_1.default.isPropertyAccessExpression(current)
+            ? current.expression
+            : current.left;
+    }
+    return typescript_1.default.isIdentifier(current) ? current : undefined;
+}
+function isNamespaceQualifiedReference(reference, namespaceNames) {
+    const parent = reference.parent;
+    // Value position, e.g. `namespace.SkyThing`; type position, e.g.
+    // `let thing: namespace.SkyThing`.
+    const qualifier = typescript_1.default.isPropertyAccessExpression(parent) && parent.name === reference
+        ? parent.expression
+        : typescript_1.default.isQualifiedName(parent) && parent.right === reference
+            ? parent.left
+            : undefined;
+    if (!qualifier) {
+        return false;
+    }
+    const namespace = getLeftmostIdentifier(qualifier);
+    return !!namespace && namespaceNames.includes(namespace.text);
+}
 function swapReference(recorder, reference, newClassName) {
     const start = reference.getStart();
     recorder.remove(start, reference.getWidth());
@@ -35,13 +71,20 @@ function swapImportedClass(recorder, filePath, sourceFile, options) {
         return;
     }
     const endOfImports = (0, ast_utils_1.findNodes)(sourceFile, typescript_1.default.SyntaxKind.ImportDeclaration).reduce((max, node) => Math.max(max, node.getEnd()), 0);
+    const namespaceImportNames = getNamespaceImportNames(sourceFile);
+    // `insertImport` reads the original AST, so inserts are batched per module
+    // and applied once below. Applying them as they are found would emit a
+    // separate import statement for every class name.
+    const addImports = {};
     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));
+            const referencesInCodeWithoutNamespaces = referencesInCode.filter((reference) => !isNamespaceQualifiedReference(reference, namespaceImportNames));
+            const referencesFiltered = referencesInCode.filter((reference) => (filter ?? (() => true))(reference) &&
+                !isNamespaceQualifiedReference(reference, namespaceImportNames));
             const newClassNameString = Array.isArray(newClassName)
                 ? newClassName.join(', ')
                 : newClassName;
@@ -49,36 +92,29 @@ function swapImportedClass(recorder, filePath, sourceFile, options) {
                 swapReference(recorder, reference, newClassNameString);
             });
             if (referencesFiltered.length > 0) {
-                const allReferencesToBeReplaced = referencesFiltered.length === referencesInCode.length;
+                const allReferencesToBeReplaced = referencesFiltered.length ===
+                    referencesInCodeWithoutNamespaces.length;
                 const newClassNameArray = Array.isArray(newClassName)
                     ? newClassName
                     : [newClassName];
                 const missingClassNames = newClassNameArray.filter((name) => !(0, ng_ast_1.isImportedFromPackage)(sourceFile, name, newModuleName));
-                if (missingClassNames.length > 0) {
-                    const missingClassNameString = missingClassNames.join(', ');
-                    if (allReferencesToBeReplaced) {
-                        if (oldModuleName === newModuleName) {
-                            const referencesInImport = findReferences(sourceFile, oldClassName).filter((reference) => reference.getEnd() <= endOfImports);
-                            if (referencesInImport.length !== 1) {
-                                throw new Error(`Expected exactly one import for ${oldClassName} from ${oldModuleName}, found ${referencesInImport.length}.`);
-                            }
-                            swapReference(recorder, referencesInImport[0], missingClassNameString);
-                        }
-                        else {
-                            const change = (0, ast_utils_1.insertImport)(sourceFile, filePath, missingClassNameString, newModuleName);
-                            shiftLineBreakForInsertedImport(change, eol);
-                            (0, change_1.applyToUpdateRecorder)(recorder, [change]);
-                            removeImports[oldModuleName] ??= [];
-                            removeImports[oldModuleName].push(oldClassName);
-                        }
-                    }
-                    else {
-                        (0, change_1.applyToUpdateRecorder)(recorder, [
-                            (0, ast_utils_1.insertImport)(sourceFile, filePath, missingClassNameString, newModuleName),
-                        ]);
+                // Staying within the same module is a rename, so the existing import
+                // specifier is edited in place rather than added and removed.
+                const isRename = missingClassNames.length > 0 &&
+                    allReferencesToBeReplaced &&
+                    oldModuleName === newModuleName;
+                if (isRename) {
+                    const referencesInImport = findReferences(sourceFile, oldClassName).filter((reference) => reference.getEnd() <= endOfImports);
+                    if (referencesInImport.length !== 1) {
+                        throw new Error(`Expected exactly one import for ${oldClassName} from ${oldModuleName}, found ${referencesInImport.length}.`);
                     }
+                    swapReference(recorder, referencesInImport[0], missingClassNames.join(', '));
                 }
                 else {
+                    if (missingClassNames.length > 0) {
+                        addImports[newModuleName] ??= [];
+                        addImports[newModuleName].push(...missingClassNames.filter((name) => !addImports[newModuleName].includes(name)));
+                    }
                     if (allReferencesToBeReplaced) {
                         removeImports[oldModuleName] ??= [];
                         removeImports[oldModuleName].push(oldClassName);
@@ -87,12 +123,18 @@ function swapImportedClass(recorder, filePath, sourceFile, options) {
             }
         });
     });
-    const removeImportEntries = Object.entries(removeImports);
-    if (removeImportEntries.length > 0) {
-        removeImportEntries.forEach(([moduleName, classNames]) => (0, remove_import_1.removeImport)(recorder, sourceFile, {
-            classNames,
-            moduleName,
-        }));
-    }
+    Object.entries(addImports).forEach(([moduleName, classNames]) => {
+        const change = (0, ast_utils_1.insertImport)(sourceFile, filePath, classNames.join(', '), moduleName);
+        shiftLineBreakForInsertedImport(change, eol);
+        // `insertRight` rather than `applyToUpdateRecorder`'s `insertLeft`: the
+        // import lands at the end of the import block, which is also where a fully
+        // removed import declaration ends, and only a right-side insert survives
+        // that removal.
+        recorder.insertRight(change.pos, change.toAdd);
+    });
+    Object.entries(removeImports).forEach(([moduleName, classNames]) => (0, remove_import_1.removeImport)(recorder, sourceFile, {
+        classNames,
+        moduleName,
+    }));
 }
 //# sourceMappingURL=swap-imported-class.js.map

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('15.0.0-alpha.4');
+exports.VERSION = new Version('15.0.0-alpha.6');
 //# sourceMappingURL=version.js.map