arkanalyzer 1.0.20 → 1.0.21

package/lib/core/model/builder/ArkNamespaceBuilder.d.ts

@@ -1,6 +1,6 @@
-import { ArkFile } from '../ArkFile';
-import ts from 'ohos-typescript';
-import { ArkNamespace } from '../ArkNamespace';
-export declare function buildArkNamespace(node: ts.ModuleDeclaration, declaringInstance: ArkFile | ArkNamespace, ns: ArkNamespace, sourceFile: ts.SourceFile): void;
-export declare function mergeNameSpaces(arkNamespaces: ArkNamespace[]): ArkNamespace[];
+import { ArkFile } from '../ArkFile';
+import ts from 'ohos-typescript';
+import { ArkNamespace } from '../ArkNamespace';
+export declare function buildArkNamespace(node: ts.ModuleDeclaration, declaringInstance: ArkFile | ArkNamespace, ns: ArkNamespace, sourceFile: ts.SourceFile): void;
+export declare function mergeNameSpaces(arkNamespaces: ArkNamespace[]): ArkNamespace[];
 //# sourceMappingURL=ArkNamespaceBuilder.d.ts.map

package/lib/core/model/builder/ArkNamespaceBuilder.js

@@ -1,205 +1,205 @@
-"use strict";
-/*
- * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeNameSpaces = exports.buildArkNamespace = void 0;
-const Position_1 = require("../../base/Position");
-const ArkClassBuilder_1 = require("./ArkClassBuilder");
-const ArkFile_1 = require("../ArkFile");
-const ArkMethodBuilder_1 = require("./ArkMethodBuilder");
-const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
-const ArkNamespace_1 = require("../ArkNamespace");
-const builderUtils_1 = require("./builderUtils");
-const logger_1 = __importStar(require("../../../utils/logger"));
-const ArkExportBuilder_1 = require("./ArkExportBuilder");
-const ArkClass_1 = require("../ArkClass");
-const ArkMethod_1 = require("../ArkMethod");
-const ArkSignature_1 = require("../ArkSignature");
-const IRUtils_1 = require("../../common/IRUtils");
-const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkNamespaceBuilder');
-function buildArkNamespace(node, declaringInstance, ns, sourceFile) {
-    var _a;
-    // modifiers
-    if (node.modifiers) {
-        ns.setModifiers((0, builderUtils_1.buildModifiers)(node));
-        ns.setDecorators((0, builderUtils_1.buildDecorators)(node, sourceFile));
-    }
-    if (declaringInstance instanceof ArkFile_1.ArkFile) {
-        ns.setDeclaringArkFile(declaringInstance);
-    }
-    else {
-        ns.setDeclaringArkNamespace(declaringInstance);
-        ns.setDeclaringArkFile(declaringInstance.getDeclaringArkFile());
-    }
-    ns.setDeclaringInstance(declaringInstance);
-    const namespaceName = node.name.text;
-    const namespaceSignature = new ArkSignature_1.NamespaceSignature(namespaceName, ns.getDeclaringArkFile().getFileSignature(), ((_a = ns.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
-    ns.setSignature(namespaceSignature);
-    // TODO: whether needed?
-    ns.setCode(node.getText(sourceFile));
-    // set line and column
-    const { line, character } = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, node.getStart(sourceFile));
-    ns.setLine(line + 1);
-    ns.setColumn(character + 1);
-    genDefaultArkClass(ns, node, sourceFile);
-    // build ns member
-    if (node.body) {
-        if (ohos_typescript_1.default.isModuleBlock(node.body)) {
-            buildNamespaceMembers(node.body, ns, sourceFile);
-        }
-        // NamespaceDeclaration extends ModuleDeclaration
-        //TODO: Check
-        else if (ohos_typescript_1.default.isModuleDeclaration(node.body)) {
-            logger.warn('This ModuleBody is an NamespaceDeclaration.');
-            let childNs = new ArkNamespace_1.ArkNamespace();
-            buildArkNamespace(node.body, ns, childNs, sourceFile);
-        }
-        else if (ohos_typescript_1.default.isIdentifier(node.body)) {
-            logger.warn('ModuleBody is Identifier.');
-        }
-        else {
-            logger.warn('JSDocNamespaceDeclaration found.');
-        }
-    }
-    else {
-        logger.warn('JSDocNamespaceDeclaration found.');
-    }
-    IRUtils_1.IRUtils.setComments(ns, node, sourceFile, ns.getDeclaringArkFile().getScene().getOptions());
-}
-exports.buildArkNamespace = buildArkNamespace;
-// TODO: check and update
-function buildNamespaceMembers(node, namespace, sourceFile) {
-    const statements = node.statements;
-    const nestedNamespaces = [];
-    statements.forEach((child) => {
-        if (ohos_typescript_1.default.isModuleDeclaration(child)) {
-            let childNs = new ArkNamespace_1.ArkNamespace();
-            childNs.setDeclaringArkNamespace(namespace);
-            childNs.setDeclaringArkFile(namespace.getDeclaringArkFile());
-            buildArkNamespace(child, namespace, childNs, sourceFile);
-            nestedNamespaces.push(childNs);
-        }
-        else if (ohos_typescript_1.default.isClassDeclaration(child) ||
-            ohos_typescript_1.default.isInterfaceDeclaration(child) ||
-            ohos_typescript_1.default.isEnumDeclaration(child) ||
-            ohos_typescript_1.default.isStructDeclaration(child)) {
-            let cls = new ArkClass_1.ArkClass();
-            (0, ArkClassBuilder_1.buildNormalArkClassFromArkNamespace)(child, namespace, cls, sourceFile);
-            namespace.addArkClass(cls);
-            if (cls.isExported()) {
-                namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(cls, namespace.getDeclaringArkFile(), Position_1.LineColPosition.buildFromNode(child, sourceFile)));
-            }
-        }
-        // TODO: Check
-        else if (ohos_typescript_1.default.isMethodDeclaration(child)) {
-            logger.warn('This is a MethodDeclaration in ArkNamespace.');
-            let mthd = new ArkMethod_1.ArkMethod();
-            (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, namespace.getDefaultClass(), mthd, sourceFile);
-            if (mthd.isExported()) {
-                namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(mthd, namespace.getDeclaringArkFile(), Position_1.LineColPosition.buildFromNode(child, sourceFile)));
-            }
-        }
-        else if (ohos_typescript_1.default.isFunctionDeclaration(child)) {
-            let mthd = new ArkMethod_1.ArkMethod();
-            (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, namespace.getDefaultClass(), mthd, sourceFile);
-            if (mthd.isExported()) {
-                namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(mthd, namespace.getDeclaringArkFile(), Position_1.LineColPosition.buildFromNode(child, sourceFile)));
-            }
-        }
-        else if (ohos_typescript_1.default.isExportDeclaration(child)) {
-            (0, ArkExportBuilder_1.buildExportDeclaration)(child, sourceFile, namespace.getDeclaringArkFile())
-                .forEach(item => namespace.addExportInfo(item));
-        }
-        else if (ohos_typescript_1.default.isExportAssignment(child)) {
-            (0, ArkExportBuilder_1.buildExportAssignment)(child, sourceFile, namespace.getDeclaringArkFile())
-                .forEach(item => namespace.addExportInfo(item));
-        }
-        else {
-            logger.info('Child joined default method of arkFile: ', ohos_typescript_1.default.SyntaxKind[child.kind]);
-            // join default method
-        }
-    });
-    const nestedMergedNameSpaces = mergeNameSpaces(nestedNamespaces);
-    nestedMergedNameSpaces.forEach(nestedNameSpace => {
-        namespace.addNamespace(nestedNameSpace);
-        if (nestedNameSpace.isExport()) {
-            const linCol = new Position_1.LineColPosition(nestedNameSpace.getLine(), nestedNameSpace.getColumn());
-            namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(nestedNameSpace, namespace.getDeclaringArkFile(), linCol));
-        }
-    });
-}
-function genDefaultArkClass(ns, node, sourceFile) {
-    let defaultClass = new ArkClass_1.ArkClass();
-    (0, ArkClassBuilder_1.buildDefaultArkClassFromArkNamespace)(ns, defaultClass, node, sourceFile);
-    ns.setDefaultClass(defaultClass);
-    ns.addArkClass(defaultClass);
-}
-function mergeNameSpaces(arkNamespaces) {
-    const namespaceMap = new Map();
-    for (let i = 0; i < arkNamespaces.length; i++) {
-        const currNamespace = arkNamespaces[i];
-        const currName = currNamespace.getName();
-        if (namespaceMap.has(currName)) {
-            const prevNamespace = namespaceMap.get(currName);
-            const nestedPrevNamespaces = prevNamespace.getNamespaces();
-            const nestedCurrNamespaces = currNamespace.getNamespaces();
-            const nestedMergedNameSpaces = mergeNameSpaces([...nestedPrevNamespaces, ...nestedCurrNamespaces]);
-            nestedMergedNameSpaces.forEach(nestedNameSpace => {
-                prevNamespace.addNamespace(nestedNameSpace);
-            });
-            const classes = currNamespace.getClasses();
-            classes.forEach(cls => {
-                prevNamespace.addArkClass(cls);
-            });
-            const preSourceCodes = prevNamespace.getCodes();
-            const currSourceCodes = currNamespace.getCodes();
-            prevNamespace.setCodes([...preSourceCodes, ...currSourceCodes]);
-            const prevLineColPairs = prevNamespace.getLineColPairs();
-            const currLineColPairs = currNamespace.getLineColPairs();
-            prevNamespace.setLineCols([...prevLineColPairs, ...currLineColPairs]);
-        }
-        else {
-            namespaceMap.set(currName, currNamespace);
-        }
-    }
-    return [...namespaceMap.values()];
-}
-exports.mergeNameSpaces = mergeNameSpaces;
+"use strict";
+/*
+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeNameSpaces = exports.buildArkNamespace = void 0;
+const Position_1 = require("../../base/Position");
+const ArkClassBuilder_1 = require("./ArkClassBuilder");
+const ArkFile_1 = require("../ArkFile");
+const ArkMethodBuilder_1 = require("./ArkMethodBuilder");
+const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
+const ArkNamespace_1 = require("../ArkNamespace");
+const builderUtils_1 = require("./builderUtils");
+const logger_1 = __importStar(require("../../../utils/logger"));
+const ArkExportBuilder_1 = require("./ArkExportBuilder");
+const ArkClass_1 = require("../ArkClass");
+const ArkMethod_1 = require("../ArkMethod");
+const ArkSignature_1 = require("../ArkSignature");
+const IRUtils_1 = require("../../common/IRUtils");
+const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkNamespaceBuilder');
+function buildArkNamespace(node, declaringInstance, ns, sourceFile) {
+    var _a;
+    // modifiers
+    if (node.modifiers) {
+        ns.setModifiers((0, builderUtils_1.buildModifiers)(node));
+        ns.setDecorators((0, builderUtils_1.buildDecorators)(node, sourceFile));
+    }
+    if (declaringInstance instanceof ArkFile_1.ArkFile) {
+        ns.setDeclaringArkFile(declaringInstance);
+    }
+    else {
+        ns.setDeclaringArkNamespace(declaringInstance);
+        ns.setDeclaringArkFile(declaringInstance.getDeclaringArkFile());
+    }
+    ns.setDeclaringInstance(declaringInstance);
+    const namespaceName = node.name.text;
+    const namespaceSignature = new ArkSignature_1.NamespaceSignature(namespaceName, ns.getDeclaringArkFile().getFileSignature(), ((_a = ns.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
+    ns.setSignature(namespaceSignature);
+    // TODO: whether needed?
+    ns.setCode(node.getText(sourceFile));
+    // set line and column
+    const { line, character } = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, node.getStart(sourceFile));
+    ns.setLine(line + 1);
+    ns.setColumn(character + 1);
+    genDefaultArkClass(ns, node, sourceFile);
+    // build ns member
+    if (node.body) {
+        if (ohos_typescript_1.default.isModuleBlock(node.body)) {
+            buildNamespaceMembers(node.body, ns, sourceFile);
+        }
+        // NamespaceDeclaration extends ModuleDeclaration
+        //TODO: Check
+        else if (ohos_typescript_1.default.isModuleDeclaration(node.body)) {
+            logger.warn('This ModuleBody is an NamespaceDeclaration.');
+            let childNs = new ArkNamespace_1.ArkNamespace();
+            buildArkNamespace(node.body, ns, childNs, sourceFile);
+        }
+        else if (ohos_typescript_1.default.isIdentifier(node.body)) {
+            logger.warn('ModuleBody is Identifier.');
+        }
+        else {
+            logger.warn('JSDocNamespaceDeclaration found.');
+        }
+    }
+    else {
+        logger.warn('JSDocNamespaceDeclaration found.');
+    }
+    IRUtils_1.IRUtils.setComments(ns, node, sourceFile, ns.getDeclaringArkFile().getScene().getOptions());
+}
+exports.buildArkNamespace = buildArkNamespace;
+// TODO: check and update
+function buildNamespaceMembers(node, namespace, sourceFile) {
+    const statements = node.statements;
+    const nestedNamespaces = [];
+    statements.forEach((child) => {
+        if (ohos_typescript_1.default.isModuleDeclaration(child)) {
+            let childNs = new ArkNamespace_1.ArkNamespace();
+            childNs.setDeclaringArkNamespace(namespace);
+            childNs.setDeclaringArkFile(namespace.getDeclaringArkFile());
+            buildArkNamespace(child, namespace, childNs, sourceFile);
+            nestedNamespaces.push(childNs);
+        }
+        else if (ohos_typescript_1.default.isClassDeclaration(child) ||
+            ohos_typescript_1.default.isInterfaceDeclaration(child) ||
+            ohos_typescript_1.default.isEnumDeclaration(child) ||
+            ohos_typescript_1.default.isStructDeclaration(child)) {
+            let cls = new ArkClass_1.ArkClass();
+            (0, ArkClassBuilder_1.buildNormalArkClassFromArkNamespace)(child, namespace, cls, sourceFile);
+            namespace.addArkClass(cls);
+            if (cls.isExported()) {
+                namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(cls, namespace.getDeclaringArkFile(), Position_1.LineColPosition.buildFromNode(child, sourceFile)));
+            }
+        }
+        // TODO: Check
+        else if (ohos_typescript_1.default.isMethodDeclaration(child)) {
+            logger.warn('This is a MethodDeclaration in ArkNamespace.');
+            let mthd = new ArkMethod_1.ArkMethod();
+            (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, namespace.getDefaultClass(), mthd, sourceFile);
+            if (mthd.isExported()) {
+                namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(mthd, namespace.getDeclaringArkFile(), Position_1.LineColPosition.buildFromNode(child, sourceFile)));
+            }
+        }
+        else if (ohos_typescript_1.default.isFunctionDeclaration(child)) {
+            let mthd = new ArkMethod_1.ArkMethod();
+            (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, namespace.getDefaultClass(), mthd, sourceFile);
+            if (mthd.isExported()) {
+                namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(mthd, namespace.getDeclaringArkFile(), Position_1.LineColPosition.buildFromNode(child, sourceFile)));
+            }
+        }
+        else if (ohos_typescript_1.default.isExportDeclaration(child)) {
+            (0, ArkExportBuilder_1.buildExportDeclaration)(child, sourceFile, namespace.getDeclaringArkFile())
+                .forEach(item => namespace.addExportInfo(item));
+        }
+        else if (ohos_typescript_1.default.isExportAssignment(child)) {
+            (0, ArkExportBuilder_1.buildExportAssignment)(child, sourceFile, namespace.getDeclaringArkFile())
+                .forEach(item => namespace.addExportInfo(item));
+        }
+        else {
+            logger.info('Child joined default method of arkFile: ', ohos_typescript_1.default.SyntaxKind[child.kind]);
+            // join default method
+        }
+    });
+    const nestedMergedNameSpaces = mergeNameSpaces(nestedNamespaces);
+    nestedMergedNameSpaces.forEach(nestedNameSpace => {
+        namespace.addNamespace(nestedNameSpace);
+        if (nestedNameSpace.isExport()) {
+            const linCol = new Position_1.LineColPosition(nestedNameSpace.getLine(), nestedNameSpace.getColumn());
+            namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(nestedNameSpace, namespace.getDeclaringArkFile(), linCol));
+        }
+    });
+}
+function genDefaultArkClass(ns, node, sourceFile) {
+    let defaultClass = new ArkClass_1.ArkClass();
+    (0, ArkClassBuilder_1.buildDefaultArkClassFromArkNamespace)(ns, defaultClass, node, sourceFile);
+    ns.setDefaultClass(defaultClass);
+    ns.addArkClass(defaultClass);
+}
+function mergeNameSpaces(arkNamespaces) {
+    const namespaceMap = new Map();
+    for (let i = 0; i < arkNamespaces.length; i++) {
+        const currNamespace = arkNamespaces[i];
+        const currName = currNamespace.getName();
+        if (namespaceMap.has(currName)) {
+            const prevNamespace = namespaceMap.get(currName);
+            const nestedPrevNamespaces = prevNamespace.getNamespaces();
+            const nestedCurrNamespaces = currNamespace.getNamespaces();
+            const nestedMergedNameSpaces = mergeNameSpaces([...nestedPrevNamespaces, ...nestedCurrNamespaces]);
+            nestedMergedNameSpaces.forEach(nestedNameSpace => {
+                prevNamespace.addNamespace(nestedNameSpace);
+            });
+            const classes = currNamespace.getClasses();
+            classes.forEach(cls => {
+                prevNamespace.addArkClass(cls);
+            });
+            const preSourceCodes = prevNamespace.getCodes();
+            const currSourceCodes = currNamespace.getCodes();
+            prevNamespace.setCodes([...preSourceCodes, ...currSourceCodes]);
+            const prevLineColPairs = prevNamespace.getLineColPairs();
+            const currLineColPairs = currNamespace.getLineColPairs();
+            prevNamespace.setLineCols([...prevLineColPairs, ...currLineColPairs]);
+        }
+        else {
+            namespaceMap.set(currName, currNamespace);
+        }
+    }
+    return [...namespaceMap.values()];
+}
+exports.mergeNameSpaces = mergeNameSpaces;

package/lib/core/model/builder/ArkSignatureBuilder.d.ts

@@ -1,9 +1,9 @@
-import { ClassSignature, FieldSignature, MethodSignature, MethodSubSignature } from '../ArkSignature';
-export declare class ArkSignatureBuilder {
-    static buildMethodSignatureFromClassNameAndMethodName(className: string, methodName: string, staticFlag?: boolean): MethodSignature;
-    static buildMethodSignatureFromMethodName(methodName: string, staticFlag?: boolean): MethodSignature;
-    static buildMethodSubSignatureFromMethodName(methodName: string, staticFlag?: boolean): MethodSubSignature;
-    static buildClassSignatureFromClassName(className: string): ClassSignature;
-    static buildFieldSignatureFromFieldName(fieldName: string, staticFlag?: boolean): FieldSignature;
-}
+import { ClassSignature, FieldSignature, MethodSignature, MethodSubSignature } from '../ArkSignature';
+export declare class ArkSignatureBuilder {
+    static buildMethodSignatureFromClassNameAndMethodName(className: string, methodName: string, staticFlag?: boolean): MethodSignature;
+    static buildMethodSignatureFromMethodName(methodName: string, staticFlag?: boolean): MethodSignature;
+    static buildMethodSubSignatureFromMethodName(methodName: string, staticFlag?: boolean): MethodSubSignature;
+    static buildClassSignatureFromClassName(className: string): ClassSignature;
+    static buildFieldSignatureFromFieldName(fieldName: string, staticFlag?: boolean): FieldSignature;
+}
 //# sourceMappingURL=ArkSignatureBuilder.d.ts.map

package/lib/core/model/builder/ArkSignatureBuilder.js

@@ -1,40 +1,40 @@
-"use strict";
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArkSignatureBuilder = void 0;
-const ArkSignature_1 = require("../ArkSignature");
-const Type_1 = require("../../base/Type");
-class ArkSignatureBuilder {
-    static buildMethodSignatureFromClassNameAndMethodName(className, methodName, staticFlag = false) {
-        const classSignature = this.buildClassSignatureFromClassName(className);
-        const methodSubSignature = this.buildMethodSubSignatureFromMethodName(methodName, staticFlag);
-        return new ArkSignature_1.MethodSignature(classSignature, methodSubSignature);
-    }
-    static buildMethodSignatureFromMethodName(methodName, staticFlag = false) {
-        const methodSubSignature = this.buildMethodSubSignatureFromMethodName(methodName, staticFlag);
-        return new ArkSignature_1.MethodSignature(ArkSignature_1.ClassSignature.DEFAULT, methodSubSignature);
-    }
-    static buildMethodSubSignatureFromMethodName(methodName, staticFlag = false) {
-        return new ArkSignature_1.MethodSubSignature(methodName, [], Type_1.UnknownType.getInstance(), staticFlag);
-    }
-    static buildClassSignatureFromClassName(className) {
-        return new ArkSignature_1.ClassSignature(className, ArkSignature_1.FileSignature.DEFAULT);
-    }
-    static buildFieldSignatureFromFieldName(fieldName, staticFlag = false) {
-        return new ArkSignature_1.FieldSignature(fieldName, ArkSignature_1.ClassSignature.DEFAULT, Type_1.UnknownType.getInstance(), staticFlag);
-    }
-}
-exports.ArkSignatureBuilder = ArkSignatureBuilder;
+"use strict";
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArkSignatureBuilder = void 0;
+const ArkSignature_1 = require("../ArkSignature");
+const Type_1 = require("../../base/Type");
+class ArkSignatureBuilder {
+    static buildMethodSignatureFromClassNameAndMethodName(className, methodName, staticFlag = false) {
+        const classSignature = this.buildClassSignatureFromClassName(className);
+        const methodSubSignature = this.buildMethodSubSignatureFromMethodName(methodName, staticFlag);
+        return new ArkSignature_1.MethodSignature(classSignature, methodSubSignature);
+    }
+    static buildMethodSignatureFromMethodName(methodName, staticFlag = false) {
+        const methodSubSignature = this.buildMethodSubSignatureFromMethodName(methodName, staticFlag);
+        return new ArkSignature_1.MethodSignature(ArkSignature_1.ClassSignature.DEFAULT, methodSubSignature);
+    }
+    static buildMethodSubSignatureFromMethodName(methodName, staticFlag = false) {
+        return new ArkSignature_1.MethodSubSignature(methodName, [], Type_1.UnknownType.getInstance(), staticFlag);
+    }
+    static buildClassSignatureFromClassName(className) {
+        return new ArkSignature_1.ClassSignature(className, ArkSignature_1.FileSignature.DEFAULT);
+    }
+    static buildFieldSignatureFromFieldName(fieldName, staticFlag = false) {
+        return new ArkSignature_1.FieldSignature(fieldName, ArkSignature_1.ClassSignature.DEFAULT, Type_1.UnknownType.getInstance(), staticFlag);
+    }
+}
+exports.ArkSignatureBuilder = ArkSignatureBuilder;

package/lib/core/model/builder/BodyBuilder.d.ts

@@ -1,31 +1,56 @@
-import { ArkBody } from '../ArkBody';
-import { ArkMethod } from '../ArkMethod';
-import { MethodSignature } from '../ArkSignature';
-import { CfgBuilder } from '../../graph/builder/CfgBuilder';
-import * as ts from 'ohos-typescript';
-import { GlobalRef } from '../../base/Ref';
-export declare class BodyBuilder {
-    private cfgBuilder;
-    private globals?;
-    constructor(methodSignature: MethodSignature, sourceAstNode: ts.Node, declaringMethod: ArkMethod, sourceFile: ts.SourceFile);
-    build(): ArkBody | null;
-    getCfgBuilder(): CfgBuilder;
-    getGlobals(): Map<string, GlobalRef> | undefined;
-    setGlobals(globals: Map<string, GlobalRef>): void;
-    handleGlobalAndClosure(): void;
-    private updateLocalTypesWithTypeAlias;
-    private inferUnclearReferenceTypeWithTypeAlias;
-    private findNestedMethod;
-    private moveLocalToGlobal;
-    private moveGlobalToLexicalEnv;
-    private updateNestedMethodWithClosures;
-    private updateOuterMethodWithClosures;
-    private getOriginalNestedMethodName;
-    private updateGlobalInfoWithClosures;
-    private updateLocalInfoWithClosures;
-    private updateAbstractInvokeExprWithClosures;
-    private createNewSignatureWithClosures;
-    private updateSignatureAndArgsInArkInvokeExpr;
-    private addClosureParamsAssignStmts;
-}
+import { ArkBody } from '../ArkBody';
+import { ArkMethod } from '../ArkMethod';
+import { MethodSignature } from '../ArkSignature';
+import { CfgBuilder } from '../../graph/builder/CfgBuilder';
+import * as ts from 'ohos-typescript';
+import { GlobalRef } from '../../base/Ref';
+export declare class BodyBuilder {
+    private cfgBuilder;
+    private globals?;
+    constructor(methodSignature: MethodSignature, sourceAstNode: ts.Node, declaringMethod: ArkMethod, sourceFile: ts.SourceFile);
+    build(): ArkBody | null;
+    getCfgBuilder(): CfgBuilder;
+    getGlobals(): Map<string, GlobalRef> | undefined;
+    setGlobals(globals: Map<string, GlobalRef>): void;
+    /**
+     * Find out all locals in the parent method which are used by the childrenChain, these locals are the closures of the root node of the childrenChain.
+     * childrenChain contains all nested method from the root node of the childrenChain.
+     * baseLocals are all locals defined in the outer function.
+     * allNestedLocals are collect all locals defined in all outer functions of this childrenChain.
+     * Only the globals of the root of the childrenChain, which are in the baseLocals but not in the allNestedLocals are the actual closures that in baseLocals.
+     */
+    private findClosuresUsedInNested;
+    /**
+     * 1. Find out all locals in the parent method which are used by the childrenChain, these locals are the closures of the root node of the childrenChain.
+     * 2. Create a lexical env local in the parent method, and pass it to root node of the childrenChain through the method signature.
+     * 3. Update the root node of the childrenChain to add parameterRef assign stmt and closureRef assign stmt.
+     * 4. Recursively do this for all nested method level by level.
+     */
+    private buildLexicalEnv;
+    /**
+     * Find out and tag all closures from globals, and remove closures from both globals and locals.
+     * Precondition: body build has been done. All locals, globals and closures are both set as Local in body,
+     * while potential globals and closures are also recorded in bodybuilder.
+     * Constraint: only the outermost function can call this method to recursively handle closures of itself as well as all nested methods.
+     */
+    handleGlobalAndClosure(): void;
+    private freeBodyBuilder;
+    private updateLocalTypesWithTypeAlias;
+    private inferUnclearReferenceTypeWithTypeAlias;
+    private generateNestedMethodChains;
+    private getNestedChildrenChains;
+    private moveCurrentMethodLocalToGlobal;
+    private reorganizeGlobalAndLocal;
+    private inferTypesDefineInOuter;
+    private updateNestedMethodUsedInOuter;
+    private updateNestedMethodWithClosures;
+    private updateOuterMethodWithClosures;
+    private getOriginalNestedMethodName;
+    private updateGlobalInfoWithClosures;
+    private updateLocalInfoWithClosures;
+    private updateAbstractInvokeExprWithClosures;
+    private createNewSignatureWithClosures;
+    private updateSignatureAndArgsInArkInvokeExpr;
+    private addClosureParamsAssignStmts;
+}
 //# sourceMappingURL=BodyBuilder.d.ts.map

package/lib/core/model/builder/BodyBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BodyBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/BodyBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAkB,eAAe,EAAsB,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAItC,OAAO,EAAuD,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAchG,qBAAa,WAAW;IACpB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAC,CAAyB;gBAE7B,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU;IAIpH,KAAK,IAAI,OAAO,GAAG,IAAI;IAcvB,aAAa,IAAI,UAAU;IAI3B,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS;IAIhD,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;IAIjD,sBAAsB,IAAI,IAAI;IAsDrC,OAAO,CAAC,6BAA6B;IASrC,OAAO,CAAC,sCAAsC;IA4B9C,OAAO,CAAC,gBAAgB;IAmBxB,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,8BAA8B;IAkBtC,OAAO,CAAC,6BAA6B;IA2BrC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,4BAA4B;IAoBpC,OAAO,CAAC,2BAA2B;IAwBnC,OAAO,CAAC,oCAAoC;IA2B5C,OAAO,CAAC,8BAA8B;IAgBtC,OAAO,CAAC,qCAAqC;IA8B7C,OAAO,CAAC,2BAA2B;CAyCtC"}
+{"version":3,"file":"BodyBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/BodyBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAkB,eAAe,EAA8C,MAAM,iBAAiB,CAAC;AAC9G,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAItC,OAAO,EAAuD,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAmBhG,qBAAa,WAAW;IACpB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAC,CAAyB;gBAE7B,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU;IAIpH,KAAK,IAAI,OAAO,GAAG,IAAI;IAcvB,aAAa,IAAI,UAAU;IAI3B,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS;IAIhD,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;IAIxD;;;;;;OAMG;IACH,OAAO,CAAC,wBAAwB;IAiChC;;;;;OAKG;IACH,OAAO,CAAC,eAAe;IA2BvB;;;;;OAKG;IACI,sBAAsB,IAAI,IAAI;IAwDrC,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,6BAA6B;IASrC,OAAO,CAAC,sCAAsC;IA4B9C,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,uBAAuB;IAgB/B,OAAO,CAAC,8BAA8B;IAmBtC,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,6BAA6B;IAsCrC,OAAO,CAAC,8BAA8B;IAkBtC,OAAO,CAAC,6BAA6B;IA2BrC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,4BAA4B;IAoBpC,OAAO,CAAC,2BAA2B;IAwBnC,OAAO,CAAC,oCAAoC;IA2B5C,OAAO,CAAC,8BAA8B;IAgBtC,OAAO,CAAC,qCAAqC;IA8B7C,OAAO,CAAC,2BAA2B;CA4CtC"}