@umbraco-cms/backoffice 14.0.0-335b4f13 → 14.0.0-500b9dc0

package/dist-cms/packages/tags/property-editors/tags/manifests.js

@@ -6,7 +6,7 @@ const manifest = {
     loader: () => import('./property-editor-ui-tags.element.js'),
     meta: {
         label: 'Tags',
-        propertyEditorAlias: 'Umbraco.Tags',
+        propertyEditorSchemaAlias: 'Umbraco.Tags',
         icon: 'umb:tags',
         group: 'common',
     },

package/dist-cms/packages/tags/property-editors/tags/manifests.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../src/packages/tags/property-editors/tags/manifests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAG7E,MAAM,QAAQ,GAA6B;IAC1C,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,2BAA2B;IAClC,IAAI,EAAE,yBAAyB;IAC/B,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,sCAAsC,CAAC;IAC5D,IAAI,EAAE;QACL,KAAK,EAAE,MAAM;QACb,mBAAmB,EAAE,cAAc;QACnC,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,QAAQ;KACf;CACD,CAAC;AAEF,MAAM,MAAM,GAAoC,CAAC,WAAW,CAAC,CAAC;AAE9D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,CAAC"}
+{"version":3,"file":"manifests.js","sourceRoot":"","sources":["../../../../../src/packages/tags/property-editors/tags/manifests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAG7E,MAAM,QAAQ,GAA6B;IAC1C,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,2BAA2B;IAClC,IAAI,EAAE,yBAAyB;IAC/B,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,sCAAsC,CAAC;IAC5D,IAAI,EAAE;QACL,KAAK,EAAE,MAAM;QACb,yBAAyB,EAAE,cAAc;QACzC,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,QAAQ;KACf;CACD,CAAC;AAEF,MAAM,MAAM,GAAoC,CAAC,WAAW,CAAC,CAAC;AAE9D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,CAAC"}

package/dist-cms/packages/templating/stylesheets/repository/stylesheet.repository.js

@@ -1,38 +1,21 @@
 import { UMB_STYLESHEET_TREE_STORE_CONTEXT_TOKEN } from './stylesheet.tree.store.js';
 import { UmbStylesheetTreeServerDataSource } from './sources/stylesheet.tree.server.data.js';
 import { UmbStylesheetServerDataSource } from './sources/stylesheet.server.data.js';
-import { UMB_NOTIFICATION_CONTEXT_TOKEN } from '../../../core/notification/index.js';
 import { UmbContextConsumerController } from '../../../../libs/context-api/index.js';
 export class UmbStylesheetRepository {
     #host;
     #dataSource;
     #treeDataSource;
     #treeStore;
-    #notificationContext;
-    #initResolver;
-    #initialized = false;
+    #init;
     constructor(host) {
         this.#host = host;
         // TODO: figure out how spin up get the correct data source
         this.#dataSource = new UmbStylesheetServerDataSource(this.#host);
         this.#treeDataSource = new UmbStylesheetTreeServerDataSource(this.#host);
-        new UmbContextConsumerController(this.#host, UMB_STYLESHEET_TREE_STORE_CONTEXT_TOKEN, (instance) => {
+        this.#init = new UmbContextConsumerController(this.#host, UMB_STYLESHEET_TREE_STORE_CONTEXT_TOKEN, (instance) => {
             this.#treeStore = instance;
-            this.#checkIfInitialized();
-        });
-        new UmbContextConsumerController(this.#host, UMB_NOTIFICATION_CONTEXT_TOKEN, (instance) => {
-            this.#notificationContext = instance;
-            this.#checkIfInitialized();
-        });
-    }
-    #init = new Promise((resolve) => {
-        this.#initialized ? resolve() : (this.#initResolver = resolve);
-    });
-    #checkIfInitialized() {
-        if (this.#treeStore && this.#notificationContext) {
-            this.#initialized = true;
-            this.#initResolver?.();
-        }
+        }).asPromise();
     }
     // TREE:
     async requestTreeRoot() {

package/dist-cms/packages/templating/stylesheets/repository/stylesheet.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"stylesheet.repository.js","sourceRoot":"","sources":["../../../../../src/packages/templating/stylesheets/repository/stylesheet.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stylesheet.repository.js","sourceRoot":"","sources":["../../../../../src/packages/templating/stylesheets/repository/stylesheet.repository.ts"],"names":[],"mappings":"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"}

package/dist-cms/packages/templating/templates/workspace/template-workspace-editor.element.js

@@ -84,37 +84,7 @@ export let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorE
         });
     }
     #resetMasterTemplate() {
-        this.#setMasterTemplateId(null);
-    }
-    async #setMasterTemplateId(id) {
-        //root item selected
-        if (id === '')
-            return;
-        if (this._content === null || this._content === undefined)
-            return;
-        const layoutBlockRegex = /(@{[\s\S][^if]*?Layout\s*?=\s*?)("[^"]*?"|null)(;[\s\S]*?})/gi;
-        const masterTemplate = await this.#templateWorkspaceContext?.setMasterTemplate(id);
-        //Reset master template or is did not exist and the declaration exists
-        if (masterTemplate === null && layoutBlockRegex.test(this._content)) {
-            const string = this._content?.replace(layoutBlockRegex, `$1null$3`);
-            this.#templateWorkspaceContext?.setContent(string);
-            return;
-        }
-        //No declaration and no valid id - do nothing
-        if (masterTemplate === null)
-            return;
-        //if has master template in the content
-        if (layoutBlockRegex.test(this._content)) {
-            const string = this._content?.replace(layoutBlockRegex, `$1"${masterTemplate?.name}.cshtml"$3`);
-            this.#templateWorkspaceContext?.setContent(string);
-            return;
-        }
-        //if no master template in the content insert it at the beginning
-        const string = `@{
-	Layout = "${masterTemplate?.name}.cshtml";
-}
-${this._content}`;
-        this.#templateWorkspaceContext?.setContent(string);
+        this.#templateWorkspaceContext?.setMasterTemplate(null);
     }
     #openMasterTemplatePicker() {
         const modalContext = this._modalContext?.open(UMB_TEMPLATE_PICKER_MODAL, {
@@ -126,7 +96,7 @@ ${this._content}`;
         modalContext?.onSubmit().then((data) => {
             if (!data.selection)
                 return;
-            this.#setMasterTemplateId(data.selection[0] ?? '');
+            this.#templateWorkspaceContext?.setMasterTemplate(data.selection[0] ?? '');
         });
     }
     #renderMasterTemplatePicker() {
@@ -162,7 +132,7 @@ ${this._content}`;
 			<uui-input placeholder="Enter name..." slot="header" .value=${this._name} @input=${this.#onNameInput}
 				><umb-template-alias-input
 					slot="append"
-					.value=${this._alias}
+					.value=${this._alias ?? ''}
 					@change=${this.#onAliasInput}></umb-template-alias-input
 			></uui-input>
 			<uui-box>

package/dist-cms/packages/templating/templates/workspace/template-workspace-editor.element.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-workspace-editor.element.js","sourceRoot":"","sources":["../../../../../src/packages/templating/templates/workspace/template-workspace-editor.element.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"template-workspace-editor.element.js","sourceRoot":"","sources":["../../../../../src/packages/templating/templates/workspace/template-workspace-editor.element.ts"],"names":[],"mappings":"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"}

package/dist-cms/packages/templating/templates/workspace/template-workspace.context.d.ts

@@ -10,6 +10,7 @@ export declare class UmbTemplateWorkspaceContext extends UmbWorkspaceContext<Umb
     alias: import("rxjs").Observable<string | undefined>;
     content: import("rxjs").Observable<string | null | undefined>;
     id: import("rxjs").Observable<string | undefined>;
+    masterTemplateID: import("rxjs").Observable<string | null | undefined>;
     isCodeEditorReady: import("rxjs").Observable<boolean>;
     constructor(host: UmbControllerHostElement);
     getEntityType(): string;
@@ -18,6 +19,8 @@ export declare class UmbTemplateWorkspaceContext extends UmbWorkspaceContext<Umb
     setName(value: string): void;
     setAlias(value: string): void;
     setContent(value: string): void;
+    getLayoutBlockRegexPattern(): RegExp;
+    getHasLayoutBlock(): boolean;
     load(entityId: string): Promise<void>;
     setMasterTemplate(id: string | null): Promise<TemplateItemResponseModel | null>;
     save(): Promise<void>;

package/dist-cms/packages/templating/templates/workspace/template-workspace.context.js

@@ -16,8 +16,31 @@ export class UmbTemplateWorkspaceContext extends UmbWorkspaceContext {
         this.alias = createObservablePart(this.#data, (data) => data?.alias);
         this.content = createObservablePart(this.#data, (data) => data?.content);
         this.id = createObservablePart(this.#data, (data) => data?.id);
+        this.masterTemplateID = createObservablePart(this.#data, (data) => data?.masterTemplateId);
         this.#isCodeEditorReady = new UmbBooleanState(false);
         this.isCodeEditorReady = this.#isCodeEditorReady.asObservable();
+        this.#updateMasterTemplateLayoutBlock = () => {
+            const currentContent = this.#data.getValue()?.content;
+            const newMasterTemplateAlias = this.#masterTemplate?.getValue()?.alias;
+            const hasLayoutBlock = this.getHasLayoutBlock();
+            if (this.#masterTemplate.getValue() === null && hasLayoutBlock && currentContent) {
+                const newString = currentContent.replace(this.getLayoutBlockRegexPattern(), `$1null$3`);
+                this.setContent(newString);
+                return;
+            }
+            //if has layout block in the content
+            if (hasLayoutBlock && currentContent) {
+                const string = currentContent.replace(this.getLayoutBlockRegexPattern(), `$1"${newMasterTemplateAlias}.cshtml"$3`);
+                this.setContent(string);
+                return;
+            }
+            //if no layout block in the content insert it at the beginning
+            const string = `@{
+	Layout = "${newMasterTemplateAlias}.cshtml";
+}
+${currentContent}`;
+            this.setContent(string);
+        };
         this.#loadCodeEditor();
     }
     async #loadCodeEditor() {
@@ -47,42 +70,35 @@ export class UmbTemplateWorkspaceContext extends UmbWorkspaceContext {
     setContent(value) {
         this.#data.next({ ...this.#data.value, $type: this.#data.value?.$type || '', content: value });
     }
+    getLayoutBlockRegexPattern() {
+        return new RegExp('(@{[\\s\\S][^if]*?Layout\\s*?=\\s*?)("[^"]*?"|null)(;[\\s\\S]*?})', 'gi');
+    }
+    getHasLayoutBlock() {
+        return this.getData()?.content ? this.getLayoutBlockRegexPattern().test(this.getData()?.content) : false;
+    }
     async load(entityId) {
         const { data } = await this.repository.requestById(entityId);
         if (data) {
             this.setIsNew(false);
+            this.setMasterTemplate(data.masterTemplateId ?? null);
             this.#data.next(data);
-            this.#getMasterTemplateFromContent(data.content ?? '');
         }
     }
-    #getMasterTemplateFromContent(content) {
-        if (!content)
-            this.#masterTemplate.next(null);
-        const RegexString = /(@{[\s\S][^if]*?Layout\s*?=\s*?)("[^"]*?"|null)(;[\s\S]*?})/gi;
-        const match = RegexString.exec(content ?? '');
-        if (match) {
-            if (match[2] === 'null') {
-                this.#masterTemplate.next(null);
-                return null;
-            }
-            this.#masterTemplate.next({ name: match[2].replace(/"/g, '').replace('.cshtml', '') });
-            return match[2].replace(/"/g, '');
-        }
-        this.#masterTemplate.next(null);
-        return null;
-    }
     async setMasterTemplate(id) {
         if (id === null) {
             this.#masterTemplate.next(null);
+            this.#updateMasterTemplateLayoutBlock();
             return null;
         }
         const { data } = await this.repository.requestItems([id]);
         if (data) {
             this.#masterTemplate.next(data[0]);
+            this.#updateMasterTemplateLayoutBlock();
             return data[0];
         }
         return null;
     }
+    #updateMasterTemplateLayoutBlock;
     async save() {
         const template = this.#data.getValue();
         const isNew = this.getIsNew();
@@ -105,6 +121,7 @@ export class UmbTemplateWorkspaceContext extends UmbWorkspaceContext {
                 content: template.content,
                 alias: template.alias,
             });
+            this.repository.requestTreeItemsOf(this.#masterTemplate.value?.id ?? '');
         }
     }
     async create(parentId = null) {
@@ -116,11 +133,6 @@ export class UmbTemplateWorkspaceContext extends UmbWorkspaceContext {
         if (!parentId || parentId === 'root')
             return;
         await this.setMasterTemplate(parentId);
-        const RegexString = /(@{[\s\S][^if]*?Layout\s*?=\s*?)("[^"]*?"|null)(;[\s\S]*?})/gi;
-        const content = this.#data.value?.content ?? '';
-        const masterTemplateName = this.#masterTemplate.value?.name ?? '';
-        const string = content.replace(RegexString, `$1"${masterTemplateName}.cshtml"$3`) ?? '';
-        this.setContent(string);
     }
     destroy() {
         this.#data.complete();

package/dist-cms/packages/templating/templates/workspace/template-workspace.context.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-workspace.context.js","sourceRoot":"","sources":["../../../../../src/packages/templating/templates/workspace/template-workspace.context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"template-workspace.context.js","sourceRoot":"","sources":["../../../../../src/packages/templating/templates/workspace/template-workspace.context.ts"],"names":[],"mappings":"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"}

package/dist-cms/shared/repository/repository-items.manager.d.ts

@@ -6,7 +6,7 @@ export declare class UmbRepositoryItemsManager<ItemType extends ItemResponseMode
     #private;
     host: UmbControllerHostElement;
     repository?: UmbItemRepository<ItemType>;
-    init: Promise<unknown>;
+    get init(): Promise<unknown>;
     uniques: import("rxjs").Observable<string[]>;
     items: import("rxjs").Observable<ItemType[]>;
     itemsObserver?: UmbObserverController<ItemType[]>;

package/dist-cms/shared/repository/repository-items.manager.js

@@ -2,6 +2,11 @@ import { UmbArrayState, UmbObserverController } from '../../libs/observable-api/
 import { UmbExtensionClassInitializer } from '../../packages/core/extension-registry/index.js';
 export class UmbRepositoryItemsManager {
     #getUnique;
+    #init;
+    // the init promise is used externally for recognizing when the manager is ready.
+    get init() {
+        return this.#init;
+    }
     #uniques;
     #items;
     /* TODO: find a better way to have a getUniqueMethod. If we want to support trees/items of different types,
@@ -13,7 +18,7 @@ export class UmbRepositoryItemsManager {
         this.items = this.#items.asObservable();
         this.host = host;
         this.#getUnique = getUniqueMethod || ((entry) => entry.id || '');
-        this.init = new UmbExtensionClassInitializer(host, 'repository', repositoryAlias, (repository) => {
+        this.#init = new UmbExtensionClassInitializer(host, 'repository', repositoryAlias, (repository) => {
             // TODO: Some test that this repository is a items repository?
             this.repository = repository;
         }).asPromise();
@@ -30,7 +35,7 @@ export class UmbRepositoryItemsManager {
         return this.#items.value;
     }
     async #requestItems() {
-        await this.init;
+        await this.#init;
         if (!this.repository)
             throw new Error('Repository is not initialized');
         if (this.itemsObserver)

package/dist-cms/shared/repository/repository-items.manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"repository-items.manager.js","sourceRoot":"","sources":["../../../src/shared/repository/repository-items.manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC9F,OAAO,EAAE,4BAA4B,EAAE,MAAM,4CAA4C,CAAC;AAG1F,MAAM,OAAO,yBAAyB;IAGrC,UAAU,CAA0C;IAIpD,QAAQ,CAAiC;IAGzC,MAAM,CAAmC;IAKzC;qFACiF;IACjF,YACC,IAA8B,EAC9B,eAAuB,EACvB,eAAyD;QAb1D,aAAQ,GAAG,IAAI,aAAa,CAAS,EAAE,CAAC,CAAC;QACzC,YAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;QAEvC,WAAM,GAAG,IAAI,aAAa,CAAW,EAAE,CAAC,CAAC;QACzC,UAAK,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QAWlC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,eAAe,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAEjE,IAAI,CAAC,IAAI,GAAG,IAAI,4BAA4B,CAAC,IAAI,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC,UAAU,EAAE,EAAE;YAChG,8DAA8D;YAC9D,IAAI,CAAC,UAAU,GAAG,UAAyC,CAAC;QAC7D,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IAChB,CAAC;IAED,UAAU;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC5B,CAAC;IAED,UAAU,CAAC,OAAiB;QAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE5B,qDAAqD;QACrD,IAAI,CAAC,aAAa,EAAE,CAAC;IACtB,CAAC;IAED,QAAQ;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,aAAa;QAClB,MAAM,IAAI,CAAC,IAAI,CAAC;QAChB,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACvE,IAAI,IAAI,CAAC,aAAa;YAAE,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAErD,yHAAyH;QACzH,6KAA6K;QAE7K,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAE/E,IAAI,YAAY,EAAE;YACjB,IAAI,CAAC,aAAa,GAAG,IAAI,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC5G;IACF,CAAC;CAYD"}
+{"version":3,"file":"repository-items.manager.js","sourceRoot":"","sources":["../../../src/shared/repository/repository-items.manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC9F,OAAO,EAAE,4BAA4B,EAAE,MAAM,4CAA4C,CAAC;AAG1F,MAAM,OAAO,yBAAyB;IAGrC,UAAU,CAA0C;IAEpD,KAAK,CAAmB;IAExB,iFAAiF;IACjF,IAAW,IAAI;QACd,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAED,QAAQ,CAAiC;IAGzC,MAAM,CAAmC;IAKzC;qFACiF;IACjF,YACC,IAA8B,EAC9B,eAAuB,EACvB,eAAyD;QAb1D,aAAQ,GAAG,IAAI,aAAa,CAAS,EAAE,CAAC,CAAC;QACzC,YAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;QAEvC,WAAM,GAAG,IAAI,aAAa,CAAW,EAAE,CAAC,CAAC;QACzC,UAAK,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QAWlC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,eAAe,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAEjE,IAAI,CAAC,KAAK,GAAG,IAAI,4BAA4B,CAAC,IAAI,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC,UAAU,EAAE,EAAE;YACjG,8DAA8D;YAC9D,IAAI,CAAC,UAAU,GAAG,UAAyC,CAAC;QAC7D,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IAChB,CAAC;IAED,UAAU;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC5B,CAAC;IAED,UAAU,CAAC,OAAiB;QAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE5B,qDAAqD;QACrD,IAAI,CAAC,aAAa,EAAE,CAAC;IACtB,CAAC;IAED,QAAQ;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,aAAa;QAClB,MAAM,IAAI,CAAC,KAAK,CAAC;QACjB,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACvE,IAAI,IAAI,CAAC,aAAa;YAAE,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAErD,yHAAyH;QACzH,6KAA6K;QAE7K,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAE/E,IAAI,YAAY,EAAE;YACjB,IAAI,CAAC,aAAa,GAAG,IAAI,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC5G;IACF,CAAC;CAYD"}