@immense/vue-pom-generator 1.0.38 → 1.0.39

package/RELEASE_NOTES.md

@@ -1,51 +1,40 @@
-● Now I have enough information to generate the release notes. The main feature is auto-wiring
-  fixture overrides in Playwright test fixtures.
-
-  ```markdown
-  # Release v1.0.38
+● # Release Notes: v1.0.39
 
   ## Highlights
 
-  - Playwright fixtures now automatically detect and use handwritten POM override classes
-  - Override classes in `overrides/<ClassName>.ts` are auto-wired when generating fixtures
-  - Enhanced test coverage for class generation and TypeScript compilation
-  - Updated documentation with fixture override conventions
+  - **Flattened helper attachments**: New capability in class generation for handling helper
+  attachments in a flattened structure
+  - **Extensive documentation updates**: README expanded with over 1,100 new lines of
+  documentation
+  - **Enhanced test coverage**: Added 89 lines of new tests for generated TypeScript compilation
+  - **PR automation**: Added release notes preview comments on pull requests
 
   ## Changes
 
-  ### Playwright Fixture Generation
-
-  - Fixtures now automatically prefer matching handwritten override classes from the `overrides/`
-  directory
-  - Override directory location is inferred as sibling to `generation.playwright.customPoms.dir`
-  - Generated fixtures import and instantiate override classes when available (e.g.,
-  `tests/playwright/pom/overrides/<ClassName>.ts`)
-  - Added runtime detection of override files via filesystem checks during generation
+  ### Features
+  - Add flattened helper attachments support in class generation (`class-generation/index.ts`)
 
   ### Documentation
-
-  - Added fixture override convention documentation to README
-  - Updated plugin type definitions with fixture override behavior
-  - Documented override directory structure and lookup rules
+  - Significantly expanded README with detailed documentation (+1,118 lines)
 
   ### Testing
+  - Enhanced `tests/generated-tsc.test.ts` with additional test cases (+89 lines)
 
-  - Expanded `tests/class-generation-coverage.test.ts` with fixture override scenarios
-  - Enhanced `tests/generated-tsc.test.ts` with 75+ additional lines of TypeScript compilation
-  tests
+  ### Tooling
+  - Added PR release-notes preview comment automation
+  - Minor updates to plugin type definitions and support files
 
   ## Breaking Changes
 
-  None.
+  None
 
   ## Pull Requests Included
 
-  - #1 Add PR release-notes preview comments https://github.com/immense/vue-pom-generator/pull/1
-  (by @dkattan)
+  - #1 Add PR release-notes preview comments (https://github.com/immense/vue-pom-generator/pull/1)
+   by @dkattan
 
   ## Testing
 
-  Test coverage expanded significantly with new test cases for fixture override auto-wiring and
-  TypeScript compilation validation.
-  ```
+  Tests updated and expanded to cover new flattened helper attachments functionality. Added 89
+  lines of test coverage in `tests/generated-tsc.test.ts`.
 

package/class-generation/index.ts

@@ -1,3 +1,5 @@
+import { parse } from "@babel/parser";
+import type { ClassMethod } from "@babel/types";
 import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
@@ -62,6 +64,28 @@ interface RouteMeta {
   template: string;
 }
 
+interface CustomPomMethodSignature {
+  params: string;
+  argNames: string[];
+}
+
+type CustomPomMethodSignatureMap = Map<string, CustomPomMethodSignature>;
+
+interface CustomPomAttachment {
+  className: string;
+  propertyName: string;
+  attachWhenUsesComponents: string[];
+  attachTo?: "views" | "components" | "both";
+  flatten?: boolean;
+}
+
+interface ResolvedCustomPomAttachment {
+  className: string;
+  propertyName: string;
+  flatten: boolean;
+  methodSignatures: CustomPomMethodSignatureMap;
+}
+
 async function getRouteMetaByComponent(
   projectRoot?: string,
   routerEntry?: string,
@@ -368,17 +392,7 @@ export interface GenerateFilesOptions {
    * aggregated output (e.g. via `tests/playwright/pom/custom/*.ts` inlining), but we only attach them to
    * view classes that actually use certain components.
    */
-  customPomAttachments?: Array<{
-    className: string;
-    propertyName: string;
-    attachWhenUsesComponents: string[];
-
-    /**
-     * Controls whether this attachment is applied to views, components, or both.
-     * Defaults to "views" for backwards compatibility.
-     */
-    attachTo?: "views" | "components" | "both";
-  }>;
+  customPomAttachments?: CustomPomAttachment[];
 
   /** Attribute name to treat as the test id. Defaults to `data-testid`. */
   testIdAttribute?: string;
@@ -412,23 +426,14 @@ interface GenerateContentOptions {
   /** When true, omit file headers/import blocks that should be shared in an aggregated file. */
   aggregated?: boolean;
 
-  customPomAttachments?: Array<{
-    className: string;
-    propertyName: string;
-    attachWhenUsesComponents: string[];
-
-    /**
-     * Controls whether this attachment is applied to views, components, or both.
-     * Defaults to "views" for backwards compatibility.
-     */
-    attachTo?: "views" | "components" | "both";
-  }>;
+  customPomAttachments?: CustomPomAttachment[];
 
   projectRoot?: string;
   customPomDir?: string;
   customPomImportAliases?: Record<string, string>;
   customPomClassIdentifierMap?: Record<string, string>;
   customPomAvailableClassIdentifiers?: Set<string>;
+  customPomMethodSignaturesByClass?: Map<string, CustomPomMethodSignatureMap>;
 
   /** Attribute name to treat as the test id. Defaults to `data-testid`. */
   testIdAttribute?: string;
@@ -1216,6 +1221,7 @@ function generateViewObjectModelContent(
 
   const customPomClassIdentifierMap = options.customPomClassIdentifierMap ?? {};
   const customPomAvailableClassIdentifiers = options.customPomAvailableClassIdentifiers ?? new Set<string>();
+  const customPomMethodSignaturesByClass = options.customPomMethodSignaturesByClass ?? new Map<string, CustomPomMethodSignatureMap>();
 
   const attachmentsForThisClass = customPomAttachments
     .filter((a) => {
@@ -1233,6 +1239,10 @@ function generateViewObjectModelContent(
     .map(a => ({
       className: customPomClassIdentifierMap[a.className]!,
       propertyName: a.propertyName,
+      flatten: a.flatten ?? false,
+      methodSignatures: a.flatten
+        ? (customPomMethodSignaturesByClass.get(a.className) ?? new Map<string, CustomPomMethodSignature>())
+        : new Map<string, CustomPomMethodSignature>(),
     }));
 
   let content: string = "";
@@ -1295,6 +1305,19 @@ function generateViewObjectModelContent(
   const componentRefsForInstances = isView
     ? (usedComponentSet?.size ? usedComponentSet : childrenComponentSet)
     : childrenComponentSet;
+  const childInstancePropertyNames = Array.from(componentRefsForInstances)
+    .filter(child => componentHierarchyMap.has(child) && componentHierarchyMap.get(child)?.dataTestIdSet.size)
+    .map(child => child.split(".vue")[0]);
+  const blockedViewPassthroughMethodNames = new Set(
+    attachmentsForThisClass
+      .filter(a => a.flatten)
+      .flatMap(a => Array.from(a.methodSignatures.keys())),
+  );
+  const reservedAttachmentPassthroughNames = new Set<string>([
+    ...attachmentsForThisClass.map(a => a.propertyName),
+    ...widgetInstances.map(w => w.propertyName),
+    ...childInstancePropertyNames,
+  ]);
 
   // Only views get child component instance fields by default.
   // Components will only get a constructor/fields when they have explicit custom attachments
@@ -1307,6 +1330,7 @@ function generateViewObjectModelContent(
     content += getComponentInstances(new Set(), componentHierarchyMap, attachmentsForThisClass);
     content += getConstructor(new Set(), componentHierarchyMap, attachmentsForThisClass, [], { testIdAttribute });
   }
+  content += getAttachmentPassthroughMethods(componentName, dependencies, attachmentsForThisClass, reservedAttachmentPassthroughNames);
 
   // Ergonomics: when a view is primarily composed of a single component POM (e.g. a form),
   // allow calling that component's methods directly on the page class.
@@ -1322,7 +1346,7 @@ function generateViewObjectModelContent(
   // around a single child component POM. This prevents "layout" components (Page, PageHeader,
   // etc.) from injecting lots of noisy passthrough APIs into every view.
   if (isView && componentRefsForInstances.size === 1) {
-    content += getViewPassthroughMethods(componentName, dependencies, componentRefsForInstances, componentHierarchyMap);
+    content += getViewPassthroughMethods(componentName, dependencies, componentRefsForInstances, componentHierarchyMap, blockedViewPassthroughMethodNames);
   }
 
   if (isView && options.vueRouterFluentChaining) {
@@ -1343,6 +1367,7 @@ function getViewPassthroughMethods(
   viewDependencies: IComponentDependencies,
   childrenComponentSet: Set<string>,
   componentHierarchyMap: Map<string, IComponentDependencies>,
+  blockedMethodNames: Set<string> = new Set(),
 ) {
   const existingOnView = viewDependencies.generatedMethods ?? new Map<string, { params: string; argNames: string[] } | null>();
 
@@ -1366,7 +1391,7 @@ function getViewPassthroughMethods(
         continue; // ambiguous on the child itself
 
       // If the view already has this method name, never generate a pass-through.
-      if (existingOnView.has(name))
+      if (existingOnView.has(name) || blockedMethodNames.has(name))
         continue;
 
       const list = methodToChildren.get(name) ?? [];
@@ -1406,6 +1431,169 @@ function getViewPassthroughMethods(
   ].join("\n");
 }
 
+function getAttachmentPassthroughMethods(
+  ownerName: string,
+  ownerDependencies: IComponentDependencies,
+  attachmentsForThisClass: ResolvedCustomPomAttachment[],
+  reservedMemberNames: Set<string>,
+) {
+  if (!attachmentsForThisClass.some(a => a.flatten && a.methodSignatures.size > 0)) {
+    return "";
+  }
+
+  const existingOnClass = ownerDependencies.generatedMethods ?? new Map<string, { params: string; argNames: string[] } | null>();
+  const methodToAttachments = new Map<string, Array<{ propertyName: string; params: string; argNames: string[] }>>();
+
+  for (const attachment of attachmentsForThisClass) {
+    if (!attachment.flatten) {
+      continue;
+    }
+
+    for (const [methodName, signature] of attachment.methodSignatures.entries()) {
+      if (methodName === "constructor" || existingOnClass.has(methodName) || reservedMemberNames.has(methodName)) {
+        continue;
+      }
+
+      const list = methodToAttachments.get(methodName) ?? [];
+      list.push({
+        propertyName: attachment.propertyName,
+        params: signature.params,
+        argNames: signature.argNames,
+      });
+      methodToAttachments.set(methodName, list);
+    }
+  }
+
+  const sorted = Array.from(methodToAttachments.entries()).sort((a, b) => a[0].localeCompare(b[0]));
+  const lines: string[] = [];
+
+  for (const [methodName, candidates] of sorted) {
+    if (candidates.length !== 1) {
+      continue;
+    }
+
+    const { propertyName, params, argNames } = candidates[0];
+    const callArgs = argNames.join(", ");
+    const invocation = callArgs
+      ? `this.${propertyName}.${methodName}(${callArgs})`
+      : `this.${propertyName}.${methodName}()`;
+
+    lines.push(
+      "",
+      `    ${methodName}(${params}) {`,
+      `        return ${invocation};`,
+      "    }",
+    );
+  }
+
+  if (!lines.length) {
+    return "";
+  }
+
+  return [
+    "",
+    `    // Passthrough methods composed from custom helper attachments of ${ownerName}.`,
+    ...lines,
+    "",
+  ].join("\n");
+}
+
+function sliceNodeSource(source: string, node: { start?: number | null; end?: number | null }): string | null {
+  if (node.start == null || node.end == null) {
+    return null;
+  }
+
+  const snippet = source.slice(node.start, node.end).trim();
+  return snippet.length ? snippet : null;
+}
+
+function getCustomPomCallArgumentName(param: ClassMethod["params"][number]): string | null {
+  if (param.type === "Identifier") {
+    return param.name;
+  }
+
+  if (param.type === "AssignmentPattern") {
+    return param.left.type === "Identifier" ? param.left.name : null;
+  }
+
+  if (param.type === "RestElement") {
+    return param.argument.type === "Identifier" ? `...${param.argument.name}` : null;
+  }
+
+  return null;
+}
+
+function extractCustomPomMethodSignatures(source: string, exportName: string): CustomPomMethodSignatureMap {
+  const signatures: CustomPomMethodSignatureMap = new Map();
+
+  let ast: ReturnType<typeof parse>;
+  try {
+    ast = parse(source, {
+      sourceType: "module",
+      plugins: ["typescript", "jsx"],
+    });
+  }
+  catch {
+    return signatures;
+  }
+
+  for (const statement of ast.program.body) {
+    if (statement.type !== "ExportNamedDeclaration" || !statement.declaration || statement.declaration.type !== "ClassDeclaration") {
+      continue;
+    }
+
+    const declaration = statement.declaration;
+    if (declaration.id?.name !== exportName) {
+      continue;
+    }
+
+    for (const member of declaration.body.body) {
+      if (member.type !== "ClassMethod" || member.kind !== "method" || member.static || member.computed) {
+        continue;
+      }
+
+      if (member.accessibility === "private" || member.accessibility === "protected") {
+        continue;
+      }
+
+      if (member.key.type !== "Identifier") {
+        continue;
+      }
+
+      const params: string[] = [];
+      const argNames: string[] = [];
+      let supported = true;
+
+      member.params.forEach((param) => {
+        if (!supported) {
+          return;
+        }
+
+        const paramSource = sliceNodeSource(source, param);
+        const argName = getCustomPomCallArgumentName(param);
+        if (!paramSource || !argName) {
+          supported = false;
+          return;
+        }
+
+        params.push(paramSource);
+        argNames.push(argName);
+      });
+
+      if (!supported) {
+        continue;
+      }
+
+      signatures.set(member.key.name, {
+        params: params.join(", "),
+        argNames,
+      });
+    }
+  }
+
+  return signatures;
+}
+
 function ensureDir(dir: string) {
   const normalized = dir.replace(/\\/g, "/");
   if (!fs.existsSync(normalized)) {
@@ -1489,6 +1677,7 @@ async function generateAggregatedFiles(
       ]);
       const usedImportIdentifiers = new Set<string>();
       const customPomClassIdentifierMap: Record<string, string> = {};
+      const customPomMethodSignaturesByClass = new Map<string, CustomPomMethodSignatureMap>();
 
       const ensureUniqueIdentifier = (base: string) => {
         let candidate = base;
@@ -1507,7 +1696,10 @@ async function generateAggregatedFiles(
         : path.resolve(projectRoot, customDirRelOrAbs);
 
       if (!fs.existsSync(customDirAbs)) {
-        return;
+        return {
+          classIdentifierMap: customPomClassIdentifierMap,
+          methodSignaturesByClass: customPomMethodSignaturesByClass,
+        };
       }
 
       const files = fs.readdirSync(customDirAbs)
@@ -1540,8 +1732,13 @@ async function generateAggregatedFiles(
           localIdentifier = ensureUniqueIdentifier(requested);
         }
 
-        customPomClassIdentifierMap[exportName] = localIdentifier;
         const customFileAbs = path.join(customDirAbs, file);
+        customPomClassIdentifierMap[exportName] = localIdentifier;
+        const customPomMethodSignatures = extractCustomPomMethodSignatures(fs.readFileSync(customFileAbs, "utf8"), exportName);
+        if (customPomMethodSignatures.size > 0) {
+          customPomMethodSignaturesByClass.set(exportName, customPomMethodSignatures);
+        }
+
         const fromOutputDir = outputDir;
         const importPath = stripExtension(toPosixRelativePath(fromOutputDir, customFileAbs));
         if (localIdentifier !== exportName) {
@@ -1552,11 +1749,16 @@ async function generateAggregatedFiles(
         }
       }
 
-      return customPomClassIdentifierMap;
+      return {
+        classIdentifierMap: customPomClassIdentifierMap,
+        methodSignaturesByClass: customPomMethodSignaturesByClass,
+      };
     };
 
-    const customPomClassIdentifierMap = addCustomPomImports();
-    const customPomAvailableClassIdentifiers = new Set(Object.values(customPomClassIdentifierMap ?? {}));
+    const customPomImportResolution = addCustomPomImports();
+    const customPomClassIdentifierMap = customPomImportResolution?.classIdentifierMap ?? {};
+    const customPomMethodSignaturesByClass = customPomImportResolution?.methodSignaturesByClass ?? new Map<string, CustomPomMethodSignatureMap>();
+    const customPomAvailableClassIdentifiers = new Set(Object.values(customPomClassIdentifierMap));
 
     // Collect any navigation return types referenced by generated methods so we can emit
     // stub classes when the destination view has no generated test ids (and therefore no
@@ -1759,6 +1961,7 @@ async function generateAggregatedFiles(
         customPomAttachments: options.customPomAttachments ?? [],
         customPomClassIdentifierMap,
         customPomAvailableClassIdentifiers,
+        customPomMethodSignaturesByClass,
         testIdAttribute: options.testIdAttribute,
         vueRouterFluentChaining: options.vueRouterFluentChaining,
         routeMetaByComponent: options.routeMetaByComponent,

package/dist/class-generation/index.d.ts

@@ -4,6 +4,13 @@ export { generateViewObjectModelMethodContent };
 interface RouteMeta {
     template: string;
 }
+interface CustomPomAttachment {
+    className: string;
+    propertyName: string;
+    attachWhenUsesComponents: string[];
+    attachTo?: "views" | "components" | "both";
+    flatten?: boolean;
+}
 export interface GenerateFilesOptions {
     /**
      * Output directory for generated files.
@@ -61,16 +68,7 @@ export interface GenerateFilesOptions {
      * aggregated output (e.g. via `tests/playwright/pom/custom/*.ts` inlining), but we only attach them to
      * view classes that actually use certain components.
      */
-    customPomAttachments?: Array<{
-        className: string;
-        propertyName: string;
-        attachWhenUsesComponents: string[];
-        /**
-         * Controls whether this attachment is applied to views, components, or both.
-         * Defaults to "views" for backwards compatibility.
-         */
-        attachTo?: "views" | "components" | "both";
-    }>;
+    customPomAttachments?: CustomPomAttachment[];
     /** Attribute name to treat as the test id. Defaults to `data-testid`. */
     testIdAttribute?: string;
     /** Which POM languages to emit. Defaults to ["ts"]. */

package/dist/class-generation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../class-generation/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,oCAAoC,EAAE,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EAAE,sBAAsB,EAAoE,MAAM,UAAU,CAAC;AAQpH,OAAO,EAAE,oCAAoC,EAAE,CAAC;AA8ChD,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAuPD,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;;;;;;;;;OAeG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAE1D;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,oCAAoC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IAEzD;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,KAAK,CAAC;QAC3B,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;QACrB,wBAAwB,EAAE,MAAM,EAAE,CAAC;QAEnC;;;WAGG;QACH,QAAQ,CAAC,EAAE,OAAO,GAAG,YAAY,GAAG,MAAM,CAAC;KAC5C,CAAC,CAAC;IAEH,yEAAyE;IACzE,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,uDAAuD;IACvD,aAAa,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC;IAEvC,6BAA6B;IAC7B,MAAM,CAAC,EAAE;QACP,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,6EAA6E;IAC7E,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC,2FAA2F;IAC3F,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,mDAAmD;IACnD,UAAU,CAAC,EAAE,YAAY,GAAG,MAAM,CAAC;IAEnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClD;AAwCD,wBAAsB,aAAa,CACjC,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,EAC1D,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,iBAAiB,EAAE,MAAM,EACzB,OAAO,GAAE,oBAAyB,iBAmFnC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../class-generation/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oCAAoC,EAAE,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EAAE,sBAAsB,EAAoE,MAAM,UAAU,CAAC;AAQpH,OAAO,EAAE,oCAAoC,EAAE,CAAC;AA8ChD,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AASD,UAAU,mBAAmB;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,EAAE,OAAO,GAAG,YAAY,GAAG,MAAM,CAAC;IAC3C,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AA8PD,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;;;;;;;;;OAeG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAE1D;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,oCAAoC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IAEzD;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAE7C,yEAAyE;IACzE,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,uDAAuD;IACvD,aAAa,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC;IAEvC,6BAA6B;IAC7B,MAAM,CAAC,EAAE;QACP,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,6EAA6E;IAC7E,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC,2FAA2F;IAC3F,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,mDAAmD;IACnD,UAAU,CAAC,EAAE,YAAY,GAAG,MAAM,CAAC;IAEnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClD;AA+BD,wBAAsB,aAAa,CACjC,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,EAC1D,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,iBAAiB,EAAE,MAAM,EACzB,OAAO,GAAE,oBAAyB,iBAmFnC"}