arkanalyzer 1.0.18 → 1.0.19

package/lib/core/common/TypeInference.js

@@ -56,6 +56,7 @@ const Const_1 = require("./Const");
 const ValueUtil_1 = require("./ValueUtil");
 const ArkImport_1 = require("../model/ArkImport");
 const IRInference_1 = require("./IRInference");
+const TypeExpr_1 = require("../base/TypeExpr");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'TypeInference');
 class TypeInference {
     static inferTypeInArkField(arkField) {
@@ -65,6 +66,7 @@ class TypeInference {
         const method = (_a = arkClass.getMethodWithName(Const_1.INSTANCE_INIT_METHOD_NAME)) !== null && _a !== void 0 ? _a : arkClass.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME);
         for (const stmt of stmts) {
             if (method) {
+                this.resolveTypeExprsInStmt(stmt, method);
                 this.resolveExprsInStmt(stmt, method);
                 this.resolveFieldRefsInStmt(stmt, method);
                 this.resolveArkAssignStmt(stmt, method);
@@ -156,10 +158,7 @@ class TypeInference {
         }
         signatures.forEach(s => {
             s.getMethodSubSignature().getParameters().forEach(p => {
-                const type = TypeInference.inferUnclearedType(p.getType(), arkClass);
-                if (type) {
-                    p.setType(type);
-                }
+                this.inferParameterType(p, arkMethod);
             });
             this.inferSignatureReturnType(s, arkMethod);
         });
@@ -170,6 +169,7 @@ class TypeInference {
         const cfg = body.getCfg();
         for (const block of cfg.getBlocks()) {
             for (const stmt of block.getStmts()) {
+                this.resolveTypeExprsInStmt(stmt, arkMethod);
                 this.resolveExprsInStmt(stmt, arkMethod);
                 this.resolveFieldRefsInStmt(stmt, arkMethod);
                 this.resolveArkAssignStmt(stmt, arkMethod);
@@ -208,6 +208,14 @@ class TypeInference {
             stmt.getAliasType().setOriginalType(stmt.getAliasTypeExpr().getType());
         }
     }
+    /**
+     * infer value type for TypeExprs in stmt which specify the type such as TypeQueryExpr
+     */
+    static resolveTypeExprsInStmt(stmt, arkMethod) {
+        for (let typeExpr of stmt.getTypeExprs()) {
+            typeExpr.inferType(arkMethod);
+        }
+    }
     /**
      * infer type for fieldRefs in stmt.
      */
@@ -284,14 +292,23 @@ class TypeInference {
             if (rightType) {
                 this.setValueType(rightOp, rightType);
             }
+            else {
+                if (rightOp instanceof Local_1.Local) {
+                    IRInference_1.IRInference.inferLocal(rightOp, arkMethod);
+                    rightType = rightOp.getType();
+                }
+            }
         }
         const leftOp = stmt.getLeftOp();
         let leftType = leftOp.getType();
         if (this.isUnclearType(leftType)) {
-            leftType = this.inferUnclearedType(leftType, arkClass);
-            if (!leftType && !this.isUnclearType(rightType)) {
+            const newLeftType = this.inferUnclearedType(leftType, arkClass);
+            if (!newLeftType && !this.isUnclearType(rightType)) {
                 leftType = rightType;
             }
+            else if (newLeftType) {
+                leftType = newLeftType;
+            }
         }
         if (leftType && !this.isUnclearType(leftType)) {
             this.setValueType(leftOp, leftType);
@@ -331,7 +348,13 @@ class TypeInference {
             return this.hasUnclearReferenceType(type.getBaseType());
         }
         else if (type instanceof Type_1.AliasType) {
-            return this.hasUnclearReferenceType(type.getOriginalType());
+            return this.isUnclearType(type.getOriginalType());
+        }
+        else if (type instanceof TypeExpr_1.KeyofTypeExpr) {
+            return this.isUnclearType(type.getOpType());
+        }
+        else if (type instanceof TypeExpr_1.TypeQueryExpr) {
+            return this.isUnclearType(type.getType());
         }
         return false;
     }
@@ -349,6 +372,12 @@ class TypeInference {
         else if (type instanceof Type_1.AliasType) {
             return this.hasUnclearReferenceType(type.getOriginalType());
         }
+        else if (type instanceof TypeExpr_1.KeyofTypeExpr) {
+            return this.hasUnclearReferenceType(type.getOpType());
+        }
+        else if (type instanceof TypeExpr_1.TypeQueryExpr) {
+            return this.hasUnclearReferenceType(type.getType());
+        }
         return false;
     }
     static inferSimpleTypeInStmt(stmt) {
@@ -399,6 +428,18 @@ class TypeInference {
         }
         return value.getType();
     }
+    static inferParameterType(param, arkMethod) {
+        let pType = param.getType();
+        const type = TypeInference.inferUnclearedType(pType, arkMethod.getDeclaringArkClass());
+        if (type) {
+            param.setType(type);
+        }
+        else {
+            if (pType instanceof TypeExpr_1.AbstractTypeExpr) {
+                pType.inferType(arkMethod);
+            }
+        }
+    }
     static inferSignatureReturnType(oldSignature, arkMethod) {
         if (oldSignature.getMethodSubSignature().getMethodName() === TSConst_1.CONSTRUCTOR_NAME) {
             const newReturnType = new Type_1.ClassType(oldSignature.getDeclaringClassSignature());
@@ -409,6 +450,14 @@ class TypeInference {
         if (!this.isUnclearType(currReturnType)) {
             return;
         }
+        if (currReturnType instanceof TypeExpr_1.AbstractTypeExpr) {
+            currReturnType.inferType(arkMethod);
+            return;
+        }
+        if (currReturnType instanceof Type_1.ArrayType && currReturnType.getBaseType() instanceof TypeExpr_1.AbstractTypeExpr) {
+            currReturnType.getBaseType().inferType(arkMethod);
+            return;
+        }
         const newReturnType = this.inferUnclearedType(currReturnType, arkMethod.getDeclaringArkClass());
         if (newReturnType) {
             oldSignature.getMethodSubSignature().setReturnType(newReturnType);

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

@@ -1 +1 @@
-{"version":3,"file":"builderUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/builderUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,oBAAoB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC/G,OAAO,EACH,SAAS,EAIT,WAAW,EAGX,IAAI,EAIP,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAGH,eAAe,EAElB,MAAM,oBAAoB,CAAC;AAQ5B,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,GAAG,MAAM,CAUlE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,GAAG,MAAM,CAYxF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,CAUxF;AA2BD,wBAAgB,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,MAAM,CAUpD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBxG;AAED,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,EAAE,CAAC,SAAS,CAAC,wBAAwB,CAAC,EACtD,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,WAAW,EAAE,CAmB/G;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,oBAAoB,CAAC,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,qBA4GvI;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,IAAI,CA8ChG;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,QAM3F;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,wBAAwB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAC9E,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAwF9E;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,QA8CjD"}
+{"version":3,"file":"builderUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/builderUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,oBAAoB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC/G,OAAO,EACH,SAAS,EAIT,WAAW,EAGX,IAAI,EAIP,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAGH,eAAe,EAElB,MAAM,oBAAoB,CAAC;AAc5B,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,GAAG,MAAM,CAUlE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,GAAG,MAAM,CAYxF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,CAUxF;AA2BD,wBAAgB,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,MAAM,CAUpD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBxG;AAED,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,EAAE,CAAC,SAAS,CAAC,wBAAwB,CAAC,EACtD,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,WAAW,EAAE,CAmB/G;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,oBAAoB,CAAC,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,qBA4GvI;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,IAAI,CA8ChG;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,QAM3F;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,wBAAwB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAC9E,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,CA0F9E;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,QA8CjD"}

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

@@ -54,6 +54,11 @@ const ArkClassBuilder_1 = require("./ArkClassBuilder");
 const Builtin_1 = require("../../common/Builtin");
 const ArkBaseModel_1 = require("../ArkBaseModel");
 const ArkValueTransformer_1 = require("../../common/ArkValueTransformer");
+const TypeExpr_1 = require("../../base/TypeExpr");
+const TSConst_1 = require("../../common/TSConst");
+const ArkSignatureBuilder_1 = require("./ArkSignatureBuilder");
+const Ref_1 = require("../../base/Ref");
+const Local_1 = require("../../base/Local");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'builderUtils');
 function handleQualifiedName(node) {
     let right = node.right.text;
@@ -434,6 +439,9 @@ function tsNode2Type(typeNode, sourceFile, arkInstance) {
     else if (ohos_typescript_1.default.isTypeOperatorNode(typeNode)) {
         return buildTypeFromTypeOperator(typeNode, sourceFile, arkInstance);
     }
+    else if (ohos_typescript_1.default.isTypeQueryNode(typeNode)) {
+        return buildTypeFromTypeQuery(typeNode, sourceFile, arkInstance);
+    }
     else if (typeNode.kind === ohos_typescript_1.default.SyntaxKind.ObjectKeyword) {
         return new Type_1.ClassType(Builtin_1.Builtin.OBJECT_CLASS_SIGNATURE);
     }
@@ -491,20 +499,60 @@ function buildTypeFromPreStr(preStr) {
 }
 exports.buildTypeFromPreStr = buildTypeFromPreStr;
 function buildTypeFromTypeOperator(typeOperatorNode, sourceFile, arkInstance) {
+    const typeNode = typeOperatorNode.type;
+    let type = tsNode2Type(typeNode, sourceFile, arkInstance);
     switch (typeOperatorNode.operator) {
         case (ohos_typescript_1.default.SyntaxKind.ReadonlyKeyword): {
-            const typeNode = typeOperatorNode.type;
-            let type = tsNode2Type(typeNode, sourceFile, arkInstance);
             if (type instanceof Type_1.ArrayType || type instanceof Type_1.TupleType) {
                 type.setReadonlyFlag(true);
             }
             return type;
         }
-        case (ohos_typescript_1.default.SyntaxKind.UniqueKeyword):
-            return Type_1.UnknownType.getInstance();
         case (ohos_typescript_1.default.SyntaxKind.KeyOfKeyword):
+            return new TypeExpr_1.KeyofTypeExpr(type);
+        case (ohos_typescript_1.default.SyntaxKind.UniqueKeyword):
             return Type_1.UnknownType.getInstance();
         default:
             return Type_1.UnknownType.getInstance();
     }
 }
+function buildTypeFromTypeQuery(typeQueryNode, sourceFile, arkInstance) {
+    var _a, _b, _c, _d, _e, _f;
+    const exprNameNode = typeQueryNode.exprName;
+    let opValue;
+    if (ohos_typescript_1.default.isQualifiedName(exprNameNode)) {
+        if (exprNameNode.left.getText(sourceFile) === TSConst_1.THIS_NAME) {
+            const fieldName = exprNameNode.right.getText(sourceFile);
+            if (arkInstance instanceof ArkMethod_1.ArkMethod) {
+                const fieldSignature = (_b = (_a = arkInstance.getDeclaringArkClass().getFieldWithName(fieldName)) === null || _a === void 0 ? void 0 : _a.getSignature()) !== null && _b !== void 0 ? _b : ArkSignatureBuilder_1.ArkSignatureBuilder.buildFieldSignatureFromFieldName(fieldName);
+                const baseLocal = (_d = (_c = arkInstance.getBody()) === null || _c === void 0 ? void 0 : _c.getLocals().get(TSConst_1.THIS_NAME)) !== null && _d !== void 0 ? _d : new Local_1.Local(TSConst_1.THIS_NAME, new Type_1.ClassType(arkInstance.getDeclaringArkClass().getSignature(), arkInstance.getDeclaringArkClass().getGenericsTypes()));
+                opValue = new Ref_1.ArkInstanceFieldRef(baseLocal, fieldSignature);
+            }
+            else if (arkInstance instanceof ArkClass_1.ArkClass) {
+                const fieldSignature = (_f = (_e = arkInstance.getFieldWithName(fieldName)) === null || _e === void 0 ? void 0 : _e.getSignature()) !== null && _f !== void 0 ? _f : ArkSignatureBuilder_1.ArkSignatureBuilder.buildFieldSignatureFromFieldName(fieldName);
+                const baseLocal = new Local_1.Local(TSConst_1.THIS_NAME, new Type_1.ClassType(arkInstance.getSignature(), arkInstance.getGenericsTypes()));
+                opValue = new Ref_1.ArkInstanceFieldRef(baseLocal, fieldSignature);
+            }
+            else {
+                const fieldSignature = arkInstance.getSignature();
+                const baseLocal = new Local_1.Local(TSConst_1.THIS_NAME, new Type_1.ClassType(arkInstance.getDeclaringArkClass().getSignature(), arkInstance.getDeclaringArkClass().getGenericsTypes()));
+                opValue = new Ref_1.ArkInstanceFieldRef(baseLocal, fieldSignature);
+            }
+        }
+        else {
+            const exprName = exprNameNode.getText(sourceFile);
+            opValue = new Local_1.Local(exprName, Type_1.UnknownType.getInstance());
+        }
+    }
+    else {
+        const exprName = exprNameNode.escapedText.toString();
+        opValue = new Local_1.Local(exprName, Type_1.UnknownType.getInstance());
+    }
+    let expr = new TypeExpr_1.TypeQueryExpr(opValue);
+    if (typeQueryNode.typeArguments) {
+        for (const typeArgument of typeQueryNode.typeArguments) {
+            expr.addGenericType(tsNode2Type(typeArgument, sourceFile, arkInstance));
+        }
+    }
+    return expr;
+}

package/lib/save/source/SourceTransformer.d.ts

@@ -39,6 +39,8 @@ export declare class SourceTransformer {
     private arrayType2string;
     private tupleType2string;
     private aliasType2string;
+    private keyofTypeExpr2string;
+    private typeQueryExpr2string;
     private unclearReferenceType2string;
     private classType2string;
 }

package/lib/save/source/SourceTransformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SourceTransformer.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceTransformer.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAMH,qBAAqB,EAKrB,mBAAmB,EAKtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,OAAO,EAGH,SAAS,EAQT,IAAI,EAKP,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAmE,MAAM,qBAAqB,CAAC;AACnH,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AASnD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAI7D,MAAM,WAAW,kBAAkB;IAC/B,UAAU,IAAI,OAAO,CAAC;IAEtB,wBAAwB,IAAI,YAAY,GAAG,SAAS,CAAC;IAErD,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,CAAC;IAExD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;IAErD,UAAU,IAAI,aAAa,CAAC;IAE5B,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;IAEpC,iBAAiB,IAAI,OAAO,CAAC;CAChC;AAED,qBAAa,iBAAiB;IAC1B,SAAS,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAE1B,OAAO,EAAE,kBAAkB;IAIvC,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,sBAAsB;IAKvB,0BAA0B,CAAC,UAAU,EAAE,qBAAqB,GAAG,MAAM;IAkBrE,wBAAwB,CAAC,UAAU,EAAE,mBAAmB,GAAG,MAAM;IA0DxE,OAAO,CAAC,oBAAoB;IAYrB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,GAAE,MAAa,GAAG,MAAM;WASvD,aAAa,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM;IAQpD,OAAO,CAAC,YAAY;IA2Db,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM;IA8BvC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IAiDtD,qBAAqB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM;IAW9C,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IA2DvC,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,2BAA2B;IAQnC,OAAO,CAAC,gBAAgB;CAkB3B"}
+{"version":3,"file":"SourceTransformer.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceTransformer.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAMH,qBAAqB,EAKrB,mBAAmB,EAKtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,OAAO,EAGH,SAAS,EAQT,IAAI,EAKP,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAmE,MAAM,qBAAqB,CAAC;AACnH,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AASnD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAS7D,MAAM,WAAW,kBAAkB;IAC/B,UAAU,IAAI,OAAO,CAAC;IAEtB,wBAAwB,IAAI,YAAY,GAAG,SAAS,CAAC;IAErD,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,CAAC;IAExD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;IAErD,UAAU,IAAI,aAAa,CAAC;IAE5B,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;IAEpC,iBAAiB,IAAI,OAAO,CAAC;CAChC;AAED,qBAAa,iBAAiB;IAC1B,SAAS,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAE1B,OAAO,EAAE,kBAAkB;IAIvC,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,sBAAsB;IAKvB,0BAA0B,CAAC,UAAU,EAAE,qBAAqB,GAAG,MAAM;IAkBrE,wBAAwB,CAAC,UAAU,EAAE,mBAAmB,GAAG,MAAM;IA0DxE,OAAO,CAAC,oBAAoB;IAYrB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,GAAE,MAAa,GAAG,MAAM;WASvD,aAAa,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM;IAQpD,OAAO,CAAC,YAAY;IA2Db,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM;IA8BvC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IAiDtD,qBAAqB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM;IAW9C,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IA+DvC,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,2BAA2B;IAQnC,OAAO,CAAC,gBAAgB;CAkB3B"}

package/lib/save/source/SourceTransformer.js

@@ -42,6 +42,7 @@ const Constant_1 = require("../../core/base/Constant");
 const Expr_1 = require("../../core/base/Expr");
 const Local_1 = require("../../core/base/Local");
 const ArkClass_1 = require("../../core/model/ArkClass");
+const ArkMethod_1 = require("../../core/model/ArkMethod");
 const logger_1 = __importStar(require("../../utils/logger"));
 const PrinterUtils_1 = require("../base/PrinterUtils");
 const SourceMethod_1 = require("./SourceMethod");
@@ -51,6 +52,12 @@ const Ref_1 = require("../../core/base/Ref");
 const EtsConst_1 = require("../../core/common/EtsConst");
 const Const_1 = require("../../core/common/Const");
 const Stmt_1 = require("../../core/base/Stmt");
+const ArkNamespace_1 = require("../../core/model/ArkNamespace");
+const TypeExpr_1 = require("../../core/base/TypeExpr");
+const ArkBaseModel_1 = require("../../core/model/ArkBaseModel");
+const ArkField_1 = require("../../core/model/ArkField");
+const ArkExport_1 = require("../../core/model/ArkExport");
+const ArkImport_1 = require("../../core/model/ArkImport");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'SourceTransformer');
 class SourceTransformer {
     constructor(context) {
@@ -278,7 +285,7 @@ class SourceTransformer {
         if (type instanceof Type_1.LiteralType) {
             return this.literalType2string(type);
         }
-        if (type instanceof Type_1.PrimitiveType) {
+        if (type instanceof Type_1.PrimitiveType || type instanceof Type_1.GenericType) {
             return type.getName();
         }
         if (type instanceof Type_1.UnionType || type instanceof Type_1.IntersectionType) {
@@ -309,12 +316,15 @@ class SourceTransformer {
         if (type instanceof Type_1.UnclearReferenceType) {
             return this.unclearReferenceType2string(type);
         }
-        if (type instanceof Type_1.GenericType) {
-            return type.getName();
-        }
         if (type instanceof Type_1.AliasType) {
             return this.aliasType2string(type);
         }
+        if (type instanceof TypeExpr_1.KeyofTypeExpr) {
+            return this.keyofTypeExpr2string(type);
+        }
+        if (type instanceof TypeExpr_1.TypeQueryExpr) {
+            return this.typeQueryExpr2string(type);
+        }
         if (!type) {
             return 'any';
         }
@@ -352,7 +362,7 @@ class SourceTransformer {
             dimensions.push('[]');
         }
         let baseType = type.getBaseType();
-        if (baseType instanceof Type_1.UnionType || baseType instanceof Type_1.IntersectionType) {
+        if (baseType instanceof Type_1.UnionType || baseType instanceof Type_1.IntersectionType || baseType instanceof TypeExpr_1.AbstractTypeExpr) {
             return `${readonly}(${this.typeToString(baseType)})${dimensions.join('')}`;
         }
         return `${readonly}${this.typeToString(baseType)}${dimensions.join('')}`;
@@ -379,6 +389,34 @@ class SourceTransformer {
         }
         return type.getName();
     }
+    keyofTypeExpr2string(type) {
+        if (type.getOpType() instanceof Type_1.UnionType || type.getOpType() instanceof Type_1.IntersectionType) {
+            return `keyof (${this.typeToString(type.getOpType())})`;
+        }
+        return `keyof ${this.typeToString(type.getOpType())}`;
+    }
+    typeQueryExpr2string(type) {
+        const gTypes = type.getGenerateTypes();
+        const genericStr = this.genericTypesToString(gTypes);
+        const opValue = type.getOpValue();
+        if (opValue instanceof ArkBaseModel_1.ArkBaseModel) {
+            if (opValue instanceof ArkClass_1.ArkClass || opValue instanceof ArkMethod_1.ArkMethod || opValue instanceof ArkNamespace_1.ArkNamespace || opValue instanceof ArkField_1.ArkField) {
+                return `typeof ${opValue.getName()}${genericStr}`;
+            }
+            else if (opValue instanceof ArkExport_1.ExportInfo) {
+                return `typeof ${opValue.getExportClauseName()}${genericStr}`;
+            }
+            else if (opValue instanceof ArkImport_1.ImportInfo) {
+                return `typeof ${opValue.getImportClauseName()}${genericStr}`;
+            }
+            else {
+                return `typeof *invalid*`;
+            }
+        }
+        else {
+            return `typeof ${this.valueToString(opValue)}${genericStr}`;
+        }
+    }
     unclearReferenceType2string(type) {
         let genericTypes = type.getGenericTypes();
         if (genericTypes.length > 0) {

package/lib/utils/SparseBitVector.d.ts

@@ -38,9 +38,12 @@ declare class SparseBitVectorElement {
     private bits;
     constructor(elementSize?: number);
     word(idx: number): number;
+    clone(): Word;
     get elementSize(): number;
+    get bitWordNum(): number;
     isEmpty(): boolean;
     set(bitIdx: number): void;
+    setWord(word: Word): void;
     reset(bitIdx: number): void;
     test(bitIdx: number): boolean;
     test_and_set(bitIdx: number): boolean;
@@ -50,6 +53,7 @@ declare class SparseBitVectorElement {
     equals(rhs: SparseBitVectorElement): boolean;
     unionWith(other: SparseBitVectorElement): boolean;
     intersectWith(other: SparseBitVectorElement): boolean;
+    subtractWith(rhs: SparseBitVectorElement): boolean;
     countBitsV2(word: number): number;
     countBits(word: number): number;
     isZero(): boolean;
@@ -65,10 +69,12 @@ export declare class SparseBitVector {
     test(bitIdx: number): boolean;
     testAndSet(bitIdx: number): boolean;
     reset(bitIdx: number): void;
+    clear(): void;
+    clone(): SparseBitVector;
     findFirst(): number;
     count(): number;
     isEmpty(): boolean;
-    [Symbol.iterator](): Iterator<number>;
+    [Symbol.iterator](): IterableIterator<number>;
     /**
      * Check if this SparseBitVector is equal to another SparseBitVector.
      */
@@ -84,8 +90,11 @@ export declare class SparseBitVector {
      */
     intersectWith(rhs: SparseBitVector): boolean;
     /**
-     * Dump as string.
+     * Subtract another SparseBitVector from this one.
+     * This operation modifies the current SparseBitVector in place.
+     * Return True if the current SparseBitVector was modified, false otherwise.
      */
+    subtractWith(rhs: SparseBitVector): boolean;
     toString(): string;
 }
 export {};

package/lib/utils/SparseBitVector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SparseBitVector.d.ts","sourceRoot":"","sources":["../../src/utils/SparseBitVector.ts"],"names":[],"mappings":"AAeA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,MAAM,MAAM,IAAI,GAAG,WAAW,CAAC;AAE/B,cAAM,sBAAsB;IACxB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,IAAI,CAAO;gBAEP,WAAW,GAAE,MAAY;IAMrC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIzB,IAAI,WAAW,IAAI,MAAM,CAExB;IAGD,OAAO,IAAI,OAAO;IAKlB,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAOzB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAO3B,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAO7B,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAUrC,KAAK,IAAI,MAAM;IASf,SAAS,IAAI,MAAM;IAUnB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAuBhC,MAAM,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO;IAW5C,SAAS,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO;IAajD,aAAa,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO;IAarD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAUjC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAgB/B,MAAM,IAAI,OAAO;IAUjB,OAAO,CAAC,kBAAkB;CAwB7B;AAED,qBAAa,eAAe;IACxB,OAAO,CAAC,YAAY,CAAS;IAG7B,OAAO,CAAC,QAAQ,CAAkD;gBAEtD,YAAY,GAAE,MAAY;IAGtC,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAE/C;IAGD,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAWzB,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAO7B,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAUnC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAY3B,SAAS,IAAI,MAAM;IAYnB,KAAK,IAAI,MAAM;IASf,OAAO,IAAI,OAAO;IAIlB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC;IAgCrC;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAcrC;;;OAGG;IACH,SAAS,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAwBxC;;;OAGG;IACH,aAAa,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAoC5C;;OAEG;IACH,QAAQ,IAAI,MAAM;CAIrB"}
+{"version":3,"file":"SparseBitVector.d.ts","sourceRoot":"","sources":["../../src/utils/SparseBitVector.ts"],"names":[],"mappings":"AAeA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,MAAM,MAAM,IAAI,GAAG,WAAW,CAAC;AAE/B,cAAM,sBAAsB;IACxB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,IAAI,CAAO;gBAEP,WAAW,GAAE,MAAY;IAMrC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIzB,KAAK,IAAI,IAAI;IAIb,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAGD,OAAO,IAAI,OAAO;IAKlB,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAMzB,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAKzB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAO3B,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAO7B,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAUrC,KAAK,IAAI,MAAM;IASf,SAAS,IAAI,MAAM;IAUnB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAuBhC,MAAM,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO;IAW5C,SAAS,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO;IAajD,aAAa,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO;IAarD,YAAY,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO;IAiBlD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAUjC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAgB/B,MAAM,IAAI,OAAO;IAUjB,OAAO,CAAC,kBAAkB;CAwB7B;AAED,qBAAa,eAAe;IACxB,OAAO,CAAC,YAAY,CAAS;IAG7B,OAAO,CAAC,QAAQ,CAAkD;gBAEtD,YAAY,GAAE,MAAY;IAItC,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAE/C;IAGD,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAWzB,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAO7B,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAUnC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAY3B,KAAK,IAAI,IAAI;IAKb,KAAK,IAAI,eAAe;IAaxB,SAAS,IAAI,MAAM;IAYnB,KAAK,IAAI,MAAM;IASf,OAAO,IAAI,OAAO;IAIlB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,MAAM,CAAC;IAsC7C;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAcrC;;;OAGG;IACH,SAAS,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAwBxC;;;OAGG;IACH,aAAa,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAoC5C;;;;OAIG;IACH,YAAY,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IA2B3C,QAAQ,IAAI,MAAM;CAIrB"}

package/lib/utils/SparseBitVector.js

@@ -25,9 +25,15 @@ class SparseBitVectorElement {
     word(idx) {
         return this.bits[idx];
     }
+    clone() {
+        return new Uint32Array(this.bits);
+    }
     get elementSize() {
         return this.ELEMENT_SIZE;
     }
+    get bitWordNum() {
+        return this.BITWORDS_NUM;
+    }
     // Check if the element is empty (all bits are zero)
     isEmpty() {
         return this.isZero();
@@ -38,6 +44,9 @@ class SparseBitVectorElement {
         const bitOffset = bitIdx % BITWORD_SIZE;
         this.bits[wordIndex] |= (1 << bitOffset);
     }
+    setWord(word) {
+        this.bits = word;
+    }
     // Reset a bit at the given index
     reset(bitIdx) {
         const wordIndex = Math.floor(bitIdx / BITWORD_SIZE);
@@ -128,6 +137,20 @@ class SparseBitVectorElement {
         }
         return changed;
     }
+    // Subtract another SparseBitVectorElement from this one.
+    subtractWith(rhs) {
+        let changed = false;
+        // Perform subtraction: this = this & ~rhs
+        for (let i = 0; i < this.bits.length; i++) {
+            const oldWord = this.bits[i];
+            this.bits[i] &= ~rhs.bits[i];
+            // If any bit was changed, mark as changed
+            if (this.bits[i] !== oldWord) {
+                changed = true;
+            }
+        }
+        return changed;
+    }
     // Count the number of set bits in a word
     countBitsV2(word) {
         let count = 0;
@@ -230,6 +253,20 @@ class SparseBitVector {
             }
         }
     }
+    // Clear all elements
+    clear() {
+        this.elements.clear();
+    }
+    // Clone, return a deep copied object
+    clone() {
+        const newVector = new SparseBitVector(this.elementSize);
+        for (const [idx, element] of this.elements) {
+            const newElement = new SparseBitVectorElement(this.elementSize);
+            newElement.setWord(element.clone());
+            newVector.elems.set(idx, newElement);
+        }
+        return newVector;
+    }
     // Find the first set bit in the vector
     findFirst() {
         if (this.elements.size === 0)
@@ -264,7 +301,10 @@ class SparseBitVector {
             return {
                 next() {
                     return { value: undefined, done: true };
-                }
+                },
+                [Symbol.iterator]() {
+                    return this; // Make the iterator itself iterable
+                },
             };
         }
         let bitIndex = element[1].findFirst();
@@ -283,7 +323,10 @@ class SparseBitVector {
                     return { value: v, done: false };
                 }
                 return { value: undefined, done: true };
-            }
+            },
+            [Symbol.iterator]() {
+                return this; // Make the iterator itself iterable
+            },
         };
     }
     /**
@@ -367,8 +410,32 @@ class SparseBitVector {
         return changed;
     }
     /**
-     * Dump as string.
+     * Subtract another SparseBitVector from this one.
+     * This operation modifies the current SparseBitVector in place.
+     * Return True if the current SparseBitVector was modified, false otherwise.
      */
+    subtractWith(rhs) {
+        if (this.elementSize !== rhs.elementSize || this.isEmpty() || rhs.isEmpty()) {
+            return false;
+        }
+        let needDeleteIdx = new Set();
+        let changed = false;
+        for (const [elementIndex, element] of this.elements) {
+            const rhsElement = rhs.elements.get(elementIndex);
+            if (rhsElement) {
+                changed = element.subtractWith(rhsElement) || changed;
+                if (element.isEmpty()) {
+                    needDeleteIdx.add(elementIndex);
+                }
+            }
+        }
+        if (needDeleteIdx.size > 0) {
+            needDeleteIdx.forEach(idx => this.elements.delete(idx));
+            changed = true;
+        }
+        return changed;
+    }
+    // Dump as string
     toString() {
         let ar = [...this];
         return ar.toString();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arkanalyzer",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "files": [
     "docs",
     "lib",