@researchdatabox/redbox-core 5.0.4 → 5.1.0-beta.12573

package/dist/controllers/BrandingAppController.js

@@ -3,109 +3,297 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Controllers = void 0;
 /**
  * Branding App Controller
- * Endpoints consumed by the Angular admin UI (session / cookie auth, CSRF enabled by default)
+ * Endpoints consumed by the Angular admin UI (session / cookie auth, CSRF enabled by default).
+ * Mirrors the REST surface behaviour using the same BrandingService lifecycle.
  */
 const CoreController_1 = require("../CoreController");
+const branding_config_1 = require("../config/branding.config");
+const BrandingTypeface_1 = require("../model/BrandingTypeface");
 const RequestParamUtils_1 = require("../utilities/RequestParamUtils");
-function mapError(e) {
-    const msg = e.message || '';
-    if (msg === 'unauthorized')
-        return { status: 403, body: { error: 'forbidden' } };
-    if (msg.startsWith('Invalid variable key') || msg.startsWith('Invalid variable value'))
-        return { status: 400, body: { error: 'invalid-variable', detail: msg } };
-    if (msg.startsWith('contrast-violation'))
-        return { status: 400, body: { error: 'contrast', detail: msg } };
-    if (msg === 'branding-not-found')
-        return { status: 404, body: { error: 'branding-not-found' } };
-    if (msg === 'history-not-found')
-        return { status: 404, body: { error: 'history-not-found' } };
-    if (msg === 'publish-conflict')
-        return { status: 409, body: { error: 'publish-conflict' } };
-    if (msg.startsWith('logo-invalid'))
-        return { status: 400, body: { error: 'logo-invalid', detail: msg } };
-    if (msg.startsWith('favicon-invalid'))
-        return { status: 400, body: { error: 'favicon-invalid', detail: msg } };
-    return { status: 500, body: { error: 'server-error', detail: msg } };
-}
+const BrandingControllerSupport_1 = require("./BrandingControllerSupport");
+const fs_1 = require("fs");
 var Controllers;
 (function (Controllers) {
     class BrandingApp extends CoreController_1.Controllers.Core.Controller {
-        _exportedMethods = ['config', 'draft', 'preview', 'publish', 'logo', 'favicon'];
-        /** 9.1 Return current draft/active branding config + logo meta */
+        _exportedMethods = [
+            'config',
+            'draft',
+            'uploadFace',
+            'deleteFace',
+            'useDefault',
+            'revert',
+            'preview',
+            'versions',
+            'versionPreview',
+            'publish',
+            'restore',
+            'rollback',
+            'logo',
+            'favicon',
+        ];
+        sendError(req, res, e) {
+            const mapped = (0, BrandingControllerSupport_1.mapBrandingError)(e);
+            return this.sendResp(req, res, {
+                status: mapped.status,
+                displayErrors: [{ code: mapped.code, detail: mapped.detail }],
+                ...(mapped.current ? { data: { current: mapped.current } } : {}),
+                headers: this.getNoCacheHeaders(),
+            });
+        }
+        sendState(req, res, state, extra = {}) {
+            return this.sendResp(req, res, {
+                data: { ...state, ...extra },
+                headers: this.getNoCacheHeaders(),
+            });
+        }
+        /** Canonical Admin state: active, draft, versions, limits, counters, warnings */
         async config(req, res) {
             try {
                 const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
-                const brand = BrandingService.getBrand(branding);
-                if (!brand)
-                    return res.status(404).json({ error: 'branding-not-found' });
-                return res.ok({ branding: brand });
+                const state = await BrandingService.getAdminState(branding);
+                return this.sendState(req, res, state);
             }
             catch (e) {
-                const { status, body } = mapError(e);
-                return res.status(status).json(body);
+                return this.sendError(req, res, e);
             }
         }
-        /** 9.2 Save draft variables */
+        /** Replace validated colour draft with expected revision */
         async draft(req, res) {
             const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
             const actor = req.user;
-            // Validate variables if provided
-            const variablesInput = req.body?.variables;
+            const body = (req.body ?? {});
+            const variablesInput = body.variables;
             if (variablesInput !== undefined && variablesInput !== null) {
                 if (typeof variablesInput !== 'object' || Array.isArray(variablesInput)) {
-                    return res.status(400).json({ error: 'Invalid variables in request body' });
+                    return this.sendResp(req, res, {
+                        status: 400,
+                        displayErrors: [{ code: 'invalid-variable', detail: 'Invalid variables in request body' }],
+                        headers: this.getNoCacheHeaders(),
+                    });
                 }
             }
-            // Coerce variables to empty object if missing
-            const variables = variablesInput || {};
             try {
-                const updated = await BrandingService.saveDraft({ branding, variables, actor });
-                return res.ok({ branding: updated });
+                const state = await BrandingService.saveDraft({
+                    branding,
+                    variables: (variablesInput || {}) || {},
+                    expectedDraftRevision: body.expectedDraftRevision,
+                    actor,
+                });
+                return this.sendState(req, res, state);
             }
             catch (e) {
-                const { status, body } = mapError(e);
-                return res.status(status).json(body);
+                return this.sendError(req, res, e);
             }
         }
-        /** 9.3 Create preview token */
-        async preview(req, res) {
+        /** Multipart face upload (`face`) with expected revision field */
+        async uploadFace(req, res) {
             const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
-            const portal = (0, RequestParamUtils_1.getRouteParam)(req, 'portal');
+            const slot = (0, RequestParamUtils_1.getRouteParam)(req, 'slot');
+            const actor = req.user;
+            const maxBytes = (0, branding_config_1.getBrandingPositiveInt)('typefaceFaceMaxBytes', BrandingTypeface_1.BRANDING_TYPEFACE_FACE_MAX_BYTES);
+            const files = [];
             try {
-                const { token, url, hash } = await BrandingService.preview(branding, portal);
-                let brandConfig = null;
-                try {
-                    brandConfig = await BrandingService.getBrandingFromDB(branding);
+                await (0, BrandingControllerSupport_1.receiveSingleFile)(req, 'face', maxBytes, files);
+                if (files.length === 0) {
+                    return this.sendResp(req, res, {
+                        status: 400,
+                        displayErrors: [{ code: 'no-file' }],
+                        headers: this.getNoCacheHeaders(),
+                    });
                 }
-                catch (_e) {
-                    sails.log.warn('Failed to fetch brand config for preview:', _e);
+                const body = (req.body ?? {});
+                const expectedDraftRevision = Number(body.expectedDraftRevision);
+                const buf = await fs_1.promises.readFile(files[0].fd);
+                const state = await BrandingService.uploadTypefaceFace({
+                    branding,
+                    slot,
+                    bytes: buf,
+                    originalFilename: files[0].filename,
+                    expectedDraftRevision: Number.isFinite(expectedDraftRevision) ? expectedDraftRevision : undefined,
+                    actor,
+                });
+                return this.sendState(req, res, state);
+            }
+            catch (e) {
+                if ((0, BrandingControllerSupport_1.isUploadSizeError)(e)) {
+                    return this.sendResp(req, res, {
+                        status: 413,
+                        displayErrors: [
+                            { code: 'typeface-face-too-large', detail: `Face exceeds the configured maximum of ${maxBytes} bytes` },
+                        ],
+                        headers: this.getNoCacheHeaders(),
+                    });
                 }
-                return res.ok({ token, url, hash, previewToken: token, previewUrl: url, branding: brandConfig || undefined });
+                return this.sendError(req, res, e);
+            }
+            finally {
+                await Promise.all(files.map(file => fs_1.promises.unlink(file.fd).catch(() => undefined)));
+            }
+        }
+        /** Remove one draft face */
+        async deleteFace(req, res) {
+            const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
+            const slot = (0, RequestParamUtils_1.getRouteParam)(req, 'slot');
+            const actor = req.user;
+            try {
+                const body = (req.body ?? {});
+                const state = await BrandingService.removeTypefaceFace({
+                    branding,
+                    slot,
+                    expectedDraftRevision: body.expectedDraftRevision,
+                    actor,
+                });
+                return this.sendState(req, res, state);
+            }
+            catch (e) {
+                return this.sendError(req, res, e);
+            }
+        }
+        /** Set draft typeface to Default Typography */
+        async useDefault(req, res) {
+            const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
+            const actor = req.user;
+            try {
+                const body = (req.body ?? {});
+                const state = await BrandingService.useDefaultTypography({
+                    branding,
+                    expectedDraftRevision: body.expectedDraftRevision,
+                    actor,
+                });
+                return this.sendState(req, res, state);
             }
             catch (e) {
-                const { status, body } = mapError(e);
-                return res.status(status).json(body);
+                return this.sendError(req, res, e);
             }
         }
-        /** 9.4 Publish draft */
+        /** Copy active typeface to draft only */
+        async revert(req, res) {
+            const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
+            const actor = req.user;
+            try {
+                const body = (req.body ?? {});
+                const state = await BrandingService.revertTypefaceDraft({
+                    branding,
+                    expectedDraftRevision: body.expectedDraftRevision,
+                    actor,
+                });
+                return this.sendState(req, res, state);
+            }
+            catch (e) {
+                return this.sendError(req, res, e);
+            }
+        }
+        /** Create a single-use CSS preview for the exact draft revision */
+        async preview(req, res) {
+            const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
+            const portal = (0, RequestParamUtils_1.getRouteParam)(req, 'portal');
+            try {
+                const body = (req.body ?? {});
+                const preview = await BrandingService.preview(branding, portal, body.expectedDraftRevision);
+                return this.sendResp(req, res, {
+                    data: { ...preview, previewToken: preview.token, previewUrl: preview.url },
+                    headers: this.getNoCacheHeaders(),
+                });
+            }
+            catch (e) {
+                return this.sendError(req, res, e);
+            }
+        }
+        /** List newest retained versions */
+        async versions(req, res) {
+            try {
+                const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
+                const versions = await BrandingService.listVersions(branding);
+                return this.sendResp(req, res, { data: versions, headers: this.getNoCacheHeaders() });
+            }
+            catch (e) {
+                return this.sendError(req, res, e);
+            }
+        }
+        /** Preview a retained version without mutating draft */
+        async versionPreview(req, res) {
+            const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
+            const portal = (0, RequestParamUtils_1.getRouteParam)(req, 'portal');
+            const versionId = (0, RequestParamUtils_1.getRouteParam)(req, 'versionId');
+            try {
+                const preview = await BrandingService.previewVersion({ branding, portal, versionId });
+                return this.sendResp(req, res, {
+                    data: { ...preview, previewToken: preview.token, previewUrl: preview.url },
+                    headers: this.getNoCacheHeaders(),
+                });
+            }
+            catch (e) {
+                return this.sendError(req, res, e);
+            }
+        }
+        /** Publish the draft using both expected counters */
         async publish(req, res) {
             const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
             const portal = (0, RequestParamUtils_1.getRouteParam)(req, 'portal');
             const actor = req.user;
             try {
-                const expectedVersion = req.body?.expectedVersion;
-                const { version, hash, idempotent } = await BrandingService.publish(branding, portal, actor, { expectedVersion });
-                const body = { version, hash };
-                if (idempotent)
-                    body.idempotent = true;
-                return res.ok(body);
+                const body = (req.body ?? {});
+                const result = await BrandingService.publish(branding, portal, actor, {
+                    expectedVersion: body.expectedVersion,
+                    expectedDraftRevision: body.expectedDraftRevision,
+                });
+                return this.sendState(req, res, result.state, {
+                    version: result.version,
+                    hash: result.hash,
+                    ...(result.idempotent ? { idempotent: true } : {}),
+                });
+            }
+            catch (e) {
+                return this.sendError(req, res, e);
+            }
+        }
+        /** Immediately restore a retained version as a new version */
+        async restore(req, res) {
+            const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
+            const versionId = (0, RequestParamUtils_1.getRouteParam)(req, 'versionId');
+            const actor = req.user;
+            try {
+                const body = (req.body ?? {});
+                const result = await BrandingService.restore({
+                    branding,
+                    versionId,
+                    expectedVersion: body.expectedVersion,
+                    expectedDraftRevision: body.expectedDraftRevision,
+                    actor,
+                });
+                return this.sendState(req, res, result.state, { version: result.version, hash: result.hash });
+            }
+            catch (e) {
+                return this.sendError(req, res, e);
+            }
+        }
+        /**
+         * Deprecated one-major-release alias with restore semantics.
+         * Returns a Deprecation header; removal is scheduled for the next major release.
+         */
+        async rollback(req, res) {
+            const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
+            const versionId = (0, RequestParamUtils_1.getRouteParam)(req, 'versionId');
+            const actor = req.user;
+            try {
+                const body = (req.body ?? {});
+                const result = await BrandingService.restore({
+                    branding,
+                    versionId,
+                    expectedVersion: body.expectedVersion,
+                    expectedDraftRevision: body.expectedDraftRevision,
+                    actor,
+                });
+                return this.sendResp(req, res, {
+                    data: { ...result.state, version: result.version, hash: result.hash },
+                    headers: { ...this.getNoCacheHeaders(), Deprecation: 'true' },
+                });
             }
             catch (e) {
-                const { status, body } = mapError(e);
-                return res.status(status).json(body);
+                return this.sendError(req, res, e);
             }
         }
-        /** 9.5 Upload logo */
+        /** Upload logo */
         async logo(req, res) {
             const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
             const portal = (0, RequestParamUtils_1.getRouteParam)(req, 'portal');
@@ -127,7 +315,12 @@ var Controllers;
                 const fs = require('fs').promises;
                 const buf = await fs.readFile(f.fd);
                 try {
-                    const { hash } = await BrandingLogoService.putLogo({ branding, portal, fileBuffer: buf, contentType: f.type });
+                    const { hash } = await BrandingLogoService.putLogo({
+                        branding,
+                        portal,
+                        fileBuffer: buf,
+                        contentType: f.type,
+                    });
                     await fs.unlink(f.fd);
                     return res.ok({ hash });
                 }
@@ -137,11 +330,10 @@ var Controllers;
                 }
             }
             catch (e) {
-                const { status, body } = mapError(e);
-                return res.status(status).json(body);
+                return this.sendError(req, res, e);
             }
         }
-        /** 9.6 Upload favicon */
+        /** Upload favicon */
         async favicon(req, res) {
             const branding = (0, RequestParamUtils_1.getRouteParam)(req, 'branding');
             const portal = (0, RequestParamUtils_1.getRouteParam)(req, 'portal');
@@ -163,7 +355,12 @@ var Controllers;
                 const fs = require('fs').promises;
                 const buf = await fs.readFile(f.fd);
                 try {
-                    const { hash } = await BrandingLogoService.putFavicon({ branding, portal, fileBuffer: buf, contentType: f.type });
+                    const { hash } = await BrandingLogoService.putFavicon({
+                        branding,
+                        portal,
+                        fileBuffer: buf,
+                        contentType: f.type,
+                    });
                     await fs.unlink(f.fd);
                     return res.ok({ hash });
                 }
@@ -173,11 +370,10 @@ var Controllers;
                 }
             }
             catch (e) {
-                const { status, body } = mapError(e);
-                return res.status(status).json(body);
+                return this.sendError(req, res, e);
             }
         }
     }
     Controllers.BrandingApp = BrandingApp;
 })(Controllers || (exports.Controllers = Controllers = {}));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BrandingAppController.js","sourceRoot":"","sources":["../../src/controllers/BrandingAppController.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BrandingAppController.js","sourceRoot":"","sources":["../../src/controllers/BrandingAppController.ts"],"names":[],"mappings":"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"}

package/dist/controllers/BrandingController.d.ts

@@ -3,8 +3,13 @@ export declare namespace Controllers {
     class Branding extends controllers.Core.Controller {
         private static readonly CSS_CACHE_MAX_SIZE;
         private static readonly CSS_CACHE_TTL_MS;
+        /** Verified face bytes are immutable and content-addressed, so no TTL is needed. */
+        private static readonly FONT_CACHE_MAX_SIZE;
+        private static readonly FONT_CACHE_MAX_BYTES;
         private readonly cssMinifier;
         private readonly cssResponseCache;
+        private readonly fontResponseCache;
+        private fontResponseCacheBytes;
         /**
          * Generate a weak ETag for the given content hash or string.
          * @param hashOrContent - Either a pre-computed hash string or content to hash
@@ -14,8 +19,17 @@ export declare namespace Controllers {
         private generateETag;
         private minifyCss;
         private getCssCacheControlHeader;
+        private getVersionedCssCacheControlHeader;
+        /**
+         * True when the request pins the current publication hash (?v=<hash>).
+         * Layouts emit this form so a republish (new hash, new URL) applies
+         * immediately instead of waiting out the unversioned browser cache.
+         */
+        private requestMatchesPublicationHash;
         private getCachedCssResponse;
         private setCachedCssResponse;
+        private getCachedFontResponse;
+        private setCachedFontResponse;
         /**
          * Exported methods, accessible from internet.
          */
@@ -31,8 +45,17 @@ export declare namespace Controllers {
         renderCss(req: Sails.Req, res: Sails.Res): Promise<import("express").Response<any, Record<string, any>>>;
         /** Serve temporary preview CSS using BrandingService preview token (/:branding/:portal/preview/:token.css) */
         renderPreviewCss(req: Sails.Req, res: Sails.Res): Promise<import("express").Response<any, Record<string, any>>>;
-        /** Create a preview token (JSON) */
+        /** Create a preview token (JSON) for a caller-supplied draft revision (legacy public surface) */
         createPreview(req: Sails.Req, res: Sails.Res): Promise<import("express").Response<any, Record<string, any>>>;
+        /**
+         * Serves one immutable Brand Typeface face by exact brand name and content hash
+         * (GET|HEAD /fonts/branding/:branding/:sha256.woff2).
+         *
+         * Portal-independent and sessionless so every portal under a brand shares the
+         * browser cache. Missing brands/objects and hash mismatches are 404 without
+         * substituting another font; corruption is logged server-side.
+         */
+        renderFont(req: Sails.Req, res: Sails.Res): Promise<import("express").Response<any, Record<string, any>>>;
         /**
          *
          * Renders the API Blueprint spec for the given branding

package/dist/controllers/BrandingController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BrandingController.d.ts","sourceRoot":"","sources":["../../src/controllers/BrandingController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAe/D,yBAAiB,WAAW,CAAC;IAE3B,MAAa,QAAS,SAAQ,WAAW,CAAC,IAAI,CAAC,UAAU;QACvD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAO;QACjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAiB;QACzD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAKzB;QACH,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAuE;QAExG;;;;;WAKG;QACH,OAAO,CAAC,YAAY;QAYpB,OAAO,CAAC,SAAS;QAQjB,OAAO,CAAC,wBAAwB;QAKhC,OAAO,CAAC,oBAAoB;QAiB5B,OAAO,CAAC,oBAAoB;QAY5B;;WAEG;QACH,UAAmB,gBAAgB,EAAE,MAAM,EAAE,CAU3C;QAEK,IAAI;QAIX;;;;;;WAMG;QACU,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAgErD,8GAA8G;QACjG,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAgC5D,oCAAoC;QACvB,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAWzD;;;;;;WAMG;QACI,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAWhD;;;;;;WAMG;QACI,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAcvD;;;;;;WAMG;QACI,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAavD;;;;;;WAMG;QACU,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAoCvD;;;;;;WAMG;QACU,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;KAkC1D;CACF"}
+{"version":3,"file":"BrandingController.d.ts","sourceRoot":"","sources":["../../src/controllers/BrandingController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAgB/D,yBAAiB,WAAW,CAAC;IAC3B,MAAa,QAAS,SAAQ,WAAW,CAAC,IAAI,CAAC,UAAU;QACvD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAO;QACjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAiB;QACzD,oFAAoF;QACpF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAM;QACjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAoB;QAChE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAKzB;QACH,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAuE;QACxG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6B;QAC/D,OAAO,CAAC,sBAAsB,CAAK;QAEnC;;;;;WAKG;QACH,OAAO,CAAC,YAAY;QAYpB,OAAO,CAAC,SAAS;QAQjB,OAAO,CAAC,wBAAwB;QAKhC,OAAO,CAAC,iCAAiC;QAMzC;;;;WAIG;QACH,OAAO,CAAC,6BAA6B;QAYrC,OAAO,CAAC,oBAAoB;QAiB5B,OAAO,CAAC,oBAAoB;QAY5B,OAAO,CAAC,qBAAqB;QAW7B,OAAO,CAAC,qBAAqB;QAkB7B;;WAEG;QACH,UAAmB,gBAAgB,EAAE,MAAM,EAAE,CAW3C;QAEK,IAAI;QAIX;;;;;;WAMG;QACU,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QA0DrD,8GAA8G;QACjG,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAgC5D,iGAAiG;QACpF,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAwCzD;;;;;;;WAOG;QACU,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAkEtD;;;;;;WAMG;QACI,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAUhD;;;;;;WAMG;QACI,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAcvD;;;;;;WAMG;QACI,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAavD;;;;;;WAMG;QACU,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;QAoCvD;;;;;;WAMG;QACU,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;KAyB1D;CACF"}