@angular-architects/native-federation-v4 20.3.4 → 20.3.7

package/README.md

@@ -239,9 +239,9 @@ When bootstrapping the host (shell), Native Federation (`projects\shell\src\main
 import { initFederation } from '@angular-architects/native-federation';
 
 initFederation('/assets/federation.manifest.json')
-  .catch((err) => console.error(err))
-  .then((_) => import('./bootstrap'))
-  .catch((err) => console.error(err));
+  .catch(err => console.error(err))
+  .then(_ => import('./bootstrap'))
+  .catch(err => console.error(err));
 ```
 
 > This file is generated by the schematic described above.
@@ -270,9 +270,9 @@ When bootstrapping your remote (`projects\mfe1\src\main.ts`), Native Federation
 import { initFederation } from '@angular-architects/native-federation';
 
 initFederation()
-  .catch((err) => console.error(err))
-  .then((_) => import('./bootstrap'))
-  .catch((err) => console.error(err));
+  .catch(err => console.error(err))
+  .then(_ => import('./bootstrap'))
+  .catch(err => console.error(err));
 ```
 
 > Our `init` schematic shown above also generates this file.
@@ -301,7 +301,7 @@ export const APP_ROUTES: Routes = [
   // Add this route:
   {
     path: 'flights',
-    loadComponent: () => loadRemoteModule('mfe1', './Component').then((m) => m.AppComponent),
+    loadComponent: () => loadRemoteModule('mfe1', './Component').then(m => m.AppComponent),
   },
 
   {

package/migration-collection.json

@@ -10,4 +10,4 @@
       "description": "migrating to v18"
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/native-federation-v4",
-  "version": "20.3.4",
+  "version": "20.3.7",
   "generators": "./collection.json",
   "builders": "./builders.json",
   "schematics": "./collection.json",
@@ -10,8 +10,8 @@
     "url": "http://www.angulararchitects.io"
   },
   "dependencies": {
-    "@softarc/native-federation": "4.0.0-RC5",
-    "@softarc/native-federation-runtime": "4.0.0-RC5",
+    "@softarc/native-federation": "4.0.0-RC8",
+    "@softarc/native-federation-runtime": "4.0.0-RC8",
     "@angular-devkit/architect": "^0.2003.1",
     "@angular-devkit/build-angular": "~20.3.1",
     "@angular-devkit/core": "~20.3.1",

package/src/builders/build/builder.d.ts

@@ -1,6 +1,7 @@
+import './setup-builder-env-variables.js';
 import { type BuilderContext, type BuilderOutput } from '@angular-devkit/architect';
 import { type NfBuilderSchema } from './schema.js';
-export declare function runBuilder(nfOptions: NfBuilderSchema, context: BuilderContext): AsyncIterable<BuilderOutput>;
+export declare function runBuilder(nfBuilderOptions: NfBuilderSchema, context: BuilderContext): AsyncIterable<BuilderOutput>;
 declare const _default: any;
 export default _default;
 //# sourceMappingURL=builder.d.ts.map

package/src/builders/build/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../src/builders/build/builder.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,aAAa,EAGnB,MAAM,2BAA2B,CAAC;AAkCnC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAsCnD,wBAAuB,UAAU,CAC/B,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE,cAAc,GACtB,aAAa,CAAC,aAAa,CAAC,CA+X9B;wBA6C2C,GAAG;AAA/C,wBAAgD"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../src/builders/build/builder.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC;AAS1C,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,aAAa,EAGnB,MAAM,2BAA2B,CAAC;AAgCnC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AA2CnD,wBAAuB,UAAU,CAC/B,gBAAgB,EAAE,eAAe,EACjC,OAAO,EAAE,cAAc,GACtB,aAAa,CAAC,aAAa,CAAC,CAkY9B;wBA6C2C,GAAG;AAA/C,wBAAgD"}

package/src/builders/build/builder.js

@@ -1,18 +1,17 @@
+import './setup-builder-env-variables.js';
 import * as fs from 'fs';
 import * as mrmime from 'mrmime';
 import * as path from 'path';
 import { buildApplication } from '@angular/build';
-import { buildApplicationInternal, serveWithVite } from '@angular/build/private';
+import { buildApplicationInternal, serveWithVite, SourceFileCache } from '@angular/build/private';
 import { createBuilder, targetFromTargetString, } from '@angular-devkit/architect';
 import { normalizeOptions } from '@angular-devkit/build-angular/src/builders/dev-server/options.js';
-import { buildForFederation, getExternals, loadFederationConfig, setBuildAdapter, } from '@softarc/native-federation';
-import { logger, setLogLevel, RebuildQueue, AbortedError, } from '@softarc/native-federation/internal';
-import { createAngularBuildAdapter, setMemResultHandler, } from '../../utils/angular-esbuild-adapter.js';
+import { buildForFederation, rebuildForFederation, getExternals, loadFederationConfig, normalizeFederationOptions, setBuildAdapter, createFederationCache, } from '@softarc/native-federation';
+import { logger, setLogLevel, RebuildQueue, AbortedError, getDefaultCachePath, } from '@softarc/native-federation/internal';
+import { createAngularBuildAdapter } from '../../utils/angular-esbuild-adapter.js';
 import { existsSync, mkdirSync, rmSync } from 'fs';
 import { fstart } from '../../tools/fstart-as-data-url.js';
-import { EsBuildResult, MemResults, NgCliAssetResult } from '../../utils/mem-resuts.js';
 import { getI18nConfig, translateFederationArtifacts } from '../../utils/i18n.js';
-import { RebuildHubs } from '../../utils/rebuild-events.js';
 import { createSharedMappingsPlugin } from '../../utils/shared-mappings-plugin.js';
 import { updateScriptTags } from '../../utils/updateIndexHtml.js';
 import { federationBuildNotifier } from './federation-build-notifier.js';
@@ -27,7 +26,7 @@ process.stderr.write = function (chunk, encodingOrCallback, callback) {
     }
     return originalWrite(chunk, encodingOrCallback, callback);
 };
-function _buildApplication(options, context, pluginsOrExtensions) {
+const createInternalAngularBuilder = (_) => (options, context, pluginsOrExtensions) => {
     let extensions;
     if (pluginsOrExtensions && Array.isArray(pluginsOrExtensions)) {
         extensions = {
@@ -37,10 +36,12 @@ function _buildApplication(options, context, pluginsOrExtensions) {
     else {
         extensions = pluginsOrExtensions;
     }
+    // Todo: share cache with Angular builder: https://github.com/angular/angular-cli/pull/32527
+    // options.codeBundleCache = nfOptions.federationCache.bundlerCache;
     return buildApplicationInternal(options, context, extensions);
-}
-export async function* runBuilder(nfOptions, context) {
-    let target = targetFromTargetString(nfOptions.target);
+};
+export async function* runBuilder(nfBuilderOptions, context) {
+    let target = targetFromTargetString(nfBuilderOptions.target);
     let targetOptions = (await context.getTargetOptions(target));
     let builder = await context.getBuilderNameForTarget(target);
     if (builder === '@angular-devkit/build-angular:browser-esbuild') {
@@ -66,18 +67,17 @@ export async function* runBuilder(nfOptions, context) {
     /**
      * Explicitly defined as devServer or if the target contains "serve"
      */
-    const runServer = typeof nfOptions.devServer !== 'undefined'
-        ? !!nfOptions.devServer
+    const runServer = typeof nfBuilderOptions.devServer !== 'undefined'
+        ? !!nfBuilderOptions.devServer
         : target.target.includes('serve');
     let options = (await context.validateOptions(runServer
         ? {
             ...targetOptions,
-            port: nfOptions.port || targetOptions['port'],
+            port: nfBuilderOptions.port || targetOptions['port'],
         }
         : targetOptions, builder));
     let serverOptions = null;
-    const write = true;
-    const watch = nfOptions.watch;
+    const watch = nfBuilderOptions.watch;
     if (options['buildTarget']) {
         serverOptions = await normalizeOptions(context, context.target.project, options);
         target = targetFromTargetString(options['buildTarget']);
@@ -86,14 +86,13 @@ export async function* runBuilder(nfOptions, context) {
         options = (await context.validateOptions(targetOptions, builder));
     }
     options.watch = watch;
-    if (nfOptions.baseHref) {
-        options.baseHref = nfOptions.baseHref;
+    if (nfBuilderOptions.baseHref) {
+        options.baseHref = nfBuilderOptions.baseHref;
     }
-    if (nfOptions.outputPath) {
-        options.outputPath = nfOptions.outputPath;
+    if (nfBuilderOptions.outputPath) {
+        options.outputPath = nfBuilderOptions.outputPath;
     }
-    const rebuildEvents = new RebuildHubs();
-    const adapter = createAngularBuildAdapter(options, context, rebuildEvents);
+    const adapter = createAngularBuildAdapter(options, context);
     setBuildAdapter(adapter);
     setLogLevel(options.verbose ? 'verbose' : 'info');
     if (!options.outputPath) {
@@ -117,23 +116,24 @@ export async function* runBuilder(nfOptions, context) {
     const devServerOutputPath = !differentDevServerOutputPath
         ? browserOutputPath
         : path.join(outputOptions.base, outputOptions.browser, localeFilter[0]);
-    const entryPoint = path.join(path.dirname(options.tsConfig), 'src/main.ts');
-    const fedOptions = {
+    const entryPoint = nfBuilderOptions.entryPoint ?? path.join(path.dirname(options.tsConfig), 'src/main.ts');
+    const cachePath = getDefaultCachePath(context.workspaceRoot);
+    const nfOptions = normalizeFederationOptions({
         workspaceRoot: context.workspaceRoot,
         outputPath: browserOutputPath,
         federationConfig: inferConfigPath(options.tsConfig),
         tsConfig: options.tsConfig,
         verbose: options.verbose,
-        watch: false, // options.watch,
-        dev: !!nfOptions.dev,
-        chunks: !nfOptions.chunks ? false : nfOptions.chunks,
+        watch: options.watch,
+        dev: !!nfBuilderOptions.dev,
+        chunks: !nfBuilderOptions.chunks ? false : nfBuilderOptions.chunks,
         entryPoint,
-        buildNotifications: nfOptions.buildNotifications,
-        cacheExternalArtifacts: nfOptions.cacheExternalArtifacts,
-    };
-    const activateSsr = nfOptions.ssr && !nfOptions.dev;
+        buildNotifications: nfBuilderOptions.buildNotifications,
+        cacheExternalArtifacts: nfBuilderOptions.cacheExternalArtifacts,
+    }, createFederationCache(cachePath, new SourceFileCache(cachePath)));
+    const activateSsr = nfBuilderOptions.ssr && !nfBuilderOptions.dev;
     const start = process.hrtime();
-    const config = await loadFederationConfig(fedOptions);
+    const config = await loadFederationConfig(nfOptions);
     logger.measure(start, 'To load the federation config.');
     const externals = getExternals(config);
     const plugins = [
@@ -151,10 +151,10 @@ export async function* runBuilder(nfOptions, context) {
     if (activateSsr) {
         options.externalDependencies = externals;
     }
-    const isLocalDevelopment = runServer && nfOptions.dev;
+    const isLocalDevelopment = runServer && nfBuilderOptions.dev;
     // Initialize SSE reloader only for local development
-    if (isLocalDevelopment && nfOptions.buildNotifications?.enable) {
-        federationBuildNotifier.initialize(nfOptions.buildNotifications.endpoint);
+    if (isLocalDevelopment && nfBuilderOptions.buildNotifications?.enable) {
+        federationBuildNotifier.initialize(nfBuilderOptions.buildNotifications.endpoint);
     }
     const middleware = [
         ...(isLocalDevelopment
@@ -164,7 +164,7 @@ export async function* runBuilder(nfOptions, context) {
             : []),
         (req, res, next) => {
             const url = removeBaseHref(req, options.baseHref);
-            const fileName = path.join(fedOptions.workspaceRoot, devServerOutputPath, url);
+            const fileName = path.join(nfOptions.workspaceRoot, devServerOutputPath, url);
             const exists = fs.existsSync(fileName);
             if (url !== '/' && url !== '' && exists) {
                 const lookup = mrmime.lookup;
@@ -186,26 +186,17 @@ export async function* runBuilder(nfOptions, context) {
             }
         },
     ];
-    const memResults = new MemResults();
     let first = true;
-    let lastResult;
-    if (existsSync(fedOptions.outputPath)) {
-        rmSync(fedOptions.outputPath, { recursive: true });
+    if (existsSync(nfOptions.outputPath)) {
+        rmSync(nfOptions.outputPath, { recursive: true });
     }
-    if (!existsSync(fedOptions.outputPath)) {
-        mkdirSync(fedOptions.outputPath, { recursive: true });
-    }
-    if (!write) {
-        // todo: Hardcoded disabled?
-        setMemResultHandler((outFiles, outDir) => {
-            const fullOutDir = outDir ? path.join(fedOptions.workspaceRoot, outDir) : undefined;
-            memResults.add(outFiles.map(f => new EsBuildResult(f, fullOutDir)));
-        });
+    if (!existsSync(nfOptions.outputPath)) {
+        mkdirSync(nfOptions.outputPath, { recursive: true });
     }
     let federationResult;
     try {
         const start = process.hrtime();
-        federationResult = await buildForFederation(config, fedOptions, externals);
+        federationResult = await buildForFederation(config, nfOptions, externals);
         logger.measure(start, 'To build the artifacts.');
     }
     catch (e) {
@@ -213,7 +204,7 @@ export async function* runBuilder(nfOptions, context) {
         process.exit(1);
     }
     if (activateSsr) {
-        writeFstartScript(fedOptions);
+        writeFstartScript(nfOptions);
     }
     const hasLocales = i18n?.locales && Object.keys(i18n.locales).length > 0;
     if (hasLocales && localeFilter) {
@@ -224,95 +215,108 @@ export async function* runBuilder(nfOptions, context) {
     options.deleteOutputPath = false;
     const appBuilderName = '@angular/build:application';
     const builderRun = runServer
-        ? serveWithVite(serverOptions, appBuilderName, _buildApplication, context, nfOptions.skipHtmlTransform ? {} : { indexHtml: transformIndexHtml(nfOptions) }, {
+        ? serveWithVite(serverOptions, appBuilderName, createInternalAngularBuilder(nfOptions), context, nfBuilderOptions.skipHtmlTransform
+            ? {}
+            : { indexHtml: transformIndexHtml(nfBuilderOptions) }, {
             buildPlugins: plugins,
             middleware,
         })
         : buildApplication(options, context, {
             codePlugins: plugins,
-            indexHtmlTransformer: transformIndexHtml(nfOptions),
+            indexHtmlTransformer: transformIndexHtml(nfBuilderOptions),
         });
     const rebuildQueue = new RebuildQueue();
+    const builderIterator = builderRun[Symbol.asyncIterator]();
+    let ngBuildStatus = { success: false };
     try {
-        for await (const output of builderRun) {
-            lastResult = output;
-            if (!write && output['outputFiles']) {
-                memResults.add(output['outputFiles'].map((file) => new EsBuildResult(file)));
-            }
-            if (!write && output['assetFiles']) {
-                memResults.add(output['assetFiles'].map((file) => new NgCliAssetResult(file)));
+        let buildResult = await builderIterator.next();
+        while (!buildResult.done) {
+            if (buildResult.value)
+                ngBuildStatus = buildResult.value;
+            if (!ngBuildStatus.success) {
+                logger.warn('Skipping federation artifacts because Angular build failed.');
+                buildResult = await builderIterator.next();
             }
-            // if (write && !runServer && !nfOptions.skipHtmlTransform) {
-            //   updateIndexHtml(fedOptions, nfOptions);
-            // }
-            // if (!runServer) {
-            //   yield output;
-            // }
-            if (!first && (nfOptions.dev || watch)) {
-                rebuildQueue
-                    .enqueue(async (signal) => {
-                    if (signal?.aborted) {
-                        throw new AbortedError('Build canceled before starting');
-                    }
-                    await new Promise((resolve, reject) => {
-                        const timeout = setTimeout(resolve, Math.max(10, nfOptions.rebuildDelay));
-                        if (signal) {
-                            const abortHandler = () => {
-                                clearTimeout(timeout);
-                                reject(new AbortedError('[builder] During delay.'));
-                            };
-                            signal.addEventListener('abort', abortHandler, { once: true });
+            else if (!first && (nfBuilderOptions.dev || watch)) {
+                const nextOutputPromise = builderIterator.next();
+                const trackResult = await rebuildQueue.track(async (signal) => {
+                    try {
+                        if (signal?.aborted) {
+                            throw new AbortedError('Build canceled before starting');
                         }
-                    });
-                    if (signal?.aborted) {
-                        throw new AbortedError('[builder] Before federation build.');
-                    }
-                    const start = process.hrtime();
-                    federationResult = await buildForFederation(config, fedOptions, externals, {
-                        skipMappingsAndExposed: false,
-                        skipShared: true,
-                        signal,
-                    });
-                    if (signal?.aborted) {
-                        throw new AbortedError('[builder] After federation build.');
-                    }
-                    if (hasLocales && localeFilter) {
-                        translateFederationArtifacts(i18n, localeFilter, outputOptions.base, federationResult);
-                    }
-                    if (signal?.aborted) {
-                        throw new AbortedError('[builder] After federation translations.');
-                    }
-                    logger.info('Done!');
-                    if (isLocalDevelopment) {
-                        federationBuildNotifier.broadcastBuildCompletion();
-                    }
-                    logger.measure(start, 'To rebuild the federation artifacts.');
-                })
-                    .catch(error => {
-                    if (error instanceof AbortedError) {
-                        logger.verbose('Rebuild was canceled. Cancellation point: ' + error?.message);
-                        federationBuildNotifier.broadcastBuildCancellation();
+                        await new Promise((resolve, reject) => {
+                            const timeout = setTimeout(resolve, Math.max(10, nfBuilderOptions.rebuildDelay));
+                            if (signal) {
+                                const abortHandler = () => {
+                                    clearTimeout(timeout);
+                                    reject(new AbortedError('[builder] During delay.'));
+                                };
+                                signal.addEventListener('abort', abortHandler, { once: true });
+                            }
+                        });
+                        if (signal?.aborted) {
+                            throw new AbortedError('[builder] Before federation build.');
+                        }
+                        const start = process.hrtime();
+                        // Todo: Invalidate all source files, Angular doesn't provide a way to give the invalidated files yet.
+                        // ref: https://github.com/angular/angular-cli/pull/32527
+                        const keys = [...nfOptions.federationCache.bundlerCache.keys()].filter(k => !k.includes('node_modules'));
+                        federationResult = await rebuildForFederation(config, nfOptions, externals, keys, signal);
+                        if (signal?.aborted) {
+                            throw new AbortedError('[builder] After federation build.');
+                        }
+                        if (hasLocales && localeFilter) {
+                            translateFederationArtifacts(i18n, localeFilter, outputOptions.base, federationResult);
+                        }
+                        if (signal?.aborted) {
+                            throw new AbortedError('[builder] After federation translations.');
+                        }
+                        logger.info('Done!');
+                        if (isLocalDevelopment) {
+                            federationBuildNotifier.broadcastBuildCompletion();
+                        }
+                        logger.measure(start, 'To rebuild the federation artifacts.');
+                        return { success: true };
                     }
-                    else {
+                    catch (error) {
+                        if (error instanceof AbortedError) {
+                            logger.verbose('Rebuild was canceled. Cancellation point: ' + error?.message);
+                            federationBuildNotifier.broadcastBuildCancellation();
+                            return { success: false, cancelled: true };
+                        }
                         logger.error('Federation rebuild failed!');
                         if (options.verbose)
                             console.error(error);
                         if (isLocalDevelopment) {
                             federationBuildNotifier.broadcastBuildError(error);
                         }
+                        return { success: false };
                     }
-                });
+                }, nextOutputPromise);
+                if (trackResult.type === 'completed') {
+                    if (!trackResult.result.cancelled) {
+                        yield { success: trackResult.result.success };
+                    }
+                    buildResult = await nextOutputPromise;
+                }
+                else {
+                    buildResult = trackResult.value;
+                }
+            }
+            else {
+                buildResult = await builderIterator.next();
             }
             first = false;
         }
     }
     finally {
         rebuildQueue.dispose();
+        await adapter.dispose();
         if (isLocalDevelopment) {
             federationBuildNotifier.stopEventServer();
         }
     }
-    yield lastResult || { success: false };
+    yield ngBuildStatus;
 }
 function removeBaseHref(req, baseHref) {
     let url = req.url ?? '';
@@ -321,8 +325,8 @@ function removeBaseHref(req, baseHref) {
     }
     return url;
 }
-function writeFstartScript(fedOptions) {
-    const serverOutpath = path.join(fedOptions.outputPath, '../server');
+function writeFstartScript(nfOptions) {
+    const serverOutpath = path.join(nfOptions.outputPath, '../server');
     const fstartPath = path.join(serverOutpath, 'fstart.mjs');
     const buffer = Buffer.from(fstart, 'base64');
     fs.mkdirSync(serverOutpath, { recursive: true });

package/src/builders/build/schema.d.ts

@@ -18,5 +18,6 @@ export interface NfBuilderSchema extends JsonObject {
   ssr: boolean;
   devServer?: boolean;
   chunks?: { enable: boolean; dense: true };
+  entryPoint?: string;
   cacheExternalArtifacts?: boolean;
 } // eslint-disable-line

package/src/builders/build/schema.json

@@ -23,6 +23,9 @@
       "type": "number",
       "default": 0
     },
+    "entryPoint": {
+      "type": "string"
+    },
     "open": {
       "type": "boolean",
       "default": true,

package/src/builders/build/setup-builder-env-variables.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=setup-builder-env-variables.d.ts.map

package/src/builders/build/setup-builder-env-variables.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-builder-env-variables.d.ts","sourceRoot":"","sources":["../../../../src/builders/build/setup-builder-env-variables.ts"],"names":[],"mappings":""}

package/src/builders/build/setup-builder-env-variables.js

@@ -0,0 +1,9 @@
+/**
+ * Disables Angular's parallel caching and allows for
+ * a shared cache between the compilation steps which
+ * improves performance dramatically.
+ */
+if (!process.env['NG_BUILD_PARALLEL_TS']) {
+    process.env['NG_BUILD_PARALLEL_TS'] = '0';
+}
+export {};

package/src/plugin/externals-skip-list.js

@@ -1,4 +1,4 @@
 export const externalsSkipList = new Set(['tslib']);
 export function filterExternals(deps) {
-    return deps.filter((d) => !externalsSkipList.has(d));
+    return deps.filter(d => !externalsSkipList.has(d));
 }

package/src/utils/angular-bundler.d.ts

@@ -0,0 +1,12 @@
+import * as esbuild from 'esbuild';
+import { type SourceFileCache } from '@angular/build/private';
+import type { BuilderContext } from '@angular-devkit/architect';
+import type { ApplicationBuilderOptions } from '@angular/build';
+import type { EntryPoint, FederationCache } from '@softarc/native-federation';
+import type { MappedPath } from '@softarc/native-federation/internal';
+export interface AngularBundleResult {
+    ctx: esbuild.BuildContext;
+    pluginDisposed: Promise<void>;
+}
+export declare function createAngularEsbuildContext(builderOptions: ApplicationBuilderOptions, context: BuilderContext, entryPoints: EntryPoint[], external: string[], outdir: string, tsConfigPath: string, mappedPaths: MappedPath[], cache: FederationCache<SourceFileCache>, dev?: boolean, hash?: boolean, chunks?: boolean, platform?: 'browser' | 'node', optimizedMappings?: boolean): Promise<AngularBundleResult>;
+//# sourceMappingURL=angular-bundler.d.ts.map

package/src/utils/angular-bundler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"angular-bundler.d.ts","sourceRoot":"","sources":["../../../src/utils/angular-bundler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAOnC,OAAO,EAML,KAAK,eAAe,EAErB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAOhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAOtE,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,OAAO,CAAC,YAAY,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,wBAAsB,2BAA2B,CAC/C,cAAc,EAAE,yBAAyB,EACzC,OAAO,EAAE,cAAc,EACvB,WAAW,EAAE,UAAU,EAAE,EACzB,QAAQ,EAAE,MAAM,EAAE,EAClB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,UAAU,EAAE,EACzB,KAAK,EAAE,eAAe,CAAC,eAAe,CAAC,EACvC,GAAG,CAAC,EAAE,OAAO,EACb,IAAI,GAAE,OAAe,EACrB,MAAM,CAAC,EAAE,OAAO,EAChB,QAAQ,CAAC,EAAE,SAAS,GAAG,MAAM,EAC7B,iBAAiB,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC,mBAAmB,CAAC,CAkI9B"}