arkanalyzer 1.0.35 → 1.0.37

package/lib/core/model/ArkMethod.js

@@ -28,6 +28,7 @@ const EtsConst_1 = require("../common/EtsConst");
 const Constant_1 = require("../base/Constant");
 const Local_1 = require("../base/Local");
 const TSConst_1 = require("../common/TSConst");
+const TypeInference_1 = require("../common/TypeInference");
 exports.arkMethodNodeKind = [
     'MethodDeclaration',
     'Constructor',
@@ -546,42 +547,37 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
             }
             return args.length >= min && args.length <= max;
         });
-        const scene = this.getDeclaringArkFile().getScene();
-        return ((_c = (_b = signatures === null || signatures === void 0 ? void 0 : signatures.find(p => {
-            const parameters = p.getMethodSubSignature().getParameters();
-            for (let i = 0; i < parameters.length; i++) {
-                if (!args[i]) {
-                    return parameters[i].isOptional();
-                }
-                const isMatched = this.matchParam(parameters[i].getType(), args[i], scene);
-                if (!isMatched) {
-                    return false;
-                }
+        return ((_c = (_b = signatures === null || signatures === void 0 ? void 0 : signatures.find(p => this.isMatched(p.getMethodSubSignature().getParameters(), args))) !== null && _b !== void 0 ? _b : signatures === null || signatures === void 0 ? void 0 : signatures[0]) !== null && _c !== void 0 ? _c : this.getSignature());
+    }
+    isMatched(parameters, args, isArrowFunc = false) {
+        for (let i = 0; i < parameters.length; i++) {
+            if (!args[i]) {
+                return isArrowFunc ? true : parameters[i].isOptional();
             }
-            return true;
-        })) !== null && _b !== void 0 ? _b : signatures === null || signatures === void 0 ? void 0 : signatures[0]) !== null && _c !== void 0 ? _c : this.getSignature());
+            const isMatched = this.matchParam(parameters[i].getType(), args[i]);
+            if (!isMatched) {
+                return false;
+            }
+        }
+        return true;
     }
-    matchParam(paramType, arg, scene) {
+    matchParam(paramType, arg) {
         var _a, _b;
+        arg = ArkMethod.parseArg(arg);
         const argType = arg.getType();
-        if (arg instanceof Local_1.Local) {
-            const stmt = arg.getDeclaringStmt();
-            if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getRightOp() instanceof Constant_1.Constant) {
-                arg = stmt.getRightOp();
-            }
+        if (paramType instanceof Type_1.AliasType && !(argType instanceof Type_1.AliasType)) {
+            paramType = TypeInference_1.TypeInference.replaceAliasType(paramType);
         }
         if (paramType instanceof Type_1.UnionType) {
-            let matched = false;
-            for (const e of paramType.getTypes()) {
-                if (argType.constructor === e.constructor) {
-                    matched = true;
-                    break;
-                }
-            }
-            return matched;
+            return !!paramType.getTypes().find(p => this.matchParam(p, arg));
         }
         else if (argType instanceof Type_1.FunctionType && paramType instanceof Type_1.FunctionType) {
-            return argType.getMethodSignature().getParamLength() === paramType.getMethodSignature().getParamLength();
+            if (argType.getMethodSignature().getParamLength() > paramType.getMethodSignature().getParamLength()) {
+                return false;
+            }
+            const parameters = paramType.getMethodSignature().getMethodSubSignature().getParameters();
+            const args = argType.getMethodSignature().getMethodSubSignature().getParameters().filter(p => !p.getName().startsWith(Const_1.LEXICAL_ENV_NAME_PREFIX));
+            return this.isMatched(parameters, args, true);
         }
         else if (paramType instanceof Type_1.ClassType && paramType.getClassSignature().getClassName().includes(EtsConst_1.CALL_BACK)) {
             return argType instanceof Type_1.FunctionType;
@@ -606,6 +602,19 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
         }
         return argType.constructor === paramType.constructor;
     }
+    static parseArg(arg) {
+        if (arg instanceof Local_1.Local) {
+            const stmt = arg.getDeclaringStmt();
+            const argType = arg.getType();
+            if (argType instanceof Type_1.EnumValueType && argType.getConstant()) {
+                arg = argType.getConstant();
+            }
+            else if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getRightOp() instanceof Constant_1.Constant) {
+                arg = stmt.getRightOp();
+            }
+        }
+        return arg;
+    }
     getOuterMethod() {
         return this.outerMethod;
     }

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

@@ -316,7 +316,16 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
     const instanceInitStmts = [];
     let staticBlockId = 0;
     clsNode.members.forEach(member => {
-        if (ohos_typescript_1.default.isPropertyDeclaration(member) || ohos_typescript_1.default.isPropertySignature(member)) {
+        if (ohos_typescript_1.default.isMethodDeclaration(member) ||
+            ohos_typescript_1.default.isConstructorDeclaration(member) ||
+            ohos_typescript_1.default.isMethodSignature(member) ||
+            ohos_typescript_1.default.isConstructSignatureDeclaration(member) ||
+            ohos_typescript_1.default.isAccessor(member) ||
+            ohos_typescript_1.default.isCallSignatureDeclaration(member)) {
+            // these node types have been handled at the beginning of this function by calling buildMethodsForClass
+            return;
+        }
+        else if (ohos_typescript_1.default.isPropertyDeclaration(member) || ohos_typescript_1.default.isPropertySignature(member)) {
             const arkField = (0, ArkFieldBuilder_1.buildProperty2ArkField)(member, sourceFile, cls);
             if (ohos_typescript_1.default.isClassDeclaration(clsNode) || ohos_typescript_1.default.isClassExpression(clsNode) || ohos_typescript_1.default.isStructDeclaration(clsNode)) {
                 if (arkField.isStatic()) {
@@ -346,10 +355,10 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
             staticInitStmts.push(new Stmt_1.ArkInvokeStmt(staticBlockInvokeExpr));
         }
         else if (ohos_typescript_1.default.isSemicolonClassElement(member)) {
-            logger.debug('Skip these members.');
+            logger.trace('Skip these members.');
         }
         else {
-            logger.warn('Please contact developers to support new member type!');
+            logger.warn(`Please contact developers to support new member in class: ${cls.getSignature().toString()}, member: ${member.getText()}!`);
         }
     });
     if (ohos_typescript_1.default.isClassDeclaration(clsNode) || ohos_typescript_1.default.isClassExpression(clsNode) || ohos_typescript_1.default.isStructDeclaration(clsNode)) {

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

@@ -66,7 +66,7 @@ function buildProperty2ArkField(member, sourceFile, cls) {
             fieldName = (0, builderUtils_1.handlePropertyAccessExpression)(member.name.expression);
         }
         else {
-            logger.warn('Other property expression type found!');
+            logger.warn(`Other property expression type found: ${member.name.expression.getText()}!`);
         }
     }
     else if (member.name && (ohos_typescript_1.default.isIdentifier(member.name) || ohos_typescript_1.default.isLiteralExpression(member.name))) {
@@ -78,7 +78,7 @@ function buildProperty2ArkField(member, sourceFile, cls) {
         field.addModifier(ArkBaseModel_1.ModifierType.PRIVATE);
     }
     else {
-        logger.warn('Other type of property name found!');
+        logger.warn(`Other type of property name found: ${member.getText()}!`);
     }
     let fieldType = Type_1.UnknownType.getInstance();
     if (ohos_typescript_1.default.isPropertyDeclaration(member) || ohos_typescript_1.default.isPropertySignature(member)) {

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

@@ -124,7 +124,7 @@ function buildArkFile(arkFile, astRoot) {
         }
         // TODO: Check
         else if (ohos_typescript_1.default.isMethodDeclaration(child)) {
-            logger.warn('This is a MethodDeclaration in ArkFile.');
+            logger.trace('This is a MethodDeclaration in ArkFile.');
             let mthd = new ArkMethod_1.ArkMethod();
             (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, arkFile.getDefaultClass(), mthd, astRoot);
             if (mthd.isExported()) {
@@ -161,7 +161,7 @@ function buildArkFile(arkFile, astRoot) {
             child.expression.text.trim() === Const_1.ARKTS_STATIC_MARK && arkFile.setLanguage(ArkFile_1.Language.ARKTS1_2);
         }
         else {
-            logger.info('Child joined default method of arkFile: ', ohos_typescript_1.default.SyntaxKind[child.kind]);
+            logger.trace('Child joined default method of arkFile: ', ohos_typescript_1.default.SyntaxKind[child.kind]);
         }
     });
     const mergedNameSpaces = (0, ArkNamespaceBuilder_1.mergeNameSpaces)(namespaces);

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

@@ -88,13 +88,13 @@ function buildArkNamespace(node, declaringInstance, ns, sourceFile) {
         // NamespaceDeclaration extends ModuleDeclaration
         //TODO: Check
         else if (ohos_typescript_1.default.isModuleDeclaration(node.body)) {
-            logger.warn('This ModuleBody is an NamespaceDeclaration.');
+            logger.trace('This ModuleBody is an NamespaceDeclaration.');
             let childNs = new ArkNamespace_1.ArkNamespace();
             buildArkNamespace(node.body, ns, childNs, sourceFile);
             ns.addNamespace(childNs);
         }
         else if (ohos_typescript_1.default.isIdentifier(node.body)) {
-            logger.warn('ModuleBody is Identifier.');
+            logger.warn('ModuleBody is Identifier');
         }
         else {
             logger.warn('JSDocNamespaceDeclaration found.');
@@ -128,7 +128,7 @@ function buildNamespaceMembers(node, namespace, sourceFile) {
         }
         // TODO: Check
         else if (ohos_typescript_1.default.isMethodDeclaration(child)) {
-            logger.warn('This is a MethodDeclaration in ArkNamespace.');
+            logger.trace('This is a MethodDeclaration in ArkNamespace.');
             let mthd = new ArkMethod_1.ArkMethod();
             (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, namespace.getDefaultClass(), mthd, sourceFile);
             if (mthd.isExported()) {
@@ -152,7 +152,7 @@ function buildNamespaceMembers(node, namespace, sourceFile) {
             (0, ArkExportBuilder_1.buildExportVariableStatement)(child, sourceFile, namespace.getDeclaringArkFile(), namespace).forEach(item => namespace.addExportInfo(item));
         }
         else {
-            logger.info('Child joined default method of arkFile: ', ohos_typescript_1.default.SyntaxKind[child.kind]);
+            logger.trace('Child joined default method of arkFile: ', ohos_typescript_1.default.SyntaxKind[child.kind]);
             // join default method
         }
     });

package/lib/save/JsonPrinter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JsonPrinter.d.ts","sourceRoot":"","sources":["../../src/save/JsonPrinter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAmEhD,qBAAa,WAAY,SAAQ,OAAO;IACxB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,OAAO;IAI7B,IAAI,IAAI,MAAM;IAKrB,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,wBAAwB;IAQhC,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,wBAAwB;IAOhC,OAAO,CAAC,aAAa;IAwHrB,OAAO,CAAC,sBAAsB;IAO9B,OAAO,CAAC,2BAA2B;IASnC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,wBAAwB;IAYhC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,YAAY;IAsBpB,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,cAAc;IAyJtB,OAAO,CAAC,aAAa;CAmCxB"}
+{"version":3,"file":"JsonPrinter.d.ts","sourceRoot":"","sources":["../../src/save/JsonPrinter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAsEhD,qBAAa,WAAY,SAAQ,OAAO;IACxB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,OAAO;IAI7B,IAAI,IAAI,MAAM;IAKrB,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,wBAAwB;IAShC,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,wBAAwB;IAOhC,OAAO,CAAC,aAAa;IA6HrB,OAAO,CAAC,sBAAsB;IAO9B,OAAO,CAAC,2BAA2B;IASnC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,wBAAwB;IAYhC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,YAAY;IAsBpB,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,cAAc;IAuKtB,OAAO,CAAC,aAAa;CAuCxB"}

package/lib/save/JsonPrinter.js

@@ -13,9 +13,6 @@
  * 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.JsonPrinter = void 0;
 const Printer_1 = require("./Printer");
@@ -26,7 +23,6 @@ const Constant_1 = require("../core/base/Constant");
 const ArkSignature_1 = require("../core/model/ArkSignature");
 const Ref_1 = require("../core/base/Ref");
 const Local_1 = require("../core/base/Local");
-const util_1 = __importDefault(require("util"));
 class JsonPrinter extends Printer_1.Printer {
     constructor(arkFile) {
         super();
@@ -57,8 +53,9 @@ class JsonPrinter extends Printer_1.Printer {
         return {
             signature: this.serializeClassSignature(clazz.getSignature()),
             modifiers: clazz.getModifiers(),
-            decorators: clazz.getDecorators().map(decorator => this.serializeDecorator(decorator)),
-            typeParameters: (_a = clazz.getGenericsTypes()) === null || _a === void 0 ? void 0 : _a.map(type => this.serializeType(type)),
+            decorators: clazz.getDecorators().map((decorator) => this.serializeDecorator(decorator)),
+            typeParameters: (_a = clazz.getGenericsTypes()) === null || _a === void 0 ? void 0 : _a.map((type) => this.serializeType(type)),
+            category: clazz.getCategory(),
             superClassName: clazz.getSuperClassName(),
             implementedInterfaceNames: clazz.getImplementedInterfaceNames(),
             fields: clazz.getFields().map(field => this.serializeField(field)),
@@ -96,6 +93,7 @@ class JsonPrinter extends Printer_1.Printer {
             name: parameter.getName(),
             type: this.serializeType(parameter.getType()),
             isOptional: parameter.isOptional(),
+            isRest: parameter.hasDotDotDotToken(),
         };
     }
     serializeImportInfo(importInfo) {
@@ -161,6 +159,12 @@ class JsonPrinter extends Printer_1.Printer {
                 types: type.getTypes().map(type => this.serializeType(type)),
             };
         }
+        else if (type instanceof Type_1.IntersectionType) {
+            return {
+                _: 'IntersectionType',
+                types: type.getTypes().map((type) => this.serializeType(type)),
+            };
+        }
         else if (type instanceof Type_1.TupleType) {
             return {
                 _: 'TupleType',
@@ -203,9 +207,6 @@ class JsonPrinter extends Printer_1.Printer {
                 literal: type.getLiteralName(),
             };
         }
-        else if (type instanceof Type_1.PrimitiveType) {
-            throw new Error('Unhandled PrimitiveType: ' + util_1.default.inspect(type, { showHidden: true, depth: null }));
-        }
         else if (type instanceof Type_1.ClassType) {
             return {
                 _: 'ClassType',
@@ -235,13 +236,13 @@ class JsonPrinter extends Printer_1.Printer {
             };
         }
         else if (type instanceof Type_1.GenericType) {
-            let defaultType = type.getDefaultType();
             let constraint = type.getConstraint();
+            let defaultType = type.getDefaultType();
             return {
                 _: 'GenericType',
                 name: type.getName(),
-                defaultType: defaultType && this.serializeType(defaultType),
                 constraint: constraint && this.serializeType(constraint),
+                defaultType: defaultType && this.serializeType(defaultType),
             };
         }
         else if (type instanceof Type_1.AliasType) {
@@ -265,11 +266,12 @@ class JsonPrinter extends Printer_1.Printer {
                 originType: type.getOriginType(),
             };
         }
-        else if (type instanceof Type_1.AnnotationType) {
-            throw new Error('Unhandled AnnotationType: ' + util_1.default.inspect(type, { showHidden: true, depth: null }));
-        }
         else {
-            throw new Error('Unhandled Type: ' + util_1.default.inspect(type, { showHidden: true, depth: null }));
+            console.warn(`Unhandled Type: ${type.constructor.name} (${type.toString()})`);
+            return {
+                _: type.constructor.name,
+                text: type.toString(),
+            };
         }
     }
     serializeFileSignature(file) {
@@ -457,9 +459,6 @@ class JsonPrinter extends Printer_1.Printer {
                 right: this.serializeValue(value.getOp2()),
             };
         }
-        else if (value instanceof Expr_1.AbstractBinopExpr) {
-            return new Error('Unhandled BinopExpr: ' + util_1.default.inspect(value, { showHidden: true, depth: null }));
-        }
         else if (value instanceof Expr_1.ArkUnopExpr) {
             return {
                 _: 'UnopExpr',
@@ -490,9 +489,6 @@ class JsonPrinter extends Printer_1.Printer {
                 args: value.getArgs().map(arg => this.serializeValue(arg)),
             };
         }
-        else if (value instanceof Expr_1.AbstractInvokeExpr) {
-            throw new Error('Unhandled CallExpr: ' + util_1.default.inspect(value, { showHidden: true, depth: null }));
-        }
         else if (value instanceof Ref_1.ArkThisRef) {
             return {
                 _: 'ThisRef',
@@ -514,6 +510,28 @@ class JsonPrinter extends Printer_1.Printer {
                 type: this.serializeType(value.getType()),
             };
         }
+        else if (value instanceof Ref_1.ArkCaughtExceptionRef) {
+            return {
+                _: 'CaughtExceptionRef',
+                type: this.serializeType(value.getType()),
+            };
+        }
+        else if (value instanceof Ref_1.GlobalRef) {
+            let ref = value.getRef();
+            return {
+                _: 'GlobalRef',
+                name: value.getName(),
+                ref: ref ? this.serializeValue(ref) : null,
+            };
+        }
+        else if (value instanceof Ref_1.ClosureFieldRef) {
+            return {
+                _: 'ClosureFieldRef',
+                base: this.serializeLocal(value.getBase()),
+                fieldName: value.getFieldName(),
+                type: this.serializeType(value.getType()),
+            };
+        }
         else if (value instanceof Ref_1.ArkInstanceFieldRef) {
             return {
                 _: 'InstanceFieldRef',
@@ -527,17 +545,13 @@ class JsonPrinter extends Printer_1.Printer {
                 field: this.serializeFieldSignature(value.getFieldSignature()),
             };
         }
-        else if (value instanceof Ref_1.AbstractFieldRef) {
-            throw new Error('Unhandled FieldRef: ' + util_1.default.inspect(value, { showHidden: true, depth: null }));
-        }
-        else if (value instanceof Ref_1.AbstractRef) {
-            throw new Error('Unhandled Ref: ' + util_1.default.inspect(value, { showHidden: true, depth: null }));
-        }
-        else if (value instanceof Expr_1.AbstractExpr) {
-            throw new Error('Unhandled Expr: ' + util_1.default.inspect(value, { showHidden: true, depth: null }));
-        }
         else {
-            throw new Error('Unhandled Value: ' + util_1.default.inspect(value, { showHidden: true, depth: null }));
+            console.warn(`Unhandled Value: ${value.constructor.name} (${value.toString()})`);
+            return {
+                _: value.constructor.name,
+                text: value.toString(),
+                type: this.serializeType(value.getType()),
+            };
         }
     }
     serializeStmt(stmt) {
@@ -578,7 +592,11 @@ class JsonPrinter extends Printer_1.Printer {
             };
         }
         else {
-            throw new Error('Unhandled Stmt: ' + util_1.default.inspect(stmt, { showHidden: true, depth: null }));
+            console.warn(`Unhandled Stmt: ${stmt.constructor.name} (${stmt.toString()})`);
+            return {
+                _: stmt.constructor.name,
+                text: stmt.toString(),
+            };
         }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "arkanalyzer",
-  "version": "1.0.35",
-  "commit_id": "1f7c702c",
+  "version": "1.0.37",
+  "commit_id": "587cf6a8",
   "files": [
     "docs",
     "lib",