@sitecore-feaas/clientside 0.5.3 → 0.5.4

package/src/components/FEAASComponent.tsx

@@ -104,6 +104,7 @@ export class FEAASComponent extends FEAASElement<FEAASComponentsProps, string> {
   } as Partial<FEAASComponentsProps>
 
   needsRefresh: boolean
+  needsToFetchTemplate: boolean
 
   setData(data: DataOptions) {
     this.set({ data })
@@ -123,14 +124,19 @@ export class FEAASComponent extends FEAASElement<FEAASComponentsProps, string> {
     // force component to be refreshed
     if (name == 'library' || name == 'component' || name == 'revision' || name == 'version') {
       this.payload = undefined
+      if (this.alreadyRendered) {
+        this.needsRefresh = true
+        this.needsToFetchTemplate = true
+      }
     }
 
-    this.needsRefresh = true
-
     super.attributeChangedCallback(name, oldValue, newValue)
 
-    if (name === 'data' && this.props.fetch.includes('data')) {
-      this.fetchData()
+    if (name == 'data') {
+      this.needsRefresh = true
+      if (this.props.fetch.includes('data') || this.alreadyRendered || !DataSettings.hasDataSettings(this.props.data)) {
+        this.fetchData()
+      }
     }
   }
 
@@ -157,6 +163,7 @@ export class FEAASComponent extends FEAASElement<FEAASComponentsProps, string> {
   constructor() {
     super()
 
+    const data = this.getAttribute('data')
     if (!this.getAttribute('data')) {
       this.whenDataReady.resolve({})
     }
@@ -225,7 +232,8 @@ export class FEAASComponent extends FEAASElement<FEAASComponentsProps, string> {
       })
     }
 
-    if (this.props.fetch.includes('template')) {
+    if (this.props.fetch.includes('template') || this.needsToFetchTemplate) {
+      this.needsToFetchTemplate = false
       var templatePromise = fetchAndRevalidateComponent(this.props, (html) => {
         this.payload = html
         advanceIfEverythingIsReady()
@@ -252,11 +260,17 @@ export class FEAASComponent extends FEAASElement<FEAASComponentsProps, string> {
   update() {
     this.alreadyRendered = true
     // avoid unnecessary rendering if hydration was disabled
-    if (!this.props.fetch.includes('data') && !this.props.fetch.includes('template') && this.firstElementChild) return
+    if (
+      !this.props.fetch.includes('data') &&
+      !this.props.fetch.includes('template') &&
+      this.firstElementChild &&
+      !this.needsRefresh
+    )
+      return
     if (Array.from(this.children).filter((c) => c.tagName != 'BR').length > 0 && !this.needsRefresh) {
       renderDOMElement(this, this.readyData)
     } else {
-      this.needsRefresh = true
+      this.needsRefresh = false
       // defer rendering to original element
       if (this.getOriginal()) {
         return

package/src/utils/settings.ts

@@ -192,7 +192,7 @@ export async function fetchData(data: DataOptions): Promise<DataScopes> {
   )
 }
 
-export async function hasDataSettings(data: DataOptions) {
+export function hasDataSettings(data: DataOptions) {
   if (!data) return false
   return isDataSettings(data) || Object.values(data).some(isDataSettings)
 }

package/test/FEAASComponent.test.tsx

@@ -47,10 +47,17 @@ describe('Components', () => {
   })
 
   describe('fetch control', () => {
-    it('should not make requests when hydration is turned off', async () => {
+    it('should not make requests when hydration is turned off, unless attribute changed after initial render', async () => {
       const spy = vi.spyOn(global, 'fetch')
-
-      // Fixme юhange to production component
+      spy.mockImplementation(async (url: string, options: Parameters<typeof fetch>[1] = {}) => {
+        return new Response(url, {
+          headers: {
+            date: now.toUTCString(),
+            'last-modified': earlier.toUTCString()
+          }
+        })
+      })
+      // Fixme change to production component
       document.body.innerHTML =
         '<feaas-component fetch="" library="L" cdn="CDN" component="C" version="V" revision="R"></feaas-component>'
 
@@ -59,7 +66,11 @@ describe('Components', () => {
       await expect(component.whenRendered).resolves.toEqual(component)
       expect(spy).toHaveBeenCalledTimes(0)
 
-      expect(component.innerHTML).toBe('')
+      component.setAttribute('library', 'Z')
+      await expect(component.whenRendered).resolves.toEqual(component)
+      expect(spy).toHaveBeenCalledTimes(1)
+
+      expect(component.innerHTML).toBe('CDN/components/Z/C/V/R.html')
     })
 
     it('should not make requests when hydration is turned off, but should render template', async () => {
@@ -81,7 +92,7 @@ describe('Components', () => {
       const spy = vi.spyOn(global, 'fetch')
       spy.mockImplementation(async (url: string, options: Parameters<typeof fetch>[1] = {}) => {
         if (url.match('.css')) {
-          return new Response('{}', {
+          return new Response('.a{}', {
             headers: {
               date: now.toUTCString(),
               'last-modified': earlier.toUTCString()
@@ -113,7 +124,7 @@ describe('Components', () => {
           })
         }
         if (url.match('.css')) {
-          return new Response('{}', {
+          return new Response('.a{}', {
             headers: {
               date: now.toUTCString(),
               'last-modified': earlier.toUTCString()
@@ -143,7 +154,7 @@ describe('Components', () => {
           })
         }
         if (url.match('.css')) {
-          return new Response('{}', {
+          return new Response('.a{}', {
             headers: {
               date: now.toUTCString(),
               'last-modified': earlier.toUTCString()
@@ -163,17 +174,9 @@ describe('Components', () => {
       expect(document.head.querySelectorAll('style').length).toEqual(1)
     })
 
-    it('should make data/css/html requests when fetch="template stylesheet data"', async () => {
+    it('should fetch data even if fetch control doesnt allow it, once data attribute was updated', async () => {
       const spy = vi.spyOn(global, 'fetch')
       spy.mockImplementation(async (url: string, options: Parameters<typeof fetch>[1] = {}) => {
-        if (url.match('.html')) {
-          return new Response('<var data-path="source.path"></var>', {
-            headers: {
-              date: now.toUTCString(),
-              'last-modified': earlier.toUTCString()
-            }
-          })
-        }
         if (url.match('my.json')) {
           return new Response('{"path": "value"}', {
             headers: {
@@ -181,26 +184,23 @@ describe('Components', () => {
               'last-modified': earlier.toUTCString()
             }
           })
-        }
-        if (url.match('.css')) {
-          return new Response('{}', {
-            headers: {
-              date: now.toUTCString(),
-              'last-modified': earlier.toUTCString()
-            }
-          })
+        } else {
+          throw new Error('Unknown fetch url' + url)
         }
       })
 
       document.body.innerHTML =
-        '<feaas-component fetch="template stylesheet data" data=\'{"source": {"url": "my.json"}}\' library="L" cdn="CDN" component="C" version="V" revision="R"></feaas-component>'
+        '<feaas-component fetch="" data=\'{"source": {"path": "original"}}\' library="L" cdn="CDN" component="C" version="V" revision="R"><var data-path="source.path">original</var></feaas-component>'
 
       const component = document.body.firstElementChild as FEAASComponent
 
       await expect(component.whenRendered).resolves.toEqual(component)
-      expect(spy).toHaveBeenCalledTimes(3)
+      expect(spy).toHaveBeenCalledTimes(0)
+      expect(component.innerHTML).toBe('<var data-path="source.path">original</var>')
+      component.setAttribute('data', '{"source": {"url": "my.json"}}')
+      await expect(component.whenRendered).resolves.toEqual(component)
+      expect(spy).toHaveBeenCalledTimes(1)
       expect(component.innerHTML).toBe('<var data-path="source.path">value</var>')
-      expect(document.head.querySelectorAll('style').length).toEqual(1)
     })
   })
 

package/types/components/FEAASComponent.d.ts

@@ -61,6 +61,7 @@ export declare class FEAASComponent extends FEAASElement<FEAASComponentsProps, s
         fetch: string[];
     }>;
     needsRefresh: boolean;
+    needsToFetchTemplate: boolean;
     setData(data: DataOptions): void;
     getProps(): {
         data: DataOptions;

package/types/components/FEAASComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FEAASComponent.d.ts","sourceRoot":"","sources":["../../src/components/FEAASComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAgB,MAAM,sBAAsB,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY;;;;;;;;;;;;;;EAwCzD;AAED,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAE1E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,cAAe,SAAQ,YAAY,CAAC,oBAAoB,EAAE,MAAM,CAAC;IAC5E,SAAS,EAAE,GAAG,CAAK;IACnB,aAAa,yBAGZ;IAED,MAAM,CAAC,kBAAkB,WAYxB;IAED,YAAY;;;;;;;;;;;;;;OAOsB;IAElC,YAAY,EAAE,OAAO,CAAA;IAErB,OAAO,CAAC,IAAI,EAAE,WAAW;IAIzB,QAAQ;;;;;;;;;;;;;;;IAIR,eAAe,CAAC,IAAI,EAAE,MAAM,oBAAoB;IAIhD,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAkB1E,SAAS;IAef,SAAS,IAAI,GAAG;;IAkBhB,IAAI;IASJ,WAAW;IAaX,aAAa;IAMb,MAAM,SAAU,MAAM,UAGrB;IAEK,IAAI;IAwCV,eAAe,EAAE,OAAO,CAAA;IAExB,KAAK;IAML,MAAM;CAeP;AAED,KAAK,YAAY,GAAG,MAAM,GAAG,UAAU,GAAG,YAAY,CAAA;AAEtD,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,GAAG,CAAC;QACZ,UAAU,iBAAiB;YACzB,iBAAiB,EAAE;gBACjB,IAAI,CAAC,EAAE,GAAG,CAAA;gBACV,KAAK,CAAC,EAAE,MAAM,CAAA;gBACd,wBAAwB,CAAC,EAAE,OAAO,CAAA;gBAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;gBAClB,QAAQ,CAAC,EAAE,GAAG,CAAA;gBACd,uBAAuB,CAAC,EAAE;oBAAE,MAAM,EAAE,MAAM,CAAA;iBAAE,CAAA;gBAC5C,eAAe,CAAC,EAAE,MAAM,CAAA;gBACxB,KAAK,CAAC,EACF,GAAG,YAAY,IAAI,YAAY,IAAI,YAAY,EAAE,GACjD,GAAG,YAAY,IAAI,YAAY,EAAE,GACjC,GAAG,YAAY,EAAE,GACjB,EAAE,CAAA;aACP,GAAG,CACA;gBACE;;mBAEG;gBACH,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,GAAG,CAAC,EAAE,MAAM,CAAA;gBACZ,OAAO,EAAE,MAAM,CAAA;gBACf,SAAS,EAAE,MAAM,CAAA;gBACjB,OAAO,CAAC,EAAE,MAAM,CAAA;gBAChB,QAAQ,CAAC,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAA;aAC5C,GACD;gBAAE,GAAG,EAAE,MAAM,CAAA;aAAE,GACf;gBAAE,QAAQ,EAAE,MAAM,CAAA;aAAE,CACvB,CAAA;SACF;KACF;CACF;AAGD,OAAO,EAAE,cAAc,IAAI,SAAS,EAAE,oBAAoB,IAAI,cAAc,EAAE,CAAA"}
+{"version":3,"file":"FEAASComponent.d.ts","sourceRoot":"","sources":["../../src/components/FEAASComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAgB,MAAM,sBAAsB,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY;;;;;;;;;;;;;;EAwCzD;AAED,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAE1E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,cAAe,SAAQ,YAAY,CAAC,oBAAoB,EAAE,MAAM,CAAC;IAC5E,SAAS,EAAE,GAAG,CAAK;IACnB,aAAa,yBAGZ;IAED,MAAM,CAAC,kBAAkB,WAYxB;IAED,YAAY;;;;;;;;;;;;;;OAOsB;IAElC,YAAY,EAAE,OAAO,CAAA;IACrB,oBAAoB,EAAE,OAAO,CAAA;IAE7B,OAAO,CAAC,IAAI,EAAE,WAAW;IAIzB,QAAQ;;;;;;;;;;;;;;;IAIR,eAAe,CAAC,IAAI,EAAE,MAAM,oBAAoB;IAIhD,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAuB1E,SAAS;IAef,SAAS,IAAI,GAAG;;IAmBhB,IAAI;IASJ,WAAW;IAaX,aAAa;IAMb,MAAM,SAAU,MAAM,UAGrB;IAEK,IAAI;IAyCV,eAAe,EAAE,OAAO,CAAA;IAExB,KAAK;IAML,MAAM;CAqBP;AAED,KAAK,YAAY,GAAG,MAAM,GAAG,UAAU,GAAG,YAAY,CAAA;AAEtD,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,GAAG,CAAC;QACZ,UAAU,iBAAiB;YACzB,iBAAiB,EAAE;gBACjB,IAAI,CAAC,EAAE,GAAG,CAAA;gBACV,KAAK,CAAC,EAAE,MAAM,CAAA;gBACd,wBAAwB,CAAC,EAAE,OAAO,CAAA;gBAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;gBAClB,QAAQ,CAAC,EAAE,GAAG,CAAA;gBACd,uBAAuB,CAAC,EAAE;oBAAE,MAAM,EAAE,MAAM,CAAA;iBAAE,CAAA;gBAC5C,eAAe,CAAC,EAAE,MAAM,CAAA;gBACxB,KAAK,CAAC,EACF,GAAG,YAAY,IAAI,YAAY,IAAI,YAAY,EAAE,GACjD,GAAG,YAAY,IAAI,YAAY,EAAE,GACjC,GAAG,YAAY,EAAE,GACjB,EAAE,CAAA;aACP,GAAG,CACA;gBACE;;mBAEG;gBACH,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,GAAG,CAAC,EAAE,MAAM,CAAA;gBACZ,OAAO,EAAE,MAAM,CAAA;gBACf,SAAS,EAAE,MAAM,CAAA;gBACjB,OAAO,CAAC,EAAE,MAAM,CAAA;gBAChB,QAAQ,CAAC,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAA;aAC5C,GACD;gBAAE,GAAG,EAAE,MAAM,CAAA;aAAE,GACf;gBAAE,QAAQ,EAAE,MAAM,CAAA;aAAE,CACvB,CAAA;SACF;KACF;CACF;AAGD,OAAO,EAAE,cAAc,IAAI,SAAS,EAAE,oBAAoB,IAAI,cAAc,EAAE,CAAA"}

package/types/ui/FEAASPicker.d.ts

@@ -4,7 +4,7 @@ import { FEAASElement } from '../components/FEAASElement.js';
 export declare function FEAASPickerProps(element: FEAASElement<any, any>): {
     part: string;
     slot: string;
-    mode: "library" | "context" | "datasources" | "versions" | "element" | "themes" | "overview" | "attributes" | "responsive-bundles";
+    mode: "library" | "context" | "datasources" | "versions" | "element" | "themes" | "overview" | "attributes" | "bundles";
     dialog: string;
     placeholder: string;
     frontend: string;
@@ -22,7 +22,7 @@ export declare class FEAASPicker extends FEAASElement<FEAASPickerProps, typeof F
     defaultProps: Partial<{
         part: string;
         slot: string;
-        mode: "library" | "context" | "datasources" | "versions" | "element" | "themes" | "overview" | "attributes" | "responsive-bundles";
+        mode: "library" | "context" | "datasources" | "versions" | "element" | "themes" | "overview" | "attributes" | "bundles";
         dialog: string;
         placeholder: string;
         frontend: string;
@@ -37,7 +37,7 @@ export declare class FEAASPicker extends FEAASElement<FEAASPickerProps, typeof F
     getProps(): {
         part: string;
         slot: string;
-        mode: "library" | "context" | "datasources" | "versions" | "element" | "themes" | "overview" | "attributes" | "responsive-bundles";
+        mode: "library" | "context" | "datasources" | "versions" | "element" | "themes" | "overview" | "attributes" | "bundles";
         dialog: string;
         placeholder: string;
         frontend: string;

package/types/utils/settings.d.ts

@@ -15,7 +15,7 @@ export declare function clean(settings: any): Partial<{
     params: Record<string, any>;
     headers: Record<string, string>;
     jsonpath: string;
-    method: "HEAD" | "GET" | "POST" | "OPTIONS" | "PUT" | "DELETE" | "UPDATE";
+    method: "GET" | "POST" | "OPTIONS" | "PUT" | "DELETE" | "UPDATE" | "HEAD";
     body: Record<string, any>;
     url: string;
 }>;
@@ -29,7 +29,7 @@ export declare const isDataSettings: (data: any) => data is {
     params: Record<string, any>;
     headers: Record<string, string>;
     jsonpath: string;
-    method: "HEAD" | "GET" | "POST" | "OPTIONS" | "PUT" | "DELETE" | "UPDATE";
+    method: "GET" | "POST" | "OPTIONS" | "PUT" | "DELETE" | "UPDATE" | "HEAD";
     body: Record<string, any>;
     url: string;
 };
@@ -51,7 +51,7 @@ export declare function DataSettings(settings: any): {
     params: Record<string, any>;
     headers: Record<string, string>;
     jsonpath: string;
-    method: "HEAD" | "GET" | "POST" | "OPTIONS" | "PUT" | "DELETE" | "UPDATE";
+    method: "GET" | "POST" | "OPTIONS" | "PUT" | "DELETE" | "UPDATE" | "HEAD";
     body: Record<string, any>;
     url: string;
 };
@@ -62,7 +62,7 @@ export declare namespace DataSettings {
         params: Record<string, any>;
         headers: Record<string, string>;
         jsonpath: string;
-        method: "HEAD" | "GET" | "POST" | "OPTIONS" | "PUT" | "DELETE" | "UPDATE";
+        method: "GET" | "POST" | "OPTIONS" | "PUT" | "DELETE" | "UPDATE" | "HEAD";
         body: Record<string, any>;
         url: string;
     }) => Promise<Data>;
@@ -71,7 +71,7 @@ export declare namespace DataSettings {
         params: Record<string, any>;
         headers: Record<string, string>;
         jsonpath: string;
-        method: "HEAD" | "GET" | "POST" | "OPTIONS" | "PUT" | "DELETE" | "UPDATE";
+        method: "GET" | "POST" | "OPTIONS" | "PUT" | "DELETE" | "UPDATE" | "HEAD";
         body: Record<string, any>;
         url: string;
     };
@@ -87,5 +87,5 @@ export declare namespace DataSettings {
  * @returns {Promise<DataScopes>} - A promise that resolves to the fetched data.
  */
 export declare function fetchData(data: DataOptions): Promise<DataScopes>;
-export declare function hasDataSettings(data: DataOptions): Promise<boolean>;
+export declare function hasDataSettings(data: DataOptions): boolean;
 //# sourceMappingURL=settings.d.ts.map

package/types/utils/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/utils/settings.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,YAAY,GAAG,MAAM,CAAA;AAGjC,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,EAAE,CAAA;AAG9C,MAAM,MAAM,UAAU,GAAG,IAAI,GAAG,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;AAG1D,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAA;AAG1D,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC,CAAA;AAGvE,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,YAAY,GAAG,eAAe,CAAA;AAE/D;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,QAAQ,EAAE,GAAG;;;;;;;GAmBlC;AAED;;;;;GAKG;AACH,eAAO,MAAM,cAAc,SAAU,GAAG;;;;;;;CAmBvC,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,CAAC,EAAE,GAAG,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC,CA2BzE;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,GAAG;;;;;;;EAwBzC;yBAxBe,YAAY;;;;;;;;;;;;;;;;;;;;;;;AAgD5B;;;;;;;GAOG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAoBtE;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,oBAGtD"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/utils/settings.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,YAAY,GAAG,MAAM,CAAA;AAGjC,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,EAAE,CAAA;AAG9C,MAAM,MAAM,UAAU,GAAG,IAAI,GAAG,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;AAG1D,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAA;AAG1D,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC,CAAA;AAGvE,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,YAAY,GAAG,eAAe,CAAA;AAE/D;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,QAAQ,EAAE,GAAG;;;;;;;GAmBlC;AAED;;;;;GAKG;AACH,eAAO,MAAM,cAAc,SAAU,GAAG;;;;;;;CAmBvC,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,CAAC,EAAE,GAAG,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC,CA2BzE;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,GAAG;;;;;;;EAwBzC;yBAxBe,YAAY;;;;;;;;;;;;;;;;;;;;;;;AAgD5B;;;;;;;GAOG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAoBtE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,WAGhD"}