@skyux/packages 9.0.0-alpha.0 → 9.0.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyux/packages",
-  "version": "9.0.0-alpha.0",
+  "version": "9.0.0-alpha.2",
   "author": "Blackbaud, Inc.",
   "description": "Handles the `ng update` command for SKY UX component libraries.",
   "keywords": [
@@ -37,57 +37,57 @@
   "ng-update": {
     "migrations": "./src/schematics/migrations/migration-collection.json",
     "packageGroup": {
-      "@skyux-sdk/eslint-config": "9.0.0-alpha.0",
-      "@skyux-sdk/prettier-schematics": "9.0.0-alpha.0",
-      "@skyux-sdk/testing": "9.0.0-alpha.0",
-      "@skyux/a11y": "9.0.0-alpha.0",
-      "@skyux/action-bars": "9.0.0-alpha.0",
-      "@skyux/ag-grid": "9.0.0-alpha.0",
-      "@skyux/angular-tree-component": "9.0.0-alpha.0",
-      "@skyux/animations": "9.0.0-alpha.0",
-      "@skyux/assets": "9.0.0-alpha.0",
-      "@skyux/autonumeric": "9.0.0-alpha.0",
-      "@skyux/avatar": "9.0.0-alpha.0",
-      "@skyux/colorpicker": "9.0.0-alpha.0",
-      "@skyux/config": "9.0.0-alpha.0",
-      "@skyux/core": "9.0.0-alpha.0",
-      "@skyux/data-manager": "9.0.0-alpha.0",
-      "@skyux/datetime": "9.0.0-alpha.0",
-      "@skyux/errors": "9.0.0-alpha.0",
-      "@skyux/flyout": "9.0.0-alpha.0",
-      "@skyux/forms": "9.0.0-alpha.0",
-      "@skyux/grids": "9.0.0-alpha.0",
-      "@skyux/http": "9.0.0-alpha.0",
-      "@skyux/i18n": "9.0.0-alpha.0",
+      "@skyux-sdk/eslint-config": "9.0.0-alpha.2",
+      "@skyux-sdk/prettier-schematics": "9.0.0-alpha.2",
+      "@skyux-sdk/testing": "9.0.0-alpha.2",
+      "@skyux/a11y": "9.0.0-alpha.2",
+      "@skyux/action-bars": "9.0.0-alpha.2",
+      "@skyux/ag-grid": "9.0.0-alpha.2",
+      "@skyux/angular-tree-component": "9.0.0-alpha.2",
+      "@skyux/animations": "9.0.0-alpha.2",
+      "@skyux/assets": "9.0.0-alpha.2",
+      "@skyux/autonumeric": "9.0.0-alpha.2",
+      "@skyux/avatar": "9.0.0-alpha.2",
+      "@skyux/colorpicker": "9.0.0-alpha.2",
+      "@skyux/config": "9.0.0-alpha.2",
+      "@skyux/core": "9.0.0-alpha.2",
+      "@skyux/data-manager": "9.0.0-alpha.2",
+      "@skyux/datetime": "9.0.0-alpha.2",
+      "@skyux/errors": "9.0.0-alpha.2",
+      "@skyux/flyout": "9.0.0-alpha.2",
+      "@skyux/forms": "9.0.0-alpha.2",
+      "@skyux/grids": "9.0.0-alpha.2",
+      "@skyux/http": "9.0.0-alpha.2",
+      "@skyux/i18n": "9.0.0-alpha.2",
       "@skyux/icons": "^6.0.0",
-      "@skyux/indicators": "9.0.0-alpha.0",
-      "@skyux/inline-form": "9.0.0-alpha.0",
-      "@skyux/layout": "9.0.0-alpha.0",
-      "@skyux/list-builder": "9.0.0-alpha.0",
-      "@skyux/list-builder-common": "9.0.0-alpha.0",
-      "@skyux/list-builder-view-checklist": "9.0.0-alpha.0",
-      "@skyux/list-builder-view-grids": "9.0.0-alpha.0",
-      "@skyux/lists": "9.0.0-alpha.0",
-      "@skyux/lookup": "9.0.0-alpha.0",
-      "@skyux/modals": "9.0.0-alpha.0",
-      "@skyux/navbar": "9.0.0-alpha.0",
-      "@skyux/omnibar-interop": "9.0.0-alpha.0",
-      "@skyux/pages": "9.0.0-alpha.0",
-      "@skyux/phone-field": "9.0.0-alpha.0",
-      "@skyux/popovers": "9.0.0-alpha.0",
-      "@skyux/progress-indicator": "9.0.0-alpha.0",
-      "@skyux/router": "9.0.0-alpha.0",
-      "@skyux/select-field": "9.0.0-alpha.0",
-      "@skyux/split-view": "9.0.0-alpha.0",
-      "@skyux/tabs": "9.0.0-alpha.0",
-      "@skyux/text-editor": "9.0.0-alpha.0",
-      "@skyux/theme": "9.0.0-alpha.0",
-      "@skyux/tiles": "9.0.0-alpha.0",
-      "@skyux/toast": "9.0.0-alpha.0",
-      "@skyux/validation": "9.0.0-alpha.0",
-      "ag-grid-angular": "^28.2.1",
-      "ag-grid-community": "^28.2.1",
-      "ag-grid-enterprise": "^28.2.1"
+      "@skyux/indicators": "9.0.0-alpha.2",
+      "@skyux/inline-form": "9.0.0-alpha.2",
+      "@skyux/layout": "9.0.0-alpha.2",
+      "@skyux/list-builder": "9.0.0-alpha.2",
+      "@skyux/list-builder-common": "9.0.0-alpha.2",
+      "@skyux/list-builder-view-checklist": "9.0.0-alpha.2",
+      "@skyux/list-builder-view-grids": "9.0.0-alpha.2",
+      "@skyux/lists": "9.0.0-alpha.2",
+      "@skyux/lookup": "9.0.0-alpha.2",
+      "@skyux/modals": "9.0.0-alpha.2",
+      "@skyux/navbar": "9.0.0-alpha.2",
+      "@skyux/omnibar-interop": "9.0.0-alpha.2",
+      "@skyux/pages": "9.0.0-alpha.2",
+      "@skyux/phone-field": "9.0.0-alpha.2",
+      "@skyux/popovers": "9.0.0-alpha.2",
+      "@skyux/progress-indicator": "9.0.0-alpha.2",
+      "@skyux/router": "9.0.0-alpha.2",
+      "@skyux/select-field": "9.0.0-alpha.2",
+      "@skyux/split-view": "9.0.0-alpha.2",
+      "@skyux/tabs": "9.0.0-alpha.2",
+      "@skyux/text-editor": "9.0.0-alpha.2",
+      "@skyux/theme": "9.0.0-alpha.2",
+      "@skyux/tiles": "9.0.0-alpha.2",
+      "@skyux/toast": "9.0.0-alpha.2",
+      "@skyux/validation": "9.0.0-alpha.2",
+      "ag-grid-angular": "^29.3.5",
+      "ag-grid-community": "^29.3.5",
+      "ag-grid-enterprise": "^29.3.5"
     }
   },
   "peerDependencies": {

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

@@ -1,14 +1,19 @@
 {
   "schematics": {
     "noop": {
-      "version": "9.0.0-alpha.0",
+      "version": "9.0.0-alpha.2",
       "factory": "./noop/noop.schematic",
       "description": "Update all SKY UX component packages"
     },
     "update-angular-tree-component": {
-      "version": "8.0.0-alpha.0",
+      "version": "9.0.0-0",
       "factory": "./update-9/update-angular-tree-component/update-angular-tree-component.schematic",
-      "description": "Update the angular tree component package to point to the Blackbaud forked version"
+      "description": "Update the Angular tree component package to point to the Blackbaud forked version"
+    },
+    "add-forms-popovers-peer-dependency": {
+      "version": "9.0.0-0",
+      "factory": "./update-9/add-forms-popovers-peer-dependency/add-forms-popovers-peer-dependency.schematic",
+      "description": "Add @skyux/popovers peer dependency for @skyux/forms"
     }
   }
 }

package/src/schematics/migrations/update-9/add-forms-popovers-peer-dependency/add-forms-popovers-peer-dependency.schematic.d.ts

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

package/src/schematics/migrations/update-9/add-forms-popovers-peer-dependency/add-forms-popovers-peer-dependency.schematic.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const dependencies_1 = require("@schematics/angular/utility/dependencies");
+const ensure_peers_installed_1 = require("../../../rules/ensure-peers-installed");
+function default_1() {
+    return (0, ensure_peers_installed_1.ensurePeersInstalled)('@skyux/forms', [
+        {
+            matchVersion: true,
+            name: '@skyux/popovers',
+            type: dependencies_1.NodeDependencyType.Default,
+        },
+    ]);
+}
+exports.default = default_1;
+//# sourceMappingURL=add-forms-popovers-peer-dependency.schematic.js.map

package/src/schematics/migrations/update-9/add-forms-popovers-peer-dependency/add-forms-popovers-peer-dependency.schematic.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-forms-popovers-peer-dependency.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-9/add-forms-popovers-peer-dependency/add-forms-popovers-peer-dependency.schematic.ts"],"names":[],"mappings":";;AACA,2EAA8E;AAE9E,kFAA6E;AAE7E;IACE,OAAO,IAAA,6CAAoB,EAAC,cAAc,EAAE;QAC1C;YACE,YAAY,EAAE,IAAI;YAClB,IAAI,EAAE,iBAAiB;YACvB,IAAI,EAAE,iCAAkB,CAAC,OAAO;SACjC;KACF,CAAC,CAAC;AACL,CAAC;AARD,4BAQC"}

package/src/schematics/migrations/update-9/update-angular-tree-component/update-angular-tree-component.schematic.js

@@ -1,18 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const schematics_1 = require("@angular-devkit/schematics");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const ensure_peers_installed_1 = require("../../../rules/ensure-peers-installed");
+const tree_1 = require("../../../utility/tree");
+const workspace_1 = require("../../../utility/workspace");
+function renameTypeScriptImportPaths() {
+    return async (tree) => {
+        const { workspace } = await (0, workspace_1.getWorkspace)(tree);
+        for (const [, projectDefinition] of workspace.projects.entries()) {
+            tree.getDir(projectDefinition.root).visit((filePath) => {
+                if (filePath.match(/\.ts$/)) {
+                    const content = (0, tree_1.readRequiredFile)(tree, filePath);
+                    const updatedContent = content.replace(/import {\s*(?:\w|,|\s)+\s*} from ['"](@circlon)\/angular-tree-component(?:\w|\/)*['"];/g, (match, importPath) => match.replace(importPath, '@blackbaud'));
+                    if (updatedContent !== content) {
+                        tree.overwrite(filePath, updatedContent);
+                    }
+                }
+            });
+        }
+    };
+}
 function default_1() {
-    return (0, ensure_peers_installed_1.ensurePeersInstalled)('@skyux/angular-tree-component', [
-        {
-            name: '@blackbaud/angular-tree-component',
-            version: '1.0.0-alpha.0',
-            type: dependencies_1.NodeDependencyType.Default,
-        },
-    ], [
-        {
-            name: '@circlon/angular-tree-component',
-        },
+    return (0, schematics_1.chain)([
+        renameTypeScriptImportPaths(),
+        (0, ensure_peers_installed_1.ensurePeersInstalled)('@skyux/angular-tree-component', [
+            {
+                name: '@blackbaud/angular-tree-component',
+                version: '1.0.0-alpha.0',
+                type: dependencies_1.NodeDependencyType.Default,
+            },
+        ], [
+            {
+                name: '@circlon/angular-tree-component',
+            },
+        ]),
     ]);
 }
 exports.default = default_1;

package/src/schematics/migrations/update-9/update-angular-tree-component/update-angular-tree-component.schematic.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-tree-component.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-9/update-angular-tree-component/update-angular-tree-component.schematic.ts"],"names":[],"mappings":";;AACA,2EAA8E;AAE9E,kFAA6E;AAE7E;IACE,OAAO,IAAA,6CAAoB,EACzB,+BAA+B,EAC/B;QACE;YACE,IAAI,EAAE,mCAAmC;YACzC,OAAO,EAAE,eAAe;YACxB,IAAI,EAAE,iCAAkB,CAAC,OAAO;SACjC;KACF,EACD;QACE;YACE,IAAI,EAAE,iCAAiC;SACxC;KACF,CACF,CAAC;AACJ,CAAC;AAhBD,4BAgBC"}
+{"version":3,"file":"update-angular-tree-component.schematic.js","sourceRoot":"","sources":["../../../../../../../../../libs/components/packages/src/schematics/migrations/update-9/update-angular-tree-component/update-angular-tree-component.schematic.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AACzD,2EAA8E;AAE9E,kFAA6E;AAC7E,gDAAyD;AACzD,0DAA0D;AAE1D,SAAS,2BAA2B;IAClC,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAE/C,KAAK,MAAM,CAAC,EAAE,iBAAiB,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE;YAChE,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACrD,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;oBAC3B,MAAM,OAAO,GAAG,IAAA,uBAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;oBAEjD,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CACpC,yFAAyF,EACzF,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,CAC/D,CAAC;oBAEF,IAAI,cAAc,KAAK,OAAO,EAAE;wBAC9B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;qBAC1C;iBACF;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AAED;IACE,OAAO,IAAA,kBAAK,EAAC;QACX,2BAA2B,EAAE;QAC7B,IAAA,6CAAoB,EAClB,+BAA+B,EAC/B;YACE;gBACE,IAAI,EAAE,mCAAmC;gBACzC,OAAO,EAAE,eAAe;gBACxB,IAAI,EAAE,iCAAkB,CAAC,OAAO;aACjC;SACF,EACD;YACE;gBACE,IAAI,EAAE,iCAAiC;aACxC;SACF,CACF;KACF,CAAC,CAAC;AACL,CAAC;AAnBD,4BAmBC"}

package/src/schematics/rules/ensure-peers-installed.d.ts

@@ -1,8 +1,9 @@
 import { Rule } from '@angular-devkit/schematics';
 import { NodeDependencyType } from '@schematics/angular/utility/dependencies';
 type PackageDetails = {
+    matchVersion?: boolean;
     name: string;
-    version: string;
+    version?: string;
     type: NodeDependencyType;
 };
 /**

package/src/schematics/rules/ensure-peers-installed.js

@@ -5,16 +5,21 @@ const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const tree_1 = require("../utility/tree");
-function installPackages(packages) {
+function installPackages(packages, targetPackageVersion) {
     return (tree, context) => {
         for (const details of packages) {
             // Remove the package (if it exists) so we can ensure it's added to the appropriate section.
             (0, dependencies_1.removePackageJsonDependency)(tree, details.name, '/package.json');
-            (0, dependencies_1.addPackageJsonDependency)(tree, {
-                type: details.type,
-                name: details.name,
-                version: details.version,
-            });
+            const version = details.matchVersion
+                ? targetPackageVersion
+                : details.version;
+            if (version) {
+                (0, dependencies_1.addPackageJsonDependency)(tree, {
+                    type: details.type,
+                    name: details.name,
+                    version,
+                });
+            }
         }
         context.addTask(new tasks_1.NodePackageInstallTask());
     };
@@ -40,12 +45,17 @@ function uninstallPackages(packages) {
 function ensurePeersInstalled(targetPackageName, peers, peersToRemove) {
     return async (tree) => {
         const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
+        const targetPackageVersion = packageJson.dependencies?.[targetPackageName] ??
+            packageJson.devDependencies?.[targetPackageName];
         const dependencies = {
             ...(packageJson.dependencies || {}),
             ...(packageJson.devDependencies || {}),
         };
         return dependencies[targetPackageName]
-            ? (0, schematics_1.chain)([uninstallPackages(peersToRemove), installPackages(peers)])
+            ? (0, schematics_1.chain)([
+                uninstallPackages(peersToRemove),
+                installPackages(peers, targetPackageVersion),
+            ])
             : undefined;
     };
 }

package/src/schematics/rules/ensure-peers-installed.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-peers-installed.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/rules/ensure-peers-installed.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AACzD,4DAA0E;AAC1E,2EAIkD;AAElD,0CAAmD;AAQnD,SAAS,eAAe,CAAC,QAA0B;IACjD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,4FAA4F;YAC5F,IAAA,0CAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YACjE,IAAA,uCAAwB,EAAC,IAAI,EAAE;gBAC7B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC;SACJ;QAED,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,QAAyC;IAClE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,0BAA0B;QAC1B,IAAI,QAAQ,EAAE;YACZ,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC9B,IAAA,0CAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;aAClE;YAED,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;SAC/C;IACH,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAClC,iBAAyB,EACzB,KAAuB,EACvB,aAA8C;IAE9C,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,WAAW,GAGb,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAExD,MAAM,YAAY,GAA2B;YAC3C,GAAG,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;YACnC,GAAG,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;SACvC,CAAC;QAEF,OAAO,YAAY,CAAC,iBAAiB,CAAC;YACpC,CAAC,CAAC,IAAA,kBAAK,EAAC,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;YACnE,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AApBD,oDAoBC"}
+{"version":3,"file":"ensure-peers-installed.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/rules/ensure-peers-installed.ts"],"names":[],"mappings":";;;AAAA,2DAAyD;AACzD,4DAA0E;AAC1E,2EAIkD;AAElD,0CAAmD;AAcnD,SAAS,eAAe,CACtB,QAA0B,EAC1B,oBAA6B;IAE7B,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,4FAA4F;YAC5F,IAAA,0CAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YAEjE,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY;gBAClC,CAAC,CAAC,oBAAoB;gBACtB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;YAEpB,IAAI,OAAO,EAAE;gBACX,IAAA,uCAAwB,EAAC,IAAI,EAAE;oBAC7B,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,OAAO;iBACR,CAAC,CAAC;aACJ;SACF;QAED,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,QAAyC;IAClE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,0BAA0B;QAC1B,IAAI,QAAQ,EAAE;YACZ,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC9B,IAAA,0CAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;aAClE;YAED,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;SAC/C;IACH,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAClC,iBAAyB,EACzB,KAAuB,EACvB,aAA8C;IAE9C,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,WAAW,GAAgB,IAAI,CAAC,KAAK,CACzC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CACxC,CAAC;QACF,MAAM,oBAAoB,GACxB,WAAW,CAAC,YAAY,EAAE,CAAC,iBAAiB,CAAC;YAC7C,WAAW,CAAC,eAAe,EAAE,CAAC,iBAAiB,CAAC,CAAC;QAEnD,MAAM,YAAY,GAA2B;YAC3C,GAAG,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;YACnC,GAAG,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;SACvC,CAAC;QAEF,OAAO,YAAY,CAAC,iBAAiB,CAAC;YACpC,CAAC,CAAC,IAAA,kBAAK,EAAC;gBACJ,iBAAiB,CAAC,aAAa,CAAC;gBAChC,eAAe,CAAC,KAAK,EAAE,oBAAoB,CAAC;aAC7C,CAAC;YACJ,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAzBD,oDAyBC"}