@eddeee888/gcg-typescript-resolver-files 0.2.0 → 0.3.0

package/src/utils/getNodePropertyMap.d.ts

@@ -0,0 +1,9 @@
+import { Node } from 'ts-morph';
+export declare type NodePropertyMap = Record<string, {
+    name: string;
+}>;
+/**
+ * Function to get properties of a Node in a map
+ * If unable to find, returns empty object
+ */
+export declare const getNodePropertyMap: (node: Node | undefined) => NodePropertyMap;

package/src/utils/getNodePropertyMap.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNodePropertyMap = void 0;
+const ts_morph_1 = require("ts-morph");
+/**
+ * Function to get properties of a Node in a map
+ * If unable to find, returns empty object
+ */
+const getNodePropertyMap = (node) => {
+    if (!node) {
+        return {};
+    }
+    const properties = getNodeProperties(node);
+    const nodePropertyMap = properties.reduce((res, { propertyName }) => {
+        res[propertyName] = {
+            name: propertyName,
+        };
+        return res;
+    }, {});
+    return nodePropertyMap;
+};
+exports.getNodePropertyMap = getNodePropertyMap;
+const getNodeProperties = (node) => {
+    if (node.isKind(ts_morph_1.SyntaxKind.InterfaceDeclaration)) {
+        return node.getProperties().map((prop) => ({
+            propertyName: prop.getName(),
+        }));
+    }
+    else if (node.isKind(ts_morph_1.SyntaxKind.TypeAliasDeclaration)) {
+        const typeNode = node.getTypeNodeOrThrow();
+        if (ts_morph_1.Node.isTypeLiteral(typeNode)) {
+            return typeNode.getProperties().map((prop) => {
+                return {
+                    propertyName: prop.getName(),
+                };
+            });
+        }
+        else if (ts_morph_1.Node.isTypeReference(typeNode)) {
+            return typeNode
+                .getType()
+                .getProperties()
+                .map((prop) => ({
+                propertyName: prop.getName(),
+            }));
+        }
+    }
+    return [];
+};
+//# sourceMappingURL=getNodePropertyMap.js.map

package/src/utils/getNodePropertyMap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getNodePropertyMap.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/getNodePropertyMap.ts"],"names":[],"mappings":";;;AAAA,uCAA4C;AAI5C;;;GAGG;AACI,MAAM,kBAAkB,GAAG,CAAC,IAAsB,EAAmB,EAAE;IAC5E,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,EAAE,CAAC;KACX;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAE3C,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CACvC,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE;QACxB,GAAG,CAAC,YAAY,CAAC,GAAG;YAClB,IAAI,EAAE,YAAY;SACnB,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CACH,CAAC;IAEF,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAlBW,QAAA,kBAAkB,sBAkB7B;AAEF,MAAM,iBAAiB,GAAG,CAAC,IAAU,EAA8B,EAAE;IACnE,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAU,CAAC,oBAAoB,CAAC,EAAE;QAChD,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACzC,YAAY,EAAE,IAAI,CAAC,OAAO,EAAE;SAC7B,CAAC,CAAC,CAAC;KACL;SAAM,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAU,CAAC,oBAAoB,CAAC,EAAE;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC3C,IAAI,eAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;YAChC,OAAO,QAAQ,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC3C,OAAO;oBACL,YAAY,EAAE,IAAI,CAAC,OAAO,EAAE;iBAC7B,CAAC;YACJ,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,eAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE;YACzC,OAAO,QAAQ;iBACZ,OAAO,EAAE;iBACT,aAAa,EAAE;iBACf,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACd,YAAY,EAAE,IAAI,CAAC,OAAO,EAAE;aAC7B,CAAC,CAAC,CAAC;SACP;KACF;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC"}

package/src/utils/index.d.ts

@@ -2,5 +2,6 @@ export * from './parseLocationForWhitelistedModule';
 export * from './isNativeNamedType';
 export * from './isRootObjectType';
 export * from './printImportLine';
+export * from './getNodePropertyMap';
 export declare const relativeModulePath: (from: string, to: string) => string;
 export declare const normalizeRelativePath: (path: string) => string;

package/src/utils/index.js

@@ -7,6 +7,7 @@ tslib_1.__exportStar(require("./parseLocationForWhitelistedModule"), exports);
 tslib_1.__exportStar(require("./isNativeNamedType"), exports);
 tslib_1.__exportStar(require("./isRootObjectType"), exports);
 tslib_1.__exportStar(require("./printImportLine"), exports);
+tslib_1.__exportStar(require("./getNodePropertyMap"), exports);
 // TODO: break the functions below this line into smaller files
 // -----------
 const relativeModulePath = (from, to) => {

package/src/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/index.ts"],"names":[],"mappings":";;;;AAAA,6BAA6B;AAE7B,8EAAoD;AACpD,8DAAoC;AACpC,6DAAmC;AACnC,4DAAkC;AAElC,+DAA+D;AAC/D,cAAc;AACP,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAU,EAAU,EAAE;IACrE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACxC,OAAO,IAAA,6BAAqB,EAAC,OAAO,CAAC,CAAC;AACxC,CAAC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B;AAEK,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAU,EAAE;IAC5D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACrD,OAAO,KAAK,IAAI,EAAE,CAAC;KACpB;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AALW,QAAA,qBAAqB,yBAKhC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/index.ts"],"names":[],"mappings":";;;;AAAA,6BAA6B;AAE7B,8EAAoD;AACpD,8DAAoC;AACpC,6DAAmC;AACnC,4DAAkC;AAClC,+DAAqC;AAErC,+DAA+D;AAC/D,cAAc;AACP,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAU,EAAU,EAAE;IACrE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACxC,OAAO,IAAA,6BAAqB,EAAC,OAAO,CAAC,CAAC;AACxC,CAAC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B;AAEK,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAU,EAAE;IAC5D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACrD,OAAO,KAAK,IAAI,EAAE,CAAC;KACpB;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AALW,QAAA,qBAAqB,yBAKhC"}

package/src/validatePresetConfig/validatePresetConfig.d.ts

@@ -1,5 +1,6 @@
 import * as typeScriptPlugin from '@graphql-codegen/typescript';
 import * as typeScriptResolversPlugin from '@graphql-codegen/typescript-resolvers';
+import type { ProjectOptions } from 'ts-morph';
 declare type ParsedTypesPluginsConfig = Omit<typeScriptPlugin.TypeScriptPluginConfig, 'scalars'> & Omit<typeScriptResolversPlugin.TypeScriptResolversPluginConfig, 'scalars'> & {
     scalars: Record<string, string>;
 };
@@ -15,6 +16,8 @@ interface ParsedPresetConfig {
     blacklistedModules: string[];
     externalResolvers: Record<string, string>;
     typesPluginsConfig: ParsedTypesPluginsConfig;
+    tsMorphProjectOptions: ProjectOptions;
+    fixObjectTypeResolvers: 'smart' | 'disabled';
 }
 export interface RawPresetConfig {
     resolverTypesPath?: string;
@@ -28,6 +31,8 @@ export interface RawPresetConfig {
     blacklistedModules?: string[];
     externalResolvers?: Record<string, string>;
     typesPluginsConfig?: typeScriptPlugin.TypeScriptPluginConfig & typeScriptResolversPlugin.TypeScriptResolversPluginConfig;
+    tsConfigFilePath?: string;
+    fixObjectTypeResolvers?: string;
 }
-export declare const validatePresetConfig: ({ resolverTypesPath, resolverRelativeTargetDir, resolverMainFile, typeDefsFilePath, mappersFileExtension, mappersSuffix, mode, whitelistedModules, blacklistedModules, externalResolvers, typesPluginsConfig, }: RawPresetConfig) => ParsedPresetConfig;
+export declare const validatePresetConfig: ({ resolverTypesPath, resolverRelativeTargetDir, resolverMainFile, typeDefsFilePath, mappersFileExtension, mappersSuffix, mode, whitelistedModules, blacklistedModules, externalResolvers, typesPluginsConfig, tsConfigFilePath, fixObjectTypeResolvers, }: RawPresetConfig) => ParsedPresetConfig;
 export {};

package/src/validatePresetConfig/validatePresetConfig.js

@@ -2,39 +2,44 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePresetConfig = void 0;
 const path = require("path");
-const presetName = '@eddeee888/gcg-typescript-resolver-files';
+const fs = require("fs");
+const preset_1 = require("../preset");
 const defaultResolverRelativeTargetDirMap = {
     modules: 'resolvers',
     merged: '',
 };
 const defaultTypeDefsFilePath = './typeDefs.generated.ts';
-const validatePresetConfig = ({ resolverTypesPath = './types.generated.ts', resolverRelativeTargetDir, resolverMainFile = 'resolvers.generated.ts', typeDefsFilePath = defaultTypeDefsFilePath, mappersFileExtension = '.mappers.ts', mappersSuffix = 'Mapper', mode = 'modules', whitelistedModules, blacklistedModules, externalResolvers = {}, typesPluginsConfig = {}, }) => {
+const validatePresetConfig = ({ resolverTypesPath = './types.generated.ts', resolverRelativeTargetDir, resolverMainFile = 'resolvers.generated.ts', typeDefsFilePath = defaultTypeDefsFilePath, mappersFileExtension = '.mappers.ts', mappersSuffix = 'Mapper', mode = 'modules', whitelistedModules, blacklistedModules, externalResolvers = {}, typesPluginsConfig = {}, tsConfigFilePath = './tsconfig.json', fixObjectTypeResolvers = 'smart', }) => {
     if (mode !== 'merged' && mode !== 'modules') {
-        throw new Error(`Validation Error - ${presetName} - presetConfig.mode must be "merged" or "modules" (default is "modules")`);
+        throw new Error(`Validation Error - ${preset_1.presetName} - presetConfig.mode must be "merged" or "modules" (default is "modules")`);
+    }
+    if (fixObjectTypeResolvers !== 'smart' &&
+        fixObjectTypeResolvers !== 'disabled') {
+        throw new Error(`Validation Error - ${preset_1.presetName} - presetConfig.fixObjectTypeResolvers must be "smart" or "disabled" (default is "smart")`);
     }
     if (!resolverTypesPath) {
-        throw new Error(`Validation Error - ${presetName} - presetConfig.resolverTypesPath is required`);
+        throw new Error(`Validation Error - ${preset_1.presetName} - presetConfig.resolverTypesPath is required`);
     }
     const finalResolverRelativeTargetDir = resolverRelativeTargetDir === undefined
         ? defaultResolverRelativeTargetDirMap[mode]
         : resolverRelativeTargetDir;
     if (path.extname(resolverMainFile) === '') {
-        throw new Error(`Validation Error - ${presetName} - presetConfig.mainFile must be a valid file name`);
+        throw new Error(`Validation Error - ${preset_1.presetName} - presetConfig.mainFile must be a valid file name`);
     }
     if (whitelistedModules) {
         if (!Array.isArray(whitelistedModules)) {
-            throw new Error(`Validation Error - ${presetName} - presetConfig.whitelistedModules must be an array if provided`);
+            throw new Error(`Validation Error - ${preset_1.presetName} - presetConfig.whitelistedModules must be an array if provided`);
         }
         if (mode !== 'modules') {
-            throw new Error(`Validation Error - ${presetName} - presetConfig.whitelistedModules can only be used with presetConfig.mode == "modules"`);
+            throw new Error(`Validation Error - ${preset_1.presetName} - presetConfig.whitelistedModules can only be used with presetConfig.mode == "modules"`);
         }
     }
     if (blacklistedModules) {
         if (!Array.isArray(blacklistedModules)) {
-            throw new Error(`Validation Error - ${presetName} - presetConfig.blacklistedModules must be an array if provided`);
+            throw new Error(`Validation Error - ${preset_1.presetName} - presetConfig.blacklistedModules must be an array if provided`);
         }
         if (mode !== 'modules') {
-            throw new Error(`Validation Error - ${presetName} - presetConfig.blacklistedModules can only be used with presetConfig.mode == "modules"`);
+            throw new Error(`Validation Error - ${preset_1.presetName} - presetConfig.blacklistedModules can only be used with presetConfig.mode == "modules"`);
         }
     }
     if (!validateTypesPluginsConfig(typesPluginsConfig)) {
@@ -44,6 +49,18 @@ const validatePresetConfig = ({ resolverTypesPath = './types.generated.ts', reso
     if (finalTypeDefsFilePath === true) {
         finalTypeDefsFilePath = defaultTypeDefsFilePath;
     }
+    const tsMorphProjectOptions = {
+        skipAddingFilesFromTsConfig: true, // avoid long startup time by NOT loading files included by tsconfig.json. We only use this virtually anyways so we don't need all the files
+    };
+    if (tsConfigFilePath) {
+        const absoluteTsConfigFilePath = path.join(process.cwd(), tsConfigFilePath);
+        if (fs.existsSync(absoluteTsConfigFilePath)) {
+            tsMorphProjectOptions.tsConfigFilePath = absoluteTsConfigFilePath;
+        }
+        else {
+            console.warn(`[${preset_1.presetName}] WARN: Unable to find TypeScript config at ${absoluteTsConfigFilePath}. Use presetConfig.tsConfigFilePath to set a custom value. Otherwise, type analysis may not work correctly.`);
+        }
+    }
     return {
         resolverTypesPath,
         resolverRelativeTargetDir: finalResolverRelativeTargetDir,
@@ -56,13 +73,15 @@ const validatePresetConfig = ({ resolverTypesPath = './types.generated.ts', reso
         blacklistedModules: blacklistedModules || [],
         externalResolvers,
         typesPluginsConfig,
+        tsMorphProjectOptions,
+        fixObjectTypeResolvers,
     };
 };
 exports.validatePresetConfig = validatePresetConfig;
 const validateTypesPluginsConfig = (config) => {
     config.scalars = config.scalars || {};
     if (typeof config.scalars === 'string') {
-        throw new Error(`Validation Error - ${presetName} - presetConfig.typesPluginsConfig.scalars of type "string" is not supported`);
+        throw new Error(`Validation Error - ${preset_1.presetName} - presetConfig.typesPluginsConfig.scalars of type "string" is not supported`);
     }
     return true;
 };

package/src/validatePresetConfig/validatePresetConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"validatePresetConfig.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/validatePresetConfig/validatePresetConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validatePresetConfig.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/validatePresetConfig/validatePresetConfig.ts"],"names":[],"mappings":"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"}

package/src/generateResolverFiles/fixExistingResolvers.d.ts

@@ -1,2 +0,0 @@
-import type { GenerateResolverFilesContext } from './types';
-export declare const fixExistingResolvers: ({ result, }: GenerateResolverFilesContext) => void;

package/src/generateResolverFiles/fixExistingResolvers.js

@@ -1,62 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fixExistingResolvers = void 0;
-const fs_1 = require("fs");
-const ts_morph_1 = require("ts-morph");
-const path = require("path");
-const fixExistingResolvers = ({ result, }) => {
-    const existingResolverFiles = Object.entries(result.files).reduce((res, [filePath, file]) => {
-        if ((0, fs_1.existsSync)(filePath) && file.__filetype === 'resolver') {
-            res[filePath] = file;
-        }
-        return res;
-    }, {});
-    const project = new ts_morph_1.Project();
-    project.addSourceFilesAtPaths(Object.keys(existingResolverFiles));
-    const sourceFiles = project.getSourceFiles();
-    sourceFiles.forEach((sourceFile) => {
-        const normalizedRelativePath = path.relative(process.cwd(), sourceFile.getFilePath());
-        const file = existingResolverFiles[normalizedRelativePath];
-        if (!file) {
-            throw new Error(`Unable to find resolver file: ${normalizedRelativePath}`);
-        }
-        // TODO: Check missing import
-        // ...
-        // Check expected identifier
-        let isExpectedIdentifierExportedInVariableStatement = false;
-        const variableStatementWithExpectedIdentifier = sourceFile.getVariableStatement((statement) => {
-            let hasExpectedIdentifier = false;
-            statement
-                .getDeclarationList()
-                .getDeclarations()
-                .forEach((declarationNode) => {
-                if (declarationNode.getName() === file.mainImportIdentifier) {
-                    hasExpectedIdentifier = true;
-                    if (statement.isExported()) {
-                        isExpectedIdentifierExportedInVariableStatement = true;
-                    }
-                }
-            });
-            return hasExpectedIdentifier;
-        });
-        if (!variableStatementWithExpectedIdentifier) {
-            // Did not find variable statement with expected identifier, add it to the end with a warning
-            sourceFile.addStatements('/* WARNING: The following resolver was missing from this file. Make sure it is properly implemented or there could be runtime errors. */');
-            sourceFile.addStatements(file.meta.resolverVariableStatement);
-        }
-        else if (variableStatementWithExpectedIdentifier &&
-            !isExpectedIdentifierExportedInVariableStatement) {
-            // If has identifier but not exported
-            // Add export keyword to statement
-            const isExpectedIdentifierExported = Boolean(sourceFile.getExportedDeclarations().get(file.mainImportIdentifier));
-            if (!isExpectedIdentifierExported) {
-                variableStatementWithExpectedIdentifier.setIsExported(true);
-            }
-            // else, if identifier's been exported do nothing
-        }
-        // Overwrite existing files with fixes
-        result.files[normalizedRelativePath] = Object.assign(Object.assign({}, file), { content: sourceFile.getText() });
-    });
-};
-exports.fixExistingResolvers = fixExistingResolvers;
-//# sourceMappingURL=fixExistingResolvers.js.map

package/src/generateResolverFiles/fixExistingResolvers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fixExistingResolvers.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/fixExistingResolvers.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,uCAAmC;AACnC,6BAA6B;AAGtB,MAAM,oBAAoB,GAAG,CAAC,EACnC,MAAM,GACuB,EAAQ,EAAE;IACvC,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAE/D,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;QAC1B,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,EAAE;YAC1D,GAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;SACtB;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;IAC9B,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAC7C,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACjC,MAAM,sBAAsB,GAAG,IAAI,CAAC,QAAQ,CAC1C,OAAO,CAAC,GAAG,EAAE,EACb,UAAU,CAAC,WAAW,EAAE,CACzB,CAAC;QACF,MAAM,IAAI,GAAG,qBAAqB,CAAC,sBAAsB,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CACb,iCAAiC,sBAAsB,EAAE,CAC1D,CAAC;SACH;QAED,6BAA6B;QAC7B,MAAM;QAEN,4BAA4B;QAC5B,IAAI,+CAA+C,GAAG,KAAK,CAAC;QAC5D,MAAM,uCAAuC,GAC3C,UAAU,CAAC,oBAAoB,CAAC,CAAC,SAAS,EAAE,EAAE;YAC5C,IAAI,qBAAqB,GAAG,KAAK,CAAC;YAClC,SAAS;iBACN,kBAAkB,EAAE;iBACpB,eAAe,EAAE;iBACjB,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;gBAC3B,IAAI,eAAe,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,oBAAoB,EAAE;oBAC3D,qBAAqB,GAAG,IAAI,CAAC;oBAC7B,IAAI,SAAS,CAAC,UAAU,EAAE,EAAE;wBAC1B,+CAA+C,GAAG,IAAI,CAAC;qBACxD;iBACF;YACH,CAAC,CAAC,CAAC;YACL,OAAO,qBAAqB,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,uCAAuC,EAAE;YAC5C,6FAA6F;YAC7F,UAAU,CAAC,aAAa,CACtB,0IAA0I,CAC3I,CAAC;YACF,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;SAC/D;aAAM,IACL,uCAAuC;YACvC,CAAC,+CAA+C,EAChD;YACA,qCAAqC;YACrC,kCAAkC;YAClC,MAAM,4BAA4B,GAAG,OAAO,CAC1C,UAAU,CAAC,uBAAuB,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CACpE,CAAC;YACF,IAAI,CAAC,4BAA4B,EAAE;gBACjC,uCAAuC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;aAC7D;YACD,iDAAiD;SAClD;QAED,sCAAsC;QACtC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,mCAC/B,IAAI,KACP,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,GAC9B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA5EW,QAAA,oBAAoB,wBA4E/B"}