@adobe/create-ccweb-add-on 2.5.0 → 3.1.0

package/templates/swc-javascript-with-document-sandbox/template.json

@@ -6,8 +6,8 @@
         "package": "ccweb-add-on-scripts package --use webpack"
     },
     "dependencies": {
-        "@spectrum-web-components/button": "0.39.4",
-        "@spectrum-web-components/theme": "0.39.4",
+        "@spectrum-web-components/button": "1.7.0",
+        "@spectrum-web-components/theme": "1.7.0",
         "lit": "2.8.0"
     },
     "devDependencies": {
@@ -18,7 +18,7 @@
         "css-loader": "6.8.1",
         "html-webpack-plugin": "5.5.3",
         "style-loader": "3.3.3",
-        "webpack-cli": "5.1.4",
-        "webpack": "5.89.0"
+        "webpack-cli": "6.0.1",
+        "webpack": "5.98.0"
     }
 }

package/templates/swc-typescript/template/src/components/App.css.ts

@@ -1,6 +1,6 @@
-import { css } from "lit";
+import { type CSSResult, css } from "lit";
 
-export const style = css`
+export const style: CSSResult = css`
     .container {
         margin: 24px;
         display: flex;

package/templates/swc-typescript/template/src/components/App.ts

@@ -1,4 +1,4 @@
-// To support: theme="express" scale="medium" color="light"
+// To support: system="express" scale="medium" color="light"
 // import these spectrum web components modules:
 import "@spectrum-web-components/theme/express/scale-medium.js";
 import "@spectrum-web-components/theme/express/theme-light.js";
@@ -10,7 +10,7 @@ import "@spectrum-web-components/theme/theme-light.js";
 import "@spectrum-web-components/button/sp-button.js";
 import "@spectrum-web-components/theme/sp-theme.js";
 
-import { LitElement, html } from "lit";
+import { LitElement, TemplateResult, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
 import { style } from "./App.css";
 
@@ -32,10 +32,10 @@ export class App extends LitElement {
         this._buttonLabel = "Clicked";
     }
 
-    render() {
+    render(): TemplateResult {
         // Please note that the below "<sp-theme>" component does not react to theme changes in Express.
         // You may use "this.addOnUISdk.app.ui.theme" to get the current theme and react accordingly.
-        return html` <sp-theme theme="express" color="light" scale="medium">
+        return html` <sp-theme system="express" color="light" scale="medium">
             <div class="container">
                 <sp-button size="m" @click=${this._handleClick}>${this._buttonLabel}</sp-button>
             </div>

package/templates/swc-typescript/template/src/index.ts

@@ -1,4 +1,4 @@
-import { LitElement, html } from "lit";
+import { LitElement, TemplateResult, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
 import { until } from "lit/directives/until.js";
 import "./components/App";
@@ -10,7 +10,7 @@ export class Root extends LitElement {
     @state()
     private _isAddOnUISdkReady = addOnUISdk.ready;
 
-    render() {
+    render(): TemplateResult {
         return html`
             ${until(
                 this._isAddOnUISdkReady.then(() => {

package/templates/swc-typescript/template/webpack.config.js

@@ -12,6 +12,7 @@ module.exports = {
         outputModule: true
     },
     output: {
+        pathinfo: !isEnvProduction,
         path: path.resolve(__dirname, "dist"),
         module: true,
         filename: "index.js"

package/templates/swc-typescript/template.json

@@ -6,8 +6,8 @@
         "package": "ccweb-add-on-scripts package --use webpack"
     },
     "dependencies": {
-        "@spectrum-web-components/button": "0.39.4",
-        "@spectrum-web-components/theme": "0.39.4",
+        "@spectrum-web-components/button": "1.7.0",
+        "@spectrum-web-components/theme": "1.7.0",
         "lit": "2.8.0"
     },
     "devDependencies": {
@@ -17,7 +17,7 @@
         "style-loader": "3.3.3",
         "ts-loader": "9.5.1",
         "typescript": "5.3.2",
-        "webpack-cli": "5.1.4",
-        "webpack": "5.89.0"
+        "webpack-cli": "6.0.1",
+        "webpack": "5.98.0"
     }
 }

package/templates/swc-typescript-with-document-sandbox/template/src/ui/components/App.css.ts

@@ -1,6 +1,6 @@
-import { css } from "lit";
+import { type CSSResult, css } from "lit";
 
-export const style = css`
+export const style: CSSResult = css`
     .container {
         margin: 24px;
         display: flex;

package/templates/swc-typescript-with-document-sandbox/template/src/ui/components/App.ts

@@ -1,4 +1,4 @@
-// To support: theme="express" scale="medium" color="light"
+// To support: system="express" scale="medium" color="light"
 // import these spectrum web components modules:
 import "@spectrum-web-components/theme/express/scale-medium.js";
 import "@spectrum-web-components/theme/express/theme-light.js";
@@ -10,7 +10,7 @@ import "@spectrum-web-components/theme/theme-light.js";
 import "@spectrum-web-components/button/sp-button.js";
 import "@spectrum-web-components/theme/sp-theme.js";
 
-import { LitElement, html } from "lit";
+import { LitElement, TemplateResult, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
 import { DocumentSandboxApi } from "../../models/DocumentSandboxApi";
 import { style } from "./App.css";
@@ -43,10 +43,10 @@ export class App extends LitElement {
         this._sandboxProxy.createRectangle();
     }
 
-    render() {
+    render(): TemplateResult {
         // Please note that the below "<sp-theme>" component does not react to theme changes in Express.
         // You may use "this.addOnUISdk.app.ui.theme" to get the current theme and react accordingly.
-        return html` <sp-theme theme="express" color="light" scale="medium">
+        return html` <sp-theme system="express" color="light" scale="medium">
             <div class="container">
                 <sp-button size="m" @click=${this._handleClick}>Create Rectangle</sp-button>
             </div>

package/templates/swc-typescript-with-document-sandbox/template/src/ui/index.ts

@@ -1,4 +1,4 @@
-import { LitElement, html } from "lit";
+import { LitElement, TemplateResult, html } from "lit";
 import { customElement, state } from "lit/decorators.js";
 import { until } from "lit/directives/until.js";
 import "./components/App";
@@ -10,7 +10,7 @@ export class Root extends LitElement {
     @state()
     private _isAddOnUISdkReady = addOnUISdk.ready;
 
-    render() {
+    render(): TemplateResult {
         return html`
             ${until(
                 this._isAddOnUISdkReady.then(async () => {

package/templates/swc-typescript-with-document-sandbox/template/webpack.config.js

@@ -18,6 +18,7 @@ module.exports = {
         outputModule: true
     },
     output: {
+        pathinfo: !isEnvProduction,
         path: path.resolve(__dirname, "dist"),
         module: true,
         filename: "[name].js"

package/templates/swc-typescript-with-document-sandbox/template.json

@@ -6,8 +6,8 @@
         "package": "ccweb-add-on-scripts package --use webpack"
     },
     "dependencies": {
-        "@spectrum-web-components/button": "0.39.4",
-        "@spectrum-web-components/theme": "0.39.4",
+        "@spectrum-web-components/button": "1.7.0",
+        "@spectrum-web-components/theme": "1.7.0",
         "lit": "2.8.0"
     },
     "devDependencies": {
@@ -17,7 +17,7 @@
         "style-loader": "3.3.3",
         "ts-loader": "9.5.1",
         "typescript": "5.3.2",
-        "webpack-cli": "5.1.4",
-        "webpack": "5.89.0"
+        "webpack-cli": "6.0.1",
+        "webpack": "5.98.0"
     }
 }

package/tsconfig.json

@@ -17,11 +17,13 @@
         "outDir": "dist",
         "preserveConstEnums": true,
         "resolveJsonModule": true,
+        "skipLibCheck": true,
         "sourceMap": true,
         "strict": true,
         "target": "ESNext",
         "types": ["reflect-metadata"],
-        "useUnknownInCatchVariables": false
+        "useUnknownInCatchVariables": false,
+        "isolatedDeclarations": true
     },
     "exclude": ["node_modules", "src/test/**/*"],
     "include": ["src/**/*"],

package/dist/app/AddOnManager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AddOnManager.d.ts","sourceRoot":"","sources":["../../src/app/AddOnManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE;;GAEG;AACH,qBAAa,YAAY;IACrB;;;;;OAKG;IAGH,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW;CAanF"}

package/dist/app/AddOnTemplateSelector.d.ts

@@ -1,54 +0,0 @@
-/********************************************************************************
- * MIT License
-
- * © Copyright 2023 Adobe. All rights reserved.
-
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- ********************************************************************************/
-import type { AnalyticsService } from "@adobe/ccweb-add-on-analytics";
-import type { Logger } from "@adobe/ccweb-add-on-core";
-import "reflect-metadata";
-import type { CLIOptions } from "../models/index.js";
-import type { TemplateSelector } from "./TemplateSelector.js";
-export declare class AddOnTemplateSelector implements TemplateSelector {
-    private readonly _logger;
-    private readonly _analyticsService;
-    /**
-     * Instantiate {@link AddOnTemplateSelector}.
-     * @param logger - {@link Logger} reference.
-     * @param analyticsService - {@link AnalyticsService} reference.
-     * @returns Reference to a new {@link AddOnTemplateSelector} instance.
-     */
-    constructor(logger: Logger, analyticsService: AnalyticsService);
-    /**
-     * Sets up a template, as selected/provided by the user
-     * for scaffolding the add-on project.
-     * @param options - {@link CLIOptions}.
-     * @returns User selected/provided template name.
-     */
-    setupTemplate(options: CLIOptions): Promise<string>;
-    private _promptMessage;
-    private _promptMessageOption;
-    /**
-     * Validate whether addOnKind is valid or not.
-     * @param addOnKind - Kind of Add-on. For example: panel.
-     */
-    private _validateAddOnKind;
-}
-//# sourceMappingURL=AddOnTemplateSelector.d.ts.map

package/dist/app/AddOnTemplateSelector.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AddOnTemplateSelector.d.ts","sourceRoot":"","sources":["../../src/app/AddOnTemplateSelector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAMvD,OAAO,kBAAkB,CAAC;AAI1B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,qBACa,qBAAsB,YAAW,gBAAgB;IAC1D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IAErD;;;;;OAKG;gBAE4B,MAAM,EAAE,MAAM,EACC,gBAAgB,EAAE,gBAAgB;IAMhF;;;;;OAKG;IACG,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAsEzD,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,oBAAoB;IAO5B;;;OAGG;YACW,kBAAkB;CA6BnC"}

package/dist/app/AddOnTemplateSelector.js

@@ -1,168 +0,0 @@
-/********************************************************************************
- * MIT License
-
- * © Copyright 2023 Adobe. All rights reserved.
-
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- ********************************************************************************/
-import { __decorate, __metadata, __param } from "tslib";
-import { ITypes as IAnalyticsTypes } from "@adobe/ccweb-add-on-analytics";
-import { ITypes as ICoreTypes, isNullOrWhiteSpace } from "@adobe/ccweb-add-on-core";
-import { EntrypointType } from "@adobe/ccweb-add-on-manifest";
-import chalk from "chalk";
-import { inject, injectable } from "inversify";
-import prompts from "prompts";
-import "reflect-metadata";
-import format from "string-template";
-import { AnalyticsErrorMarkers } from "../AnalyticsMarkers.js";
-import { ADD_ON_TEMPLATES, AVAILABLE_ADD_ON_TEMPLATES, PROGRAM_NAME, WITH_DOCUMENT_SANDBOX } from "../constants.js";
-let AddOnTemplateSelector = class AddOnTemplateSelector {
-    _logger;
-    _analyticsService;
-    /**
-     * Instantiate {@link AddOnTemplateSelector}.
-     * @param logger - {@link Logger} reference.
-     * @param analyticsService - {@link AnalyticsService} reference.
-     * @returns Reference to a new {@link AddOnTemplateSelector} instance.
-     */
-    constructor(logger, analyticsService) {
-        this._logger = logger;
-        this._analyticsService = analyticsService;
-    }
-    /**
-     * Sets up a template, as selected/provided by the user
-     * for scaffolding the add-on project.
-     * @param options - {@link CLIOptions}.
-     * @returns User selected/provided template name.
-     */
-    async setupTemplate(options) {
-        await this._validateAddOnKind(options.addOnKind);
-        if (!isNullOrWhiteSpace(options.templateName)) {
-            if (AVAILABLE_ADD_ON_TEMPLATES.includes(options.templateName)) {
-                return options.templateName;
-            }
-            else {
-                this._logger.warning(LOGS.chooseValidTemplate, { prefix: LOGS.newLine });
-            }
-        }
-        // Add a line break for better log readability.
-        console.log();
-        const templateChoices = [];
-        for (const [templateName, description] of ADD_ON_TEMPLATES.entries()) {
-            templateChoices.push({
-                title: this._promptMessageOption(templateName, description),
-                value: templateName
-            });
-        }
-        const templateResponse = await prompts.prompt({
-            type: "select",
-            name: "selectedTemplate",
-            message: this._promptMessage(LOGS.setupTemplate),
-            choices: templateChoices,
-            initial: 0
-        });
-        if (!templateResponse || !templateResponse.selectedTemplate) {
-            console.log();
-            return process.exit(0);
-        }
-        /* c8 ignore next 4 */
-        /* All templates are currently available. */
-        if (!AVAILABLE_ADD_ON_TEMPLATES.includes(`${templateResponse.selectedTemplate}-${WITH_DOCUMENT_SANDBOX}`)) {
-            return templateResponse.selectedTemplate;
-        }
-        const documentSandboxChoices = [
-            {
-                title: this._promptMessageOption(LOGS.no),
-                value: false
-            },
-            {
-                title: this._promptMessageOption(LOGS.yes),
-                value: true
-            }
-        ];
-        const documentSandboxResponse = await prompts.prompt({
-            type: "select",
-            name: "includeDocumentSandbox",
-            message: this._promptMessage(LOGS.includeDocumentSandbox),
-            choices: documentSandboxChoices,
-            initial: 0
-        });
-        if (!documentSandboxResponse || documentSandboxResponse.includeDocumentSandbox === undefined) {
-            console.log();
-            return process.exit(0);
-        }
-        // Append `with-document-sandbox` to the template name if user wants to include document sandbox
-        return documentSandboxResponse.includeDocumentSandbox
-            ? `${templateResponse.selectedTemplate}-${WITH_DOCUMENT_SANDBOX}`
-            : templateResponse.selectedTemplate;
-    }
-    _promptMessage(message) {
-        return chalk.cyan(message);
-    }
-    _promptMessageOption(option, description) {
-        if (description) {
-            return `${chalk.hex("#E59400").bold(`[${option}]:`)} ${chalk.green(description)}`;
-        }
-        return chalk.green.bold(option);
-    }
-    /**
-     * Validate whether addOnKind is valid or not.
-     * @param addOnKind - Kind of Add-on. For example: panel.
-     */
-    async _validateAddOnKind(addOnKind) {
-        if (addOnKind !== EntrypointType.PANEL) {
-            this._logger.warning(LOGS.chooseValidKind);
-            this._logger.warning(format(LOGS.executeProgramWithValidKind, {
-                PROGRAM_NAME
-            }), {
-                prefix: LOGS.tab
-            });
-            this._logger.message(LOGS.forExample, { prefix: LOGS.newLine });
-            this._logger.information(format(LOGS.executeProgramWithValidKindExample, {
-                PROGRAM_NAME
-            }), {
-                prefix: LOGS.tab
-            });
-            await this._analyticsService.postEvent(AnalyticsErrorMarkers.ERROR_INVALID_KIND, LOGS.analyticsInvalidKind, false);
-            return process.exit(0);
-        }
-    }
-};
-AddOnTemplateSelector = __decorate([
-    injectable(),
-    __param(0, inject(ICoreTypes.Logger)),
-    __param(1, inject(IAnalyticsTypes.AnalyticsService)),
-    __metadata("design:paramtypes", [Object, Object])
-], AddOnTemplateSelector);
-export { AddOnTemplateSelector };
-const LOGS = {
-    newLine: "\n",
-    tab: "  ",
-    setupTemplate: "Please select a template which you want to scaffold the Add-on project with",
-    chooseValidKind: "Please choose a valid Add-on kind (valid kind: panel)",
-    executeProgramWithValidKind: "{PROGRAM_NAME} <add-on-name> --kind <panel>",
-    executeProgramWithValidKindExample: "{PROGRAM_NAME} my-add-on --kind panel",
-    chooseValidTemplate: "You have chosen an invalid template.",
-    forExample: "For example:",
-    analyticsInvalidKind: "Invalid Add-on kind specified",
-    includeDocumentSandbox: "Do you want to include document sandbox runtime?",
-    yes: "Yes",
-    no: "No"
-};
-//# sourceMappingURL=AddOnTemplateSelector.js.map

package/dist/app/WxpAddOnFactory.d.ts

@@ -1,62 +0,0 @@
-/********************************************************************************
- * MIT License
-
- * © Copyright 2023 Adobe. All rights reserved.
-
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- ********************************************************************************/
-import type { AnalyticsService } from "@adobe/ccweb-add-on-analytics";
-import type { Logger, Process } from "@adobe/ccweb-add-on-core";
-import type { AddOnScaffolder } from "@adobe/ccweb-add-on-scaffolder";
-import "reflect-metadata";
-import type { CLIOptions } from "../models/CLIOptions.js";
-import type { DirectoryValidator, EnvironmentValidator } from "../validators/index.js";
-import type { AddOnFactory } from "./AddOnFactory.js";
-import type { TemplateSelector } from "./TemplateSelector.js";
-/**
- * AddOn factory implementation class.
- */
-export declare class WxpAddOnFactory implements AddOnFactory {
-    private readonly _directoryValidator;
-    private readonly _environmentValidator;
-    private readonly _templateSelector;
-    private readonly _scaffolder;
-    private readonly _process;
-    private readonly _logger;
-    private readonly _analyticsService;
-    /**
-     * Instantiate {@link WxpAddOnFactory}.
-     * @param directoryValidator - {@link DirectoryValidator} reference.
-     * @param environmentValidator - {@link EnvironmentValidator} reference.
-     * @param templateSelector - {@link TemplateSelector} reference.
-     * @param scaffolder - {@link AddOnScaffolder} reference.
-     * @param cliProcess - {@link Process} reference.
-     * @param logger - {@link Logger} reference.
-     * @param analyticsService - {@link AnalyticsService} reference.
-     * @returns Reference to a new {@link WxpAddOnFactory} instance.
-     */
-    constructor(directoryValidator: DirectoryValidator, environmentValidator: EnvironmentValidator, templateSelector: TemplateSelector, scaffolder: AddOnScaffolder, cliProcess: Process, logger: Logger, analyticsService: AnalyticsService);
-    /**
-     * Create the Add-on project.
-     * @param options - {@link CLIOptions}.
-     */
-    create(options: CLIOptions): Promise<void>;
-    private _copyTemplateFiles;
-}
-//# sourceMappingURL=WxpAddOnFactory.d.ts.map

package/dist/app/WxpAddOnFactory.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"WxpAddOnFactory.d.ts","sourceRoot":"","sources":["../../src/app/WxpAddOnFactory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEhE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAOtE,OAAO,kBAAkB,CAAC;AAM1B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;GAEG;AACH,qBACa,eAAgB,YAAW,YAAY;IAChD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqB;IACzD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAuB;IAC7D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IAErD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAkB;IAE9C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IAErD;;;;;;;;;;OAUG;gBAEoC,kBAAkB,EAAE,kBAAkB,EACpC,oBAAoB,EAAE,oBAAoB,EAC9C,gBAAgB,EAAE,gBAAgB,EACzB,UAAU,EAAE,eAAe,EACzC,UAAU,EAAE,OAAO,EACpB,MAAM,EAAE,MAAM,EACC,gBAAgB,EAAE,gBAAgB;IAchF;;;OAGG;IACG,MAAM,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA0EhD,OAAO,CAAC,kBAAkB;CAa7B"}