arkanalyzer 1.0.70 → 1.0.71

package/lib/core/model/ArkMetadata.d.ts

@@ -1,7 +1,8 @@
 import { FullPosition } from '../base/Position';
 export declare enum ArkMetadataKind {
     LEADING_COMMENTS = 0,
-    TRAILING_COMMENTS = 1
+    TRAILING_COMMENTS = 1,
+    ENUM_INIT_TYPE_USER = 2
 }
 export interface ArkMetadataType {
 }
@@ -29,4 +30,9 @@ export declare class CommentsMetadata implements ArkMetadataType {
     constructor(comments: CommentItem[]);
     getComments(): CommentItem[];
 }
+export declare class EnumInitTypeUserMetadata implements ArkMetadataType {
+    private originTypeUser;
+    constructor(originTypeUser: boolean);
+    isUserDefined(): boolean;
+}
 //# sourceMappingURL=ArkMetadata.d.ts.map

package/lib/core/model/ArkMetadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkMetadata.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkMetadata.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,oBAAY,eAAe;IACvB,gBAAgB,IAAA;IAChB,iBAAiB,IAAA;CACpB;AAED,MAAM,WAAW,eAAe;CAAG;AAEnC;;;;;;;;;GASG;AACH,qBAAa,WAAW;IACpB,SAAS,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAEpD,WAAW,CAAC,IAAI,EAAE,eAAe,GAAG,eAAe,GAAG,SAAS;IAI/D,WAAW,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI;CAM1E;AAED,MAAM,MAAM,WAAW,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;CAC1B,CAAC;AAEF,qBAAa,gBAAiB,YAAW,eAAe;IACpD,OAAO,CAAC,QAAQ,CAAqB;gBAEzB,QAAQ,EAAE,WAAW,EAAE;IAI5B,WAAW,IAAI,WAAW,EAAE;CAGtC"}
+{"version":3,"file":"ArkMetadata.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkMetadata.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,oBAAY,eAAe;IACvB,gBAAgB,IAAA;IAChB,iBAAiB,IAAA;IACjB,mBAAmB,IAAA;CACtB;AAED,MAAM,WAAW,eAAe;CAAI;AAEpC;;;;;;;;;GASG;AACH,qBAAa,WAAW;IACpB,SAAS,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAEpD,WAAW,CAAC,IAAI,EAAE,eAAe,GAAG,eAAe,GAAG,SAAS;IAI/D,WAAW,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI;CAM1E;AAED,MAAM,MAAM,WAAW,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,YAAY,CAAC;CAC1B,CAAC;AAEF,qBAAa,gBAAiB,YAAW,eAAe;IACpD,OAAO,CAAC,QAAQ,CAAqB;gBAEzB,QAAQ,EAAE,WAAW,EAAE;IAI5B,WAAW,IAAI,WAAW,EAAE;CAGtC;AAED,qBAAa,wBAAyB,YAAW,eAAe;IAC5D,OAAO,CAAC,cAAc,CAAU;gBAEpB,cAAc,EAAE,OAAO;IAI5B,aAAa,IAAI,OAAO;CAGlC"}

package/lib/core/model/ArkMetadata.js

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommentsMetadata = exports.ArkMetadata = exports.ArkMetadataKind = void 0;
+exports.EnumInitTypeUserMetadata = exports.CommentsMetadata = exports.ArkMetadata = exports.ArkMetadataKind = void 0;
 var ArkMetadataKind;
 (function (ArkMetadataKind) {
     ArkMetadataKind[ArkMetadataKind["LEADING_COMMENTS"] = 0] = "LEADING_COMMENTS";
     ArkMetadataKind[ArkMetadataKind["TRAILING_COMMENTS"] = 1] = "TRAILING_COMMENTS";
+    ArkMetadataKind[ArkMetadataKind["ENUM_INIT_TYPE_USER"] = 2] = "ENUM_INIT_TYPE_USER";
 })(ArkMetadataKind = exports.ArkMetadataKind || (exports.ArkMetadataKind = {}));
 /**
  * ArkMetadata
@@ -53,3 +54,12 @@ class CommentsMetadata {
     }
 }
 exports.CommentsMetadata = CommentsMetadata;
+class EnumInitTypeUserMetadata {
+    constructor(originTypeUser) {
+        this.originTypeUser = originTypeUser;
+    }
+    isUserDefined() {
+        return this.originTypeUser;
+    }
+}
+exports.EnumInitTypeUserMetadata = EnumInitTypeUserMetadata;

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

@@ -1 +1 @@
-{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAmE,MAAM,iBAAiB,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AA0BtD,MAAM,MAAM,aAAa,GACnB,EAAE,CAAC,gBAAgB,GACnB,EAAE,CAAC,oBAAoB,GACvB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,iBAAiB,GACpB,EAAE,CAAC,uBAAuB,CAAC;AAUjC,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CAItH;AAED,wBAAgB,oCAAoC,CAChD,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,QAAQ,EACtB,MAAM,EAAE,EAAE,CAAC,iBAAiB,EAC5B,UAAU,EAAE,EAAE,CAAC,UAAU,GAC1B,IAAI,CAIN;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,IAAI,CAOpJ;AAED,wBAAgB,8BAA8B,CAC1C,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,eAAe,CAAC,EAAE,SAAS,GAC5B,IAAI,CASN;AAED,wBAAgB,mCAAmC,CAC/C,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,eAAe,CAAC,EAAE,SAAS,GAC5B,IAAI,CAUN;AAmBD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,IAAI,CA0BvI"}
+{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAmE,MAAM,iBAAiB,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AA+BtD,MAAM,MAAM,aAAa,GACnB,EAAE,CAAC,gBAAgB,GACnB,EAAE,CAAC,oBAAoB,GACvB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,iBAAiB,GACpB,EAAE,CAAC,uBAAuB,CAAC;AAUjC,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CAItH;AAED,wBAAgB,oCAAoC,CAChD,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,QAAQ,EACtB,MAAM,EAAE,EAAE,CAAC,iBAAiB,EAC5B,UAAU,EAAE,EAAE,CAAC,UAAU,GAC1B,IAAI,CAIN;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,IAAI,CAOpJ;AAED,wBAAgB,8BAA8B,CAC1C,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,eAAe,CAAC,EAAE,SAAS,GAC5B,IAAI,CASN;AAED,wBAAgB,mCAAmC,CAC/C,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,eAAe,CAAC,EAAE,SAAS,GAC5B,IAAI,CAUN;AAmBD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,IAAI,CA0BvI"}

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

@@ -61,6 +61,10 @@ const Type_1 = require("../../base/Type");
 const BodyBuilder_1 = require("./BodyBuilder");
 const Expr_1 = require("../../base/Expr");
 const ArkBaseModel_1 = require("../ArkBaseModel");
+const Constant_1 = require("../../base/Constant");
+const ValueUtil_1 = require("../../common/ValueUtil");
+const Local_1 = require("../../base/Local");
+const ArkMetadata_1 = require("../ArkMetadata");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkClassBuilder');
 function buildDefaultArkClassFromArkFile(arkFile, defaultClass, astRoot) {
     defaultClass.setDeclaringArkFile(arkFile);
@@ -317,6 +321,7 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
     const staticInitStmts = [];
     const instanceInitStmts = [];
     let staticBlockId = 0;
+    const enumFieldInfo = { lastFieldName: '', curValue: 0, isCurValueValid: true };
     clsNode.members.forEach(member => {
         if (isClassMethod(member)) {
             // these node types have been handled at the beginning of this function by calling buildMethodsForClass
@@ -341,7 +346,7 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
         }
         if (ohos_typescript_1.default.isEnumMember(member)) {
             const arkField = (0, ArkFieldBuilder_1.buildProperty2ArkField)(member, sourceFile, cls);
-            getInitStmts(staticIRTransformer, arkField, member.initializer);
+            getInitStmts(staticIRTransformer, arkField, member.initializer, enumFieldInfo);
             arkField.getInitializer().forEach(stmt => staticInitStmts.push(stmt));
         }
         else if (ohos_typescript_1.default.isIndexSignatureDeclaration(member)) {
@@ -466,29 +471,57 @@ function buildStaticBlocksForClass(clsNode, cls, sourceFile) {
     });
     return staticBlockMethodSignatures;
 }
-function getInitStmts(transformer, field, initNode) {
+function getInitStmts(transformer, field, initNode, enumFieldInfo) {
+    let initValue;
+    let initPositions;
+    const stmts = [];
     if (initNode) {
-        const stmts = [];
-        let { value: initValue, valueOriginalPositions: initPositions, stmts: initStmts } = transformer.tsNodeToValueAndStmts(initNode);
+        let initStmts = [];
+        ({ value: initValue, valueOriginalPositions: initPositions, stmts: initStmts } = transformer.tsNodeToValueAndStmts(initNode));
         initStmts.forEach(stmt => stmts.push(stmt));
         if (IRUtils_1.IRUtils.moreThanOneAddress(initValue)) {
             ({ value: initValue, valueOriginalPositions: initPositions, stmts: initStmts } = transformer.generateAssignStmtForValue(initValue, initPositions));
             initStmts.forEach(stmt => stmts.push(stmt));
         }
-        const fieldRef = new Ref_1.ArkInstanceFieldRef(transformer.getThisLocal(), field.getSignature());
-        const fieldRefPositions = [Position_1.FullPosition.DEFAULT, Position_1.FullPosition.DEFAULT];
-        const assignStmt = new Stmt_1.ArkAssignStmt(fieldRef, initValue);
-        assignStmt.setOperandOriginalPositions([...fieldRefPositions, ...initPositions]);
-        stmts.push(assignStmt);
-        const fieldSourceCode = field.getCode();
-        const fieldOriginPosition = field.getOriginPosition();
-        for (const stmt of stmts) {
-            stmt.setOriginPositionInfo(fieldOriginPosition);
-            stmt.setOriginalText(fieldSourceCode);
+        if (enumFieldInfo !== undefined) {
+            if (initValue instanceof Constant_1.NumberConstant) {
+                enumFieldInfo.curValue = parseFloat(initValue.getValue()) + 1;
+                enumFieldInfo.isCurValueValid = true;
+            }
+            else {
+                enumFieldInfo.lastFieldName = field.getName();
+                enumFieldInfo.isCurValueValid = false;
+            }
         }
-        field.setInitializer(stmts);
-        if (field.getType() instanceof Type_1.UnknownType) {
-            field.getSignature().setType(initValue.getType());
+    }
+    else if (enumFieldInfo !== undefined) {
+        if (enumFieldInfo.isCurValueValid) {
+            initValue = ValueUtil_1.ValueUtil.getOrCreateNumberConst(enumFieldInfo.curValue);
+            enumFieldInfo.curValue += 1;
+        }
+        else {
+            initValue = new Expr_1.ArkNormalBinopExpr(new Local_1.Local(enumFieldInfo.lastFieldName), ValueUtil_1.ValueUtil.getOrCreateNumberConst(1), Expr_1.NormalBinaryOperator.Addition);
+            enumFieldInfo.lastFieldName = field.getName();
         }
+        initPositions = [Position_1.FullPosition.DEFAULT];
+        field.setMetadata(ArkMetadata_1.ArkMetadataKind.ENUM_INIT_TYPE_USER, new ArkMetadata_1.EnumInitTypeUserMetadata(false));
+    }
+    else {
+        return;
+    }
+    const fieldRef = new Ref_1.ArkInstanceFieldRef(transformer.getThisLocal(), field.getSignature());
+    const fieldRefPositions = [Position_1.FullPosition.DEFAULT, Position_1.FullPosition.DEFAULT];
+    const assignStmt = new Stmt_1.ArkAssignStmt(fieldRef, initValue);
+    assignStmt.setOperandOriginalPositions([...fieldRefPositions, ...initPositions]);
+    stmts.push(assignStmt);
+    const fieldSourceCode = field.getCode();
+    const fieldOriginPosition = field.getOriginPosition();
+    for (const stmt of stmts) {
+        stmt.setOriginPositionInfo(fieldOriginPosition);
+        stmt.setOriginalText(fieldSourceCode);
+    }
+    field.setInitializer(stmts);
+    if (field.getType() instanceof Type_1.UnknownType) {
+        field.getSignature().setType(initValue.getType());
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "arkanalyzer",
-  "version": "1.0.70",
-  "commit_id": "2a5b916e",
+  "version": "1.0.71",
+  "commit_id": "e4e5347f",
   "files": [
     "docs",
     "lib",