@notjustcoders/ioc-arise 1.0.4 → 1.0.6

package/dist/generator/modular-container-generator.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModularContainerGenerator = void 0;
+const dependency_resolver_1 = require("../analyser/dependency-resolver");
+const base_container_generator_1 = require("./base-container-generator");
+const module_container_function_generator_1 = require("./modular/module-container-function-generator");
+const module_instantiation_generator_1 = require("./modular/module-instantiation-generator");
+const container_aggregator_1 = require("./modular/container-aggregator");
+/**
+ * Generator for modular container structure.
+ * Handles module-based dependency injection with inter-module dependencies.
+ */
+class ModularContainerGenerator extends base_container_generator_1.BaseContainerGenerator {
+    constructor(fileWriter, moduleGroupedClasses, moduleDependencyResolver, importGenerator) {
+        super(fileWriter, importGenerator);
+        this.moduleGroupedClasses = moduleGroupedClasses;
+        this.moduleDependencyResolver = moduleDependencyResolver;
+        this.moduleContainerFunctionGenerator = new module_container_function_generator_1.ModuleContainerFunctionGenerator(moduleGroupedClasses);
+        this.moduleInstantiationGenerator = new module_instantiation_generator_1.ModuleInstantiationGenerator(moduleGroupedClasses);
+        this.containerAggregator = new container_aggregator_1.ContainerAggregator();
+    }
+    generate() {
+        // First, check for module-level cycles
+        const moduleResult = this.moduleDependencyResolver.resolve();
+        if (moduleResult.cycles.length > 0) {
+            throw new Error(`Circular dependencies detected between modules: ${JSON.stringify(moduleResult.cycles)}`);
+        }
+        // Then resolve class-level dependencies within each module
+        const allClasses = Array.from(this.moduleGroupedClasses.values()).flat();
+        const dependencyResolver = new dependency_resolver_1.DependencyResolver(allClasses);
+        const sortResult = dependencyResolver.resolve();
+        if (sortResult.cycles.length > 0) {
+            throw new Error(`Circular dependencies detected within classes: ${JSON.stringify(sortResult.cycles)}`);
+        }
+        const containerCode = this.generateContainerCode(moduleResult.sortedModules, moduleResult.moduleDependencies);
+        this.writeContainer(containerCode);
+    }
+    generateContainerCode(sortedModules, moduleDependencies) {
+        if (!sortedModules || !moduleDependencies) {
+            const moduleResult = this.moduleDependencyResolver.resolve();
+            sortedModules = moduleResult.sortedModules;
+            moduleDependencies = moduleResult.moduleDependencies;
+        }
+        const imports = this.importGenerator.generateImports();
+        const moduleContainers = this.generateModuleContainers(sortedModules, moduleDependencies);
+        const aggregatedContainer = this.containerAggregator.generateAggregatedContainer(sortedModules);
+        const typeExport = this.containerAggregator.generateModularTypeExport();
+        return `${imports}\n\n${moduleContainers}\n\n${aggregatedContainer}\n\n${typeExport}\n`;
+    }
+    generateModuleContainers(sortedModules, moduleDependencies) {
+        const moduleContainerFunctions = this.moduleContainerFunctionGenerator.generateModuleContainerFunctions(sortedModules, moduleDependencies);
+        const moduleInstantiations = this.moduleInstantiationGenerator.generateModuleInstantiations(sortedModules, moduleDependencies);
+        return moduleContainerFunctions.join('\n\n') + '\n\n' + moduleInstantiations.join('\n');
+    }
+}
+exports.ModularContainerGenerator = ModularContainerGenerator;
+//# sourceMappingURL=modular-container-generator.js.map

package/dist/generator/modular-container-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modular-container-generator.js","sourceRoot":"","sources":["../../src/generator/modular-container-generator.ts"],"names":[],"mappings":"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"}

package/dist/generator/module-container-function-generator.d.ts

@@ -0,0 +1,30 @@
+import { ClassInfo } from '../types';
+/**
+ * Generator for module container functions.
+ * Handles the creation of individual module container functions with their dependencies.
+ */
+export declare class ModuleContainerFunctionGenerator {
+    private moduleGroupedClasses;
+    constructor(moduleGroupedClasses: Map<string, ClassInfo[]>);
+    /**
+     * Generates module container functions for all modules.
+     */
+    generateModuleContainerFunctions(sortedModules: string[], moduleDependencies: Map<string, Set<string>>): string[];
+    private createModuleContainerFunction;
+    private generateFunctionParameters;
+    private createFunctionSignature;
+    private generateModuleFunctionBody;
+    private generateTransientFactories;
+    private generateSingletonVariables;
+    private generateSingletonGetters;
+    private createSingletonGetter;
+    private buildConstructorArguments;
+    private resolveDependencyArgument;
+    private findExternalModuleDependency;
+    private findInternalModuleDependency;
+    private generateModuleExports;
+    private createModuleExportGetter;
+    private sortClassesByDependencies;
+    private camelCase;
+}
+//# sourceMappingURL=module-container-function-generator.d.ts.map

package/dist/generator/module-container-function-generator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-container-function-generator.d.ts","sourceRoot":"","sources":["../../src/generator/module-container-function-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC;;;GAGG;AACH,qBAAa,gCAAgC;IAC3C,OAAO,CAAC,oBAAoB,CAA2B;gBAE3C,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;IAI1D;;OAEG;IACH,gCAAgC,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,EAAE;IAcjH,OAAO,CAAC,6BAA6B;IAWrC,OAAO,CAAC,0BAA0B;IAWlC,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,0BAA0B;IAqBlC,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,0BAA0B;IAalC,OAAO,CAAC,wBAAwB;IAahC,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,yBAAyB;IAWjC,OAAO,CAAC,4BAA4B;IAcpC,OAAO,CAAC,4BAA4B;IAcpC,OAAO,CAAC,qBAAqB;IAa7B,OAAO,CAAC,wBAAwB;IAYhC,OAAO,CAAC,yBAAyB;IA6BjC,OAAO,CAAC,SAAS;CAGlB"}

package/dist/generator/module-container-function-generator.js

@@ -0,0 +1,199 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModuleContainerFunctionGenerator = void 0;
+/**
+ * Generator for module container functions.
+ * Handles the creation of individual module container functions with their dependencies.
+ */
+class ModuleContainerFunctionGenerator {
+    constructor(moduleGroupedClasses) {
+        this.moduleGroupedClasses = moduleGroupedClasses;
+    }
+    /**
+     * Generates module container functions for all modules.
+     */
+    generateModuleContainerFunctions(sortedModules, moduleDependencies) {
+        const moduleContainerFunctions = [];
+        for (const moduleName of sortedModules) {
+            const moduleClasses = this.moduleGroupedClasses.get(moduleName);
+            if (!moduleClasses)
+                continue;
+            const moduleContainerFunction = this.createModuleContainerFunction(moduleName, moduleClasses, moduleDependencies);
+            moduleContainerFunctions.push(moduleContainerFunction);
+        }
+        return moduleContainerFunctions;
+    }
+    createModuleContainerFunction(moduleName, moduleClasses, moduleDependencies) {
+        const moduleFunctionName = `create${moduleName}Container`;
+        const moduleDeps = moduleDependencies.get(moduleName) || new Set();
+        const functionParams = this.generateFunctionParameters(moduleDeps);
+        const functionSignature = this.createFunctionSignature(moduleFunctionName, functionParams);
+        const functionBody = this.generateModuleFunctionBody(moduleClasses, moduleDeps);
+        return `${functionSignature} {\n${functionBody}\n}`;
+    }
+    generateFunctionParameters(moduleDeps) {
+        const functionParams = [];
+        for (const depModule of moduleDeps) {
+            const depVarName = this.camelCase(depModule) + 'Container';
+            functionParams.push(`${depVarName}: ReturnType<typeof create${depModule}Container>`);
+        }
+        return functionParams;
+    }
+    createFunctionSignature(functionName, params) {
+        return params.length > 0 ?
+            `function ${functionName}(${params.join(', ')})` :
+            `function ${functionName}()`;
+    }
+    generateModuleFunctionBody(moduleClasses, moduleDeps) {
+        const factoryFunctions = this.generateTransientFactories(moduleClasses);
+        const lazyInitializations = this.generateSingletonVariables(moduleClasses);
+        const lazyGetters = this.generateSingletonGetters(moduleClasses, moduleDeps);
+        const moduleExports = this.generateModuleExports(moduleClasses);
+        const returnObject = moduleExports.length > 0 ?
+            `  return {\n${moduleExports.join(',\n')}\n  };` :
+            '  return {};';
+        return [
+            ...factoryFunctions,
+            '',
+            ...lazyInitializations,
+            '',
+            ...lazyGetters,
+            '',
+            returnObject
+        ].filter(line => line !== '' || factoryFunctions.length > 0 || lazyInitializations.length > 0 || lazyGetters.length > 0).join('\n');
+    }
+    generateTransientFactories(moduleClasses) {
+        const factoryFunctions = [];
+        for (const classInfo of moduleClasses) {
+            if (classInfo.scope === 'transient') {
+                const instanceName = this.camelCase(classInfo.name);
+                const factoryName = `${instanceName}Factory`;
+                factoryFunctions.push(`  const ${factoryName} = (): ${classInfo.name} => new ${classInfo.name}();`);
+            }
+        }
+        return factoryFunctions;
+    }
+    generateSingletonVariables(moduleClasses) {
+        const singletonClasses = moduleClasses.filter(c => c.scope !== 'transient');
+        const sortedSingletons = this.sortClassesByDependencies(singletonClasses, moduleClasses);
+        const lazyInitializations = [];
+        for (const classInfo of sortedSingletons) {
+            const instanceName = this.camelCase(classInfo.name);
+            lazyInitializations.push(`  let ${instanceName}: ${classInfo.name} | undefined;`);
+        }
+        return lazyInitializations;
+    }
+    generateSingletonGetters(moduleClasses, moduleDeps) {
+        const singletonClasses = moduleClasses.filter(c => c.scope !== 'transient');
+        const sortedSingletons = this.sortClassesByDependencies(singletonClasses, moduleClasses);
+        const lazyGetters = [];
+        for (const classInfo of sortedSingletons) {
+            const lazyGetter = this.createSingletonGetter(classInfo, moduleClasses, moduleDeps);
+            lazyGetters.push(lazyGetter);
+        }
+        return lazyGetters;
+    }
+    createSingletonGetter(classInfo, moduleClasses, moduleDeps) {
+        const instanceName = this.camelCase(classInfo.name);
+        const getterName = `get${classInfo.name}`;
+        const constructorArgs = this.buildConstructorArguments(classInfo, moduleClasses, moduleDeps);
+        const instantiation = constructorArgs.length > 0 ?
+            `new ${classInfo.name}(${constructorArgs.join(', ')})` :
+            `new ${classInfo.name}()`;
+        return `  const ${getterName} = (): ${classInfo.name} => {\n    if (!${instanceName}) {\n      ${instanceName} = ${instantiation};\n    }\n    return ${instanceName};\n  };`;
+    }
+    buildConstructorArguments(classInfo, moduleClasses, moduleDeps) {
+        const constructorArgs = [];
+        for (const dep of classInfo.dependencies) {
+            const arg = this.resolveDependencyArgument(dep, moduleClasses, moduleDeps);
+            if (arg) {
+                constructorArgs.push(arg);
+            }
+        }
+        return constructorArgs;
+    }
+    resolveDependencyArgument(dependency, moduleClasses, moduleDeps) {
+        // Check if dependency is from another module
+        const externalModuleArg = this.findExternalModuleDependency(dependency, moduleDeps);
+        if (externalModuleArg) {
+            return externalModuleArg;
+        }
+        // Check if dependency is from the same module
+        return this.findInternalModuleDependency(dependency, moduleClasses);
+    }
+    findExternalModuleDependency(dependency, moduleDeps) {
+        for (const depModule of moduleDeps) {
+            const depModuleClasses = this.moduleGroupedClasses.get(depModule);
+            if (depModuleClasses) {
+                const depClass = depModuleClasses.find(c => c.interfaceName === dependency);
+                if (depClass) {
+                    const depModuleVarName = this.camelCase(depModule) + 'Container';
+                    return `${depModuleVarName}.${dependency}`;
+                }
+            }
+        }
+        return null;
+    }
+    findInternalModuleDependency(dependency, moduleClasses) {
+        const depClass = moduleClasses.find(c => c.interfaceName === dependency);
+        if (depClass) {
+            if (depClass.scope === 'transient') {
+                const depInstanceName = this.camelCase(depClass.name);
+                return `${depInstanceName}Factory()`;
+            }
+            else {
+                const depGetterName = `get${depClass.name}`;
+                return `${depGetterName}()`;
+            }
+        }
+        return null;
+    }
+    generateModuleExports(moduleClasses) {
+        const moduleExports = [];
+        for (const classInfo of moduleClasses) {
+            if (classInfo.interfaceName) {
+                const exportGetter = this.createModuleExportGetter(classInfo);
+                moduleExports.push(exportGetter);
+            }
+        }
+        return moduleExports;
+    }
+    createModuleExportGetter(classInfo) {
+        const instanceName = this.camelCase(classInfo.name);
+        const isTransient = classInfo.scope === 'transient';
+        if (isTransient) {
+            return `    get ${classInfo.interfaceName}(): ${classInfo.name} {\n      return ${instanceName}Factory();\n    }`;
+        }
+        else {
+            const getterName = `get${classInfo.name}`;
+            return `    get ${classInfo.interfaceName}(): ${classInfo.name} {\n      return ${getterName}();\n    }`;
+        }
+    }
+    sortClassesByDependencies(classes, allModuleClasses) {
+        // Import TopologicalSorter when needed
+        const { TopologicalSorter } = require('../utils/topological-sorter');
+        // Build dependency graph for classes within the module
+        const dependencyGraph = new Map();
+        for (const classInfo of classes) {
+            const dependencies = [];
+            // Only include dependencies that are within the same module and are singletons
+            for (const dep of classInfo.dependencies) {
+                const depClass = allModuleClasses.find(c => c.interfaceName === dep && c.scope !== 'transient');
+                if (depClass && classes.includes(depClass)) {
+                    dependencies.push(depClass.name);
+                }
+            }
+            dependencyGraph.set(classInfo.name, dependencies);
+        }
+        // Use TopologicalSorter to sort the classes
+        const sortResult = TopologicalSorter.sort(dependencyGraph);
+        // Map sorted class names back to ClassInfo objects
+        const classMap = new Map(classes.map(c => [c.name, c]));
+        return sortResult.sorted.map(className => classMap.get(className)).filter((classInfo) => classInfo !== undefined);
+    }
+    camelCase(str) {
+        return str.charAt(0).toLowerCase() + str.slice(1).replace(/[^a-zA-Z0-9]/g, '');
+    }
+}
+exports.ModuleContainerFunctionGenerator = ModuleContainerFunctionGenerator;
+//# sourceMappingURL=module-container-function-generator.js.map

package/dist/generator/module-container-function-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-container-function-generator.js","sourceRoot":"","sources":["../../src/generator/module-container-function-generator.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notjustcoders/ioc-arise",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "A CLI tool to generate type-safe IoC containers for TypeScript projects with automatic dependency injection",
   "main": "dist/index.js",
   "bin": {
@@ -70,6 +70,6 @@
     "test5:generate": "npm run build && node dist/index.js generate --source examples/simple-modules",
     "test6:generate": "npm run build && node dist/index.js generate --source examples/use-cases-example",
     "test7:generate": "npm run build && node dist/index.js generate --source examples/duplicate-interfaces-example",
-    "test8:generate": "npm run build && node dist/index.js generate --source examples/generics-example"
+    "test8:generate": "npm run build && node dist/index.js generate --source examples/name-collision-example"
   }
 }

package/dist/generator/module-container-generator.d.ts

@@ -1,10 +0,0 @@
-import { ClassInfo } from '../types';
-export declare class ModuleContainerGenerator {
-    private moduleGroupedClasses;
-    constructor(moduleGroupedClasses: Map<string, ClassInfo[]>);
-    generateModuleContainers(): string;
-    generateAggregatedContainer(): string;
-    generateModularTypeExport(): string;
-    private camelCase;
-}
-//# sourceMappingURL=module-container-generator.d.ts.map

package/dist/generator/module-container-generator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"module-container-generator.d.ts","sourceRoot":"","sources":["../../src/generator/module-container-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,qBAAa,wBAAwB;IACnC,OAAO,CAAC,oBAAoB,CAA2B;gBAE3C,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;IAI1D,wBAAwB,IAAI,MAAM;IA+BlC,2BAA2B,IAAI,MAAM;IAYrC,yBAAyB,IAAI,MAAM;IAInC,OAAO,CAAC,SAAS;CAGlB"}

package/dist/generator/module-container-generator.js

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleContainerGenerator = void 0;
-class ModuleContainerGenerator {
-    constructor(moduleGroupedClasses) {
-        this.moduleGroupedClasses = moduleGroupedClasses;
-    }
-    generateModuleContainers() {
-        const moduleContainerCodes = [];
-        for (const [moduleName, moduleClasses] of this.moduleGroupedClasses) {
-            const moduleVarName = this.camelCase(moduleName) + 'Container';
-            const moduleExports = [];
-            for (const classInfo of moduleClasses) {
-                if (classInfo.interfaceName) {
-                    const instanceName = this.camelCase(classInfo.name);
-                    // Check if this is a transient dependency (has factory)
-                    const isTransient = classInfo.scope === 'transient';
-                    const exportValue = isTransient ?
-                        `get ${classInfo.interfaceName}(): ${classInfo.name} {\n    return ${instanceName}Factory();\n  }` :
-                        `${classInfo.interfaceName}: ${instanceName}`;
-                    if (isTransient) {
-                        moduleExports.push(`  ${exportValue}`);
-                    }
-                    else {
-                        moduleExports.push(`  ${exportValue}`);
-                    }
-                }
-            }
-            const moduleContainerCode = `const ${moduleVarName} = {\n${moduleExports.join(',\n')}\n};`;
-            moduleContainerCodes.push(moduleContainerCode);
-        }
-        return moduleContainerCodes.join('\n\n');
-    }
-    generateAggregatedContainer() {
-        const moduleExports = [];
-        for (const [moduleName] of this.moduleGroupedClasses) {
-            const moduleVarName = this.camelCase(moduleName) + 'Container';
-            const moduleKey = this.camelCase(moduleName);
-            moduleExports.push(`  ${moduleKey}: ${moduleVarName}`);
-        }
-        return `export const container = {\n${moduleExports.join(',\n')}\n};`;
-    }
-    generateModularTypeExport() {
-        return 'export type Container = typeof container;';
-    }
-    camelCase(str) {
-        return str.charAt(0).toLowerCase() + str.slice(1).replace(/[^a-zA-Z0-9]/g, '');
-    }
-}
-exports.ModuleContainerGenerator = ModuleContainerGenerator;
-//# sourceMappingURL=module-container-generator.js.map

package/dist/generator/module-container-generator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"module-container-generator.js","sourceRoot":"","sources":["../../src/generator/module-container-generator.ts"],"names":[],"mappings":";;;AAEA,MAAa,wBAAwB;IAGnC,YAAY,oBAA8C;QACxD,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACnD,CAAC;IAED,wBAAwB;QACtB,MAAM,oBAAoB,GAAa,EAAE,CAAC;QAE1C,KAAK,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACpE,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC;YAC/D,MAAM,aAAa,GAAa,EAAE,CAAC;YAEnC,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE,CAAC;gBACtC,IAAI,SAAS,CAAC,aAAa,EAAE,CAAC;oBAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;oBACpD,wDAAwD;oBACxD,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,KAAK,WAAW,CAAC;oBACpD,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC;wBAC/B,OAAO,SAAS,CAAC,aAAa,OAAO,SAAS,CAAC,IAAI,kBAAkB,YAAY,iBAAiB,CAAC,CAAC;wBACpG,GAAG,SAAS,CAAC,aAAa,KAAK,YAAY,EAAE,CAAC;oBAEhD,IAAI,WAAW,EAAE,CAAC;wBAChB,aAAa,CAAC,IAAI,CAAC,KAAK,WAAW,EAAE,CAAC,CAAC;oBACzC,CAAC;yBAAM,CAAC;wBACN,aAAa,CAAC,IAAI,CAAC,KAAK,WAAW,EAAE,CAAC,CAAC;oBACzC,CAAC;gBACH,CAAC;YACH,CAAC;YAED,MAAM,mBAAmB,GAAG,SAAS,aAAa,SAAS,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;YAC3F,oBAAoB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACjD,CAAC;QAED,OAAO,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED,2BAA2B;QACzB,MAAM,aAAa,GAAa,EAAE,CAAC;QAEnC,KAAK,MAAM,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACrD,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC;YAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAC7C,aAAa,CAAC,IAAI,CAAC,KAAK,SAAS,KAAK,aAAa,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,OAAO,+BAA+B,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IACxE,CAAC;IAED,yBAAyB;QACvB,OAAO,2CAA2C,CAAC;IACrD,CAAC;IAEO,SAAS,CAAC,GAAW;QAC3B,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IACjF,CAAC;CACF;AAzDD,4DAyDC"}