arkanalyzer 1.0.7 → 1.0.9

package/lib/core/common/IRUtils.d.ts

@@ -1,7 +1,13 @@
 import { Value } from '../base/Value';
 import { Scene } from '../../Scene';
+import ts from 'ohos-typescript';
+import { SceneOptions } from '../../Config';
+import { Stmt } from '../base/Stmt';
+import { ArkBaseModel } from '../model/ArkBaseModel';
 export declare class IRUtils {
     static moreThanOneAddress(value: Value): boolean;
     static generateTextForStmt(scene: Scene): void;
+    static setLeadingComments(metadata: Stmt | ArkBaseModel, node: ts.Node, sourceFile: ts.SourceFile, options: SceneOptions): void;
+    static getLeadingComments(node: ts.Node, sourceFile: ts.SourceFile, options: SceneOptions): string[];
 }
 //# sourceMappingURL=IRUtils.d.ts.map

package/lib/core/common/IRUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IRUtils.d.ts","sourceRoot":"","sources":["../../../src/core/common/IRUtils.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,qBAAa,OAAO;IAChB,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAQhD,MAAM,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;CAUjD"}
+{"version":3,"file":"IRUtils.d.ts","sourceRoot":"","sources":["../../../src/core/common/IRUtils.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,OAAO;IAChB,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAchD,MAAM,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAW9C,MAAM,CAAC,kBAAkB,CACrB,QAAQ,EAAE,IAAI,GAAG,YAAY,EAC7B,IAAI,EAAE,EAAE,CAAC,IAAI,EACb,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,OAAO,EAAE,YAAY,GACtB,IAAI;IAOP,MAAM,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,MAAM,EAAE;CAYvG"}

package/lib/core/common/IRUtils.js

@@ -13,14 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IRUtils = void 0;
 const Expr_1 = require("../base/Expr");
 const Ref_1 = require("../base/Ref");
+const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
+const ArkMetadata_1 = require("../model/ArkMetadata");
 class IRUtils {
     static moreThanOneAddress(value) {
-        if (value instanceof Expr_1.AbstractBinopExpr || value instanceof Expr_1.AbstractInvokeExpr || value instanceof Ref_1.AbstractFieldRef ||
-            value instanceof Ref_1.ArkArrayRef || value instanceof Expr_1.ArkCastExpr || value instanceof Expr_1.ArkUnopExpr) {
+        if (value instanceof Expr_1.AbstractBinopExpr ||
+            value instanceof Expr_1.AbstractInvokeExpr ||
+            value instanceof Ref_1.AbstractFieldRef ||
+            value instanceof Ref_1.ArkArrayRef ||
+            value instanceof Expr_1.ArkCastExpr ||
+            value instanceof Expr_1.ArkUnopExpr) {
             return true;
         }
         return false;
@@ -35,5 +44,23 @@ class IRUtils {
             }
         }
     }
+    static setLeadingComments(metadata, node, sourceFile, options) {
+        let comments = this.getLeadingComments(node, sourceFile, options);
+        if (comments.length > 0) {
+            metadata.setMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS, comments);
+        }
+    }
+    static getLeadingComments(node, sourceFile, options) {
+        let comments = [];
+        if (!options.enableLeadingComments) {
+            return comments;
+        }
+        const commentRanges = ohos_typescript_1.default.getLeadingCommentRanges(node.getFullText(sourceFile), 0) || [];
+        for (const range of commentRanges) {
+            const comment = node.getFullText(sourceFile).slice(range.pos, range.end).replace(/\r\n/g, '\n');
+            comments.push(comment);
+        }
+        return comments;
+    }
 }
 exports.IRUtils = IRUtils;

package/lib/core/common/ModelUtils.d.ts

@@ -57,5 +57,6 @@ export declare function getArkFile(im: FromInfo): ArkFile | null | undefined;
  * @param fromInfo importInfo or exportInfo
  */
 export declare function findExportInfo(fromInfo: FromInfo): ExportInfo | null;
+export declare function findArkExport(exportInfo: ExportInfo | undefined): ArkExport | null;
 export declare function findArkExportInFile(name: string, declaringArkFile: ArkFile): ArkExport | null;
 //# sourceMappingURL=ModelUtils.d.ts.map

package/lib/core/common/ModelUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelUtils.d.ts","sourceRoot":"","sources":["../../../src/core/common/ModelUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ModelUtils.d.ts","sourceRoot":"","sources":["../../../src/core/common/ModelUtils.ts"],"names":[],"mappings":"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"}

package/lib/core/common/ModelUtils.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.findArkExportInFile = exports.findExportInfo = exports.getArkFile = exports.ModelUtils = void 0;
+exports.findArkExportInFile = exports.findArkExport = exports.findExportInfo = exports.getArkFile = exports.ModelUtils = void 0;
 const Local_1 = require("../base/Local");
 const ArkClass_1 = require("../model/ArkClass");
 const ArkMethod_1 = require("../model/ArkMethod");
@@ -50,12 +50,12 @@ const ArkExport_1 = require("../model/ArkExport");
 const logger_1 = __importStar(require("../../utils/logger"));
 const FileUtils_1 = require("../../utils/FileUtils");
 const path_1 = __importDefault(require("path"));
-const pathTransfer_1 = require("../../utils/pathTransfer");
 const TSConst_1 = require("./TSConst");
 const ArkExportBuilder_1 = require("../model/builder/ArkExportBuilder");
 const EtsConst_1 = require("./EtsConst");
 const Type_1 = require("../base/Type");
-const ArkClassBuilder_1 = require("../model/builder/ArkClassBuilder");
+const ArkMethodBuilder_1 = require("../model/builder/ArkMethodBuilder");
+const Const_1 = require("./Const");
 class ModelUtils {
     static getMethodSignatureFromArkClass(arkClass, methodName) {
         for (const arkMethod of arkClass.getMethods()) {
@@ -209,7 +209,7 @@ class ModelUtils {
     static getStaticMethodWithName(methodName, thisClass) {
         const thisNamespace = thisClass.getDeclaringArkNamespace();
         if (thisNamespace) {
-            const defaultClass = thisNamespace.getClassWithName('_DEFAULT_ARK_CLASS');
+            const defaultClass = thisNamespace.getClassWithName(Const_1.DEFAULT_ARK_CLASS_NAME);
             if (defaultClass) {
                 const method = defaultClass.getMethodWithName(methodName);
                 if (method) {
@@ -220,7 +220,7 @@ class ModelUtils {
         return this.getStaticMethodInFileWithName(methodName, thisClass.getDeclaringArkFile());
     }
     static getStaticMethodInFileWithName(methodName, arkFile) {
-        const defaultClass = arkFile.getClasses().find(cls => cls.getName() === '_DEFAULT_ARK_CLASS') || null;
+        const defaultClass = arkFile.getClasses().find(cls => cls.getName() === Const_1.DEFAULT_ARK_CLASS_NAME) || null;
         if (defaultClass) {
             let method = defaultClass.getMethodWithName(methodName);
             if (method) {
@@ -328,14 +328,15 @@ class ModelUtils {
         return (_j = (_e = (_d = (_c = (_b = (_a = namespace.getDefaultClass()) === null || _a === void 0 ? void 0 : _a.getMethodWithName(name)) !== null && _b !== void 0 ? _b : findArkExport(namespace.getExportInfoBy(name))) !== null && _c !== void 0 ? _c : namespace.getClassWithName(name)) !== null && _d !== void 0 ? _d : namespace.getNamespaceWithName(name)) !== null && _e !== void 0 ? _e : (_h = (_g = (_f = namespace.getDefaultClass()) === null || _f === void 0 ? void 0 : _f.getDefaultArkMethod()) === null || _g === void 0 ? void 0 : _g.getBody()) === null || _h === void 0 ? void 0 : _h.getAliasTypeByName(name)) !== null && _j !== void 0 ? _j : (_o = (_m = (_l = (_k = namespace.getDefaultClass()) === null || _k === void 0 ? void 0 : _k.getDefaultArkMethod()) === null || _l === void 0 ? void 0 : _l.getBody()) === null || _m === void 0 ? void 0 : _m.getLocals()) === null || _o === void 0 ? void 0 : _o.get(name);
     }
     static findPropertyInClass(name, arkClass) {
-        var _a, _b, _c, _d;
-        let arkMethod = (_b = (_a = arkClass.getMethodWithName(name)) !== null && _a !== void 0 ? _a : arkClass.getStaticMethodWithName(name)) !== null && _b !== void 0 ? _b : (_c = arkClass.getSuperClass()) === null || _c === void 0 ? void 0 : _c.getMethodWithName(name);
-        if (arkMethod) {
-            return arkMethod;
-        }
-        const arkField = (_d = arkClass.getFieldWithName(name)) !== null && _d !== void 0 ? _d : arkClass.getStaticFieldWithName(name);
-        if (arkField) {
-            return arkField;
+        var _a, _b, _c;
+        let property;
+        let currentClass = arkClass;
+        do {
+            property = (_c = (_b = (_a = currentClass.getMethodWithName(name)) !== null && _a !== void 0 ? _a : currentClass.getStaticMethodWithName(name)) !== null && _b !== void 0 ? _b : currentClass.getFieldWithName(name)) !== null && _c !== void 0 ? _c : currentClass.getStaticFieldWithName(name);
+            currentClass = currentClass.getSuperClass();
+        } while (!property && currentClass);
+        if (property) {
+            return property;
         }
         if (arkClass.isDefaultArkClass()) {
             return findArkExport(arkClass.getDeclaringArkFile().getExportInfoBy(name));
@@ -346,8 +347,10 @@ class ModelUtils {
         var _a, _b;
         if (file.getFilePath().includes(EtsConst_1.COMPONENT_PATH) || file.getFilePath().includes(EtsConst_1.API_INTERNAL)) {
             this.getAllClassesInFile(file).forEach(cls => {
-                if (!cls.isAnonymousClass()) {
+                if (!cls.isAnonymousClass() && !cls.isDefaultArkClass()) {
                     globalMap.set(cls.getName(), cls);
+                }
+                if (cls.isDefaultArkClass()) {
                     cls.getMethods().forEach(mtd => {
                         if (!mtd.isDefaultArkMethod() && !mtd.isAnonymousMethod()) {
                             globalMap.set(mtd.getName(), mtd);
@@ -357,7 +360,7 @@ class ModelUtils {
             });
             (_b = (_a = file.getDefaultClass().getDefaultArkMethod()) === null || _a === void 0 ? void 0 : _a.getBody()) === null || _b === void 0 ? void 0 : _b.getLocals().forEach(local => {
                 const name = local.getName();
-                if (name !== TSConst_1.THIS_NAME && !name.startsWith(TSConst_1.TEMP_LOCAL_PREFIX) && !name.endsWith(EtsConst_1.COMPONENT_INSTANCE)) {
+                if (name !== TSConst_1.THIS_NAME && !name.startsWith(Const_1.TEMP_LOCAL_PREFIX) && !name.endsWith(EtsConst_1.COMPONENT_INSTANCE)) {
                     const type = local.getType();
                     let arkExport;
                     if (type instanceof Type_1.UnclearReferenceType) {
@@ -372,16 +375,16 @@ class ModelUtils {
                         entry.setSignature(signature);
                         arkExport.getMethods().forEach(m => {
                             const ms = m.getSignature();
-                            m.setSignature(new ArkSignature_1.MethodSignature(signature, ms.getMethodSubSignature()));
-                            (0, ArkClassBuilder_1.checkAndUpdateMethod)(m, entry);
+                            m.setDeclareSignatures(new ArkSignature_1.MethodSignature(signature, ms.getMethodSubSignature()));
+                            (0, ArkMethodBuilder_1.checkAndUpdateMethod)(m, entry);
                             entry.addMethod(m);
                         });
                         const attr = globalMap.get(name + EtsConst_1.COMPONENT_ATTRIBUTE);
                         if (attr instanceof ArkClass_1.ArkClass) {
                             attr.getMethods().forEach(m => {
                                 const ms = m.getSignature();
-                                m.setSignature(new ArkSignature_1.MethodSignature(signature, ms.getMethodSubSignature()));
-                                (0, ArkClassBuilder_1.checkAndUpdateMethod)(m, entry);
+                                m.setDeclareSignatures(new ArkSignature_1.MethodSignature(signature, ms.getMethodSubSignature()));
+                                (0, ArkMethodBuilder_1.checkAndUpdateMethod)(m, entry);
                                 entry.addMethod(m);
                             });
                         }
@@ -396,7 +399,7 @@ exports.ModelUtils = ModelUtils;
 ModelUtils.implicitArkUIBuilderMethods = new Set();
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ModelUtils');
 let moduleMap;
-const fileSuffixArray = ['.ets: ', '.ts: ', '.d.ets: ', '.d.ts: '];
+const fileSuffixArray = ['.ets', '.ts', '.d.ets', '.d.ts'];
 /**
  * find arkFile by from info
  * export xx from '../xx'
@@ -424,7 +427,7 @@ function getArkFile(im) {
     //sdk path
     const scene = im.getDeclaringArkFile().getScene();
     for (const sdk of scene.getProjectSdkMap().values()) {
-        const arkFile = getArkFileFormMap(processSdkPath(sdk, from), scene.getSdkArkFilesMap());
+        const arkFile = getArkFileFormMap(sdk.name, processSdkPath(sdk, from), scene);
         if (arkFile) {
             return arkFile;
         }
@@ -490,6 +493,7 @@ function findArkExport(exportInfo) {
     }
     return arkExport || null;
 }
+exports.findArkExport = findArkExport;
 function findArkExportInFile(name, declaringArkFile) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     let arkExport = (_f = (_c = (_b = (_a = declaringArkFile.getClassWithName(name)) !== null && _a !== void 0 ? _a : declaringArkFile.getDefaultClass().getMethodWithName(name)) !== null && _b !== void 0 ? _b : declaringArkFile.getNamespaceWithName(name)) !== null && _c !== void 0 ? _c : (_e = (_d = declaringArkFile.getDefaultClass().getDefaultArkMethod()) === null || _d === void 0 ? void 0 : _d.getBody()) === null || _e === void 0 ? void 0 : _e.getLocals().get(name)) !== null && _f !== void 0 ? _f : (_h = (_g = declaringArkFile.getDefaultClass().getDefaultArkMethod()) === null || _g === void 0 ? void 0 : _g.getBody()) === null || _h === void 0 ? void 0 : _h.getAliasTypeByName(name);
@@ -506,7 +510,6 @@ function findArkExportInFile(name, declaringArkFile) {
 }
 exports.findArkExportInFile = findArkExportInFile;
 function processSdkPath(sdk, formPath) {
-    const sdkName = sdk.name;
     let dir;
     if (formPath.startsWith('@ohos.') || formPath.startsWith('@hms.') || formPath.startsWith('@system.')) {
         dir = 'api';
@@ -522,9 +525,9 @@ function processSdkPath(sdk, formPath) {
         if (FileUtils_1.FileUtils.isDirectory(originPath)) {
             formPath = path_1.default.join(formPath, FileUtils_1.FileUtils.getIndexFileName(originPath));
         }
-        return `@${sdkName}/${formPath}`;
+        return `${formPath}`;
     }
-    return `@${sdkName}/${dir}/${formPath}`;
+    return `${dir}/${formPath}`;
 }
 function getArkFileFromScene(im, originPath) {
     if (FileUtils_1.FileUtils.isDirectory(originPath)) {
@@ -537,22 +540,19 @@ function getArkFileFromScene(im, originPath) {
         return scene.getFile(fromSignature);
     }
     const projectName = im.getDeclaringArkFile().getProjectName();
-    const filePath = `@${projectName}/${fileName}`;
-    if (projectName !== scene.getProjectName()) {
-        return getArkFileFormMap(filePath, scene.getSdkArkFilesMap());
-    }
-    return getArkFileFormMap(filePath, scene.getFilesMap());
+    return getArkFileFormMap(projectName, fileName, scene);
 }
-function getArkFileFormMap(filePath, map) {
+function getArkFileFormMap(projectName, filePath, scene) {
     if (/\.e?ts$/.test(filePath)) {
-        return map.get((0, pathTransfer_1.transfer2UnixPath)(filePath) + ': ');
+        return scene.getFile(new ArkSignature_1.FileSignature(projectName, filePath));
     }
     for (const suffix of fileSuffixArray) {
-        const arkFile = map.get((0, pathTransfer_1.transfer2UnixPath)(filePath) + suffix);
+        const arkFile = scene.getFile(new ArkSignature_1.FileSignature(projectName, filePath + suffix));
         if (arkFile) {
             return arkFile;
         }
     }
+    return null;
 }
 function findExportInfoInfile(fromInfo, file) {
     const exportName = fromInfo.isDefault() ? TSConst_1.DEFAULT : fromInfo.getOriginName();

package/lib/core/common/TSConst.d.ts

@@ -1,11 +1,18 @@
 export declare const CONSTRUCTOR_NAME = "constructor";
 export declare const SUPER_NAME = "super";
 export declare const THIS_NAME = "this";
+export declare const GLOBAL_THIS: string;
 export declare const DEFAULT = "default";
 export declare const ALL = "*";
 export declare const IMPORT = "import";
 export declare const DECLARE_KEYWORD = "DeclareKeyword";
-export declare const ABSTRACT_KEYWORD = "AbstractKeyword";
-export declare const STATIC_KEYWORD = "StaticKeyword";
-export declare const TEMP_LOCAL_PREFIX = "$temp";
+export declare const NULL_KEYWORD = "null";
+export declare const UNDEFINED_KEYWORD = "undefined";
+export declare const ANY_KEYWORD = "any";
+export declare const UNKNOWN_KEYWORD = "unknown";
+export declare const BOOLEAN_KEYWORD = "boolean";
+export declare const NUMBER_KEYWORD = "number";
+export declare const STRING_KEYWORD = "string";
+export declare const VOID_KEYWORD = "void";
+export declare const NEVER_KEYWORD = "never";
 //# sourceMappingURL=TSConst.d.ts.map

package/lib/core/common/TSConst.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TSConst.d.ts","sourceRoot":"","sources":["../../../src/core/common/TSConst.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAC9C,eAAO,MAAM,UAAU,UAAU,CAAC;AAClC,eAAO,MAAM,SAAS,SAAS,CAAC;AAEhC,eAAO,MAAM,OAAO,YAAY,CAAC;AAEjC,eAAO,MAAM,GAAG,MAAM,CAAC;AAEvB,eAAO,MAAM,MAAM,WAAW,CAAC;AAG/B,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,gBAAgB,oBAAoB,CAAC;AAClD,eAAO,MAAM,cAAc,kBAAkB,CAAC;AAE9C,eAAO,MAAM,iBAAiB,UAAU,CAAC"}
+{"version":3,"file":"TSConst.d.ts","sourceRoot":"","sources":["../../../src/core/common/TSConst.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAC9C,eAAO,MAAM,UAAU,UAAU,CAAC;AAClC,eAAO,MAAM,SAAS,SAAS,CAAC;AAChC,eAAO,MAAM,WAAW,EAAE,MAAqB,CAAA;AAE/C,eAAO,MAAM,OAAO,YAAY,CAAC;AAEjC,eAAO,MAAM,GAAG,MAAM,CAAC;AAEvB,eAAO,MAAM,MAAM,WAAW,CAAC;AAG/B,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,eAAO,MAAM,iBAAiB,cAAc,CAAC;AAC7C,eAAO,MAAM,WAAW,QAAQ,CAAC;AACjC,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,cAAc,WAAW,CAAC;AACvC,eAAO,MAAM,cAAc,WAAW,CAAC;AACvC,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,eAAO,MAAM,aAAa,UAAU,CAAC"}

package/lib/core/common/TSConst.js

@@ -14,15 +14,22 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TEMP_LOCAL_PREFIX = exports.STATIC_KEYWORD = exports.ABSTRACT_KEYWORD = exports.DECLARE_KEYWORD = exports.IMPORT = exports.ALL = exports.DEFAULT = exports.THIS_NAME = exports.SUPER_NAME = exports.CONSTRUCTOR_NAME = void 0;
+exports.NEVER_KEYWORD = exports.VOID_KEYWORD = exports.STRING_KEYWORD = exports.NUMBER_KEYWORD = exports.BOOLEAN_KEYWORD = exports.UNKNOWN_KEYWORD = exports.ANY_KEYWORD = exports.UNDEFINED_KEYWORD = exports.NULL_KEYWORD = exports.DECLARE_KEYWORD = exports.IMPORT = exports.ALL = exports.DEFAULT = exports.GLOBAL_THIS = exports.THIS_NAME = exports.SUPER_NAME = exports.CONSTRUCTOR_NAME = void 0;
 exports.CONSTRUCTOR_NAME = 'constructor';
 exports.SUPER_NAME = 'super';
 exports.THIS_NAME = 'this';
+exports.GLOBAL_THIS = 'globalThis';
 exports.DEFAULT = 'default';
 exports.ALL = '*';
 exports.IMPORT = 'import';
 // ast const
 exports.DECLARE_KEYWORD = 'DeclareKeyword';
-exports.ABSTRACT_KEYWORD = 'AbstractKeyword';
-exports.STATIC_KEYWORD = 'StaticKeyword';
-exports.TEMP_LOCAL_PREFIX = '$temp';
+exports.NULL_KEYWORD = 'null';
+exports.UNDEFINED_KEYWORD = 'undefined';
+exports.ANY_KEYWORD = 'any';
+exports.UNKNOWN_KEYWORD = 'unknown';
+exports.BOOLEAN_KEYWORD = 'boolean';
+exports.NUMBER_KEYWORD = 'number';
+exports.STRING_KEYWORD = 'string';
+exports.VOID_KEYWORD = 'void';
+exports.NEVER_KEYWORD = 'never';

package/lib/core/common/TypeInference.d.ts

@@ -1,10 +1,11 @@
 import { Stmt } from '../base/Stmt';
-import { GenericType, Type } from '../base/Type';
+import { GenericType, Type, UnclearReferenceType } from '../base/Type';
 import { ArkMethod } from '../model/ArkMethod';
 import { ArkExport } from '../model/ArkExport';
 import { ArkClass } from '../model/ArkClass';
 import { ArkField } from '../model/ArkField';
 import { Value } from '../base/Value';
+import { ClassSignature } from '../model/ArkSignature';
 export declare class TypeInference {
     static inferTypeInArkField(arkField: ArkField): void;
     static inferUnclearedType(leftOpType: Type, declaringArkClass: ArkClass, rightType?: Type): Type | null | undefined;
@@ -23,6 +24,7 @@ export declare class TypeInference {
      * infer type for fieldRefs in stmt.
      */
     private static resolveFieldRefsInStmt;
+    private static processRef;
     static parseArkExport2Type(arkExport: ArkExport | undefined | null): Type | null;
     /**
      * infer and pass type for ArkAssignStmt right and left
@@ -33,12 +35,16 @@ export declare class TypeInference {
     static isUnclearType(type: Type | null | undefined): boolean;
     static inferSimpleTypeInStmt(stmt: Stmt): void;
     static buildTypeFromStr(typeStr: string): Type;
-    static inferValueType(value: Value, arkClass: ArkClass): Type | null;
+    static inferValueType(value: Value, arkMethod: ArkMethod): Type | null;
     static inferMethodReturnType(method: ArkMethod): void;
+    private static inferSignatureReturnType;
     static inferGenericType(types: GenericType[] | undefined, arkClass: ArkClass): void;
+    static inferUnclearRefType(urType: UnclearReferenceType, arkClass: ArkClass): Type | null;
     static inferUnclearReferenceType(refName: string, arkClass: ArkClass): Type | null;
     static inferFieldType(baseType: Type, fieldName: string, declareClass: ArkClass): [any, Type] | null;
     static inferBaseType(baseName: string, arkClass: ArkClass): Type | null;
     static inferRealGenericTypes(realTypes: Type[] | undefined, arkClass: ArkClass): void;
+    static inferAnonymousClass(anon: ArkClass | null, declaredSignature: ClassSignature, set?: Set<string>): void;
+    private static assignAnonField;
 }
 //# sourceMappingURL=TypeInference.d.ts.map

package/lib/core/common/TypeInference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypeInference.d.ts","sourceRoot":"","sources":["../../../src/core/common/TypeInference.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAgC,IAAI,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAQH,WAAW,EAKX,IAAI,EAMP,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAiB,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAatC,qBAAa,aAAa;WAER,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;WAqC7C,kBAAkB,CAAC,UAAU,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,IAAI;WA6ClF,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAoB3D;;;OAGG;WACW,uBAAuB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAcjE;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAcjC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,sBAAsB;WAiCvB,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI;IAkCvF;;;;OAIG;WACW,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;WA8B1D,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS;WAU3C,qBAAqB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;WAcvC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;WA2BvC,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI;WAU7D,qBAAqB,CAAC,MAAM,EAAE,SAAS;WAwBvC,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,QAAQ;WAmBrE,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI;WAoC3E,cAAc,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI;WA4C7F,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI;WAoBhE,qBAAqB,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAc/F"}
+{"version":3,"file":"TypeInference.d.ts","sourceRoot":"","sources":["../../../src/core/common/TypeInference.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAgC,IAAI,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAQH,WAAW,EAKX,IAAI,EACJ,oBAAoB,EAKvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAMtC,OAAO,EAAE,cAAc,EAAuC,MAAM,uBAAuB,CAAC;AAQ5F,qBAAa,aAAa;WAER,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;WAqC7C,kBAAkB,CAAC,UAAU,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,IAAI;WA6ClF,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAsC3D;;;OAGG;WACW,uBAAuB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAcjE;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAcjC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,sBAAsB;IAerC,OAAO,CAAC,MAAM,CAAC,UAAU;WAsBX,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI;IAwBvF;;;;OAIG;WACW,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;WAuC1D,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS;WAgB3C,qBAAqB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;WAcvC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;WA2BvC,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI,GAAG,IAAI;WAU/D,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAgC5D,OAAO,CAAC,MAAM,CAAC,wBAAwB;WAkBzB,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,QAAQ;WAmBrE,mBAAmB,CAAC,MAAM,EAAE,oBAAoB,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI;WAmBlF,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI;WAoC3E,cAAc,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI;WAgD7F,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI;WAoBhE,qBAAqB,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;WAe9E,mBAAmB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,EAAE,iBAAiB,EAAE,cAAc,EAAE,GAAG,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,IAAI;IA+B/H,OAAO,CAAC,MAAM,CAAC,eAAe;CA8BjC"}