arkanalyzer 1.0.28 → 1.0.30

package/lib/Config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../src/Config.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAIhD,MAAM,WAAW,GAAG;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,QAAQ;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE;YACJ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;SAC3B,CAAC;KACL,CAAC;CAEL;AAED,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;AAC9G,MAAM,WAAW,YAAY;IACzB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,sBAAsB,CAAC,EAAC,OAAO,CAAA;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAAC;CACvC;AAID,qBAAa,WAAW;IACpB,OAAO,CAAC,iBAAiB,CAAc;IACvC,OAAO,CAAC,sBAAsB,CAAc;IAE5C,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,OAAO,CAAa;IAE5B,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,WAAW,CAAsD;IAEzE,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,aAAa,CAAoC;IAEzD,OAAO,CAAC,OAAO,CAAe;gBAElB,OAAO,CAAC,EAAE,YAAY;IAK3B,UAAU,IAAI,YAAY;IAIjC;;;;;;;OAOG;IACI,WAAW,CACd,iBAAiB,EAAE,MAAM,EACzB,sBAAsB,EAAE,MAAM,EAC9B,IAAI,EAAE,GAAG,EAAE,EACX,YAAY,CAAC,EAAE,MAAM,EAAE;IAU3B;;;;;;;;;;;;OAYG;IACI,mBAAmB,CAAC,sBAAsB,EAAE,MAAM;IAUlD,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,EACnF,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI;IAgBxE,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,sBAAsB;IAiBvB,aAAa,CAAC,cAAc,EAAE,MAAM;IAmCpC,oBAAoB;IAIpB,yBAAyB;IAIzB,eAAe;IAIf,gBAAgB,IAAI,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC;IAIzC,WAAW;IAIX,cAAc;IAId,aAAa;IAIb,UAAU;IAIjB,OAAO,CAAC,iBAAiB;CAY5B"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../src/Config.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAKhD,MAAM,WAAW,GAAG;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,QAAQ;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE;YACJ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;SAC3B,CAAC;KACL,CAAC;CAEL;AAED,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;AAC9G,MAAM,WAAW,YAAY;IACzB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,sBAAsB,CAAC,EAAC,OAAO,CAAA;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAAC;CACvC;AAID,qBAAa,WAAW;IACpB,OAAO,CAAC,iBAAiB,CAAc;IACvC,OAAO,CAAC,sBAAsB,CAAc;IAE5C,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,OAAO,CAAa;IAE5B,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,WAAW,CAAsD;IAEzE,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,aAAa,CAAoC;IAEzD,OAAO,CAAC,OAAO,CAAe;gBAElB,OAAO,CAAC,EAAE,YAAY;IAK3B,UAAU,IAAI,YAAY;IAIjC;;;;;;;OAOG;IACI,WAAW,CACd,iBAAiB,EAAE,MAAM,EACzB,sBAAsB,EAAE,MAAM,EAC9B,IAAI,EAAE,GAAG,EAAE,EACX,YAAY,CAAC,EAAE,MAAM,EAAE;IAU3B;;;;;;;;;;;;OAYG;IACI,mBAAmB,CAAC,sBAAsB,EAAE,MAAM;IAUlD,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,EACnF,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI;IAgBxE,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,sBAAsB;IAiBvB,aAAa,CAAC,cAAc,EAAE,MAAM;IAmCpC,oBAAoB;IAIpB,yBAAyB;IAIzB,eAAe;IAIf,gBAAgB,IAAI,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC;IAIzC,WAAW;IAIX,cAAc;IAId,aAAa;IAIb,UAAU;IAIjB,OAAO,CAAC,iBAAiB;CAmB5B"}

package/lib/Config.js

@@ -45,6 +45,7 @@ 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 pathTransfer_1 = require("./utils/pathTransfer");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'Config');
 const CONFIG_FILENAME = 'arkanalyzer.json';
 const DEFAULT_CONFIG_FILE = path_1.default.join(__dirname, '../config', CONFIG_FILENAME);
@@ -209,13 +210,20 @@ class SceneConfig {
     }
     loadDefaultConfig(options) {
         let configFile = DEFAULT_CONFIG_FILE;
+        const modulePath = (0, pathTransfer_1.getArkAnalyzerModulePath)('arkanalyzer');
+        if (modulePath !== null) {
+            configFile = path_1.default.join(modulePath, 'config', CONFIG_FILENAME);
+        }
         if (!fs_1.default.existsSync(configFile)) {
             configFile = path_1.default.join(__dirname, 'config', CONFIG_FILENAME);
         }
+        logger.info(`try to parse config file ${configFile}`);
         try {
             this.options = Object.assign(Object.assign({}, this.options), JSON.parse(fs_1.default.readFileSync(configFile, 'utf-8')));
         }
-        catch (error) { }
+        catch (error) {
+            logger.error(`Failed to parse config file with error: ${error}`);
+        }
         if (options) {
             this.options = Object.assign(Object.assign({}, this.options), options);
         }

package/lib/Scene.d.ts

@@ -276,7 +276,14 @@ export declare class Scene {
      ```
      */
     inferSimpleTypes(): void;
+    private addNSClasses;
+    private addNSExportedClasses;
+    private addFileImportedClasses;
     getClassMap(): Map<FileSignature | NamespaceSignature, ArkClass[]>;
+    private addNSLocals;
+    private addNSExportedLocals;
+    private addFileImportLocals;
+    private handleNestedNSLocals;
     getGlobalVariableMap(): Map<FileSignature | NamespaceSignature, Local[]>;
     getStaticInitMethods(): ArkMethod[];
     buildClassDone(): boolean;

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":"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"}

package/lib/Scene.js

@@ -986,8 +986,98 @@ class Scene {
             }
         }
     }
-    getClassMap() {
+    addNSClasses(namespaceStack, finalNamespaces, classMap, parentMap) {
+        while (namespaceStack.length > 0) {
+            const ns = namespaceStack.shift();
+            const nsClass = [];
+            for (const arkClass of ns.getClasses()) {
+                nsClass.push(arkClass);
+            }
+            classMap.set(ns.getNamespaceSignature(), nsClass);
+            if (ns.getNamespaces().length === 0) {
+                finalNamespaces.push(ns);
+            }
+            else {
+                for (const nsns of ns.getNamespaces()) {
+                    namespaceStack.push(nsns);
+                    parentMap.set(nsns, ns);
+                }
+            }
+        }
+    }
+    addNSExportedClasses(finalNamespaces, classMap, parentMap) {
         var _a, _b, _c, _d;
+        while (finalNamespaces.length > 0) {
+            const finalNS = finalNamespaces.shift();
+            const exportClass = [];
+            for (const arkClass of finalNS.getClasses()) {
+                if (arkClass.isExported()) {
+                    exportClass.push(arkClass);
+                }
+            }
+            const parent = parentMap.get(finalNS);
+            if (parent instanceof ArkNamespace_1.ArkNamespace) {
+                (_a = classMap.get(parent.getNamespaceSignature())) === null || _a === void 0 ? void 0 : _a.push(...exportClass);
+            }
+            else if (parent instanceof ArkFile_1.ArkFile) {
+                (_b = classMap.get(parent.getFileSignature())) === null || _b === void 0 ? void 0 : _b.push(...exportClass);
+            }
+            let p = finalNS;
+            while (!(parentMap.get(p) instanceof ArkFile_1.ArkFile) && p.isExported()) {
+                const grandParent = parentMap.get(parentMap.get(p));
+                if (grandParent instanceof ArkNamespace_1.ArkNamespace) {
+                    (_c = classMap.get(grandParent.getNamespaceSignature())) === null || _c === void 0 ? void 0 : _c.push(...exportClass);
+                    p = parentMap.get(p);
+                }
+                else if (grandParent instanceof ArkFile_1.ArkFile) {
+                    (_d = classMap.get(grandParent.getFileSignature())) === null || _d === void 0 ? void 0 : _d.push(...exportClass);
+                    break;
+                }
+            }
+            if (parent instanceof ArkNamespace_1.ArkNamespace && !finalNamespaces.includes(parent)) {
+                finalNamespaces.push(parent);
+            }
+        }
+    }
+    addFileImportedClasses(file, classMap) {
+        const importClasses = [];
+        const importNameSpaces = [];
+        for (const importInfo of file.getImportInfos()) {
+            const importClass = ModelUtils_1.ModelUtils.getClassInImportInfoWithName(importInfo.getImportClauseName(), file);
+            if (importClass && !importClasses.includes(importClass)) {
+                importClasses.push(importClass);
+                continue;
+            }
+            const importNameSpace = ModelUtils_1.ModelUtils.getNamespaceInImportInfoWithName(importInfo.getImportClauseName(), file);
+            if (importNameSpace && !importNameSpaces.includes(importNameSpace)) {
+                try {
+                    // 遗留问题：只统计了项目文件的namespace，没统计sdk文件内部的引入
+                    const importNameSpaceClasses = classMap.get(importNameSpace.getNamespaceSignature());
+                    importClasses.push(...importNameSpaceClasses.filter(c => !importClasses.includes(c) && c.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME));
+                }
+                catch (_a) {
+                }
+            }
+        }
+        const fileClasses = classMap.get(file.getFileSignature());
+        fileClasses.push(...importClasses.filter(c => !fileClasses.includes(c)));
+        // 子节点加上父节点的class
+        const namespaceStack = [...file.getNamespaces()];
+        for (const ns of namespaceStack) {
+            const nsClasses = classMap.get(ns.getNamespaceSignature());
+            nsClasses.push(...fileClasses.filter(c => !nsClasses.includes(c) && c.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME));
+        }
+        while (namespaceStack.length > 0) {
+            const ns = namespaceStack.shift();
+            const nsClasses = classMap.get(ns.getNamespaceSignature());
+            for (const nsns of ns.getNamespaces()) {
+                const nsnsClasses = classMap.get(nsns.getNamespaceSignature());
+                nsnsClasses.push(...nsClasses.filter(c => !nsnsClasses.includes(c) && c.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME));
+                namespaceStack.push(nsns);
+            }
+        }
+    }
+    getClassMap() {
         const classMap = new Map();
         for (const file of this.getFiles()) {
             const fileClass = [];
@@ -1003,99 +1093,124 @@ class Scene {
             }
             classMap.set(file.getFileSignature(), fileClass);
             // 第一轮遍历，加上每个namespace自己的class
-            while (namespaceStack.length > 0) {
-                const ns = namespaceStack.shift();
-                const nsClass = [];
-                for (const arkClass of ns.getClasses()) {
-                    nsClass.push(arkClass);
-                }
-                classMap.set(ns.getNamespaceSignature(), nsClass);
-                if (ns.getNamespaces().length === 0) {
-                    finalNamespaces.push(ns);
-                }
-                else {
-                    for (const nsns of ns.getNamespaces()) {
-                        namespaceStack.push(nsns);
-                        parentMap.set(nsns, ns);
-                    }
-                }
-            }
+            this.addNSClasses(namespaceStack, finalNamespaces, classMap, parentMap);
             // 第二轮遍历，父节点加上子节点的export的class
-            while (finalNamespaces.length > 0) {
-                const finalNS = finalNamespaces.shift();
-                const exportClass = [];
-                for (const arkClass of finalNS.getClasses()) {
-                    if (arkClass.isExported()) {
-                        exportClass.push(arkClass);
-                    }
+            this.addNSExportedClasses(finalNamespaces, classMap, parentMap);
+        }
+        for (const file of this.getFiles()) {
+            // 文件加上import的class，包括ns的
+            this.addFileImportedClasses(file, classMap);
+        }
+        return classMap;
+    }
+    addNSLocals(namespaceStack, finalNamespaces, parentMap, globalVariableMap) {
+        var _a;
+        while (namespaceStack.length > 0) {
+            const ns = namespaceStack.shift();
+            const nsGlobalLocals = [];
+            (_a = ns.getDefaultClass().getDefaultArkMethod().getBody()) === null || _a === void 0 ? void 0 : _a.getLocals().forEach(local => {
+                if (local.getDeclaringStmt() && local.getName() !== 'this' && local.getName()[0] !== '$') {
+                    nsGlobalLocals.push(local);
                 }
-                const parent = parentMap.get(finalNS);
-                if (parent instanceof ArkNamespace_1.ArkNamespace) {
-                    (_a = classMap.get(parent.getNamespaceSignature())) === null || _a === void 0 ? void 0 : _a.push(...exportClass);
+            });
+            globalVariableMap.set(ns.getNamespaceSignature(), nsGlobalLocals);
+            if (ns.getNamespaces().length === 0) {
+                finalNamespaces.push(ns);
+            }
+            else {
+                for (const nsns of ns.getNamespaces()) {
+                    namespaceStack.push(nsns);
+                    parentMap.set(nsns, ns);
                 }
-                else if (parent instanceof ArkFile_1.ArkFile) {
-                    (_b = classMap.get(parent.getFileSignature())) === null || _b === void 0 ? void 0 : _b.push(...exportClass);
+            }
+        }
+    }
+    addNSExportedLocals(finalNamespaces, globalVariableMap, parentMap) {
+        var _a, _b, _c, _d;
+        while (finalNamespaces.length > 0) {
+            const finalNS = finalNamespaces.shift();
+            const exportLocal = [];
+            for (const exportInfo of finalNS.getExportInfos()) {
+                if (exportInfo.getExportClauseType() === ArkExport_1.ExportType.LOCAL && exportInfo.getArkExport()) {
+                    exportLocal.push(exportInfo.getArkExport());
                 }
-                let p = finalNS;
-                while (!(parentMap.get(p) instanceof ArkFile_1.ArkFile) && p.isExported()) {
-                    const grandParent = parentMap.get(parentMap.get(p));
-                    if (grandParent instanceof ArkNamespace_1.ArkNamespace) {
-                        (_c = classMap.get(grandParent.getNamespaceSignature())) === null || _c === void 0 ? void 0 : _c.push(...exportClass);
-                        p = parentMap.get(p);
-                    }
-                    else if (grandParent instanceof ArkFile_1.ArkFile) {
-                        (_d = classMap.get(grandParent.getFileSignature())) === null || _d === void 0 ? void 0 : _d.push(...exportClass);
-                        break;
-                    }
+            }
+            const parent = parentMap.get(finalNS);
+            if (parent instanceof ArkNamespace_1.ArkNamespace) {
+                (_a = globalVariableMap.get(parent.getNamespaceSignature())) === null || _a === void 0 ? void 0 : _a.push(...exportLocal);
+            }
+            else if (parent instanceof ArkFile_1.ArkFile) {
+                (_b = globalVariableMap.get(parent.getFileSignature())) === null || _b === void 0 ? void 0 : _b.push(...exportLocal);
+            }
+            let p = finalNS;
+            while (!(parentMap.get(p) instanceof ArkFile_1.ArkFile) && p.isExported()) {
+                const grandParent = parentMap.get(parentMap.get(p));
+                if (grandParent instanceof ArkNamespace_1.ArkNamespace) {
+                    (_c = globalVariableMap.get(grandParent.getNamespaceSignature())) === null || _c === void 0 ? void 0 : _c.push(...exportLocal);
+                    p = parentMap.get(p);
                 }
-                if (parent instanceof ArkNamespace_1.ArkNamespace && !finalNamespaces.includes(parent)) {
-                    finalNamespaces.push(parent);
+                else if (grandParent instanceof ArkFile_1.ArkFile) {
+                    (_d = globalVariableMap.get(grandParent.getFileSignature())) === null || _d === void 0 ? void 0 : _d.push(...exportLocal);
+                    break;
                 }
             }
+            if (parent instanceof ArkNamespace_1.ArkNamespace && !finalNamespaces.includes(parent)) {
+                finalNamespaces.push(parent);
+            }
         }
-        for (const file of this.getFiles()) {
-            // 文件加上import的class，包括ns的
-            const importClasses = [];
-            const importNameSpaces = [];
-            for (const importInfo of file.getImportInfos()) {
-                const importClass = ModelUtils_1.ModelUtils.getClassInImportInfoWithName(importInfo.getImportClauseName(), file);
-                if (importClass && !importClasses.includes(importClass)) {
-                    importClasses.push(importClass);
-                    continue;
+    }
+    addFileImportLocals(file, globalVariableMap) {
+        const importLocals = [];
+        const importNameSpaces = [];
+        for (const importInfo of file.getImportInfos()) {
+            const importLocal = ModelUtils_1.ModelUtils.getLocalInImportInfoWithName(importInfo.getImportClauseName(), file);
+            if (importLocal && !importLocals.includes(importLocal)) {
+                importLocals.push(importLocal);
+            }
+            const importNameSpace = ModelUtils_1.ModelUtils.getNamespaceInImportInfoWithName(importInfo.getImportClauseName(), file);
+            if (importNameSpace && !importNameSpaces.includes(importNameSpace)) {
+                try {
+                    // 遗留问题：只统计了项目文件，没统计sdk文件内部的引入
+                    const importNameSpaceClasses = globalVariableMap.get(importNameSpace.getNamespaceSignature());
+                    importLocals.push(...importNameSpaceClasses.filter(c => !importLocals.includes(c) && c.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME));
                 }
-                const importNameSpace = ModelUtils_1.ModelUtils.getNamespaceInImportInfoWithName(importInfo.getImportClauseName(), file);
-                if (importNameSpace && !importNameSpaces.includes(importNameSpace)) {
-                    try {
-                        // 遗留问题：只统计了项目文件的namespace，没统计sdk文件内部的引入
-                        const importNameSpaceClasses = classMap.get(importNameSpace.getNamespaceSignature());
-                        importClasses.push(...importNameSpaceClasses.filter(c => !importClasses.includes(c) && c.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME));
-                    }
-                    catch (_e) {
-                    }
+                catch (_a) {
                 }
             }
-            const fileClasses = classMap.get(file.getFileSignature());
-            fileClasses.push(...importClasses.filter(c => !fileClasses.includes(c)));
-            // 子节点加上父节点的class
-            const namespaceStack = [...file.getNamespaces()];
-            for (const ns of namespaceStack) {
-                const nsClasses = classMap.get(ns.getNamespaceSignature());
-                nsClasses.push(...fileClasses.filter(c => !nsClasses.includes(c) && c.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME));
-            }
-            while (namespaceStack.length > 0) {
-                const ns = namespaceStack.shift();
-                const nsClasses = classMap.get(ns.getNamespaceSignature());
-                for (const nsns of ns.getNamespaces()) {
-                    const nsnsClasses = classMap.get(nsns.getNamespaceSignature());
-                    nsnsClasses.push(...nsClasses.filter(c => !nsnsClasses.includes(c) && c.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME));
-                    namespaceStack.push(nsns);
+        }
+        const fileLocals = globalVariableMap.get(file.getFileSignature());
+        fileLocals.push(...importLocals.filter(c => !fileLocals.includes(c)));
+        // 子节点加上父节点的local
+        const namespaceStack = [...file.getNamespaces()];
+        for (const ns of namespaceStack) {
+            const nsLocals = globalVariableMap.get(ns.getNamespaceSignature());
+            const nsLocalNameSet = new Set(nsLocals.map(item => item.getName()));
+            for (const local of fileLocals) {
+                if (!nsLocalNameSet.has(local.getName())) {
+                    nsLocals.push(local);
                 }
             }
         }
-        return classMap;
+        while (namespaceStack.length > 0) {
+            const ns = namespaceStack.shift();
+            const nsLocals = globalVariableMap.get(ns.getNamespaceSignature());
+            for (const nsns of ns.getNamespaces()) {
+                this.handleNestedNSLocals(nsns, nsLocals, globalVariableMap);
+                namespaceStack.push(nsns);
+            }
+        }
+    }
+    handleNestedNSLocals(nsns, nsLocals, globalVariableMap) {
+        const nsnsLocals = globalVariableMap.get(nsns.getNamespaceSignature());
+        const nsnsLocalNameSet = new Set(nsnsLocals.map(item => item.getName()));
+        for (const local of nsLocals) {
+            if (!nsnsLocalNameSet.has(local.getName())) {
+                nsnsLocals.push(local);
+            }
+        }
     }
     getGlobalVariableMap() {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b;
         const globalVariableMap = new Map();
         for (const file of this.getFiles()) {
             const namespaceStack = [];
@@ -1113,105 +1228,13 @@ class Scene {
                 parentMap.set(ns, file);
             }
             // 第一轮遍历，加上每个namespace自己的local
-            while (namespaceStack.length > 0) {
-                const ns = namespaceStack.shift();
-                const nsGlobalLocals = [];
-                (_c = ns.getDefaultClass().getDefaultArkMethod().getBody()) === null || _c === void 0 ? void 0 : _c.getLocals().forEach(local => {
-                    if (local.getDeclaringStmt() && local.getName() !== 'this' && local.getName()[0] !== '$') {
-                        nsGlobalLocals.push(local);
-                    }
-                });
-                globalVariableMap.set(ns.getNamespaceSignature(), nsGlobalLocals);
-                if (ns.getNamespaces().length === 0) {
-                    finalNamespaces.push(ns);
-                }
-                else {
-                    for (const nsns of ns.getNamespaces()) {
-                        namespaceStack.push(nsns);
-                        parentMap.set(nsns, ns);
-                    }
-                }
-            }
+            this.addNSLocals(namespaceStack, finalNamespaces, parentMap, globalVariableMap);
             // 第二轮遍历，父节点加上子节点的export的local
-            while (finalNamespaces.length > 0) {
-                const finalNS = finalNamespaces.shift();
-                const exportLocal = [];
-                for (const exportInfo of finalNS.getExportInfos()) {
-                    if (exportInfo.getExportClauseType() === ArkExport_1.ExportType.LOCAL && exportInfo.getArkExport()) {
-                        exportLocal.push(exportInfo.getArkExport());
-                    }
-                }
-                const parent = parentMap.get(finalNS);
-                if (parent instanceof ArkNamespace_1.ArkNamespace) {
-                    (_d = globalVariableMap.get(parent.getNamespaceSignature())) === null || _d === void 0 ? void 0 : _d.push(...exportLocal);
-                }
-                else if (parent instanceof ArkFile_1.ArkFile) {
-                    (_e = globalVariableMap.get(parent.getFileSignature())) === null || _e === void 0 ? void 0 : _e.push(...exportLocal);
-                }
-                let p = finalNS;
-                while (!(parentMap.get(p) instanceof ArkFile_1.ArkFile) && p.isExported()) {
-                    const grandParent = parentMap.get(parentMap.get(p));
-                    if (grandParent instanceof ArkNamespace_1.ArkNamespace) {
-                        (_f = globalVariableMap.get(grandParent.getNamespaceSignature())) === null || _f === void 0 ? void 0 : _f.push(...exportLocal);
-                        p = parentMap.get(p);
-                    }
-                    else if (grandParent instanceof ArkFile_1.ArkFile) {
-                        (_g = globalVariableMap.get(grandParent.getFileSignature())) === null || _g === void 0 ? void 0 : _g.push(...exportLocal);
-                        break;
-                    }
-                }
-                if (parent instanceof ArkNamespace_1.ArkNamespace && !finalNamespaces.includes(parent)) {
-                    finalNamespaces.push(parent);
-                }
-            }
+            this.addNSExportedLocals(finalNamespaces, globalVariableMap, parentMap);
         }
         for (const file of this.getFiles()) {
             // 文件加上import的local，包括ns的
-            const importLocals = [];
-            const importNameSpaces = [];
-            for (const importInfo of file.getImportInfos()) {
-                const importLocal = ModelUtils_1.ModelUtils.getLocalInImportInfoWithName(importInfo.getImportClauseName(), file);
-                if (importLocal && !importLocals.includes(importLocal)) {
-                    importLocals.push(importLocal);
-                }
-                const importNameSpace = ModelUtils_1.ModelUtils.getNamespaceInImportInfoWithName(importInfo.getImportClauseName(), file);
-                if (importNameSpace && !importNameSpaces.includes(importNameSpace)) {
-                    try {
-                        // 遗留问题：只统计了项目文件，没统计sdk文件内部的引入
-                        const importNameSpaceClasses = globalVariableMap.get(importNameSpace.getNamespaceSignature());
-                        importLocals.push(...importNameSpaceClasses.filter(c => !importLocals.includes(c) && c.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME));
-                    }
-                    catch (_h) {
-                    }
-                }
-            }
-            const fileLocals = globalVariableMap.get(file.getFileSignature());
-            fileLocals.push(...importLocals.filter(c => !fileLocals.includes(c)));
-            // 子节点加上父节点的local
-            const namespaceStack = [...file.getNamespaces()];
-            for (const ns of namespaceStack) {
-                const nsLocals = globalVariableMap.get(ns.getNamespaceSignature());
-                const nsLocalNameSet = new Set(nsLocals.map(item => item.getName()));
-                for (const local of fileLocals) {
-                    if (!nsLocalNameSet.has(local.getName())) {
-                        nsLocals.push(local);
-                    }
-                }
-            }
-            while (namespaceStack.length > 0) {
-                const ns = namespaceStack.shift();
-                const nsLocals = globalVariableMap.get(ns.getNamespaceSignature());
-                for (const nsns of ns.getNamespaces()) {
-                    const nsnsLocals = globalVariableMap.get(nsns.getNamespaceSignature());
-                    const nsnsLocalNameSet = new Set(nsnsLocals.map(item => item.getName()));
-                    for (const local of nsLocals) {
-                        if (!nsnsLocalNameSet.has(local.getName())) {
-                            nsnsLocals.push(local);
-                        }
-                    }
-                    namespaceStack.push(nsns);
-                }
-            }
+            this.addFileImportLocals(file, globalVariableMap);
         }
         return globalVariableMap;
     }

package/lib/VFG/builder/DVFGBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DVFGBuilder.d.ts","sourceRoot":"","sources":["../../../src/VFG/builder/DVFGBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAwE,IAAI,EAA6C,MAAM,sBAAsB,CAAC;AAK7J,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,qBAAa,WAAW;IACpB,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,KAAK,CAAQ;gBAET,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK;IAKzB,KAAK;IAIL,oBAAoB,CAAC,CAAC,EAAE,SAAS;IAsCxC,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,aAAa;IAcd,gBAAgB,CAAC,IAAI,EAAE,IAAI;IAI3B,YAAY,IAAI,IAAI;IAEpB,YAAY,IAAI,IAAI;CAC9B"}
+{"version":3,"file":"DVFGBuilder.d.ts","sourceRoot":"","sources":["../../../src/VFG/builder/DVFGBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAwE,IAAI,EAA6C,MAAM,sBAAsB,CAAC;AAM7J,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,qBAAa,WAAW;IACpB,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,KAAK,CAAQ;gBAET,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK;IAKzB,KAAK;IAIL,oBAAoB,CAAC,CAAC,EAAE,SAAS;IAyCxC,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,aAAa;IAcd,gBAAgB,CAAC,IAAI,EAAE,IAAI;IAI3B,YAAY,IAAI,IAAI;IAEpB,YAAY,IAAI,IAAI;CAC9B"}

package/lib/VFG/builder/DVFGBuilder.js

@@ -27,7 +27,9 @@ class DVFGBuilder {
         this.scene = s;
     }
     build() {
-        this.scene.getMethods().map(m => this.buildForSingleMethod(m));
+        this.scene.getMethods().forEach(m => { if (m.getCfg()) {
+            this.buildForSingleMethod(m);
+        } });
     }
     buildForSingleMethod(m) {
         let problem = new ReachingDef_1.ReachingDefProblem(m);
@@ -47,6 +49,13 @@ class DVFGBuilder {
             }
         });
         solution.in.forEach((defs, reach) => {
+            let addNewNodes = (defId, def, reach) => {
+                if (defs.test(defId)) {
+                    let srcNode = this.dvfg.getOrNewDVFGNode(def);
+                    let dstNode = this.dvfg.getOrNewDVFGNode(reach);
+                    this.dvfg.addDVFGEdge(srcNode, dstNode);
+                }
+            };
             const reachStmt = problem.flowGraph.getNode(reach);
             this.getStmtUsedValues(reachStmt).forEach(use => {
                 var _a;
@@ -56,11 +65,7 @@ class DVFGBuilder {
                 }
                 (_a = defMap.get(target)) === null || _a === void 0 ? void 0 : _a.forEach((defStmt) => {
                     let defId = problem.flowGraph.getNodeID(defStmt);
-                    if (defs.test(defId)) {
-                        let srcNode = this.dvfg.getOrNewDVFGNode(defStmt);
-                        let dstNode = this.dvfg.getOrNewDVFGNode(reachStmt);
-                        this.dvfg.addDVFGEdge(srcNode, dstNode);
-                    }
+                    addNewNodes(defId, defStmt, reachStmt);
                 });
             });
         });

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

@@ -7,12 +7,13 @@ import { MethodSignature } from '../../core/model/ArkSignature';
 import { NodeID } from '../../core/graph/BaseExplicitGraph';
 import { CallGraph, FuncID, CallSite } from '../model/CallGraph';
 import { CallGraphBuilder } from '../model/builder/CallGraphBuilder';
+import { IPtsCollection } from '../pointerAnalysis/PtsDS';
 export declare abstract class AbstractAnalysis {
     protected scene: Scene;
     protected cg: CallGraph;
     protected cgBuilder: CallGraphBuilder;
     protected workList: FuncID[];
-    protected processedMethod: Set<FuncID>;
+    protected processedMethod: IPtsCollection<FuncID>;
     constructor(s: Scene);
     getScene(): Scene;
     getCallGraph(): CallGraph;
@@ -21,6 +22,7 @@ export declare abstract class AbstractAnalysis {
     resolveInvokeExpr(invokeExpr: AbstractInvokeExpr): ArkMethod | undefined;
     getClassHierarchy(arkClass: ArkClass): ArkClass[];
     start(displayGeneratedMethod: boolean): void;
+    private processCallSite;
     protected init(): void;
     protected processMethod(methodID: FuncID): CallSite[];
     protected getParamAnonymousMethod(invokeExpr: AbstractInvokeExpr): MethodSignature[];

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;AAIrE,8BAAsB,gBAAgB;IAClC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,EAAE,EAAG,SAAS,CAAC;IACzB,SAAS,CAAC,SAAS,EAAG,gBAAgB,CAAC;IACvC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAClC,SAAS,CAAC,eAAe,EAAG,GAAG,CAAC,MAAM,CAAC,CAAC;gBAE5B,CAAC,EAAE,KAAK;IAIb,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;IAOxE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,EAAE;IAgBjD,KAAK,CAAC,sBAAsB,EAAE,OAAO,GAAG,IAAI;IA8BnD,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,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,EAAG,SAAS,CAAC;IACzB,SAAS,CAAC,SAAS,EAAG,gBAAgB,CAAC;IACvC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAClC,SAAS,CAAC,eAAe,EAAG,cAAc,CAAC,MAAM,CAAC,CAAC;gBAEvC,CAAC,EAAE,KAAK;IAIb,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;IAOxE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,EAAE;IAgBjD,KAAK,CAAC,sBAAsB,EAAE,OAAO,GAAG,IAAI;IAqBnD,OAAO,CAAC,eAAe;IAgBvB,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"}

package/lib/callgraph/algorithm/AbstractAnalysis.js

@@ -40,6 +40,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractAnalysis = void 0;
 const Type_1 = require("../../core/base/Type");
 const logger_1 = __importStar(require("../../utils/logger"));
+const PtsDS_1 = require("../pointerAnalysis/PtsDS");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'CG');
 class AbstractAnalysis {
     constructor(s) {
@@ -76,7 +77,7 @@ class AbstractAnalysis {
         while (this.workList.length !== 0) {
             const method = this.workList.shift();
             const cgNode = this.cg.getNode(method);
-            if (this.processedMethod.has(method) || cgNode.isSdkMethod()) {
+            if (this.processedMethod.contains(method) || cgNode.isSdkMethod()) {
                 continue;
             }
             // pre process for RTA only
@@ -84,19 +85,26 @@ class AbstractAnalysis {
                 this.workList.push(cs.calleeFuncID);
             });
             this.processMethod(method).forEach((cs) => {
-                var _a;
-                let me = this.cg.getArkMethodByFuncID(cs.calleeFuncID);
-                this.addCallGraphEdge(method, me, cs, displayGeneratedMethod);
-                if (!this.processedMethod.has(cs.calleeFuncID)) {
-                    this.workList.push(cs.calleeFuncID);
-                    logger.info(`New workList item ${cs.calleeFuncID}: ${(_a = this.cg.getArkMethodByFuncID(cs.calleeFuncID)) === null || _a === void 0 ? void 0 : _a.getSignature().toString()}`);
-                    this.processedMethod.add(cs.callerFuncID);
-                }
+                this.processCallSite(method, cs, displayGeneratedMethod);
             });
         }
     }
+    processCallSite(method, cs, displayGeneratedMethod) {
+        var _a;
+        let me = this.cg.getArkMethodByFuncID(cs.calleeFuncID);
+        let meNode = this.cg.getNode(cs.calleeFuncID);
+        this.processedMethod.insert(cs.callerFuncID);
+        this.addCallGraphEdge(method, me, cs, displayGeneratedMethod);
+        if (this.processedMethod.contains(cs.calleeFuncID) || meNode.isSdkMethod()) {
+            return;
+        }
+        if (displayGeneratedMethod || !(me === null || me === void 0 ? void 0 : me.isGenerated())) {
+            this.workList.push(cs.calleeFuncID);
+            logger.info(`New workList item ${cs.calleeFuncID}: ${(_a = this.cg.getArkMethodByFuncID(cs.calleeFuncID)) === null || _a === void 0 ? void 0 : _a.getSignature().toString()}`);
+        }
+    }
     init() {
-        this.processedMethod = new Set();
+        this.processedMethod = new ((0, PtsDS_1.createPtsCollectionCtor)(PtsDS_1.PtsCollectionType.BitVector))();
         this.cg.getEntries().forEach((entryFunc) => {
             this.workList.push(entryFunc);
         });

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

@@ -1 +1 @@
-{"version":3,"file":"RapidTypeAnalysis.d.ts","sourceRoot":"","sources":["../../../src/callgraph/algorithm/RapidTypeAnalysis.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAMtD,qBAAa,iBAAkB,SAAQ,gBAAgB;IAEnD,OAAO,CAAC,gBAAgB,CAAkC;IAE1D,OAAO,CAAC,YAAY,CAA2F;gBAEnG,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS;IAKhC,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,QAAQ,EAAE;IA4DtE,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE;IAqBtD,OAAO,CAAC,+BAA+B;IA4BhC,eAAe,CAAC,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI;CAKxG"}
+{"version":3,"file":"RapidTypeAnalysis.d.ts","sourceRoot":"","sources":["../../../src/callgraph/algorithm/RapidTypeAnalysis.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAMtD,qBAAa,iBAAkB,SAAQ,gBAAgB;IAEnD,OAAO,CAAC,gBAAgB,CAAkC;IAE1D,OAAO,CAAC,YAAY,CAA2F;gBAEnG,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS;IAKhC,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,QAAQ,EAAE;IA8DtE,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE;IAqBtD,OAAO,CAAC,+BAA+B;IA4BhC,eAAe,CAAC,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI;CAKxG"}