@embroider/core 4.6.7 → 4.6.8

package/dist/src/module-resolver-options.d.ts

@@ -1,43 +0,0 @@
-import { type AddonPackage, type Package } from '@embroider/shared-internals';
-export interface Options {
-    renamePackages: {
-        [fromName: string]: string;
-    };
-    renameModules: {
-        [fromName: string]: string;
-    };
-    resolvableExtensions: string[];
-    appRoot: string;
-    engines: EngineConfig[];
-    modulePrefix: string;
-    splitAtRoutes?: (RegExp | string)[];
-    podModulePrefix?: string;
-    staticAppPaths: string[];
-    emberVersion: string;
-}
-export interface EngineConfig {
-    packageName: string;
-    activeAddons: {
-        name: string;
-        root: string;
-        canResolveFromFile: string;
-    }[];
-    fastbootFiles: {
-        [appName: string]: {
-            localFilename: string;
-            shadowedFilename: string | undefined;
-        };
-    };
-    root: string;
-    isLazy: boolean;
-}
-export declare function buildResolverOptions<T extends Options>(inputs: {
-    appPackage?: Package;
-    extraDeps?: Map<string, AddonPackage[]>;
-    modulePrefix?: string;
-    podModulePrefix?: string;
-    splitAtRoutes?: (RegExp | string)[];
-    staticAppPaths?: string[];
-    extend?: (opts: T, allActiveAddons: AddonPackage[]) => T;
-}): T;
-//# sourceMappingURL=module-resolver-options.d.ts.map

package/dist/src/module-resolver-options.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"module-resolver-options.d.ts","sourceRoot":"","sources":["../../src/module-resolver-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,KAAK,YAAY,EAAE,KAAK,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAOvH,MAAM,WAAW,OAAO;IACtB,cAAc,EAAE;QACd,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;KAC5B,CAAC;IACF,aAAa,EAAE;QACb,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;KAC5B,CAAC;IACF,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,kBAAkB,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC3E,aAAa,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG;YAAE,aAAa,EAAE,MAAM,CAAC;YAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;SAAE,CAAA;KAAE,CAAC;IACtG,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,OAAO,EAAE,MAAM,EAAE;IAC9D,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,eAAe,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;CAC1D,GAAG,CAAC,CAkCJ"}

package/dist/src/module-resolver-options.js

@@ -1,155 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildResolverOptions = buildResolverOptions;
-const shared_internals_1 = require("@embroider/shared-internals");
-const resolvable_extensions_1 = require("./resolvable-extensions");
-const path_1 = require("path");
-const fs_extra_1 = require("fs-extra");
-const flatMap_1 = __importDefault(require("lodash/flatMap"));
-function buildResolverOptions(inputs) {
-    let appPackage;
-    if (inputs.appPackage) {
-        appPackage = inputs.appPackage;
-    }
-    else {
-        let packageCache = shared_internals_1.RewrittenPackageCache.shared('embroider', process.cwd());
-        appPackage = packageCache.get(packageCache.appRoot);
-    }
-    let extraDeps = inputs.extraDeps ?? new Map();
-    let allActiveAddons = findAllActiveAddons(appPackage, extraDeps);
-    let renamePackages = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-packages']));
-    let renameModules = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-modules']));
-    let modulePrefix = appPackage.name;
-    let engines = partitionEngines(appPackage, modulePrefix, extraDeps);
-    let output = {
-        renamePackages,
-        renameModules,
-        resolvableExtensions: (0, resolvable_extensions_1.resolvableExtensions)(),
-        appRoot: appPackage.root,
-        engines,
-        modulePrefix,
-        staticAppPaths: inputs.staticAppPaths ?? [],
-        emberVersion: appPackage.dependencies.find(d => d.name === 'ember-source').version,
-        splitAtRoutes: inputs.splitAtRoutes,
-        podModulePrefix: inputs.podModulePrefix,
-    };
-    if (inputs.extend) {
-        return inputs.extend(output, allActiveAddons);
-    }
-    return output;
-}
-function partitionEngines(appPackage, modulePrefix, extraDeps) {
-    let queue = [
-        {
-            package: appPackage,
-            addons: new Map(),
-            isApp: true,
-            modulePrefix,
-            appRelativePath: '.',
-        },
-    ];
-    let done = [];
-    let seenEngines = new Set();
-    while (true) {
-        let current = queue.shift();
-        if (!current) {
-            break;
-        }
-        findActiveAddons(current.package, current, extraDeps);
-        // ensure addons are applied in the correct order, if set (via @embroider/compat/v1-addon)
-        current.addons = new Map(Array.from(current.addons).sort(([a], [b]) => {
-            return (a.meta['order-index'] || 0) - (b.meta['order-index'] || 0);
-        }));
-        for (let addon of current.addons.keys()) {
-            if (addon.isEngine() && !seenEngines.has(addon)) {
-                seenEngines.add(addon);
-                queue.push({
-                    package: addon,
-                    addons: new Map(),
-                    isApp: !current,
-                    modulePrefix: addon.name,
-                    appRelativePath: (0, shared_internals_1.explicitRelative)(appPackage.root, addon.root),
-                });
-            }
-        }
-        done.push(current);
-    }
-    return done.map(engine => ({
-        packageName: engine.package.name,
-        // we need to use the real path here because webpack requests always use the real path i.e. follow symlinks
-        root: (0, fs_extra_1.realpathSync)(engine.package.root),
-        fastbootFiles: {},
-        activeAddons: [...engine.addons]
-            .map(([addon, canResolveFromFile]) => ({
-            name: addon.name,
-            root: addon.root,
-            canResolveFromFile,
-        }))
-            // the traditional order is the order in which addons will run, such
-            // that the last one wins. Our resolver's order is the order to
-            // search, so first one wins.
-            .reverse(),
-        isLazy: engine.package.isLazyEngine(),
-    }));
-}
-// recurse to find all active addons that don't cross an engine boundary.
-// Inner engines themselves will be returned, but not those engines' children.
-// The output set's insertion order is the proper ember-cli compatible
-// ordering of the addons.
-function findActiveAddons(pkg, engine, extraDeps) {
-    for (let child of activeAddonChildren(pkg, extraDeps)) {
-        if (engine.addons.has(child))
-            continue;
-        if (!child.isEngine()) {
-            findActiveAddons(child, engine, extraDeps);
-        }
-        let canResolveFrom = (0, path_1.resolve)(pkg.root, 'package.json');
-        engine.addons.set(child, canResolveFrom);
-    }
-}
-function activeAddonChildren(pkg, extraDeps) {
-    let result = pkg.dependencies.filter(isActiveAddon).filter(
-    // When looking for child addons, we want to ignore 'peerDependencies' of
-    // a given package, to align with how ember-cli resolves addons. So here
-    // we only include dependencies that are definitely active due to one of
-    // the other sections.
-    addon => pkg.categorizeDependency(addon.name) !== 'peerDependencies');
-    let extras = extraDeps.get(pkg.root);
-    if (extras) {
-        result = [...result, ...extras];
-    }
-    return result.sort(orderAddons);
-}
-function isActiveAddon(pkg) {
-    // stage1 already took care of converting everything that's actually active
-    // into v2 addons. If it's not a v2 addon, we don't want it.
-    //
-    // We can encounter v1 addons here when there is inactive stuff floating
-    // around in the node_modules that accidentally satisfy something like an
-    // optional peer dep.
-    return pkg.isV2Addon();
-}
-function orderAddons(depA, depB) {
-    let depAIdx = 0;
-    let depBIdx = 0;
-    if (depA && depA.meta && depA.isV2Addon()) {
-        depAIdx = depA.meta['order-index'] || 0;
-    }
-    if (depB && depB.meta && depB.isV2Addon()) {
-        depBIdx = depB.meta['order-index'] || 0;
-    }
-    return depAIdx - depBIdx;
-}
-function findAllActiveAddons(appPackage, extraDeps) {
-    let result = appPackage.findDescendants(isActiveAddon);
-    let extras = extraDeps.get(appPackage.root);
-    if (extras) {
-        let extraDescendants = (0, flatMap_1.default)(extras, dep => dep.findDescendants(isActiveAddon));
-        result = [...result, ...extras, ...extraDescendants];
-    }
-    return result.sort(orderAddons);
-}
-//# sourceMappingURL=module-resolver-options.js.map

package/dist/src/module-resolver-options.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"module-resolver-options.js","sourceRoot":"","sources":["../../src/module-resolver-options.ts"],"names":[],"mappings":"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","sourcesContent":["import { explicitRelative, RewrittenPackageCache, type AddonPackage, type Package } from '@embroider/shared-internals';\nimport type { Engine } from './app-files';\nimport { resolvableExtensions } from './resolvable-extensions';\nimport { resolve as resolvePath } from 'path';\nimport { realpathSync } from 'fs-extra';\nimport flatMap from 'lodash/flatMap';\n\nexport interface Options {\n  renamePackages: {\n    [fromName: string]: string;\n  };\n  renameModules: {\n    [fromName: string]: string;\n  };\n  resolvableExtensions: string[];\n  appRoot: string;\n  engines: EngineConfig[];\n  modulePrefix: string;\n  splitAtRoutes?: (RegExp | string)[];\n  podModulePrefix?: string;\n  staticAppPaths: string[];\n  emberVersion: string;\n}\n\nexport interface EngineConfig {\n  packageName: string;\n  activeAddons: { name: string; root: string; canResolveFromFile: string }[];\n  fastbootFiles: { [appName: string]: { localFilename: string; shadowedFilename: string | undefined } };\n  root: string;\n  isLazy: boolean;\n}\n\nexport function buildResolverOptions<T extends Options>(inputs: {\n  appPackage?: Package;\n  extraDeps?: Map<string, AddonPackage[]>;\n  modulePrefix?: string;\n  podModulePrefix?: string;\n  splitAtRoutes?: (RegExp | string)[];\n  staticAppPaths?: string[];\n  extend?: (opts: T, allActiveAddons: AddonPackage[]) => T;\n}): T {\n  let appPackage: Package;\n  if (inputs.appPackage) {\n    appPackage = inputs.appPackage;\n  } else {\n    let packageCache = RewrittenPackageCache.shared('embroider', process.cwd());\n    appPackage = packageCache.get(packageCache.appRoot);\n  }\n\n  let extraDeps = inputs.extraDeps ?? new Map();\n\n  let allActiveAddons: AddonPackage[] = findAllActiveAddons(appPackage, extraDeps);\n  let renamePackages = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-packages']));\n  let renameModules = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-modules']));\n  let modulePrefix = appPackage.name;\n  let engines = partitionEngines(appPackage, modulePrefix, extraDeps);\n\n  let output: Options = {\n    renamePackages,\n    renameModules,\n    resolvableExtensions: resolvableExtensions(),\n    appRoot: appPackage.root,\n    engines,\n    modulePrefix,\n    staticAppPaths: inputs.staticAppPaths ?? [],\n    emberVersion: appPackage.dependencies.find(d => d.name === 'ember-source')!.version,\n    splitAtRoutes: inputs.splitAtRoutes,\n    podModulePrefix: inputs.podModulePrefix,\n  };\n\n  if (inputs.extend) {\n    return inputs.extend(output as T, allActiveAddons);\n  }\n  return output as T;\n}\n\nfunction partitionEngines(\n  appPackage: Package,\n  modulePrefix: string,\n  extraDeps: Map<string, AddonPackage[]>\n): EngineConfig[] {\n  let queue: Engine[] = [\n    {\n      package: appPackage,\n      addons: new Map(),\n      isApp: true,\n      modulePrefix,\n      appRelativePath: '.',\n    },\n  ];\n  let done: Engine[] = [];\n  let seenEngines: Set<Package> = new Set();\n  while (true) {\n    let current = queue.shift();\n    if (!current) {\n      break;\n    }\n    findActiveAddons(current.package, current, extraDeps);\n    // ensure addons are applied in the correct order, if set (via @embroider/compat/v1-addon)\n    current.addons = new Map(\n      Array.from(current.addons).sort(([a], [b]) => {\n        return (a.meta['order-index'] || 0) - (b.meta['order-index'] || 0);\n      })\n    );\n\n    for (let addon of current.addons.keys()) {\n      if (addon.isEngine() && !seenEngines.has(addon)) {\n        seenEngines.add(addon);\n        queue.push({\n          package: addon,\n          addons: new Map(),\n          isApp: !current,\n          modulePrefix: addon.name,\n          appRelativePath: explicitRelative(appPackage.root, addon.root),\n        });\n      }\n    }\n    done.push(current);\n  }\n\n  return done.map(engine => ({\n    packageName: engine.package.name,\n    // we need to use the real path here because webpack requests always use the real path i.e. follow symlinks\n    root: realpathSync(engine.package.root),\n    fastbootFiles: {},\n    activeAddons: [...engine.addons]\n      .map(([addon, canResolveFromFile]) => ({\n        name: addon.name,\n        root: addon.root,\n        canResolveFromFile,\n      }))\n      // the traditional order is the order in which addons will run, such\n      // that the last one wins. Our resolver's order is the order to\n      // search, so first one wins.\n      .reverse(),\n    isLazy: engine.package.isLazyEngine(),\n  }));\n}\n\n// recurse to find all active addons that don't cross an engine boundary.\n// Inner engines themselves will be returned, but not those engines' children.\n// The output set's insertion order is the proper ember-cli compatible\n// ordering of the addons.\nfunction findActiveAddons(pkg: Package, engine: Engine, extraDeps: Map<string, AddonPackage[]>): void {\n  for (let child of activeAddonChildren(pkg, extraDeps)) {\n    if (engine.addons.has(child)) continue;\n    if (!child.isEngine()) {\n      findActiveAddons(child, engine, extraDeps);\n    }\n    let canResolveFrom = resolvePath(pkg.root, 'package.json');\n    engine.addons.set(child, canResolveFrom);\n  }\n}\n\nfunction activeAddonChildren(pkg: Package, extraDeps: Map<string, AddonPackage[]>): AddonPackage[] {\n  let result = (pkg.dependencies.filter(isActiveAddon) as AddonPackage[]).filter(\n    // When looking for child addons, we want to ignore 'peerDependencies' of\n    // a given package, to align with how ember-cli resolves addons. So here\n    // we only include dependencies that are definitely active due to one of\n    // the other sections.\n    addon => pkg.categorizeDependency(addon.name) !== 'peerDependencies'\n  );\n  let extras = extraDeps.get(pkg.root);\n  if (extras) {\n    result = [...result, ...extras];\n  }\n  return result.sort(orderAddons);\n}\n\nfunction isActiveAddon(pkg: Package): boolean {\n  // stage1 already took care of converting everything that's actually active\n  // into v2 addons. If it's not a v2 addon, we don't want it.\n  //\n  // We can encounter v1 addons here when there is inactive stuff floating\n  // around in the node_modules that accidentally satisfy something like an\n  // optional peer dep.\n  return pkg.isV2Addon();\n}\n\nfunction orderAddons(depA: Package, depB: Package): number {\n  let depAIdx = 0;\n  let depBIdx = 0;\n\n  if (depA && depA.meta && depA.isV2Addon()) {\n    depAIdx = depA.meta['order-index'] || 0;\n  }\n  if (depB && depB.meta && depB.isV2Addon()) {\n    depBIdx = depB.meta['order-index'] || 0;\n  }\n\n  return depAIdx - depBIdx;\n}\n\nfunction findAllActiveAddons(appPackage: Package, extraDeps: Map<string, AddonPackage[]>): AddonPackage[] {\n  let result = appPackage.findDescendants(isActiveAddon) as AddonPackage[];\n  let extras = extraDeps.get(appPackage.root);\n  if (extras) {\n    let extraDescendants = flatMap(extras, dep => dep.findDescendants(isActiveAddon)) as AddonPackage[];\n    result = [...result, ...extras, ...extraDescendants];\n  }\n  return result.sort(orderAddons);\n}\n"]}

package/dist/src/module-resolver.d.ts

@@ -1,71 +0,0 @@
-import type { Package } from '@embroider/shared-internals';
-import { RewrittenPackageCache } from '@embroider/shared-internals';
-import { type NodeResolveOpts } from './node-resolve';
-import type { Options, EngineConfig } from './module-resolver-options';
-import { type ModuleRequest, type Resolution } from './module-request';
-export declare class Resolver {
-    readonly options: Options;
-    constructor(options: Options);
-    private beforeResolve;
-    resolve<ResolveResolution extends Resolution>(request: ModuleRequest<ResolveResolution>): Promise<ResolveResolution>;
-    nodeResolve(specifier: string, fromFile: string, opts?: NodeResolveOpts): Promise<{
-        type: 'virtual';
-        filename: string;
-        content: string;
-    } | {
-        type: 'real';
-        filename: string;
-    } | {
-        type: 'not_found';
-        err: Error;
-    }>;
-    get packageCache(): RewrittenPackageCache;
-    private afterResolve;
-    private handleSyntheticComponents;
-    private logicalPackage;
-    private generateFastbootSwitch;
-    private handleFastbootSwitch;
-    private handleImplicitModules;
-    private handleEntrypoint;
-    private handleRouteEntrypoint;
-    private handleImplicitTestScripts;
-    private handleTestSupportStyles;
-    private handleGlobalsCompat;
-    private handleVendorStyles;
-    private resolveHelper;
-    private resolveComponent;
-    private resolveHelperOrComponent;
-    private resolveModifier;
-    private componentTemplateCandidates;
-    private componentJSCandidates;
-    private podPrefix;
-    private parseGlobalPath;
-    private engineConfig;
-    private get mergeMap();
-    private get reverseMergeMap();
-    private get mergeMaps();
-    owningEngine(pkg: Package): EngineConfig;
-    get emberVersion(): string;
-    get emberVersionSupportsSeparateTemplates(): boolean;
-    private handleRewrittenPackages;
-    private get renameModulesMap();
-    private handleRenaming;
-    private handleVendor;
-    private resolveWithinMovedPackage;
-    private preHandleExternal;
-    private locateActiveAddon;
-    private fallbackResolve;
-    private restoreRehomedRequest;
-    private relativeFallbackResolve;
-    private maybeFallbackToActiveAddon;
-    private getEntryFromMergeMap;
-    private withResolvableExtensions;
-    private searchAppTree;
-    reverseSearchAppTree(fromFile: string): {
-        owningEngine: EngineConfig;
-        inAppName: string;
-    } | undefined;
-    reverseComponentLookup(filename: string): string | undefined;
-    private tryReverseComponent;
-}
-//# sourceMappingURL=module-resolver.d.ts.map

package/dist/src/module-resolver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"module-resolver.d.ts","sourceRoot":"","sources":["../../src/module-resolver.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAoB,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAQtF,OAAO,EAAe,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEvE,OAAO,EAAqB,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAmF1F,qBAAa,QAAQ;IACP,QAAQ,CAAC,OAAO,EAAE,OAAO;gBAAhB,OAAO,EAAE,OAAO;YAEvB,aAAa;IAkCrB,OAAO,CAAC,iBAAiB,SAAS,UAAU,EAChD,OAAO,EAAE,aAAa,CAAC,iBAAiB,CAAC,GACxC,OAAO,CAAC,iBAAiB,CAAC;IA8CvB,WAAW,CACf,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,eAAe,GACrB,OAAO,CACN;QAAE,IAAI,EAAE,SAAS,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GACtD;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAClC;QAAE,IAAI,EAAE,WAAW,CAAC;QAAC,GAAG,EAAE,KAAK,CAAA;KAAE,CACpC;IAID,IAAI,YAAY,0BAEf;YAEa,YAAY;YAKZ,yBAAyB;IAkCvC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,sBAAsB;IA+C9B,OAAO,CAAC,oBAAoB;IA2D5B,OAAO,CAAC,qBAAqB;IAuC7B,OAAO,CAAC,gBAAgB;IA4CxB,OAAO,CAAC,qBAAqB;IAgC7B,OAAO,CAAC,yBAAyB;IAmBjC,OAAO,CAAC,uBAAuB;YAsBjB,mBAAmB;IA+BjC,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,aAAa;YASP,gBAAgB;YAgEhB,wBAAwB;IA6BtC,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAE,2BAA2B;IAUpC,OAAO,CAAE,qBAAqB;IAW9B,OAAO,CAAC,SAAS;IAYjB,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,YAAY;IAIpB,OAAO,KAAK,QAAQ,GAEnB;IAED,OAAO,KAAK,eAAe,GAE1B;IAKD,OAAO,KAAK,SAAS,GAoHpB;IAED,YAAY,CAAC,GAAG,EAAE,OAAO;IAYzB,IAAI,YAAY,IAAI,MAAM,CAGzB;IAED,IAAe,qCAAqC,IAAI,OAAO,CAI9D;IAED,OAAO,CAAC,uBAAuB;IAgE/B,OAAO,KAAK,gBAAgB,GAkB3B;IAED,OAAO,CAAC,cAAc;IAyFtB,OAAO,CAAC,YAAY;IAmBpB,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,iBAAiB;IAqFzB,OAAO,CAAC,iBAAiB;YAoBX,eAAe;IA4G7B,OAAO,CAAC,qBAAqB;YAWf,uBAAuB;IA0BrC,OAAO,CAAC,0BAA0B;IAWlC,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAE,wBAAwB;YAUnB,aAAa;IA+B3B,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG;QAAE,YAAY,EAAE,YAAY,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS;IAYrG,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAuB5D,OAAO,CAAC,mBAAmB;CAU5B"}