@appsemble/cli 0.20.28 → 0.20.30

package/README.md

@@ -1,10 +1,10 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.20.28/config/assets/logo.svg) Appsemble CLI
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.20.30/config/assets/logo.svg) Appsemble CLI
 
 > Manage apps and blocks from the command line.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/cli)](https://www.npmjs.com/package/@appsemble/cli)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.20.28/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.20.28)
-[![Code coverage](https://codecov.io/gl/appsemble/appsemble/branch/0.20.28/graph/badge.svg)](https://codecov.io/gl/appsemble/appsemble)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.20.30/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.20.30)
+[![Code coverage](https://codecov.io/gl/appsemble/appsemble/branch/0.20.30/graph/badge.svg)](https://codecov.io/gl/appsemble/appsemble)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Installation
@@ -95,5 +95,5 @@ appsemble asset create --app-id 1 path/to/example-asset.png
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.20.28/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.20.30/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.20.28",
+  "version": "0.20.30",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -34,9 +34,9 @@
     "test": "NODE_OPTIONS=--experimental-vm-modules jest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.20.28",
-    "@appsemble/types": "0.20.28",
-    "@appsemble/utils": "0.20.28",
+    "@appsemble/node-utils": "0.20.30",
+    "@appsemble/types": "0.20.30",
+    "@appsemble/utils": "0.20.30",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "axios": "^0.27.0",
     "chalk": "^4.0.0",
@@ -62,7 +62,7 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.20.28",
+    "@appsemble/types": "0.20.30",
     "@types/concat-stream": "^2.0.0",
     "@types/inquirer": "^9.0.0",
     "@types/normalize-path": "^3.0.0",

package/__fixtures__/getBlockConfigFromTypeScript/comments/index.ts

@@ -1,40 +0,0 @@
-import '@appsemble/sdk';
-
-declare module '@appsemble/sdk' {
-  interface Actions {
-    /**
-     * Valid action comment
-     */
-    comment: never;
-
-    /**
-     * Unexpected comment
-     */
-    /**
-     * Expected comment
-     */
-    duplicate: never;
-
-    // Ignored line comment
-    line: never;
-  }
-
-  interface EventEmitters {
-    /**
-     * Test event emitter.
-     */
-    testEmit: never;
-  }
-
-  interface EventListeners {
-    /**
-     * Test event listener.
-     */
-    testListener: never;
-  }
-
-  // Comments are extracted by typescript-json-schema
-  interface Parameters {
-    param: any;
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/comments/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "../../../../../tsconfig",
-  "compilerOptions": {
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "types": ["jest"]
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/duplicateActions/index.ts

@@ -1,34 +0,0 @@
-import '@appsemble/sdk';
-
-declare module '@appsemble/sdk' {
-  interface Actions {
-    testAction: never;
-  }
-
-  interface EventEmitters {
-    testEmit: never;
-  }
-
-  interface EventListeners {
-    testListener: never;
-  }
-
-  interface Parameters {
-    param1: string;
-    param2: number;
-    param3: boolean;
-    param4?: string;
-    param5: {
-      nested1: string;
-      nested2: number;
-      nested3: boolean;
-    };
-    param6: string[];
-  }
-}
-
-declare module '@appsemble/sdk' {
-  interface Actions {
-    duplicate: never;
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/duplicateActions/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "../../../../../tsconfig",
-  "compilerOptions": {
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "types": ["jest"]
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/duplicateEventEmitters/index.ts

@@ -1,34 +0,0 @@
-import '@appsemble/sdk';
-
-declare module '@appsemble/sdk' {
-  interface Actions {
-    testAction: never;
-  }
-
-  interface EventEmitters {
-    testEmit: never;
-  }
-
-  interface EventListeners {
-    testListener: never;
-  }
-
-  interface Parameters {
-    param1: string;
-    param2: number;
-    param3: boolean;
-    param4?: string;
-    param5: {
-      nested1: string;
-      nested2: number;
-      nested3: boolean;
-    };
-    param6: string[];
-  }
-}
-
-declare module '@appsemble/sdk' {
-  interface EventEmitters {
-    duplicate: never;
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/duplicateEventEmitters/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "../../../../../tsconfig",
-  "compilerOptions": {
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "types": ["jest"]
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/duplicateEventListeners/index.ts

@@ -1,34 +0,0 @@
-import '@appsemble/sdk';
-
-declare module '@appsemble/sdk' {
-  interface Actions {
-    testAction: never;
-  }
-
-  interface EventEmitters {
-    testEmit: never;
-  }
-
-  interface EventListeners {
-    testListener: never;
-  }
-
-  interface Parameters {
-    param1: string;
-    param2: number;
-    param3: boolean;
-    param4?: string;
-    param5: {
-      nested1: string;
-      nested2: number;
-      nested3: boolean;
-    };
-    param6: string[];
-  }
-}
-
-declare module '@appsemble/sdk' {
-  interface EventListeners {
-    duplicate: never;
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/duplicateEventListeners/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "../../../../../tsconfig",
-  "compilerOptions": {
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "types": ["jest"]
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/duplicateParameters/index.ts

@@ -1,34 +0,0 @@
-import '@appsemble/sdk';
-
-declare module '@appsemble/sdk' {
-  interface Actions {
-    testAction: never;
-  }
-
-  interface EventEmitters {
-    testEmit: never;
-  }
-
-  interface EventListeners {
-    testListener: never;
-  }
-
-  interface Parameters {
-    param1: string;
-    param2: number;
-    param3: boolean;
-    param4?: string;
-    param5: {
-      nested1: string;
-      nested2: number;
-      nested3: boolean;
-    };
-    param6: string[];
-  }
-}
-
-declare module '@appsemble/sdk' {
-  interface Parameters {
-    duplicate: never;
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/duplicateParameters/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "../../../../../tsconfig",
-  "compilerOptions": {
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "types": ["jest"]
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/fontawesomeParameters/index.ts

@@ -1,11 +0,0 @@
-import '@appsemble/sdk';
-import { IconName } from '@fortawesome/fontawesome-common-types';
-
-declare module '@appsemble/sdk' {
-  interface Parameters {
-    /**
-     * This is an icon.
-     */
-    icon?: IconName;
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/fontawesomeParameters/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "../../../../../tsconfig",
-  "compilerOptions": {
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "types": ["jest"]
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/tsError/index.ts

@@ -1,4 +0,0 @@
-import '@appsemble/sdk';
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const unused = undefined;

package/__fixtures__/getBlockConfigFromTypeScript/tsError/tsconfig.json

@@ -1,8 +0,0 @@
-{
-  "extends": "../../../../../tsconfig",
-  "compilerOptions": {
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "noUnusedLocals": true,
-    "types": ["jest"]
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/valid/index.ts

@@ -1,28 +0,0 @@
-import '@appsemble/sdk';
-
-declare module '@appsemble/sdk' {
-  interface Actions {
-    testAction: never;
-  }
-
-  interface EventEmitters {
-    testEmit: never;
-  }
-
-  interface EventListeners {
-    testListener: never;
-  }
-
-  interface Parameters {
-    param1: string;
-    param2: number;
-    param3: boolean;
-    param4?: string;
-    param5: {
-      nested1: string;
-      nested2: number;
-      nested3: boolean;
-    };
-    param6: string[];
-  }
-}

package/__fixtures__/getBlockConfigFromTypeScript/valid/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "../../../../../tsconfig",
-  "compilerOptions": {
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "types": ["jest"]
-  }
-}

package/__fixtures__/makePayload/with-icon/icon.svg

@@ -1,2 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<svg />

package/assets/appsemblerc.schema.json

@@ -1,150 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema",
-  "title": ".appsemblerc.yaml",
-  "description": "A .appsemblerc.yaml file may be used to configure either an app or a block.",
-  "type": "object",
-  "additionalProperties": false,
-
-  "properties": {
-    "name": {
-      "description": "The name of a block. By default the name in package.json is used.",
-      "type": "string",
-      "pattern": "^@([\\da-z](?:(?!.*--)[\\da-z-]*[\\da-z])?)/([\\da-z](?:(?!.*--)[\\da-z-]*[\\da-z])?)$"
-    },
-    "description": {
-      "description": "A short description of the block. By default the description in package.json is used.",
-      "maxLength": 160
-    },
-    "version": {
-      "description": "A semantic version of the block representation of the block version. By default the version in package.json is used."
-    },
-    "longDescription": {
-      "description": "The long description of the block. Markdown is supported. By default the content of README.md is used.",
-      "type": "string"
-    },
-    "layout": {
-      "description": "The type of layout to be used for the block.",
-      "enum": ["float", "grow", "hidden", "static", null],
-      "default": "static"
-    },
-    "output": {
-      "description": "Where to read build output from.",
-      "type": "string",
-      "default": "dist"
-    },
-    "webpack": {
-      "description": "The path to the webpack configuration file relative to the block project directory. By default a file named webpack.config.js is used, with a fallback to the webpack configuration from @appsemble/webpack-config.",
-      "type": "string"
-    },
-    "events": {
-      "type": "object",
-      "description": "An object describing the names of the events the block can listen and emit to. By default this is extracted from the block’s TypeScript module augmentations.",
-      "additionalProperties": false,
-      "properties": {
-        "listen": {
-          "description": "The events the block listens on.",
-          "type": "object",
-          "additionalProperties": {
-            "type": "object",
-            "properties": {
-              "description": {
-                "type": "string"
-              }
-            }
-          }
-        },
-        "emit": {
-          "description": "The events the block may emit.",
-          "type": "object",
-          "additionalProperties": {
-            "type": "object",
-            "properties": {
-              "description": {
-                "type": "string"
-              }
-            }
-          }
-        }
-      }
-    },
-    "actions": {
-      "description": "An object which describes the actions a block can trigger. This will be used to validate app definitions. By default this is extracted from the block’s TypeScript module augmentations.",
-      "type": "object",
-      "additionalProperties": true
-    },
-    "parameters": {
-      "description": "A JSON schema which describes the block parameters. By default this is extracted from the block’s TypeScript module augmentations."
-    },
-    "iconBackground": {
-      "description": "The background color to use for maskable icons.",
-      "type": "string",
-      "pattern": "^#[a-zA-Z\\d]{6}$"
-    },
-    "context": {
-      "type": "object",
-      "description": "A context which can be specified using the --context command line parameter.",
-      "additionalProperties": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "remote": {
-            "description": "If remote is specified, this will override --remote passed by the command line.",
-            "type": "string",
-            "format": "uri",
-            "default": "https://appsemble.app"
-          },
-          "organization": {
-            "description": "If organization is specified, this will override --organization passed by the command line when creating an app.",
-            "type": "string",
-            "pattern": "^([\\da-z](?:(?!.*--)[\\da-z-]*[\\da-z])?)$",
-            "minLength": 1,
-            "maxLength": 30
-          },
-          "icon": {
-            "description": "A path to the app icon to use",
-            "type": "string",
-            "default": "icon.png"
-          },
-          "iconBackground": {
-            "description": "The background color to use for maskable icons.",
-            "type": "string",
-            "pattern": "^#[a-zA-Z\\d]{6}$"
-          },
-          "maskableIcon": {
-            "description": "A path to the maskable app icon to use",
-            "type": "string",
-            "default": "maskable-icon.png"
-          },
-          "id": {
-            "description": "If id is specified, this will override --id passed by the command line when updating an app.",
-            "type": "integer",
-            "minimum": 1
-          },
-          "visibility": {
-            "description": "Determine the app visibility of the app in the Appsemble app store.\n\nThis doesn’t affect whether or not the app can be accessed on its own domain.\n\n- **public**: The app is publicly listed in the Appsemble app store.,\n- **unlisted**: The app store page can be accessed, but the app isn’t listed publicly in the Appsemble app store.\n- **private**: The app is only visible to people who are part of the organization.",
-            "default": "unlisted",
-            "enum": ["public", "unlisted", "private"]
-          },
-          "showAppDefinition": {
-            "description": "Whether or not people who have access to the app may see the app definition.",
-            "type": "boolean"
-          },
-          "template": {
-            "description": "If template is specified, this will override --template passed on the command line.",
-            "type": "boolean",
-            "default": false
-          },
-          "sentryDsn": {
-            "type": "string",
-            "format": "uri",
-            "description": "A custom Sentry DSN to use for the app."
-          },
-          "sentryEnvironment": {
-            "type": "string",
-            "description": "A custom Sentry environment to use for the app."
-          }
-        }
-      }
-    }
-  }
-}

package/commands/app/create.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["create.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,OAAO,EAAE,MAAM,WAAW,CAAC;AAC3B,OAAO,aAAa,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAoBnD,MAAM,CAAC,MAAM,OAAO,GAAG,mBAAmB,CAAC;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,+DAA+D,CAAC;AAE3F,MAAM,UAAU,OAAO,CAAC,KAAW;IACjC,OAAO,KAAK;SACT,UAAU,CAAC,OAAO,EAAE;QACnB,QAAQ,EAAE,kCAAkC;KAC7C,CAAC;SACD,MAAM,CAAC,SAAS,EAAE;QACjB,QAAQ,EAAE,gEAAgE;KAC3E,CAAC;SACD,MAAM,CAAC,cAAc,EAAE;QACtB,QAAQ,EAAE,uCAAuC;KAClD,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,QAAQ,EAAE,yEAAyE;QACnF,MAAM,EAAE,UAAU;KACnB,CAAC;SACD,MAAM,CAAC,iBAAiB,EAAE;QACzB,QAAQ,EAAE,8DAA8D;QACxE,OAAO,EAAE,SAAS;KACnB,CAAC;SACD,MAAM,CAAC,eAAe,EAAE;QACvB,QAAQ,EACN,2FAA2F;QAC7F,MAAM,EAAE,UAAU;KACnB,CAAC;SACD,MAAM,CAAC,YAAY,EAAE;QACpB,QAAQ,EAAE,gDAAgD;QAC1D,OAAO,EAAE,UAAU;QACnB,OAAO,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC;KAC3C,CAAC;SACD,MAAM,CAAC,UAAU,EAAE;QAClB,QAAQ,EAAE,iDAAiD;QAC3D,IAAI,EAAE,SAAS;KAChB,CAAC;SACD,MAAM,CAAC,SAAS,EAAE;QACjB,QAAQ,EAAE,4EAA4E;QACtF,IAAI,EAAE,SAAS;KAChB,CAAC;SACD,MAAM,CAAC,WAAW,EAAE;QACnB,QAAQ,EACN,0OAA0O;QAC5O,IAAI,EAAE,SAAS;KAChB,CAAC;SACD,MAAM,CAAC,gBAAgB,EAAE;QACxB,QAAQ,EACN,0GAA0G;QAC5G,IAAI,EAAE,SAAS;KAChB,CAAC;SACD,MAAM,CAAC,qBAAqB,EAAE;QAC7B,QAAQ,EAAE,0CAA0C;KACrD,CAAC;SACD,MAAM,CAAC,YAAY,EAAE;QACpB,QAAQ,EAAE,oCAAoC;KAC/C,CAAC;SACD,MAAM,CAAC,oBAAoB,EAAE;QAC5B,QAAQ,EAAE,wDAAwD;QAClE,OAAO,EAAE,CAAC,YAAY,CAAC;KACxB,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,IAAI,EAAsB;IAClE,MAAM,eAAe,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;IAEzF,MAAM,CAAC,IAAI,CAAC,YAAY,WAAW,CAAC,MAAM,OAAO,CAAC,CAAC;IACnD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE;QAC7B,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,SAAS,CAAC;YACd,GAAG,IAAI;YACP,IAAI,EAAE,GAAG;SACV,CAAC,CAAC;KACJ;AACH,CAAC"}

package/commands/app/create.ts

@@ -1,104 +0,0 @@
-import { ReadStream } from 'node:fs';
-
-import { logger } from '@appsemble/node-utils';
-import { AppVisibility } from '@appsemble/types';
-import fg from 'fast-glob';
-import normalizePath from 'normalize-path';
-import { Argv } from 'yargs';
-
-import { createApp } from '../../lib/app.js';
-import { coerceFile } from '../../lib/coercers.js';
-import { BaseArguments } from '../../types.js';
-
-interface CreateAppArguments extends BaseArguments {
-  context: string;
-  icon: NodeJS.ReadStream | ReadStream;
-  iconBackground: string;
-  maskableIcon: NodeJS.ReadStream | ReadStream;
-  paths: string[];
-  organization: string;
-  template: boolean;
-  dryRun: boolean;
-  resources: boolean;
-  modifyContext: boolean;
-  visibility: AppVisibility;
-  sentryDsn: string;
-  sentryEnvironment: string;
-  googleAnalyticsId: string;
-}
-
-export const command = 'create <paths...>';
-export const description = 'Create a new App based on a specified YAML file or directory.';
-
-export function builder(yargs: Argv): Argv<any> {
-  return yargs
-    .positional('paths', {
-      describe: 'The paths to the apps to create.',
-    })
-    .option('context', {
-      describe: 'If specified, use the specified context from .appsemblerc.yaml',
-    })
-    .option('organization', {
-      describe: 'The ID the app should be created for.',
-    })
-    .option('icon', {
-      describe: 'The icon to upload. By default "icon.png" in the app directory is used.',
-      coerce: coerceFile,
-    })
-    .option('icon-background', {
-      describe: 'The background color to use for the icon in opaque contexts.',
-      default: '#ffffff',
-    })
-    .option('maskable-icon', {
-      describe:
-        'The maskable icon to upload. By default "maskable-icon.png" in the app directory is used.',
-      coerce: coerceFile,
-    })
-    .option('visibility', {
-      describe: 'Visibility of the app in the public app store.',
-      default: 'unlisted',
-      choices: ['public', 'unlisted', 'private'],
-    })
-    .option('template', {
-      describe: 'Whether the app should be marked as a template.',
-      type: 'boolean',
-    })
-    .option('dry-run', {
-      describe: 'Whether the API should be called to run without actually creating the app.',
-      type: 'boolean',
-    })
-    .option('resources', {
-      describe:
-        'Whether the resources from the `resources` directory should be created after creating the app. The names of subdirectories are used as the name of the resource, otherwise the names of top level resource .json files are used instead.',
-      type: 'boolean',
-    })
-    .option('modify-context', {
-      describe:
-        'If the app context is specified, modify it for the current context to include the id of the created app.',
-      type: 'boolean',
-    })
-    .option('google-analytics-id', {
-      describe: 'The ID for Google Analytics for the app.',
-    })
-    .option('sentry-dsn', {
-      describe: 'The custom Sentry DSN for the app.',
-    })
-    .option('sentry-environment', {
-      describe: 'The environment for the custom Sentry DSN for the app.',
-      implies: ['sentry-dsn'],
-    });
-}
-
-export async function handler({ paths, ...args }: CreateAppArguments): Promise<void> {
-  const normalizedPaths = paths.map((path) => normalizePath(path));
-  const directories = await fg(normalizedPaths, { absolute: true, onlyDirectories: true });
-
-  logger.info(`Creating ${directories.length} apps`);
-  for (const dir of directories) {
-    logger.info('');
-    await createApp({
-      ...args,
-      path: dir,
-    });
-  }
-}

package/commands/app/extract-messages.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extract-messages.js","sourceRoot":"","sources":["extract-messages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,MAAM,WAAW,CAAC;AAC3B,OAAO,aAAa,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAUpD,MAAM,CAAC,MAAM,OAAO,GAAG,6BAA6B,CAAC;AACrD,MAAM,CAAC,MAAM,WAAW,GAAG,gCAAgC,CAAC;AAE5D,MAAM,UAAU,OAAO,CAAC,KAAW;IACjC,OAAO,KAAK;SACT,UAAU,CAAC,OAAO,EAAE;QACnB,QAAQ,EAAE,iDAAiD;KAC5D,CAAC;SACD,MAAM,CAAC,WAAW,EAAE;QACnB,QAAQ,EAAE,qDAAqD;KAChE,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,QAAQ,EAAE,gDAAgD;QAC1D,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;QACzB,OAAO,EAAE,MAAM;KAChB,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,QAAQ,EACN,yHAAyH;KAC5H,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAC5B,MAAM,GAAG,MAAM,EACf,SAAS,GAAG,EAAE,EACd,KAAK,EACL,MAAM,GAAG,EAAE,GACS;IACpB,MAAM,eAAe,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;IACzF,MAAM,CAAC,IAAI,CAAC,4BAA4B,WAAW,CAAC,MAAM,OAAO,CAAC,CAAC;IACnE,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE;QAC7B,MAAM,gBAAgB,CACpB,GAAG,EACH,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EACpC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EACjC,MAAM,CACP,CAAC;KACH;AACH,CAAC"}