arkanalyzer 1.0.29 → 1.0.30

package/lib/core/graph/DominanceFinder.js

@@ -43,17 +43,16 @@ class DominanceFinder {
                 let blockIdx = this.blockToIdx.get(block);
                 let preds = Array.from(block.getPredecessors());
                 let newIdom = this.getFirstDefinedBlockPredIdx(preds);
-                if (preds.length > 0 && newIdom !== -1) {
-                    for (const pred of preds) {
-                        let predIdx = this.blockToIdx.get(pred);
-                        if (this.idoms[predIdx] !== -1) {
-                            newIdom = this.intersect(newIdom, predIdx);
-                        }
-                    }
-                    if (this.idoms[blockIdx] !== newIdom) {
-                        this.idoms[blockIdx] = newIdom;
-                        isChanged = true;
-                    }
+                if (preds.length <= 0 || newIdom === -1) {
+                    continue;
+                }
+                for (const pred of preds) {
+                    let predIdx = this.blockToIdx.get(pred);
+                    this.idoms[predIdx] !== -1 ? newIdom = this.intersect(newIdom, predIdx) : null;
+                }
+                if (this.idoms[blockIdx] !== newIdom) {
+                    this.idoms[blockIdx] = newIdom;
+                    isChanged = true;
                 }
             }
         }
@@ -64,14 +63,15 @@ class DominanceFinder {
         }
         for (const block of this.blocks) {
             let preds = Array.from(block.getPredecessors());
-            if (preds.length > 1) {
-                let blockIdx = this.blockToIdx.get(block);
-                for (const pred of preds) {
-                    let predIdx = this.blockToIdx.get(pred);
-                    while (predIdx !== this.idoms[blockIdx]) {
-                        this.domFrontiers[predIdx].push(blockIdx);
-                        predIdx = this.idoms[predIdx];
-                    }
+            if (preds.length <= 1) {
+                continue;
+            }
+            let blockIdx = this.blockToIdx.get(block);
+            for (const pred of preds) {
+                let predIdx = this.blockToIdx.get(pred);
+                while (predIdx !== this.idoms[blockIdx]) {
+                    this.domFrontiers[predIdx].push(blockIdx);
+                    predIdx = this.idoms[predIdx];
                 }
             }
         }

package/lib/core/graph/builder/ViewTreeBuilder.d.ts

@@ -165,6 +165,7 @@ export declare class ViewTreeImpl extends TreeNodeStack implements ViewTree {
      */
     private addSystemComponentNode;
     private findMethodInvokeBuilderMethod;
+    private parseFieldInObjectLiteral;
     private parseObjectLiteralExpr;
     private viewComponentCreationParser;
     private waterFlowCreationParser;

package/lib/core/graph/builder/ViewTreeBuilder.d.ts.map

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

package/lib/core/graph/builder/ViewTreeBuilder.js

@@ -757,43 +757,46 @@ class ViewTreeImpl extends TreeNodeStack {
             }
         }
     }
+    parseFieldInObjectLiteral(field, cls, transferMap) {
+        let dstField = cls.getFieldWithName(field.getName());
+        if ((dstField === null || dstField === void 0 ? void 0 : dstField.getStateDecorators().length) === 0 && !(dstField === null || dstField === void 0 ? void 0 : dstField.hasBuilderParamDecorator())) {
+            return;
+        }
+        let stmts = field.getInitializer();
+        if (stmts.length === 0) {
+            return;
+        }
+        let assignStmt = stmts[stmts.length - 1];
+        if (!(assignStmt instanceof Stmt_1.ArkAssignStmt)) {
+            return;
+        }
+        let value = assignStmt.getRightOp();
+        if (value instanceof Local_1.Local) {
+            value = backtraceLocalInitValue(value);
+        }
+        if (dstField === null || dstField === void 0 ? void 0 : dstField.hasBuilderParamDecorator()) {
+            let method = this.findBuilderMethod(value);
+            if (method) {
+                transferMap.set(dstField, method);
+            }
+        }
+        else {
+            let srcField;
+            if (value instanceof Ref_1.ArkInstanceFieldRef) {
+                srcField = this.getDeclaringArkClass().getFieldWithName(value.getFieldName());
+            }
+            if (srcField && dstField) {
+                transferMap.set(dstField, srcField);
+            }
+        }
+    }
     parseObjectLiteralExpr(cls, object, builder) {
         let transferMap = new Map();
         if (object instanceof Local_1.Local && object.getType() instanceof Type_1.ClassType) {
             let anonymousSig = object.getType().getClassSignature();
             let anonymous = this.findClass(anonymousSig);
             anonymous === null || anonymous === void 0 ? void 0 : anonymous.getFields().forEach((field) => {
-                let dstField = cls.getFieldWithName(field.getName());
-                if ((dstField === null || dstField === void 0 ? void 0 : dstField.getStateDecorators().length) === 0 && !(dstField === null || dstField === void 0 ? void 0 : dstField.hasBuilderParamDecorator())) {
-                    return;
-                }
-                let stmts = field.getInitializer();
-                if (stmts.length === 0) {
-                    return;
-                }
-                let assignStmt = stmts[stmts.length - 1];
-                if (!(assignStmt instanceof Stmt_1.ArkAssignStmt)) {
-                    return;
-                }
-                let value = assignStmt.getRightOp();
-                if (value instanceof Local_1.Local) {
-                    value = backtraceLocalInitValue(value);
-                }
-                if (dstField === null || dstField === void 0 ? void 0 : dstField.hasBuilderParamDecorator()) {
-                    let method = this.findBuilderMethod(value);
-                    if (method) {
-                        transferMap.set(dstField, method);
-                    }
-                }
-                else {
-                    let srcField;
-                    if (value instanceof Ref_1.ArkInstanceFieldRef) {
-                        srcField = this.getDeclaringArkClass().getFieldWithName(value.getFieldName());
-                    }
-                    if (srcField && dstField) {
-                        transferMap.set(dstField, srcField);
-                    }
-                }
+                this.parseFieldInObjectLiteral(field, cls, transferMap);
             });
         }
         // If the builder exists, there will be a unique BuilderParam

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

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

package/lib/core/model/ArkMethod.js

@@ -550,7 +550,7 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
         })) !== null && _b !== void 0 ? _b : signatures === null || signatures === void 0 ? void 0 : signatures[0]) !== null && _c !== void 0 ? _c : this.getSignature();
     }
     matchParam(paramType, arg, scene) {
-        var _a;
+        var _a, _b;
         const argType = arg.getType();
         if (arg instanceof Local_1.Local) {
             const stmt = arg.getDeclaringStmt();
@@ -571,17 +571,24 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
         else if (argType instanceof Type_1.FunctionType && paramType instanceof Type_1.FunctionType) {
             return argType.getMethodSignature().getParamLength() === paramType.getMethodSignature().getParamLength();
         }
-        else if (argType instanceof Type_1.FunctionType && paramType instanceof Type_1.ClassType &&
+        else if (paramType instanceof Type_1.ClassType &&
             paramType.getClassSignature().getClassName().includes(EtsConst_1.CALL_BACK)) {
-            return true;
+            return argType instanceof Type_1.FunctionType;
         }
         else if (paramType instanceof Type_1.LiteralType && arg instanceof Constant_1.Constant) {
             return arg.getValue().replace(/[\"|\']/g, '') === paramType.getLiteralName()
                 .toString().replace(/[\"|\']/g, '');
         }
-        else if (paramType instanceof Type_1.NumberType && argType instanceof Type_1.ClassType && ArkClass_1.ClassCategory.ENUM ===
-            ((_a = scene.getClass(argType.getClassSignature())) === null || _a === void 0 ? void 0 : _a.getCategory())) {
-            return true;
+        else if (paramType instanceof Type_1.ClassType && argType instanceof Type_1.EnumValueType) {
+            return paramType.getClassSignature() === argType.getFieldSignature().getDeclaringSignature();
+        }
+        else if (paramType instanceof Type_1.EnumValueType) {
+            if (argType instanceof Type_1.EnumValueType) {
+                return paramType.getFieldSignature() === argType.getFieldSignature();
+            }
+            else if (argType.constructor === ((_a = paramType.getConstant()) === null || _a === void 0 ? void 0 : _a.getType().constructor) && arg instanceof Constant_1.Constant) {
+                return ((_b = paramType.getConstant()) === null || _b === void 0 ? void 0 : _b.getValue()) === arg.getValue();
+            }
         }
         return argType.constructor === paramType.constructor;
     }

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;AAuB5B,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,CAyB/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,CAmDhG;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,CA8F9E;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,QAiDjD"}
+{"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;AAuB5B,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,CAyB/G;AA4ED,wBAAgB,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,oBAAoB,CAAC,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,eAAe,EAAE,CA8C3J;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,IAAI,CAmDhG;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,CA8F9E;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,QAiDjD"}

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

@@ -181,6 +181,76 @@ function buildTypeParameters(typeParameters, sourceFile, arkInstance) {
     return genericTypes;
 }
 exports.buildTypeParameters = buildTypeParameters;
+function buildObjectBindingPatternParam(methodParameter, paramNameNode) {
+    methodParameter.setName('ObjectBindingPattern');
+    let elements = [];
+    paramNameNode.elements.forEach((element) => {
+        let paraElement = new ArkMethodBuilder_1.ObjectBindingPatternParameter();
+        if (element.propertyName) {
+            if (ohos_typescript_1.default.isIdentifier(element.propertyName)) {
+                paraElement.setPropertyName(element.propertyName.text);
+            }
+            else {
+                logger.warn('New propertyName of ObjectBindingPattern found, please contact developers to support this!');
+            }
+        }
+        if (element.name) {
+            if (ohos_typescript_1.default.isIdentifier(element.name)) {
+                paraElement.setName(element.name.text);
+            }
+            else {
+                logger.warn('New name of ObjectBindingPattern found, please contact developers to support this!');
+            }
+        }
+        if (element.initializer) {
+            logger.warn('TODO: support ObjectBindingPattern initializer.');
+        }
+        if (element.dotDotDotToken) {
+            paraElement.setOptional(true);
+        }
+        elements.push(paraElement);
+    });
+    methodParameter.setObjElements(elements);
+}
+function buildBindingElementOfBindingPatternParam(element, paraElement) {
+    if (element.propertyName) {
+        if (ohos_typescript_1.default.isIdentifier(element.propertyName)) {
+            paraElement.setPropertyName(element.propertyName.text);
+        }
+        else {
+            logger.warn('New propertyName of ArrayBindingPattern found, please contact developers to support this!');
+        }
+    }
+    if (element.name) {
+        if (ohos_typescript_1.default.isIdentifier(element.name)) {
+            paraElement.setName(element.name.text);
+        }
+        else {
+            logger.warn('New name of ArrayBindingPattern found, please contact developers to support this!');
+        }
+    }
+    if (element.initializer) {
+        logger.warn('TODO: support ArrayBindingPattern initializer.');
+    }
+    if (element.dotDotDotToken) {
+        paraElement.setOptional(true);
+    }
+}
+function buildArrayBindingPatternParam(methodParameter, paramNameNode) {
+    methodParameter.setName('ArrayBindingPattern');
+    let elements = [];
+    paramNameNode.elements.forEach((element) => {
+        let paraElement = new ArkMethodBuilder_1.ArrayBindingPatternParameter();
+        if (ohos_typescript_1.default.isBindingElement(element)) {
+            buildBindingElementOfBindingPatternParam(element, paraElement);
+        }
+        else if (ohos_typescript_1.default.isOmittedExpression(element)) {
+            logger.warn('TODO: support OmittedExpression for ArrayBindingPattern parameter name.');
+        }
+        elements.push(paraElement);
+    });
+    methodParameter.setArrayElements(elements);
+}
 function buildParameters(params, arkInstance, sourceFile) {
     let parameters = [];
     params.forEach((parameter) => {
@@ -190,71 +260,10 @@ function buildParameters(params, arkInstance, sourceFile) {
             methodParameter.setName(parameter.name.text);
         }
         else if (ohos_typescript_1.default.isObjectBindingPattern(parameter.name)) {
-            methodParameter.setName('ObjectBindingPattern');
-            let elements = [];
-            parameter.name.elements.forEach((element) => {
-                let paraElement = new ArkMethodBuilder_1.ObjectBindingPatternParameter();
-                if (element.propertyName) {
-                    if (ohos_typescript_1.default.isIdentifier(element.propertyName)) {
-                        paraElement.setPropertyName(element.propertyName.text);
-                    }
-                    else {
-                        logger.warn('New propertyName of ObjectBindingPattern found, please contact developers to support this!');
-                    }
-                }
-                if (element.name) {
-                    if (ohos_typescript_1.default.isIdentifier(element.name)) {
-                        paraElement.setName(element.name.text);
-                    }
-                    else {
-                        logger.warn('New name of ObjectBindingPattern found, please contact developers to support this!');
-                    }
-                }
-                if (element.initializer) {
-                    logger.warn('TODO: support ObjectBindingPattern initializer.');
-                }
-                if (element.dotDotDotToken) {
-                    paraElement.setOptional(true);
-                }
-                elements.push(paraElement);
-            });
-            methodParameter.setObjElements(elements);
+            buildObjectBindingPatternParam(methodParameter, parameter.name);
         }
         else if (ohos_typescript_1.default.isArrayBindingPattern(parameter.name)) {
-            methodParameter.setName('ArrayBindingPattern');
-            let elements = [];
-            parameter.name.elements.forEach((element) => {
-                let paraElement = new ArkMethodBuilder_1.ArrayBindingPatternParameter();
-                if (ohos_typescript_1.default.isBindingElement(element)) {
-                    if (element.propertyName) {
-                        if (ohos_typescript_1.default.isIdentifier(element.propertyName)) {
-                            paraElement.setPropertyName(element.propertyName.text);
-                        }
-                        else {
-                            logger.warn('New propertyName of ArrayBindingPattern found, please contact developers to support this!');
-                        }
-                    }
-                    if (element.name) {
-                        if (ohos_typescript_1.default.isIdentifier(element.name)) {
-                            paraElement.setName(element.name.text);
-                        }
-                        else {
-                            logger.warn('New name of ArrayBindingPattern found, please contact developers to support this!');
-                        }
-                    }
-                    if (element.initializer) {
-                        logger.warn('TODO: support ArrayBindingPattern initializer.');
-                    }
-                    if (element.dotDotDotToken) {
-                        paraElement.setOptional(true);
-                    }
-                }
-                else if (ohos_typescript_1.default.isOmittedExpression(element)) {
-                    logger.warn('TODO: support OmittedExpression for ArrayBindingPattern parameter name.');
-                }
-                elements.push(paraElement);
-            });
-            methodParameter.setArrayElements(elements);
+            buildArrayBindingPatternParam(methodParameter, parameter.name);
         }
         else {
             logger.warn('Parameter name is not identifier, ObjectBindingPattern nor ArrayBindingPattern, please contact developers to support this!');

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

@@ -1 +1 @@
-{"version":3,"file":"serializeArkIR.d.ts","sourceRoot":"","sources":["../../src/save/serializeArkIR.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAG1D,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAKhD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,KAAK,CAY1F;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,KAAK,CAS1F;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAWxE;AAED,wBAAgB,cAAc,CAC1B,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,OAAe,GACzB,IAAI,CAcN;AAgND,eAAO,MAAM,OAAO,SAqCd,CAAC"}
+{"version":3,"file":"serializeArkIR.d.ts","sourceRoot":"","sources":["../../src/save/serializeArkIR.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAG1D,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAKhD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,KAAK,CAY1F;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,KAAK,CAS1F;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAWxE;AAED,wBAAgB,cAAc,CAC1B,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,OAAe,GACzB,IAAI,CAcN;AAgMD,eAAO,MAAM,OAAO,SAqCd,CAAC"}

package/lib/save/serializeArkIR.js

@@ -81,9 +81,7 @@ function serializeScene(scene, outDir, verbose = false) {
 }
 exports.serializeScene = serializeScene;
 function serializeSingleTsFile(input, output, options) {
-    if (options.verbose) {
-        console.log(`Serializing TS file to JSON: '${input}' -> '${output}'`);
-    }
+    options.verbose && console.log(`Serializing TS file to JSON: '${input}' -> '${output}'`);
     let filepath = path_1.default.resolve(input);
     let projectDir = path_1.default.dirname(filepath);
     const scene = buildSceneFromSingleFile(filepath, options.verbose);
@@ -95,28 +93,20 @@ function serializeSingleTsFile(input, output, options) {
         }
     }
     if (options.inferTypes) {
-        if (options.verbose) {
-            console.log('Inferring types...');
-        }
+        options.verbose && console.log('Inferring types...');
         scene.inferTypes();
         if (options.inferTypes > 1) {
             for (let i = 1; i < options.inferTypes; i++) {
-                if (options.verbose) {
-                    console.log(`Inferring types one more time (${i + 1} / ${options.inferTypes})...`);
-                }
+                options.verbose && console.log(`Inferring types one more time (${i + 1} / ${options.inferTypes})...`);
                 scene.inferTypes();
             }
         }
     }
     if (options.entrypoint) {
-        if (options.verbose) {
-            console.log('Generating entrypoint...');
-        }
+        options.verbose && console.log('Generating entrypoint...');
         PointerAnalysis_1.PointerAnalysis.pointerAnalysisForWholeProject(scene);
     }
-    if (options.verbose) {
-        console.log('Extracting single ArkFile...');
-    }
+    options.verbose && console.log('Extracting single ArkFile...');
     if (files.length === 0) {
         console.error(`ERROR: No files found in the project directory '${projectDir}'.`);
         process.exit(1);
@@ -128,6 +118,10 @@ function serializeSingleTsFile(input, output, options) {
     // Note: we explicitly push a single path to the project files (in config),
     //       so we expect there is only *one* ArkFile in the scene.
     let arkFile = scene.getFiles()[0];
+    serializeFile(arkFile, output, options, scene);
+    options.verbose && console.log('All done!');
+}
+function serializeFile(arkFile, output, options, scene) {
     let outPath;
     if (fs_1.default.existsSync(output) && fs_1.default.statSync(output).isDirectory()) {
         outPath = path_1.default.join(output, arkFile.getName() + '.json');
@@ -156,9 +150,6 @@ function serializeSingleTsFile(input, output, options) {
         console.log(`Serializing entrypoint to '${outPath}'...`);
         printer.dumpToJson(arkFile, outPath);
     }
-    if (options.verbose) {
-        console.log('All done!');
-    }
 }
 function serializeMultipleTsFiles(inputDir, outDir, options) {
     console.log(`Serializing multiple TS files to JSON: '${inputDir}' -> '${outDir}'`);
@@ -185,9 +176,7 @@ function serializeMultipleTsFiles(inputDir, outDir, options) {
         scene.inferTypes();
         if (options.inferTypes > 1) {
             for (let i = 1; i < options.inferTypes; i++) {
-                if (options.verbose) {
-                    console.log(`Inferring types one more time (${i + 1} / ${options.inferTypes})...`);
-                }
+                options.verbose && console.log(`Inferring types one more time (${i + 1} / ${options.inferTypes})...`);
                 scene.inferTypes();
             }
         }
@@ -225,9 +214,7 @@ function serializeTsProject(inputDir, outDir, options) {
         scene.inferTypes();
         if (options.inferTypes > 1) {
             for (let i = 1; i < options.inferTypes; i++) {
-                if (options.verbose) {
-                    console.log(`Inferring types one more time (${i + 1} / ${options.inferTypes})...`);
-                }
+                options.verbose && console.log(`Inferring types one more time (${i + 1} / ${options.inferTypes})...`);
                 scene.inferTypes();
             }
         }

package/lib/save/source/SourceBody.js

@@ -231,12 +231,13 @@ class SourceBody {
         for (let i = stmts.length - 1; i > 0; i--) {
             if (stmts[i] instanceof Stmt_1.ArkInvokeStmt && stmts[i].getInvokeExpr()) {
                 let instanceInvokeExpr = stmts[i].getInvokeExpr();
-                if ('constructor' === instanceInvokeExpr.getMethodSignature().getMethodSubSignature().getMethodName()) {
-                    let localName = instanceInvokeExpr.getBase().getName();
-                    let newExprIdx = findNewExpr(i, localName);
-                    if (newExprIdx >= 0 && newExprIdx < i - 1) {
-                        moveStmt(i, newExprIdx);
-                    }
+                if ('constructor' !== instanceInvokeExpr.getMethodSignature().getMethodSubSignature().getMethodName()) {
+                    continue;
+                }
+                let localName = instanceInvokeExpr.getBase().getName();
+                let newExprIdx = findNewExpr(i, localName);
+                if (newExprIdx >= 0 && newExprIdx < i - 1) {
+                    moveStmt(i, newExprIdx);
                 }
             }
         }
@@ -246,10 +247,9 @@ class SourceBody {
                 if (!(stmts[j] instanceof Stmt_1.ArkAssignStmt)) {
                     continue;
                 }
-                if (stmts[j].getLeftOp() instanceof Local_1.Local) {
-                    if (stmts[j].getLeftOp().getName() === name) {
-                        return j;
-                    }
+                const leftOp = stmts[j].getLeftOp();
+                if (leftOp instanceof Local_1.Local && leftOp.getName() === name) {
+                    return j;
                 }
             }
             return -1;

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

@@ -8,6 +8,7 @@ export declare class SourceFilePrinter extends Printer {
     arkFile: ArkFile;
     items: Dump[];
     constructor(arkFile: ArkFile);
+    private printDefaultClassInFile;
     dump(): string;
 }
 //# sourceMappingURL=SourceFilePrinter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SourceFilePrinter.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceFilePrinter.ts"],"names":[],"mappings":"AAkCA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAO3C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,OAAO;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,IAAI,EAAE,CAAM;gBAEP,OAAO,EAAE,OAAO;IAKrB,IAAI,IAAI,MAAM;CA2CxB"}
+{"version":3,"file":"SourceFilePrinter.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceFilePrinter.ts"],"names":[],"mappings":"AAkCA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAO3C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGrC;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,OAAO;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,IAAI,EAAE,CAAM;gBAEP,OAAO,EAAE,OAAO;IAK5B,OAAO,CAAC,uBAAuB;IAYxB,IAAI,IAAI,MAAM;CA8BxB"}

package/lib/save/source/SourceFilePrinter.js

@@ -31,6 +31,16 @@ class SourceFilePrinter extends Printer_1.Printer {
         this.items = [];
         this.arkFile = arkFile;
     }
+    printDefaultClassInFile(cls) {
+        for (let method of cls.getMethods()) {
+            if (method.isDefaultArkMethod()) {
+                this.items.push(...new SourceMethod_1.SourceMethod(method, this.printer.getIndent()).dumpDefaultMethod());
+            }
+            else if (!PrinterUtils_1.PrinterUtils.isAnonymousMethod(method.getName())) {
+                this.items.push(new SourceMethod_1.SourceMethod(method));
+            }
+        }
+    }
     dump() {
         this.printer.clear();
         // print imports
@@ -42,14 +52,7 @@ class SourceFilePrinter extends Printer_1.Printer {
         // print class
         for (let cls of this.arkFile.getClasses()) {
             if (cls.isDefaultArkClass()) {
-                for (let method of cls.getMethods()) {
-                    if (method.isDefaultArkMethod()) {
-                        this.items.push(...new SourceMethod_1.SourceMethod(method, this.printer.getIndent()).dumpDefaultMethod());
-                    }
-                    else if (!PrinterUtils_1.PrinterUtils.isAnonymousMethod(method.getName())) {
-                        this.items.push(new SourceMethod_1.SourceMethod(method));
-                    }
-                }
+                this.printDefaultClassInFile(cls);
             }
             else if (!PrinterUtils_1.PrinterUtils.isAnonymousClass(cls.getName())) {
                 this.items.push(new SourceClass_1.SourceClass(cls));

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

@@ -7,6 +7,7 @@ export declare class SourceNamespace extends SourceBase {
     ns: ArkNamespace;
     constructor(ns: ArkNamespace, indent?: string);
     getLine(): number;
+    private printDefaultClassInNamespace;
     dump(): string;
 }
 //# sourceMappingURL=SourceNamespace.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SourceNamespace.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceNamespace.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C;;GAEG;AACH,qBAAa,eAAgB,SAAQ,UAAU;IAC3C,EAAE,EAAE,YAAY,CAAC;gBAEE,EAAE,EAAE,YAAY,EAAE,MAAM,GAAE,MAAW;IAKjD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;CAsDxB"}
+{"version":3,"file":"SourceNamespace.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceNamespace.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAQ1C;;GAEG;AACH,qBAAa,eAAgB,SAAQ,UAAU;IAC3C,EAAE,EAAE,YAAY,CAAC;gBAEE,EAAE,EAAE,YAAY,EAAE,MAAM,GAAE,MAAW;IAKjD,OAAO,IAAI,MAAM;IAIxB,OAAO,CAAC,4BAA4B;IAU7B,IAAI,IAAI,MAAM;CA2CxB"}

package/lib/save/source/SourceNamespace.js

@@ -32,6 +32,16 @@ class SourceNamespace extends SourceBase_1.SourceBase {
     getLine() {
         return this.ns.getLine();
     }
+    printDefaultClassInNamespace(items, cls) {
+        for (let method of cls.getMethods()) {
+            if (method.isDefaultArkMethod()) {
+                items.push(...new SourceMethod_1.SourceMethod(method, this.printer.getIndent()).dumpDefaultMethod());
+            }
+            else if (!PrinterUtils_1.PrinterUtils.isAnonymousMethod(method.getName())) {
+                items.push(new SourceMethod_1.SourceMethod(method, this.printer.getIndent()));
+            }
+        }
+    }
     dump() {
         const commentsMetadata = this.ns.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS);
         if (commentsMetadata instanceof ArkMetadata_1.CommentsMetadata) {
@@ -50,14 +60,7 @@ class SourceNamespace extends SourceBase_1.SourceBase {
                 continue;
             }
             if (cls.isDefaultArkClass()) {
-                for (let method of cls.getMethods()) {
-                    if (method.isDefaultArkMethod()) {
-                        items.push(...new SourceMethod_1.SourceMethod(method, this.printer.getIndent()).dumpDefaultMethod());
-                    }
-                    else if (!PrinterUtils_1.PrinterUtils.isAnonymousMethod(method.getName())) {
-                        items.push(new SourceMethod_1.SourceMethod(method, this.printer.getIndent()));
-                    }
-                }
+                this.printDefaultClassInNamespace(items, cls);
             }
             else {
                 items.push(new SourceClass_1.SourceClass(cls, this.printer.getIndent()));

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

@@ -56,6 +56,7 @@ export declare class SourceAssignStmt extends SourceStmt {
      * temp1.constructor(10)
      */
     private transferRightNewExpr;
+    private handleConstructorInvoke;
     /**
      * $temp0 = newarray[4]
      * $temp0[0] = 1