arkanalyzer 1.0.86 → 1.0.88

package/lib/Config.js

@@ -40,15 +40,54 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SceneConfig = void 0;
+exports.SceneConfig = exports.buildSceneConfigFromProject = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const logger_1 = __importStar(require("./utils/logger"));
 const getAllFiles_1 = require("./utils/getAllFiles");
 const FileUtils_1 = require("./utils/FileUtils");
+const ast_1 = require("./frontend/cppFrontend/ast");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'Config');
+function collectSdksFromOhosSdkHome(explicitHome) {
+    const sdkHome = explicitHome || process.env.OHOS_SDK_HOME;
+    if (!sdkHome) {
+        return [];
+    }
+    const candidates = [
+        { name: 'etsSdk', path: path_1.default.join(sdkHome, 'openharmony', 'ets') },
+        { name: 'hmsSdk', path: path_1.default.join(sdkHome, 'hms', 'ets') },
+    ];
+    const sdks = [];
+    for (const c of candidates) {
+        if (fs_1.default.existsSync(c.path)) {
+            sdks.push({ moduleName: '', name: c.name, path: c.path });
+        }
+    }
+    return sdks;
+}
+/**
+ * Build a SceneConfig from a project directory and optional OHOS SDK home.
+ *
+ * SDK resolution order:
+ * 1) explicit `ohosSdkHome` (must contain at least one valid SDK directory:
+ *    `<ohosSdkHome>/openharmony/ets` or `<ohosSdkHome>/hms/ets`)
+ * 2) environment variable `OHOS_SDK_HOME`
+ *
+ * @param project Project root directory path.
+ * @param ohosSdkHome Optional OHOS SDK home path.
+ * @param options Optional SceneOptions.
+ * @returns SceneConfig initialized with project files and discovered SDKs.
+ */
+function buildSceneConfigFromProject(project, ohosSdkHome, options) {
+    const config = new SceneConfig(options);
+    const sdks = collectSdksFromOhosSdkHome(ohosSdkHome);
+    config.buildConfig(path_1.default.basename(project), project, sdks);
+    return config;
+}
+exports.buildSceneConfigFromProject = buildSceneConfigFromProject;
 const CONFIG_FILENAME = 'arkanalyzer.json';
 const DEFAULT_CONFIG_FILE = path_1.default.join(__dirname, '../config', CONFIG_FILENAME);
+const CPP_SOURCE_FILE_EXTS = (0, ast_1.getCxxSourceFileExtensions)();
 class SceneConfig {
     constructor(options) {
         this.targetProjectName = '';
@@ -58,9 +97,14 @@ class SceneConfig {
         this.sdkFiles = [];
         this.sdkFilesMap = new Map();
         this.projectFiles = [];
+        this.includeDirs = []; // Include directories that the C++ project depends on.
         this.fileLanguages = new Map();
+        this.ccjsonPath = '';
+        this.cppAstPath = '';
+        // Seed defaults before merging `config/arkanalyzer.json`. Same values remain if that file is missing or invalid.
         this.options = { supportFileExts: ['.ets', '.ts'] };
         this.loadDefaultConfig(options);
+        this.appendCppExtsToDefaultOptionsIfAstJsonDumperAvailable();
     }
     getOptions() {
         return this.options;
@@ -87,6 +131,7 @@ class SceneConfig {
      * targetProjectDirectory property of the sceneConfig object.
      * @param targetProjectDirectory - the target project directory, such as xxx/xxx/xxx, started from project
      *     directory.
+     * @param includeDirs - Header file directories that the CXX project depends on.
      * @example
      * 1. build a sceneConfig object.
     ```typescript
@@ -95,8 +140,17 @@ class SceneConfig {
     sceneConfig.buildFromProjectDir(projectDir);
     ```
      */
-    buildFromProjectDir(targetProjectDirectory) {
+    buildFromProjectDir(targetProjectDirectory, includeDirs = []) {
         this.targetProjectDirectory = targetProjectDirectory;
+        // Callers should prefer passing de-duplicated includeDirs to avoid redundant work in hot paths.
+        // Keep this defensive, order-preserving de-duplication as a fallback and reuse the target array.
+        // Intentionally avoid Set allocation here.
+        this.includeDirs.length = 0;
+        for (const includeDir of includeDirs) {
+            if (!this.includeDirs.includes(includeDir)) {
+                this.includeDirs.push(includeDir);
+            }
+        }
         this.targetProjectName = path_1.default.basename(targetProjectDirectory);
         this.projectFiles = (0, getAllFiles_1.getAllFiles)(targetProjectDirectory, this.options.supportFileExts, this.options.ignoreFileNames);
     }
@@ -191,6 +245,30 @@ class SceneConfig {
     getProjectFiles() {
         return this.projectFiles;
     }
+    /** Obtain the header file directories of the input C++ project dependencies. */
+    getIncludeDirs() {
+        return this.includeDirs;
+    }
+    setCcjsonPath(ccjsonPath) {
+        this.ccjsonPath = ccjsonPath;
+    }
+    /**
+     * Returns compile_commands.json path configured by the project.
+     *
+     * If ccjson is not configured, this value is empty initially. Before AST generation,
+     * astUtils may auto-discover a compile database near source files (for DevEco projects
+     * that load compilation databases). The discovered path is used directly by Scene and is
+     * not backfilled into this config field.
+     */
+    getCcjsonPath() {
+        return this.ccjsonPath;
+    }
+    setCppAstPath(cppAstPath) {
+        this.cppAstPath = cppAstPath;
+    }
+    getCppAstPath() {
+        return this.cppAstPath;
+    }
     getFileLanguages() {
         return this.fileLanguages;
     }
@@ -238,5 +316,16 @@ class SceneConfig {
             this.options = Object.assign(Object.assign({}, this.options), options);
         }
     }
+    appendCppExtsToDefaultOptionsIfAstJsonDumperAvailable() {
+        if (!(0, ast_1.isAstJsonDumperAvailable)()) {
+            return;
+        }
+        const configuredExts = Array.isArray(this.options.supportFileExts) ? this.options.supportFileExts : [];
+        const missingCppExts = CPP_SOURCE_FILE_EXTS.filter(ext => !configuredExts.includes(ext));
+        if (missingCppExts.length === 0) {
+            return;
+        }
+        this.options.supportFileExts = [...configuredExts, ...missingCppExts];
+    }
 }
 exports.SceneConfig = SceneConfig;

package/lib/Scene.d.ts

@@ -8,7 +8,7 @@ import { ClassSignature, FileSignature, MethodSignature, NamespaceSignature } fr
 import { Local } from './core/base/Local';
 import { ArkExport } from './core/model/ArkExport';
 import { CallGraph } from './callgraph/model/CallGraph';
-declare enum SceneBuildStage {
+export declare enum SceneBuildStage {
     BUILD_INIT = 0,
     SDK_INFERRED = 1,
     CLASS_DONE = 2,
@@ -25,6 +25,9 @@ export declare class Scene {
     private projectName;
     private projectFiles;
     private realProjectDir;
+    private includeDirs;
+    private ccjsonPath;
+    private cppAstPath;
     private moduleScenesMap;
     private modulePath2NameMap;
     private moduleSdkMap;
@@ -51,6 +54,7 @@ export declare class Scene {
     constructor();
     dispose(): void;
     getOptions(): SceneOptions;
+    getBuildStage(): SceneBuildStage;
     getOverRides(): Map<string, string>;
     getOverRideDependencyMap(): Map<string, unknown>;
     clear(): void;
@@ -86,8 +90,18 @@ export declare class Scene {
     private parseOhPackage;
     private findTsConfigInfoDeeply;
     private addTsConfigInfo;
+    /**
+     * Update or add default constructors for all classes in the scene.
+     *
+     * This function iterates through all files and classes in the scene,
+     * builds default constructors for each class, and processes existing constructors
+     * by replacing super constructor calls and adding initialization logic.
+     *
+     * @returns {void}
+     */
     private updateOrAddDefaultConstructors;
     private buildAllMethodBody;
+    private findCCJsonPath;
     private genArkFiles;
     private getFilesOrderByDependency;
     private getDependencyFilesDeeply;
@@ -106,7 +120,13 @@ export declare class Scene {
     private getDependenciesMapping;
     private getOriginPath;
     private addFileNode2DependencyGrap;
+    /**
+     * Loads SDK sources into the scene. C++ SDK files are intentionally skipped: they are not parsed or registered
+     * here (only non-C++ SDK sources are processed).
+     */
     private buildSdk;
+    private collectSdkFiles;
+    private parseAndRegisterSdkFile;
     /**
      * Build the scene for harmony project. It resolves the file path of the project first, and then fetches
      * dependencies from this file. Next, build a `ModuleScene` for this project to generate {@link ArkFile}. Finally,
@@ -248,6 +268,10 @@ export declare class Scene {
     getOhPkgFilePath(): string;
     makeCallGraphCHA(entryPoints: MethodSignature[]): CallGraph;
     makeCallGraphRTA(entryPoints: MethodSignature[]): CallGraph;
+    /** Obtain the header file directories of the input C++ project dependencies. */
+    getIncludeDirs(): string[];
+    getCcjsonPath(): string;
+    getCppAstPath(): string;
     /**
      * Infer type for each non-default method. It infers the type of each field/local/reference.
      * For example, the statement `let b = 5;`, the type of local `b` is `NumberType`; and for the statement `let s =
@@ -329,5 +353,4 @@ export declare class ModuleScene {
     addArkFile(arkFile: ArkFile): void;
     private genArkFiles;
 }
-export {};
 //# sourceMappingURL=Scene.d.ts.map

package/lib/Scene.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Scene.d.ts","sourceRoot":"","sources":["../src/Scene.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Scene.d.ts","sourceRoot":"","sources":["../src/Scene.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,EAAY,MAAM,UAAU,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/G,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAK1C,OAAO,EAAE,SAAS,EAA0B,MAAM,wBAAwB,CAAC;AAS3E,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAiBxD,oBAAY,eAAe;IACvB,UAAU,IAAA;IACV,YAAY,IAAA;IACZ,UAAU,IAAA;IACV,WAAW,IAAA;IACX,eAAe,IAAA;IACf,gBAAgB,IAAA;IAChB,aAAa,IAAA;CAChB;AAED;;;GAGG;AACH,qBAAa,KAAK;IACd,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,WAAW,CAAgB;IACnC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,UAAU,CAAc;IAEhC,OAAO,CAAC,eAAe,CAAuC;IAC9D,OAAO,CAAC,kBAAkB,CAAkD;IAE5E,OAAO,CAAC,YAAY,CAAiC;IACrD,OAAO,CAAC,aAAa,CAA+B;IAGpD,OAAO,CAAC,YAAY,CAAoC;IAGxD,OAAO,CAAC,QAAQ,CAAmC;IACnD,OAAO,CAAC,aAAa,CAAwC;IAC7D,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,UAAU,CAAqC;IAEvD,OAAO,CAAC,cAAc,CAAmC;IACzD,OAAO,CAAC,YAAY,CAAwD;IAC5E,OAAO,CAAC,eAAe,CAAsF;IAC7G,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,qBAAqB,CAAmC;IAChE,OAAO,CAAC,wBAAwB,CAAC,CAAwC;IACzE,OAAO,CAAC,OAAO,CAAC,CAAqB;IAErC,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,aAAa,CAAoC;IAEzD,OAAO,CAAC,OAAO,CAAgB;IAE/B,OAAO,CAAC,kBAAkB,CAAkC;IAC5D,OAAO,CAAC,qBAAqB,CAAgB;;IAStC,OAAO,IAAI,IAAI;IAOf,UAAU,IAAI,YAAY;IAI1B,aAAa,IAAI,eAAe;IAIhC,YAAY,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAInC,wBAAwB,IAAI,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC;IAIhD,KAAK,IAAI,IAAI;IAoBb,QAAQ,IAAI,eAAe;IAIlC;;;;;;;;;;;;;;;;;;OAkBG;IACI,wBAAwB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAKxD,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAK1D;;;;OAIG;IACI,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IA8DrD,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,cAAc;IAwBtB,OAAO,CAAC,sBAAsB;IAa9B,OAAO,CAAC,eAAe;IAYvB;;;;;;;;OAQG;IACH,OAAO,CAAC,8BAA8B;IAmBtC,OAAO,CAAC,kBAAkB;IAoD1B,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,WAAW;IAwBnB,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,wBAAwB;IAyChC,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,sBAAsB;IAgB9B,OAAO,CAAC,mBAAmB;IAU3B,OAAO,CAAC,SAAS;IAejB,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,kBAAkB;IAgB1B,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,sBAAsB;IAS9B,OAAO,CAAC,oBAAoB;IAiB5B,OAAO,CAAC,uBAAuB;IAW/B,OAAO,CAAC,+BAA+B;IAoBvC,OAAO,CAAC,uBAAuB;IA6B/B,OAAO,CAAC,sBAAsB;IAc9B,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,0BAA0B;IAIlC;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAUhB,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,uBAAuB;IAoB/B;;;;OAIG;IACI,yBAAyB,IAAI,IAAI;IAYxC,OAAO,CAAC,oBAAoB;IAUrB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,IAAI;IA6BhG,OAAO,CAAC,yBAAyB;IAoBjC;;;;;;;;OAQG;IACI,iBAAiB,IAAI,MAAM;IAIlC;;;OAGG;IACI,cAAc,IAAI,MAAM;IAIxB,eAAe,IAAI,MAAM,EAAE;IAI3B,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAIzD;;;;;;;;;;;;;;;;;;OAkBG;IACI,OAAO,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,GAAG,IAAI;IAWrD,qBAAqB,IAAI,MAAM,EAAE;IAOjC,wBAAwB,IAAI,MAAM,EAAE;IAIpC,OAAO,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAI5B,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO;IAIxD;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACI,QAAQ,IAAI,OAAO,EAAE;IAIrB,gBAAgB,IAAI,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC;IAIzC,cAAc,IAAI,OAAO,EAAE;IAI3B,eAAe,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;IAIrC,gBAAgB,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC;IAIpC,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,YAAY,GAAG,IAAI;IAgBhF,OAAO,CAAC,uBAAuB;IAW/B,OAAO,CAAC,gBAAgB;IAWjB,aAAa,IAAI,YAAY,EAAE;IAItC;;;;OAIG;IACI,QAAQ,CAAC,cAAc,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAsBhE,OAAO,CAAC,aAAa;IAoBd,UAAU,IAAI,QAAQ,EAAE;IAIxB,SAAS,CAAC,eAAe,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI;IAgBvF,OAAO,CAAC,aAAa;IAerB;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACI,UAAU,IAAI,SAAS,EAAE;IAIzB,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAIxC,YAAY,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAIxC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO;IAIxC,eAAe,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO;IAIjD,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO;IAIlC,aAAa,IAAI,OAAO;IAKxB,cAAc,IAAI,eAAe,EAAE;IAI1C,+CAA+C;IACxC,eAAe,IAAI,YAAY;IAI/B,eAAe,IAAI;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE;IAI3C,kBAAkB,IAAI,GAAG,CAAC,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAI3D,gBAAgB,IAAI,MAAM;IAI1B,gBAAgB,CAAC,WAAW,EAAE,eAAe,EAAE,GAAG,SAAS;IAO3D,gBAAgB,CAAC,WAAW,EAAE,eAAe,EAAE,GAAG,SAAS;IAOlE,gFAAgF;IACzE,cAAc,IAAI,MAAM,EAAE;IAI1B,aAAa,IAAI,MAAM;IAIvB,aAAa,IAAI,MAAM;IAI9B;;;;;;;;;;;OAWG;IACI,UAAU,IAAI,IAAI;IAazB;;;;;OAKG;IACI,aAAa,IAAI,IAAI;IAkB5B;;;;;;;;;;;;;OAaG;IACI,gBAAgB,IAAI,IAAI;IAU/B,OAAO,CAAC,YAAY;IAwBpB,OAAO,CAAC,oBAAoB;IAoC5B,OAAO,CAAC,sBAAsB;IAsCvB,WAAW,IAAI,GAAG,CAAC,aAAa,GAAG,kBAAkB,EAAE,QAAQ,EAAE,CAAC;IA8BzE,OAAO,CAAC,WAAW;IA+BnB,OAAO,CAAC,mBAAmB;IAoC3B,OAAO,CAAC,mBAAmB;IAyC3B,OAAO,CAAC,oBAAoB;IAUrB,oBAAoB,IAAI,GAAG,CAAC,aAAa,GAAG,kBAAkB,EAAE,KAAK,EAAE,CAAC;IAoCxE,oBAAoB,IAAI,SAAS,EAAE;IAUnC,cAAc,IAAI,OAAO;IAIzB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAI3D,iBAAiB,IAAI,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC;IAI7C,2BAA2B,IAAI;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS;IAIpE,UAAU,IAAI,MAAM,GAAG,SAAS;CAG1C;AAED,qBAAa,WAAW;IACpB,OAAO,CAAC,YAAY,CAAQ;IAC5B,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,aAAa,CAAmC;IAExD,OAAO,CAAC,mBAAmB,CAAc;IACzC,OAAO,CAAC,YAAY,CAAgC;gBAExC,YAAY,EAAE,KAAK;IAIxB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,WAAW,GAAE,OAAe,GAAG,IAAI;IAczH,2BAA2B,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAUhF;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAO9B;;;OAGG;IACI,aAAa,IAAI,MAAM;IAIvB,aAAa,IAAI,MAAM;IAIvB,gBAAgB,IAAI,MAAM;IAI1B,eAAe,IAAI;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE;IAI3C,iBAAiB,IAAI,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC;IAIzC,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIzC,OAAO,CAAC,WAAW;CA0BtB"}

package/lib/Scene.js

@@ -40,7 +40,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleScene = exports.Scene = void 0;
+exports.ModuleScene = exports.Scene = exports.SceneBuildStage = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const ModelUtils_1 = require("./core/common/ModelUtils");
@@ -56,17 +56,23 @@ const getAllFiles_1 = require("./utils/getAllFiles");
 const FileUtils_1 = require("./utils/FileUtils");
 const ArkExport_1 = require("./core/model/ArkExport");
 const ArkMethodBuilder_1 = require("./core/model/builder/ArkMethodBuilder");
+const ArkMethodBuilder_2 = require("./frontend/cppFrontend/model/builder/ArkMethodBuilder");
+const ast_1 = require("./frontend/cppFrontend/ast");
 const Const_1 = require("./core/common/Const");
 const CallGraph_1 = require("./callgraph/model/CallGraph");
 const CallGraphBuilder_1 = require("./callgraph/model/builder/CallGraphBuilder");
+const ArkFileBuilder_2 = require("./frontend/cppFrontend/model/builder/ArkFileBuilder");
+const IRInference_1 = require("./frontend/cppFrontend/common/IRInference");
 const TSConst_1 = require("./core/common/TSConst");
 const EtsConst_1 = require("./core/common/EtsConst");
 const SdkUtils_1 = require("./core/common/SdkUtils");
 const PointerAnalysisConfig_1 = require("./callgraph/pointerAnalysis/PointerAnalysisConfig");
 const ValueUtil_1 = require("./core/common/ValueUtil");
 const Inference_1 = require("./core/inference/Inference");
-const IRInference_1 = require("./core/common/IRInference");
+const IRInference_2 = require("./core/common/IRInference");
+const ModuleUtils_1 = require("./utils/ModuleUtils");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'Scene');
+const CXX_HEADER_EXTENSION_SET = (0, ast_1.getCxxHeaderFileExtensionSet)();
 var SceneBuildStage;
 (function (SceneBuildStage) {
     SceneBuildStage[SceneBuildStage["BUILD_INIT"] = 0] = "BUILD_INIT";
@@ -76,7 +82,7 @@ var SceneBuildStage;
     SceneBuildStage[SceneBuildStage["CLASS_COLLECTED"] = 4] = "CLASS_COLLECTED";
     SceneBuildStage[SceneBuildStage["METHOD_COLLECTED"] = 5] = "METHOD_COLLECTED";
     SceneBuildStage[SceneBuildStage["TYPE_INFERRED"] = 6] = "TYPE_INFERRED";
-})(SceneBuildStage || (SceneBuildStage = {}));
+})(SceneBuildStage = exports.SceneBuildStage || (exports.SceneBuildStage = {}));
 /**
  * The Scene class includes everything in the analyzed project.
  * We should be able to re-generate the project's code based on this class.
@@ -86,6 +92,9 @@ class Scene {
         this.projectName = '';
         this.projectFiles = [];
         this.realProjectDir = '';
+        this.includeDirs = []; // Include directories that the C++ project depends on.
+        this.ccjsonPath = '';
+        this.cppAstPath = '';
         this.moduleScenesMap = new Map();
         this.modulePath2NameMap = new Map();
         this.moduleSdkMap = new Map();
@@ -123,6 +132,9 @@ class Scene {
     getOptions() {
         return this.options;
     }
+    getBuildStage() {
+        return this.buildStage;
+    }
     getOverRides() {
         return this.overRides;
     }
@@ -185,6 +197,9 @@ class Scene {
         this.projectName = sceneConfig.getTargetProjectName();
         this.realProjectDir = fs_1.default.realpathSync(sceneConfig.getTargetProjectDirectory());
         this.projectFiles = sceneConfig.getProjectFiles();
+        this.includeDirs = sceneConfig.getIncludeDirs();
+        this.ccjsonPath = sceneConfig.getCcjsonPath();
+        this.cppAstPath = sceneConfig.getCppAstPath();
         this.parseBuildProfile();
         this.parseOhPackage();
         let tsConfigFilePath;
@@ -202,7 +217,7 @@ class Scene {
             logger.warn('This project has no tsconfig.json!');
         }
         this.buildOhPkgContentMap();
-        (0, ModelUtils_1.initModulePathMap)(this.ohPkgContentMap);
+        ModuleUtils_1.ModuleUtils.generateModuleMap(this.ohPkgContentMap);
         // handle sdks
         if (this.options.enableBuiltIn && !sceneConfig.getSdksObj().find(sdk => sdk.name === SdkUtils_1.SdkUtils.BUILT_IN_NAME)) {
             sceneConfig.getSdksObj().unshift(SdkUtils_1.SdkUtils.getBuiltInSdk());
@@ -224,6 +239,10 @@ class Scene {
         });
         if (this.buildStage < SceneBuildStage.SDK_INFERRED) {
             this.sdkArkFilesMap.forEach(file => {
+                // CXXTodo: C++ does not handle SDK files.
+                if (file.getLanguage() === ArkFile_1.Language.CXX) {
+                    return;
+                }
                 Inference_1.InferenceManager.getInstance().getInference(file.getLanguage()).doInfer(file);
                 SdkUtils_1.SdkUtils.mergeGlobalAPI(file, this.sdkGlobalMap);
             });
@@ -306,22 +325,45 @@ class Scene {
             this.baseUrl = tsConfigObj.compilerOptions.baseUrl;
         }
     }
+    /**
+     * Update or add default constructors for all classes in the scene.
+     *
+     * This function iterates through all files and classes in the scene,
+     * builds default constructors for each class, and processes existing constructors
+     * by replacing super constructor calls and adding initialization logic.
+     *
+     * @returns {void}
+     */
     updateOrAddDefaultConstructors() {
         for (const file of this.getFiles()) {
+            // CXXTodo: Select the appropriate initialization function based on file type
+            const initInConstructorFn = file.getLanguage() === ArkFile_1.Language.CXX ? ArkMethodBuilder_2.addInitInConstructor : ArkMethodBuilder_1.addInitInConstructor;
             for (const cls of ModelUtils_1.ModelUtils.getAllClassesInFile(file)) {
                 (0, ArkMethodBuilder_1.buildDefaultConstructor)(cls);
-                const constructor = cls.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME);
-                if (constructor !== null && !cls.isDefaultArkClass()) {
-                    (0, ArkMethodBuilder_1.replaceSuper2Constructor)(constructor);
-                    (0, ArkMethodBuilder_1.addInitInConstructor)(constructor);
+                // CXXTodo: Use the interface 'getAllMethodsWithName' for obtaining all methods with the same name.
+                const constructors = cls.getAllMethodsWithName(TSConst_1.CONSTRUCTOR_NAME);
+                if (cls.isDefaultArkClass()) {
+                    continue;
                 }
+                constructors.forEach(constructor => {
+                    (0, ArkMethodBuilder_1.replaceSuper2Constructor)(constructor);
+                    initInConstructorFn(constructor);
+                });
             }
         }
     }
     buildAllMethodBody() {
+        var _a;
         this.buildStage = SceneBuildStage.CLASS_DONE;
         const methods = [];
         for (const file of this.getFiles()) {
+            if (!this.options.enableOhModulesBody && file.getName().includes(EtsConst_1.OH_MODULES)) {
+                const defaultArkMethod = file.getDefaultClass().getDefaultArkMethod();
+                if (defaultArkMethod) {
+                    methods.push(defaultArkMethod);
+                }
+                continue;
+            }
             for (const cls of file.getClasses()) {
                 for (const method of cls.getMethods(true)) {
                     methods.push(method);
@@ -329,6 +371,13 @@ class Scene {
             }
         }
         for (const namespace of this.getNamespacesMap().values()) {
+            if (!this.options.enableOhModulesBody && namespace.getDeclaringArkFile().getName().includes(EtsConst_1.OH_MODULES)) {
+                const defaultArkMethod = namespace.getDefaultClass().getDefaultArkMethod();
+                if (defaultArkMethod) {
+                    methods.push(defaultArkMethod);
+                }
+                continue;
+            }
             for (const cls of namespace.getClasses()) {
                 for (const method of cls.getMethods(true)) {
                     methods.push(method);
@@ -343,19 +392,42 @@ class Scene {
                 logger.error('Error building body:', method.getSignature(), error);
             }
             finally {
-                method.freeBodyBuilder();
+                // CXXTodo: Distinguish between C++ and TS/ArkTS.
+                const isCxxFile = ((_a = method.getDeclaringArkFile()) === null || _a === void 0 ? void 0 : _a.getLanguage()) === ArkFile_1.Language.CXX;
+                if (isCxxFile) {
+                    method.freeCxxBodyBuilder();
+                }
+                else {
+                    method.freeBodyBuilder();
+                }
             }
         }
         ModelUtils_1.ModelUtils.dispose();
         this.buildStage = SceneBuildStage.METHOD_DONE;
     }
+    findCCJsonPath(file, ccjsonPath) {
+        const ext = path_1.default.extname(file).toLowerCase();
+        const isHeader = CXX_HEADER_EXTENSION_SET.has(ext);
+        let currentCcjsonPath = '';
+        if (!isHeader) {
+            currentCcjsonPath = (0, ast_1.findCompileCommands)(file);
+        }
+        return currentCcjsonPath === '' ? ccjsonPath : currentCcjsonPath;
+    }
     genArkFiles() {
         this.projectFiles.forEach(file => {
             logger.trace('=== parse file:', file);
             try {
                 const arkFile = new ArkFile_1.ArkFile(FileUtils_1.FileUtils.getFileLanguage(file, this.fileLanguages));
                 arkFile.setScene(this);
-                (0, ArkFileBuilder_1.buildArkFileFromFile)(file, this.realProjectDir, arkFile, this.projectName);
+                // CXXTodo: Distinguish between C++ and TS/ArkTS. Call different builder functions based on file language.
+                if (arkFile.getLanguage() === ArkFile_1.Language.CXX) {
+                    this.ccjsonPath = this.findCCJsonPath(file, this.ccjsonPath);
+                    (0, ArkFileBuilder_2.buildArkFileFromFile)(file, this.realProjectDir, arkFile, this.projectName, this.includeDirs);
+                }
+                else {
+                    (0, ArkFileBuilder_1.buildArkFileFromFile)(file, this.realProjectDir, arkFile, this.projectName);
+                }
                 this.setFile(arkFile);
             }
             catch (error) {
@@ -387,7 +459,13 @@ class Scene {
         try {
             const arkFile = new ArkFile_1.ArkFile(FileUtils_1.FileUtils.getFileLanguage(projectFile, this.fileLanguages));
             arkFile.setScene(this);
-            (0, ArkFileBuilder_1.buildArkFileFromFile)(projectFile, this.getRealProjectDir(), arkFile, this.getProjectName());
+            // CXXTodo: Distinguish between C++ and TS/ArkTS.
+            if (arkFile.getLanguage() === ArkFile_1.Language.CXX) {
+                (0, ArkFileBuilder_2.buildArkFileFromFile)(projectFile, this.getRealProjectDir(), arkFile, this.getProjectName(), this.includeDirs);
+            }
+            else {
+                (0, ArkFileBuilder_1.buildArkFileFromFile)(projectFile, this.getRealProjectDir(), arkFile, this.getProjectName());
+            }
             for (const [modulePath, moduleName] of this.modulePath2NameMap) {
                 if (arkFile.getFilePath().startsWith(modulePath)) {
                     this.addArkFile2ModuleScene(modulePath, moduleName, arkFile);
@@ -409,10 +487,10 @@ class Scene {
         }
     }
     isRepeatBuildFile(projectFile) {
-        for (const [key, file] of this.filesMap) {
-            if (key && file.getFilePath().toLowerCase() === projectFile.toLowerCase()) {
-                return true;
-            }
+        const relativePath = path_1.default.relative(this.getRealProjectDir(), projectFile);
+        if (!relativePath.startsWith('..') && !path_1.default.isAbsolute(relativePath)) {
+            const mapKey = (0, FileUtils_1.getFileSignatureMapKey)(this.getProjectName(), relativePath);
+            return this.filesMap.has(mapKey);
         }
         return false;
     }
@@ -588,40 +666,50 @@ class Scene {
     addFileNode2DependencyGrap(filePath) {
         this.getDependencyFilesDeeply(filePath);
     }
+    /**
+     * Loads SDK sources into the scene. C++ SDK files are intentionally skipped: they are not parsed or registered
+     * here (only non-C++ SDK sources are processed).
+     */
     buildSdk(sdkName, sdkPath) {
+        const allFiles = this.collectSdkFiles(sdkName, sdkPath);
+        allFiles.forEach((file) => {
+            if (FileUtils_1.FileUtils.getFileLanguage(file, this.fileLanguages) === ArkFile_1.Language.CXX) {
+                return;
+            }
+            this.parseAndRegisterSdkFile(file, sdkPath, sdkName);
+        });
+    }
+    collectSdkFiles(sdkName, sdkPath) {
         var _a;
-        let allFiles;
         if (sdkName === SdkUtils_1.SdkUtils.BUILT_IN_NAME) {
-            allFiles = SdkUtils_1.SdkUtils.fetchBuiltInFiles(sdkPath);
-            if (allFiles.length > 0) {
+            const builtInFiles = SdkUtils_1.SdkUtils.fetchBuiltInFiles(sdkPath);
+            if (builtInFiles.length > 0) {
                 (_a = this.getOptions().sdkGlobalFolders) === null || _a === void 0 ? void 0 : _a.push(sdkPath);
             }
+            return builtInFiles;
         }
-        else {
-            allFiles = (0, getAllFiles_1.getAllFiles)(sdkPath, this.options.supportFileExts, this.options.ignoreFileNames);
+        return (0, getAllFiles_1.getAllFiles)(sdkPath, this.options.supportFileExts, this.options.ignoreFileNames);
+    }
+    parseAndRegisterSdkFile(file, sdkPath, sdkName) {
+        logger.trace('=== parse sdk file:', file);
+        try {
+            const arkFile = new ArkFile_1.ArkFile(FileUtils_1.FileUtils.getFileLanguage(file, this.fileLanguages));
+            arkFile.setScene(this);
+            (0, ArkFileBuilder_1.buildArkFileFromFile)(file, sdkPath, arkFile, sdkName);
+            ModelUtils_1.ModelUtils.getAllClassesInFile(arkFile).forEach(cls => {
+                var _a, _b;
+                (_a = cls.getDefaultArkMethod()) === null || _a === void 0 ? void 0 : _a.buildBody();
+                (_b = cls.getDefaultArkMethod()) === null || _b === void 0 ? void 0 : _b.freeBodyBuilder();
+            });
+            const fileSig = arkFile.getFileSignature().toMapKey();
+            this.sdkArkFilesMap.set(fileSig, arkFile);
+            SdkUtils_1.SdkUtils.buildSdkImportMap(arkFile);
+            SdkUtils_1.SdkUtils.loadGlobalAPI(arkFile, this.sdkGlobalMap);
+        }
+        catch (error) {
+            logger.error('Error parsing file:', file, error);
+            this.unhandledSdkFilePaths.push(file);
         }
-        allFiles.forEach(file => {
-            logger.trace('=== parse sdk file:', file);
-            try {
-                const arkFile = new ArkFile_1.ArkFile(FileUtils_1.FileUtils.getFileLanguage(file, this.fileLanguages));
-                arkFile.setScene(this);
-                (0, ArkFileBuilder_1.buildArkFileFromFile)(file, sdkPath, arkFile, sdkName);
-                ModelUtils_1.ModelUtils.getAllClassesInFile(arkFile).forEach(cls => {
-                    var _a, _b;
-                    (_a = cls.getDefaultArkMethod()) === null || _a === void 0 ? void 0 : _a.buildBody();
-                    (_b = cls.getDefaultArkMethod()) === null || _b === void 0 ? void 0 : _b.freeBodyBuilder();
-                });
-                const fileSig = arkFile.getFileSignature().toMapKey();
-                this.sdkArkFilesMap.set(fileSig, arkFile);
-                SdkUtils_1.SdkUtils.buildSdkImportMap(arkFile);
-                SdkUtils_1.SdkUtils.loadGlobalAPI(arkFile, this.sdkGlobalMap);
-            }
-            catch (error) {
-                logger.error('Error parsing file:', file, error);
-                this.unhandledSdkFilePaths.push(file);
-                return;
-            }
-        });
     }
     /**
      * Build the scene for harmony project. It resolves the file path of the project first, and then fetches
@@ -998,6 +1086,16 @@ class Scene {
         callGraphBuilder.buildRapidTypeCallGraph(entryPoints);
         return callGraph;
     }
+    /** Obtain the header file directories of the input C++ project dependencies. */
+    getIncludeDirs() {
+        return this.includeDirs;
+    }
+    getCcjsonPath() {
+        return this.ccjsonPath;
+    }
+    getCppAstPath() {
+        return this.cppAstPath;
+    }
     /**
      * Infer type for each non-default method. It infers the type of each field/local/reference.
      * For example, the statement `let b = 5;`, the type of local `b` is `NumberType`; and for the statement `let s =
@@ -1019,6 +1117,7 @@ class Scene {
             this.buildStage = SceneBuildStage.TYPE_INFERRED;
         }
         SdkUtils_1.SdkUtils.dispose();
+        ModuleUtils_1.ModuleUtils.dispose();
     }
     /**
      * @deprecated This method is deprecated and will be removed in the next major release.
@@ -1027,9 +1126,12 @@ class Scene {
      * Scheduled for removal: one month from deprecation date.
      */
     inferTypesOld() {
+        // CXXTodo: Building the mapping between declarations and implementations of C++ functions in cross-file scenarios.
+        IRInference_1.IRInference.mapCxxDeclAndImpl(this);
         this.filesMap.forEach(file => {
             try {
-                IRInference_1.IRInference.inferFile(file);
+                // CXXTodo: Distinguish between C++ and TS/ArkTS.
+                file.getLanguage() === ArkFile_1.Language.CXX ? IRInference_1.IRInference.inferFile(file) : IRInference_2.IRInference.inferFile(file);
             }
             catch (error) {
                 logger.error('Error inferring types of project file:', file.getFileSignature(), error);
@@ -1415,7 +1517,12 @@ class ModuleScene {
                 const arkFile = new ArkFile_1.ArkFile(FileUtils_1.FileUtils.getFileLanguage(file, this.projectScene.getFileLanguages()));
                 arkFile.setScene(this.projectScene);
                 arkFile.setModuleScene(this);
-                (0, ArkFileBuilder_1.buildArkFileFromFile)(file, this.projectScene.getRealProjectDir(), arkFile, this.projectScene.getProjectName());
+                if (arkFile.getLanguage() === ArkFile_1.Language.CXX) {
+                    (0, ArkFileBuilder_2.buildArkFileFromFile)(file, this.projectScene.getRealProjectDir(), arkFile, this.projectScene.getProjectName(), this.projectScene.getIncludeDirs());
+                }
+                else {
+                    (0, ArkFileBuilder_1.buildArkFileFromFile)(file, this.projectScene.getRealProjectDir(), arkFile, this.projectScene.getProjectName());
+                }
                 this.projectScene.setFile(arkFile);
             }
             catch (error) {

package/lib/callgraph/algorithm/AbstractAnalysis.d.ts

@@ -4,6 +4,7 @@ import { Stmt } from '../../core/base/Stmt';
 import { ArkClass } from '../../core/model/ArkClass';
 import { ArkMethod } from '../../core/model/ArkMethod';
 import { MethodSignature } from '../../core/model/ArkSignature';
+import { IntWorkList } from '../../utils/IntWorkList';
 import { NodeID } from '../../core/graph/BaseExplicitGraph';
 import { CallGraph, FuncID, CallSite } from '../model/CallGraph';
 import { CallGraphBuilder } from '../model/builder/CallGraphBuilder';
@@ -12,7 +13,7 @@ export declare abstract class AbstractAnalysis {
     protected scene: Scene;
     protected cg: CallGraph;
     protected cgBuilder: CallGraphBuilder;
-    protected workList: FuncID[];
+    protected workList: IntWorkList;
     protected processedMethod: IPtsCollection<FuncID>;
     private classHierarchyCache;
     constructor(s: Scene, cg: CallGraph);
@@ -24,9 +25,9 @@ export declare abstract class AbstractAnalysis {
     getClassHierarchy(arkClass: ArkClass): ArkClass[];
     start(displayGeneratedMethod: boolean): void;
     projectStart(displayGeneratedMethod: boolean): void;
-    private processCallSite;
+    protected processCallSite(method: FuncID, cs: CallSite, displayGeneratedMethod: boolean, isProject?: boolean): void;
     protected init(): void;
-    protected processMethod(methodID: FuncID): CallSite[];
+    protected processMethod(methodID: FuncID, displayGeneratedMethod: boolean, isProject?: boolean): void;
     protected getParamAnonymousMethod(invokeExpr: AbstractInvokeExpr): MethodSignature[];
     protected addCallGraphEdge(caller: FuncID, callee: ArkMethod | null, cs: CallSite, displayGeneratedMethod: boolean): void;
 }

package/lib/callgraph/algorithm/AbstractAnalysis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractAnalysis.d.ts","sourceRoot":"","sources":["../../../src/callgraph/algorithm/AbstractAnalysis.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAiB,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAA2B,cAAc,EAAqB,MAAM,0BAA0B,CAAC;AAItG,8BAAsB,gBAAgB;IAClC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC;IACxB,SAAS,CAAC,SAAS,EAAG,gBAAgB,CAAC;IACvC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAClC,SAAS,CAAC,eAAe,EAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACnD,OAAO,CAAC,mBAAmB,CAAsC;gBAErD,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS;IAK5B,QAAQ,IAAI,KAAK;IAIjB,YAAY,IAAI,SAAS;IAIhC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,QAAQ,EAAE;IAClF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE;IAExD,iBAAiB,CAAC,UAAU,EAAE,kBAAkB,GAAG,SAAS,GAAG,SAAS;IAQxE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,EAAE;IAwBjD,KAAK,CAAC,sBAAsB,EAAE,OAAO,GAAG,IAAI;IAqB5C,YAAY,CAAC,sBAAsB,EAAE,OAAO,GAAG,IAAI;IAoB1D,OAAO,CAAC,eAAe;IAqBvB,SAAS,CAAC,IAAI,IAAI,IAAI;IAOtB,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,EAAE;IA0BrD,SAAS,CAAC,uBAAuB,CAAC,UAAU,EAAE,kBAAkB,GAAG,eAAe,EAAE;IAapF,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,sBAAsB,EAAE,OAAO,GAAG,IAAI;CAU5H"}
+{"version":3,"file":"AbstractAnalysis.d.ts","sourceRoot":"","sources":["../../../src/callgraph/algorithm/AbstractAnalysis.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAgC,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE1E,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAiB,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAA2B,cAAc,EAAqB,MAAM,0BAA0B,CAAC;AAItG,8BAAsB,gBAAgB;IAClC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC;IACxB,SAAS,CAAC,SAAS,EAAG,gBAAgB,CAAC;IACvC,SAAS,CAAC,QAAQ,EAAE,WAAW,CAAqB;IACpD,SAAS,CAAC,eAAe,EAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACnD,OAAO,CAAC,mBAAmB,CAAsC;gBAErD,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS;IAK5B,QAAQ,IAAI,KAAK;IAIjB,YAAY,IAAI,SAAS;IAIhC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,QAAQ,EAAE;IAClF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE;IAExD,iBAAiB,CAAC,UAAU,EAAE,kBAAkB,GAAG,SAAS,GAAG,SAAS;IAQxE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,EAAE;IAwBjD,KAAK,CAAC,sBAAsB,EAAE,OAAO,GAAG,IAAI;IAmB5C,YAAY,CAAC,sBAAsB,EAAE,OAAO,GAAG,IAAI;IAkB1D,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,sBAAsB,EAAE,OAAO,EAAE,SAAS,GAAE,OAAe,GAAG,IAAI;IAqB1H,SAAS,CAAC,IAAI,IAAI,IAAI;IAOtB,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,sBAAsB,EAAE,OAAO,EAAE,SAAS,GAAE,OAAe,GAAG,IAAI;IA2B5G,SAAS,CAAC,uBAAuB,CAAC,UAAU,EAAE,kBAAkB,GAAG,eAAe,EAAE;IAapF,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,sBAAsB,EAAE,OAAO,GAAG,IAAI;CAU5H"}