@skyux/packages 7.0.0-beta.6 → 7.0.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyux/packages",
-  "version": "7.0.0-beta.6",
+  "version": "7.0.0-beta.8",
   "author": "Blackbaud, Inc.",
   "description": "Handles the `ng update` command for SKY UX component libraries.",
   "keywords": [
@@ -27,54 +27,54 @@
       "@blackbaud/skyux-lib-code-block": "^7.0.0-beta.0",
       "@blackbaud/skyux-lib-media": "^7.0.0-beta.0",
       "@blackbaud/skyux-lib-stache": "^7.0.0-beta.0",
-      "@skyux-sdk/prettier-schematics": "7.0.0-beta.6",
-      "@skyux-sdk/testing": "7.0.0-beta.6",
-      "@skyux/a11y": "7.0.0-beta.6",
-      "@skyux/action-bars": "7.0.0-beta.6",
-      "@skyux/ag-grid": "7.0.0-beta.6",
-      "@skyux/angular-tree-component": "7.0.0-beta.6",
-      "@skyux/animations": "7.0.0-beta.6",
-      "@skyux/assets": "7.0.0-beta.6",
-      "@skyux/autonumeric": "7.0.0-beta.6",
-      "@skyux/avatar": "7.0.0-beta.6",
-      "@skyux/colorpicker": "7.0.0-beta.6",
-      "@skyux/config": "7.0.0-beta.6",
-      "@skyux/core": "7.0.0-beta.6",
-      "@skyux/data-manager": "7.0.0-beta.6",
-      "@skyux/datetime": "7.0.0-beta.6",
+      "@skyux-sdk/prettier-schematics": "7.0.0-beta.8",
+      "@skyux-sdk/testing": "7.0.0-beta.8",
+      "@skyux/a11y": "7.0.0-beta.8",
+      "@skyux/action-bars": "7.0.0-beta.8",
+      "@skyux/ag-grid": "7.0.0-beta.8",
+      "@skyux/angular-tree-component": "7.0.0-beta.8",
+      "@skyux/animations": "7.0.0-beta.8",
+      "@skyux/assets": "7.0.0-beta.8",
+      "@skyux/autonumeric": "7.0.0-beta.8",
+      "@skyux/avatar": "7.0.0-beta.8",
+      "@skyux/colorpicker": "7.0.0-beta.8",
+      "@skyux/config": "7.0.0-beta.8",
+      "@skyux/core": "7.0.0-beta.8",
+      "@skyux/data-manager": "7.0.0-beta.8",
+      "@skyux/datetime": "7.0.0-beta.8",
       "@skyux/docs-tools": "^7.0.0-beta.0",
-      "@skyux/errors": "7.0.0-beta.6",
-      "@skyux/flyout": "7.0.0-beta.6",
-      "@skyux/forms": "7.0.0-beta.6",
-      "@skyux/grids": "7.0.0-beta.6",
-      "@skyux/http": "7.0.0-beta.6",
-      "@skyux/i18n": "7.0.0-beta.6",
+      "@skyux/errors": "7.0.0-beta.8",
+      "@skyux/flyout": "7.0.0-beta.8",
+      "@skyux/forms": "7.0.0-beta.8",
+      "@skyux/grids": "7.0.0-beta.8",
+      "@skyux/http": "7.0.0-beta.8",
+      "@skyux/i18n": "7.0.0-beta.8",
       "@skyux/icons": "^5.1.1",
-      "@skyux/indicators": "7.0.0-beta.6",
-      "@skyux/inline-form": "7.0.0-beta.6",
-      "@skyux/layout": "7.0.0-beta.6",
-      "@skyux/list-builder": "7.0.0-beta.6",
-      "@skyux/list-builder-common": "7.0.0-beta.6",
-      "@skyux/list-builder-view-checklist": "7.0.0-beta.6",
-      "@skyux/list-builder-view-grids": "7.0.0-beta.6",
-      "@skyux/lists": "7.0.0-beta.6",
-      "@skyux/lookup": "7.0.0-beta.6",
-      "@skyux/modals": "7.0.0-beta.6",
-      "@skyux/navbar": "7.0.0-beta.6",
-      "@skyux/omnibar-interop": "7.0.0-beta.6",
-      "@skyux/pages": "7.0.0-beta.6",
-      "@skyux/phone-field": "7.0.0-beta.6",
-      "@skyux/popovers": "7.0.0-beta.6",
-      "@skyux/progress-indicator": "7.0.0-beta.6",
-      "@skyux/router": "7.0.0-beta.6",
-      "@skyux/select-field": "7.0.0-beta.6",
-      "@skyux/split-view": "7.0.0-beta.6",
-      "@skyux/tabs": "7.0.0-beta.6",
-      "@skyux/text-editor": "7.0.0-beta.6",
-      "@skyux/theme": "7.0.0-beta.6",
-      "@skyux/tiles": "7.0.0-beta.6",
-      "@skyux/toast": "7.0.0-beta.6",
-      "@skyux/validation": "7.0.0-beta.6",
+      "@skyux/indicators": "7.0.0-beta.8",
+      "@skyux/inline-form": "7.0.0-beta.8",
+      "@skyux/layout": "7.0.0-beta.8",
+      "@skyux/list-builder": "7.0.0-beta.8",
+      "@skyux/list-builder-common": "7.0.0-beta.8",
+      "@skyux/list-builder-view-checklist": "7.0.0-beta.8",
+      "@skyux/list-builder-view-grids": "7.0.0-beta.8",
+      "@skyux/lists": "7.0.0-beta.8",
+      "@skyux/lookup": "7.0.0-beta.8",
+      "@skyux/modals": "7.0.0-beta.8",
+      "@skyux/navbar": "7.0.0-beta.8",
+      "@skyux/omnibar-interop": "7.0.0-beta.8",
+      "@skyux/pages": "7.0.0-beta.8",
+      "@skyux/phone-field": "7.0.0-beta.8",
+      "@skyux/popovers": "7.0.0-beta.8",
+      "@skyux/progress-indicator": "7.0.0-beta.8",
+      "@skyux/router": "7.0.0-beta.8",
+      "@skyux/select-field": "7.0.0-beta.8",
+      "@skyux/split-view": "7.0.0-beta.8",
+      "@skyux/tabs": "7.0.0-beta.8",
+      "@skyux/text-editor": "7.0.0-beta.8",
+      "@skyux/theme": "7.0.0-beta.8",
+      "@skyux/tiles": "7.0.0-beta.8",
+      "@skyux/toast": "7.0.0-beta.8",
+      "@skyux/validation": "7.0.0-beta.8",
       "ag-grid-angular": "^27.2.0",
       "ag-grid-community": "^27.2.0",
       "ag-grid-enterprise": "^27.2.0"

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

@@ -1,7 +1,7 @@
 {
   "schematics": {
     "noop": {
-      "version": "7.0.0-beta.6",
+      "version": "7.0.0-beta.8",
       "factory": "./noop/noop.schematic",
       "description": "Update all SKY UX component packages"
     },
@@ -19,6 +19,11 @@
       "version": "7.0.0-beta.0",
       "factory": "./update-7/add-compat-stylesheets",
       "description": "Add a backwards-compatible stylesheet with styles that have been removed from components in SKY UX 7."
+    },
+    "fix-scss-imports": {
+      "version": "7.0.0-beta.0",
+      "factory": "./update-7/fix-scss-imports",
+      "description": "Fix SCSS imports"
     }
   }
 }

package/src/schematics/migrations/update-7/add-compat-stylesheets.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const schematics_1 = require("@angular-devkit/schematics");
 const tree_1 = require("../../utility/tree");
 const workspace_1 = require("../../utility/workspace");
-const SKYUX7_COMPAT_CSS_PATH = 'src/app/skyux7-compat.css';
+const SKYUX7_COMPAT_CSS_FILE_NAME = 'skyux7-compat.css';
 const compatStyles = {
     libraries: [
         {
@@ -26,10 +26,19 @@ The preset bottom margin has been removed from alert components. To implement th
         },
     ],
 };
+function getProjectSourcePath(projectDefinition) {
+    /*istanbul ignore else*/
+    if (projectDefinition.sourceRoot) {
+        return `${projectDefinition.sourceRoot}/app`;
+    }
+    else {
+        return `${projectDefinition.root}/src/app`;
+    }
+}
 function buildCommentBlock(message) {
     return `/${'*'.repeat(79)}
  * ${message.replace(/(?![^\n]{1,75}$)([^\n]{1,75})\s/g, '$1\n * ')}
-${'*'.repeat(79)}/`;
+ ${'*'.repeat(79)}/`;
 }
 function buildComponentCss(component) {
     let contents = buildCommentBlock(`COMPONENT: ${component.name.toUpperCase()}`);
@@ -43,13 +52,14 @@ ${style.css.trim()}
     }
     return contents;
 }
-function writeStylesheet(contents) {
+function writeStylesheet(sourceRoot, contents) {
+    const filePath = `${sourceRoot}/${SKYUX7_COMPAT_CSS_FILE_NAME}`;
     return (tree) => {
-        if (tree.exists(SKYUX7_COMPAT_CSS_PATH)) {
-            tree.overwrite(SKYUX7_COMPAT_CSS_PATH, contents);
+        if (tree.exists(filePath)) {
+            tree.overwrite(filePath, contents);
         }
         else {
-            tree.create(SKYUX7_COMPAT_CSS_PATH, contents);
+            tree.create(filePath, contents);
         }
     };
 }
@@ -57,16 +67,16 @@ function addStylesheetToWorkspace() {
     return () => (0, workspace_1.updateWorkspace)((workspace) => {
         for (const project of workspace.projects.values()) {
             for (const targetName of ['build', 'test']) {
-                // Ignore build target for libraries.
-                if (!(targetName === 'build' &&
-                    project.extensions.projectType === 'library')) {
+                if (project.extensions.projectType === 'application') {
                     const target = project.targets.get(targetName);
+                    const sourceRoot = getProjectSourcePath(project);
+                    const filePath = `${sourceRoot}/${SKYUX7_COMPAT_CSS_FILE_NAME}`;
                     /* istanbul ignore else */
                     if (target && target.options) {
                         const styles = (target.options.styles = (target.options.styles ||
                             []));
-                        if (!styles.includes(SKYUX7_COMPAT_CSS_PATH)) {
-                            styles.push(SKYUX7_COMPAT_CSS_PATH);
+                        if (!styles.includes(filePath)) {
+                            styles.push(filePath);
                         }
                     }
                 }
@@ -74,29 +84,43 @@ function addStylesheetToWorkspace() {
         }
     });
 }
-function default_1() {
-    return (tree) => {
-        const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
-        let contents = '';
-        for (const library of compatStyles.libraries) {
-            if (packageJson.dependencies?.[library.name] ||
-                packageJson.devDependencies?.[library.name]) {
-                for (const component of library.components) {
-                    contents += buildComponentCss(component);
-                }
+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);
             }
         }
-        const rules = [];
-        if (contents) {
-            contents = `${buildCommentBlock(`TODO: The following component libraries introduced visual breaking changes in SKY UX 7. Each block of CSS reintroduces the styles that were changed or removed for backwards compatibility. You will need to do the following before migrating to the next major version of SKY UX:
+    }
+    return contents
+        ? `${buildCommentBlock(`TODO: The following component libraries introduced visual breaking changes in SKY UX 7. Each block of CSS reintroduces the styles that were changed or removed for backwards 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}`;
-            rules.push(writeStylesheet(contents), addStylesheetToWorkspace());
+${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 = getProjectSourcePath(projectDefinition);
+                    rules.push(writeStylesheet(sourcePath, styles));
+                }
+            }
+        }
+        if (styles) {
+            rules.push(addStylesheetToWorkspace());
         }
         return (0, schematics_1.chain)(rules);
     };

package/src/schematics/migrations/update-7/add-compat-stylesheets.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-compat-stylesheets.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-compat-stylesheets.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AAEzD,6CAAsD;AACtD,uDAA0D;AAE1D,MAAM,sBAAsB,GAAG,2BAA2B,CAAC;AAE3D,MAAM,YAAY,GAAG;IACnB,SAAS,EAAE;QACT;YACE,IAAI,EAAE,mBAAmB;YACzB,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,OAAO;oBACb,MAAM,EAAE;wBACN;4BACE,GAAG,EAAE;;;EAGjB;4BACY,YAAY,EAAE;sOAC0M;yBACzN;qBACF;iBACF;aACF;SACF;KACF;CACF,CAAC;AAEF,SAAS,iBAAiB,CAAC,OAAe;IACxC,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;KACtB,OAAO,CAAC,OAAO,CAAC,kCAAkC,EAAE,SAAS,CAAC;EACjE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC;AACpB,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;QACpC,QAAQ,IAAI;;EAEd,iBAAiB,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;;EAE5C,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE;CACjB,CAAC;KACC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,eAAe,CAAC,QAAgB;IACvC,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,IAAI,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,EAAE;YACvC,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;SAClD;aAAM;YACL,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;SAC/C;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB;IAC/B,OAAO,GAAG,EAAE,CACV,IAAA,2BAAe,EAAC,CAAC,SAAS,EAAE,EAAE;QAC5B,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;YACjD,KAAK,MAAM,UAAU,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE;gBAC1C,qCAAqC;gBACrC,IACE,CAAC,CACC,UAAU,KAAK,OAAO;oBACtB,OAAO,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,CAC7C,EACD;oBACA,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;oBAE/C,0BAA0B;oBAC1B,IAAI,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;wBAC5B,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM;4BAC5D,EAAE,CAAa,CAAC,CAAC;wBAEnB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE;4BAC5C,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;yBACrC;qBACF;iBACF;aACF;SACF;IACH,CAAC,CAAC,CAAC;AACP,CAAC;AAED;IACE,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,WAAW,GAGb,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAExD,IAAI,QAAQ,GAAG,EAAE,CAAC;QAElB,KAAK,MAAM,OAAO,IAAI,YAAY,CAAC,SAAS,EAAE;YAC5C,IACE,WAAW,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;gBACxC,WAAW,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAC3C;gBACA,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE;oBAC1C,QAAQ,IAAI,iBAAiB,CAAC,SAAS,CAAC,CAAC;iBAC1C;aACF;SACF;QAED,MAAM,KAAK,GAAW,EAAE,CAAC;QAEzB,IAAI,QAAQ,EAAE;YACZ,QAAQ,GAAG,GAAG,iBAAiB,CAC7B;;;;;qBAKa,CACd;;EAEL,QAAQ,EAAE,CAAC;YAEP,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,wBAAwB,EAAE,CAAC,CAAC;SACnE;QAED,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC;AACJ,CAAC;AAvCD,4BAuCC"}
+{"version":3,"file":"add-compat-stylesheets.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-compat-stylesheets.ts"],"names":[],"mappings":"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"}

package/src/schematics/migrations/update-7/fix-scss-imports.d.ts

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

package/src/schematics/migrations/update-7/fix-scss-imports.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schematics_1 = require("@angular-devkit/schematics");
+const tree_1 = require("../../utility/tree");
+const workspace_1 = require("../../utility/workspace");
+/**
+ * Replaces any @blackbaud/skyux-design-tokens imports with their @skyux/theme equivalents.
+ */
+function replaceDesignTokensImports(contents) {
+    const matches = contents.matchAll(/@import\s+['"]?node_modules\/@blackbaud\/skyux-design-tokens\/scss\/_?(mixins|variables)(?:\.scss)?['"]?;?\s+/g);
+    for (const match of matches) {
+        const importPath = match[0];
+        const importType = match[1]; // mixins or variables
+        const replacementTemplate = new RegExp(`@import\\s+['"]?node_modules\\/@skyux\\/theme\\/scss\\/_?${importType}(?:\\.scss)?['"]?;?`);
+        // If the equivalent default import is already found, just remove the design tokens import.
+        if (replacementTemplate.test(contents)) {
+            contents = contents.replace(importPath, '');
+            continue;
+        }
+        contents = contents.replace(importPath, `@import 'node_modules/@skyux/theme/scss/${importType}';\n`);
+    }
+    return contents;
+}
+/**
+ * If a mixins import exists, add the variables import as well.
+ * (In prior versions of SKY UX, the variables were exported from the mixins file, but
+ * this created a circular reference, hence the fix.)
+ */
+function addVariablesScssImports(contents) {
+    const matches = contents.matchAll(/@import\s+['"]?node_modules\/@skyux\/theme\/scss\/(_compat\/|themes\/modern\/_compat\/)?_?mixins(?:\.scss)?['"]?;?/g);
+    for (const match of matches) {
+        const mixinsImport = match[0];
+        const variablesImport = mixinsImport.replace('mixins', 'variables');
+        if (!contents.includes(variablesImport)) {
+            contents = contents.replace(mixinsImport, `${mixinsImport}\n${variablesImport}`);
+        }
+    }
+    return contents;
+}
+function fixScssImports() {
+    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.endsWith('.scss')) {
+                    const contents = (0, tree_1.readRequiredFile)(tree, filePath);
+                    let updatedContents = contents;
+                    updatedContents = replaceDesignTokensImports(updatedContents);
+                    updatedContents = addVariablesScssImports(updatedContents);
+                    if (updatedContents !== contents) {
+                        tree.overwrite(filePath, updatedContents);
+                    }
+                }
+            });
+        }
+    };
+}
+/**
+ * Removes the local version of '@blackbaud/skyux-design-tokens' from package.json;
+ */
+function removeDesignTokensPackage() {
+    return (tree) => {
+        const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, 'package.json'));
+        if (packageJson.dependencies) {
+            delete packageJson.dependencies['@blackbaud/skyux-design-tokens'];
+        }
+        if (packageJson.devDependencies) {
+            delete packageJson.devDependencies['@blackbaud/skyux-design-tokens'];
+        }
+        tree.overwrite('package.json', JSON.stringify(packageJson));
+    };
+}
+function default_1() {
+    return (0, schematics_1.chain)([fixScssImports(), removeDesignTokensPackage()]);
+}
+exports.default = default_1;
+//# sourceMappingURL=fix-scss-imports.js.map

package/src/schematics/migrations/update-7/fix-scss-imports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fix-scss-imports.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/fix-scss-imports.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AAEzD,6CAAsD;AACtD,uDAAuD;AAEvD;;GAEG;AACH,SAAS,0BAA0B,CAAC,QAAgB;IAClD,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAC/B,gHAAgH,CACjH,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;QAC3B,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;QAEnD,MAAM,mBAAmB,GAAG,IAAI,MAAM,CACpC,4DAA4D,UAAU,qBAAqB,CAC5F,CAAC;QAEF,2FAA2F;QAC3F,IAAI,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACtC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAC5C,SAAS;SACV;QAED,QAAQ,GAAG,QAAQ,CAAC,OAAO,CACzB,UAAU,EACV,2CAA2C,UAAU,MAAM,CAC5D,CAAC;KACH;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAAC,QAAgB;IAC/C,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAC/B,qHAAqH,CACtH,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;QAC3B,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACpE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;YACvC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CACzB,YAAY,EACZ,GAAG,YAAY,KAAK,eAAe,EAAE,CACtC,CAAC;SACH;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,cAAc;IACrB,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,QAAQ,CAAC,OAAO,CAAC,EAAE;oBAC9B,MAAM,QAAQ,GAAG,IAAA,uBAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;oBAElD,IAAI,eAAe,GAAG,QAAQ,CAAC;oBAC/B,eAAe,GAAG,0BAA0B,CAAC,eAAe,CAAC,CAAC;oBAC9D,eAAe,GAAG,uBAAuB,CAAC,eAAe,CAAC,CAAC;oBAE3D,IAAI,eAAe,KAAK,QAAQ,EAAE;wBAChC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;qBAC3C;iBACF;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,yBAAyB;IAChC,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;QAEvE,IAAI,WAAW,CAAC,YAAY,EAAE;YAC5B,OAAO,WAAW,CAAC,YAAY,CAAC,gCAAgC,CAAC,CAAC;SACnE;QAED,IAAI,WAAW,CAAC,eAAe,EAAE;YAC/B,OAAO,WAAW,CAAC,eAAe,CAAC,gCAAgC,CAAC,CAAC;SACtE;QAED,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC;AACJ,CAAC;AAED;IACE,OAAO,IAAA,kBAAK,EAAC,CAAC,cAAc,EAAE,EAAE,yBAAyB,EAAE,CAAC,CAAC,CAAC;AAChE,CAAC;AAFD,4BAEC"}