arkanalyzer 1.0.90 → 1.0.92

package/lib/core/common/ArkValueTransformer.js

@@ -679,7 +679,8 @@ class ArkValueTransformer {
             argumentStmts.forEach(stmt => stmts.push(stmt));
         }
         let elementAccessExpr;
-        if (baseValue.getType() instanceof Type_1.ArrayType) {
+        const baseType = baseValue.getType();
+        if (baseType instanceof Type_1.ArrayType || baseType instanceof Type_1.StringType) {
             elementAccessExpr = new Ref_1.ArkArrayRef(baseValue, argumentValue);
         }
         else {

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

@@ -44,4 +44,7 @@ export declare const COMPONENT_DISAPPEAR_METHOD = "aboutToDisappear";
 export declare const COMPONENT_DETACHED_METHOD = "onDetached";
 export declare const COMPONENT_RECYCLE_METHOD = "aboutToRecycle";
 export declare const COMPONENT_REUSE_METHOD = "aboutToReuse";
+export declare const OH_PKG_DEPENDENCIES = "dependencies";
+export declare const OH_PKG_DEV_DEPENDENCIES = "devDependencies";
+export declare const OH_PKG_DYNAMIC_DEPENDENCIES = "dynamicDependencies";
 //# sourceMappingURL=Const.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Const.d.ts","sourceRoot":"","sources":["../../../src/core/common/Const.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,cAAc,MAAM,CAAC;AAClC,eAAO,MAAM,WAAW,MAAM,CAAC;AAC/B,eAAO,MAAM,YAAY,QAAQ,CAAC;AAClC,eAAO,MAAM,YAAY,SAAS,CAAC;AAGnC,eAAO,MAAM,sBAAsB,QAA6B,CAAC;AACjE,eAAO,MAAM,sBAAsB,QAAqB,CAAC;AACzD,yEAAyE;AACzE,eAAO,MAAM,0BAA0B,QAAqB,CAAC;AAC7D,eAAO,MAAM,yBAAyB,MAAiB,CAAC;AACxD,eAAO,MAAM,6BAA6B,MAAM,CAAC;AAGjD,eAAO,MAAM,uBAAuB,QAA6B,CAAC;AAClE,eAAO,MAAM,yBAAyB,QAA2B,CAAC;AAClE,eAAO,MAAM,uBAAuB,QAA2B,CAAC;AAChE,eAAO,MAAM,+BAA+B,QAA4B,CAAC;AACzE,eAAO,MAAM,uBAAuB,QAAqB,CAAC;AAC1D,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAC5C,eAAO,MAAM,aAAa,SAAS,CAAC;AACpC,eAAO,MAAM,aAAa,SAAS,CAAC;AACpC,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;AAG9D,eAAO,MAAM,oBAAoB,QAA6B,CAAC;AAC/D,eAAO,MAAM,iBAAiB,QAA6B,CAAC;AAC5D,eAAO,MAAM,sBAAsB,QAA6B,CAAC;AACjE,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAGtC,eAAO,MAAM,iBAAiB,MAAc,CAAC;AAC7C,eAAO,MAAM,uBAAuB,QAAiC,CAAC;AAGtE,eAAO,MAAM,iBAAiB,eAAe,CAAC;AAG9C,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAC3C,eAAO,MAAM,mBAAmB,gBAAgB,CAAC;AACjD,eAAO,MAAM,mBAAmB,gBAAgB,CAAC;AACjD,eAAO,MAAM,qCAAqC,kCAAkC,CAAC;AACrF,eAAO,MAAM,iBAAiB,cAAc,CAAC;AAG7C,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,WAAW,gBAAgB,CAAC;AACzC,eAAO,MAAM,YAAY,eAAe,CAAC;AACzC,eAAO,MAAM,qBAAqB,aAAa,CAAC;AAChD,eAAO,MAAM,2BAA2B,wBAAwB,CAAC;AACjE,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAC5E,eAAO,MAAM,4BAA4B,yBAAyB,CAAC;AACnE,eAAO,MAAM,sBAAsB,cAAc,CAAC;AAClD,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AACtD,eAAO,MAAM,0BAA0B,qBAAqB,CAAC;AAC7D,eAAO,MAAM,yBAAyB,eAAe,CAAC;AACtD,eAAO,MAAM,wBAAwB,mBAAmB,CAAC;AACzD,eAAO,MAAM,sBAAsB,iBAAiB,CAAC"}
+{"version":3,"file":"Const.d.ts","sourceRoot":"","sources":["../../../src/core/common/Const.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,cAAc,MAAM,CAAC;AAClC,eAAO,MAAM,WAAW,MAAM,CAAC;AAC/B,eAAO,MAAM,YAAY,QAAQ,CAAC;AAClC,eAAO,MAAM,YAAY,SAAS,CAAC;AAGnC,eAAO,MAAM,sBAAsB,QAA6B,CAAC;AACjE,eAAO,MAAM,sBAAsB,QAAqB,CAAC;AACzD,yEAAyE;AACzE,eAAO,MAAM,0BAA0B,QAAqB,CAAC;AAC7D,eAAO,MAAM,yBAAyB,MAAiB,CAAC;AACxD,eAAO,MAAM,6BAA6B,MAAM,CAAC;AAGjD,eAAO,MAAM,uBAAuB,QAA6B,CAAC;AAClE,eAAO,MAAM,yBAAyB,QAA2B,CAAC;AAClE,eAAO,MAAM,uBAAuB,QAA2B,CAAC;AAChE,eAAO,MAAM,+BAA+B,QAA4B,CAAC;AACzE,eAAO,MAAM,uBAAuB,QAAqB,CAAC;AAC1D,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAC5C,eAAO,MAAM,aAAa,SAAS,CAAC;AACpC,eAAO,MAAM,aAAa,SAAS,CAAC;AACpC,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;AAG9D,eAAO,MAAM,oBAAoB,QAA6B,CAAC;AAC/D,eAAO,MAAM,iBAAiB,QAA6B,CAAC;AAC5D,eAAO,MAAM,sBAAsB,QAA6B,CAAC;AACjE,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAGtC,eAAO,MAAM,iBAAiB,MAAc,CAAC;AAC7C,eAAO,MAAM,uBAAuB,QAAiC,CAAC;AAGtE,eAAO,MAAM,iBAAiB,eAAe,CAAC;AAG9C,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAC3C,eAAO,MAAM,mBAAmB,gBAAgB,CAAC;AACjD,eAAO,MAAM,mBAAmB,gBAAgB,CAAC;AACjD,eAAO,MAAM,qCAAqC,kCAAkC,CAAC;AACrF,eAAO,MAAM,iBAAiB,cAAc,CAAC;AAG7C,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,WAAW,gBAAgB,CAAC;AACzC,eAAO,MAAM,YAAY,eAAe,CAAC;AACzC,eAAO,MAAM,qBAAqB,aAAa,CAAC;AAChD,eAAO,MAAM,2BAA2B,wBAAwB,CAAC;AACjE,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAC5E,eAAO,MAAM,4BAA4B,yBAAyB,CAAC;AACnE,eAAO,MAAM,sBAAsB,cAAc,CAAC;AAClD,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AACtD,eAAO,MAAM,0BAA0B,qBAAqB,CAAC;AAC7D,eAAO,MAAM,yBAAyB,eAAe,CAAC;AACtD,eAAO,MAAM,wBAAwB,mBAAmB,CAAC;AACzD,eAAO,MAAM,sBAAsB,iBAAiB,CAAC;AAGrD,eAAO,MAAM,mBAAmB,iBAAiB,CAAC;AAClD,eAAO,MAAM,uBAAuB,oBAAoB,CAAC;AACzD,eAAO,MAAM,2BAA2B,wBAAwB,CAAC"}

package/lib/core/common/Const.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COMPONENT_REUSE_METHOD = exports.COMPONENT_RECYCLE_METHOD = exports.COMPONENT_DETACHED_METHOD = exports.COMPONENT_DISAPPEAR_METHOD = exports.COMPONENT_START_METHOD = exports.ABILITY_DESTROY_METHOD = exports.ABILITY_STAGE_DESTROY_METHOD = exports.ABILITY_STAGE_WILL_DESTROY_METHOD = exports.ABILITY_STAGE_CREATE_METHOD = exports.ABILITY_CREATE_METHOD = exports.DUMMY_METHOD = exports.DUMMY_CLASS = exports.DUMMY_FILE = exports.ONMESSAGEFUNCNAME = exports.POSTMESSAGEWITHSHAREDSENDABLEFUNCNAME = exports.POSTMESSAGEFUNCNAME = exports.CONSTRUCTORFUCNNAME = exports.MAKEOBSERVED = exports.ARKTS_STATIC_MARK = exports.LEXICAL_ENV_NAME_PREFIX = exports.TEMP_LOCAL_PREFIX = exports.UNKNOWN_METHOD_NAME = exports.UNKNOWN_FIELD_NAME = exports.UNKNOWN_CLASS_NAME = exports.UNKNOWN_NAMESPACE_NAME = exports.UNKNOWN_FILE_NAME = exports.UNKNOWN_PROJECT_NAME = exports.CONSTRUCT_SIGNATURE_NAME = exports.SETTER_PREFIX = exports.GETTER_PREFIX = exports.CALL_SIGNATURE_NAME = exports.ANONYMOUS_METHOD_PREFIX = exports.STATIC_BLOCK_METHOD_NAME_PREFIX = exports.STATIC_INIT_METHOD_NAME = exports.INSTANCE_INIT_METHOD_NAME = exports.DEFAULT_ARK_METHOD_NAME = exports.NESTED_CLASS_METHOD_DELIMITER = exports.ANONYMOUS_CLASS_DELIMITER = exports.ANONYMOUS_NAMESPACE_PREFIX = exports.ANONYMOUS_CLASS_PREFIX = exports.DEFAULT_ARK_CLASS_NAME = exports.DEFAULT_NAME = exports.UNKNOWN_NAME = exports.NAME_PREFIX = exports.NAME_DELIMITER = void 0;
+exports.OH_PKG_DYNAMIC_DEPENDENCIES = exports.OH_PKG_DEV_DEPENDENCIES = exports.OH_PKG_DEPENDENCIES = exports.COMPONENT_REUSE_METHOD = exports.COMPONENT_RECYCLE_METHOD = exports.COMPONENT_DETACHED_METHOD = exports.COMPONENT_DISAPPEAR_METHOD = exports.COMPONENT_START_METHOD = exports.ABILITY_DESTROY_METHOD = exports.ABILITY_STAGE_DESTROY_METHOD = exports.ABILITY_STAGE_WILL_DESTROY_METHOD = exports.ABILITY_STAGE_CREATE_METHOD = exports.ABILITY_CREATE_METHOD = exports.DUMMY_METHOD = exports.DUMMY_CLASS = exports.DUMMY_FILE = exports.ONMESSAGEFUNCNAME = exports.POSTMESSAGEWITHSHAREDSENDABLEFUNCNAME = exports.POSTMESSAGEFUNCNAME = exports.CONSTRUCTORFUCNNAME = exports.MAKEOBSERVED = exports.ARKTS_STATIC_MARK = exports.LEXICAL_ENV_NAME_PREFIX = exports.TEMP_LOCAL_PREFIX = exports.UNKNOWN_METHOD_NAME = exports.UNKNOWN_FIELD_NAME = exports.UNKNOWN_CLASS_NAME = exports.UNKNOWN_NAMESPACE_NAME = exports.UNKNOWN_FILE_NAME = exports.UNKNOWN_PROJECT_NAME = exports.CONSTRUCT_SIGNATURE_NAME = exports.SETTER_PREFIX = exports.GETTER_PREFIX = exports.CALL_SIGNATURE_NAME = exports.ANONYMOUS_METHOD_PREFIX = exports.STATIC_BLOCK_METHOD_NAME_PREFIX = exports.STATIC_INIT_METHOD_NAME = exports.INSTANCE_INIT_METHOD_NAME = exports.DEFAULT_ARK_METHOD_NAME = exports.NESTED_CLASS_METHOD_DELIMITER = exports.ANONYMOUS_CLASS_DELIMITER = exports.ANONYMOUS_NAMESPACE_PREFIX = exports.ANONYMOUS_CLASS_PREFIX = exports.DEFAULT_ARK_CLASS_NAME = exports.DEFAULT_NAME = exports.UNKNOWN_NAME = exports.NAME_PREFIX = exports.NAME_DELIMITER = void 0;
 // names
 exports.NAME_DELIMITER = '$';
 exports.NAME_PREFIX = '%';
@@ -69,3 +69,7 @@ exports.COMPONENT_DISAPPEAR_METHOD = 'aboutToDisappear';
 exports.COMPONENT_DETACHED_METHOD = 'onDetached';
 exports.COMPONENT_RECYCLE_METHOD = 'aboutToRecycle';
 exports.COMPONENT_REUSE_METHOD = 'aboutToReuse';
+// oh-package.json5 dependency keys
+exports.OH_PKG_DEPENDENCIES = 'dependencies';
+exports.OH_PKG_DEV_DEPENDENCIES = 'devDependencies';
+exports.OH_PKG_DYNAMIC_DEPENDENCIES = 'dynamicDependencies';

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

@@ -7,38 +7,48 @@ import { CallGraph } from '../../callgraph/model/CallGraph';
 classA.%statInit()
 const %1 = new classA()
 %1.%instInit()
+%1.onCreate()
+%1.onWindowStageCreate()
 %1.aboutToAppear()
-const %2 = new abilityA()
 ...
 count = 0
 while (true) {
+    if (count === 0) {
+        %1.aboutToRecycle()
+        %1.aboutToReuse()
+    }
     if (count === 1) {
         %1.onPageShow()
+        %1.onPageHide()
     }
     if (count === 2) {
+        %2.onWillForeground()
+        %2.onForeground()
+        %2.onDidForeground()
+        %2.onWillBackground()
         %2.onBackground()
+        %2.onDidBackground()
+    }
+    ...
+    if (count === N) {
+        %1.build()
     }
     ...
 }
+%1.onWindowStageWillDestroy()
 %1.aboutToDisappear()
 %1.onDetached()
-%2.onWindowStageDestroy()
+%1.onWindowStageDestroy()
+%2.onDestroy()
 ...
 return
  */
 export declare class DummyMainCreater {
     private entryMethods;
     private entryClasses;
-    private abilityCreateMethods;
-    private abilityStageCreateMethods;
-    private abilityStageWillDestroyMethods;
-    private abilityStageDestroyMethods;
-    private abilityDestroyMethods;
-    private componentAppearMethods;
-    private componentDisappearMethods;
-    private componentDetachedMethods;
-    private componentRecycleMethods;
-    private componentReuseMethods;
+    private startMethods;
+    private endMethods;
+    private pairedMethodGroups;
     private classLocalMap;
     private dummyMain;
     private scene;
@@ -60,6 +70,9 @@ export declare class DummyMainCreater {
     private addStaticInit;
     private addClassInit;
     private addParamInit;
+    private addStartMethods;
+    private addEndMethods;
+    private classifyMethod;
     private addBranches;
     private createConditionAndInvokeBlockPair;
     private createDummyMainCfg;

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

@@ -1 +1 @@
-{"version":3,"file":"DummyMainCreater.d.ts","sourceRoot":"","sources":["../../../src/core/common/DummyMainCreater.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAUpC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAsB/C,OAAO,EAAE,SAAS,EAAiB,MAAM,iCAAiC,CAAC;AAK3E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,YAAY,CAAkB;IACtC,OAAO,CAAC,oBAAoB,CAAmB;IAC/C,OAAO,CAAC,yBAAyB,CAAmB;IACpD,OAAO,CAAC,8BAA8B,CAAmB;IACzD,OAAO,CAAC,0BAA0B,CAAmB;IACrD,OAAO,CAAC,qBAAqB,CAAmB;IAChD,OAAO,CAAC,sBAAsB,CAAmB;IACjD,OAAO,CAAC,yBAAyB,CAAmB;IACpD,OAAO,CAAC,wBAAwB,CAAmB;IAEnD,OAAO,CAAC,uBAAuB,CAAmB;IAClD,OAAO,CAAC,qBAAqB,CAAmB;IAEhD,OAAO,CAAC,aAAa,CAAmC;IACxD,OAAO,CAAC,SAAS,CAA8B;IAC/C,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,cAAc,CAAa;IACnC,OAAO,CAAC,cAAc,CAAa;IACnC,OAAO,CAAC,mBAAmB,CAAkB;IAC7C,OAAO,CAAC,UAAU,CAAC,CAAa;IAChC,OAAO,CAAC,eAAe,CAAC,CAAS;IAEjC;;;;;;OAMG;gBACS,KAAK,EAAE,KAAK,EAAE,eAAe,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,QAAQ,EAAE,EAAE,mBAAmB,GAAE,OAAe;IAW1G,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI;IAI3C,eAAe,IAAI,IAAI;IAwD9B,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,YAAY;IAoBpB,OAAO,CAAC,YAAY;IA0BpB,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,iCAAiC;IAkBzC,OAAO,CAAC,kBAAkB;IA4D1B,OAAO,CAAC,oBAAoB;IAwB5B,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,WAAW;IAYZ,YAAY,IAAI,SAAS;IAIhC,OAAO,CAAC,6BAA6B;IA2CrC,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,0BAA0B;IAwClC;;;;OAIG;IACI,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,GAAE,OAAc,GAAG,QAAQ;CAIrF;AAED,UAAU,QAAQ;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACxB"}
+{"version":3,"file":"DummyMainCreater.d.ts","sourceRoot":"","sources":["../../../src/core/common/DummyMainCreater.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAiBpC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAU/C,OAAO,EAAE,SAAS,EAAiB,MAAM,iCAAiC,CAAC;AAK3E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,YAAY,CAAmB;IACvC,OAAO,CAAC,YAAY,CAAkB;IAEtC,OAAO,CAAC,YAAY,CAAuC;IAE3D,OAAO,CAAC,UAAU,CAAuC;IAEzD,OAAO,CAAC,kBAAkB,CAAuC;IAEjE,OAAO,CAAC,aAAa,CAAmC;IACxD,OAAO,CAAC,SAAS,CAA8B;IAC/C,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,cAAc,CAAa;IACnC,OAAO,CAAC,cAAc,CAAa;IACnC,OAAO,CAAC,mBAAmB,CAAkB;IAC7C,OAAO,CAAC,UAAU,CAAC,CAAa;IAChC,OAAO,CAAC,eAAe,CAAC,CAAS;IAEjC;;;;;;OAMG;gBACS,KAAK,EAAE,KAAK,EAAE,eAAe,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,QAAQ,EAAE,EAAE,mBAAmB,GAAE,OAAe;IAW1G,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI;IAI3C,eAAe,IAAI,IAAI;IAwD9B,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,YAAY;IAoBpB,OAAO,CAAC,YAAY;IA0BpB,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,cAAc;IAmCtB,OAAO,CAAC,WAAW;IAsBnB,OAAO,CAAC,iCAAiC;IAkBzC,OAAO,CAAC,kBAAkB;IAuD1B,OAAO,CAAC,oBAAoB;IAuB5B,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,WAAW;IAYZ,YAAY,IAAI,SAAS;IAIhC,OAAO,CAAC,6BAA6B;IAoBrC,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,0BAA0B;IAiBlC;;;;OAIG;IACI,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,GAAE,OAAc,GAAG,QAAQ;CAIrF;AAED,UAAU,QAAQ;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACxB"}

package/lib/core/common/DummyMainCreater.js

@@ -43,22 +43,39 @@ const ABILITY_BASE_CLASSES = ['UIExtensionAbility', 'Ability', 'FormExtensionAbi
 classA.%statInit()
 const %1 = new classA()
 %1.%instInit()
+%1.onCreate()
+%1.onWindowStageCreate()
 %1.aboutToAppear()
-const %2 = new abilityA()
 ...
 count = 0
 while (true) {
+    if (count === 0) {
+        %1.aboutToRecycle()
+        %1.aboutToReuse()
+    }
     if (count === 1) {
         %1.onPageShow()
+        %1.onPageHide()
     }
     if (count === 2) {
+        %2.onWillForeground()
+        %2.onForeground()
+        %2.onDidForeground()
+        %2.onWillBackground()
         %2.onBackground()
+        %2.onDidBackground()
+    }
+    ...
+    if (count === N) {
+        %1.build()
     }
     ...
 }
+%1.onWindowStageWillDestroy()
 %1.aboutToDisappear()
 %1.onDetached()
-%2.onWindowStageDestroy()
+%1.onWindowStageDestroy()
+%2.onDestroy()
 ...
 return
  */
@@ -71,20 +88,15 @@ class DummyMainCreater {
      * @param classScope if not provided, collect all Ability class and Component struct.
      */
     constructor(scene, dummyMethodName, classScope, extraInstanceAssign = false) {
-        // entryMethods includes all UIAbility and Component lifecycle methods as well as all callback methods, but exclude the start and end methods
+        // entryMethods includes all UIAbility and Component lifecycle methods as well as all callback methods, but exclude the start, end and paired methods
         this.entryMethods = [];
         this.entryClasses = [];
-        this.abilityCreateMethods = [];
-        this.abilityStageCreateMethods = [];
-        this.abilityStageWillDestroyMethods = [];
-        this.abilityStageDestroyMethods = [];
-        this.abilityDestroyMethods = [];
-        this.componentAppearMethods = [];
-        this.componentDisappearMethods = [];
-        this.componentDetachedMethods = [];
-        // aboutToRecycle and aboutToReuse methods should be put into the same block because they are used paired
-        this.componentRecycleMethods = [];
-        this.componentReuseMethods = [];
+        // start methods grouped by method name, ordered by LIFECYCLE_START_METHODS
+        this.startMethods = new Map();
+        // end methods grouped by method name, ordered by LIFECYCLE_END_METHODS
+        this.endMethods = new Map();
+        // paired methods grouped by their pair group index (defined in entryMethodUtils)
+        this.pairedMethodGroups = new Map();
         // every declaring class of method in entryMethods have its instance local which is used to be the base of instance invoke expr
         this.classLocalMap = new Map();
         this.dummyMain = new ArkMethod_1.ArkMethod();
@@ -206,14 +218,67 @@ class DummyMainCreater {
             paramIdx++;
         }
     }
+    addStartMethods(block) {
+        for (const methodName of entryMethodUtils_1.LIFECYCLE_START_METHODS) {
+            const methods = this.startMethods.get(methodName);
+            if (methods) {
+                this.addMethodsInvokeStmt(block, methods);
+            }
+        }
+    }
+    addEndMethods(block) {
+        for (const methodName of entryMethodUtils_1.LIFECYCLE_END_METHODS) {
+            const methods = this.endMethods.get(methodName);
+            if (methods) {
+                this.addMethodsInvokeStmt(block, methods);
+            }
+        }
+    }
+    classifyMethod(mtd) {
+        const name = mtd.getName();
+        if (entryMethodUtils_1.LIFECYCLE_START_METHODS.includes(name)) {
+            let group = this.startMethods.get(name);
+            if (!group) {
+                group = [];
+                this.startMethods.set(name, group);
+            }
+            group.push(mtd);
+            return;
+        }
+        if (entryMethodUtils_1.LIFECYCLE_END_METHODS.includes(name)) {
+            let group = this.endMethods.get(name);
+            if (!group) {
+                group = [];
+                this.endMethods.set(name, group);
+            }
+            group.push(mtd);
+            return;
+        }
+        const groupIndex = (0, entryMethodUtils_1.getPairedMethodGroupIndex)(name);
+        if (groupIndex >= 0) {
+            let group = this.pairedMethodGroups.get(groupIndex);
+            if (!group) {
+                group = [];
+                this.pairedMethodGroups.set(groupIndex, group);
+            }
+            group.push(mtd);
+            return;
+        }
+        if (entryMethodUtils_1.LIFECYCLE_METHOD_NAME.includes(name) || entryMethodUtils_1.COMPONENT_LIFECYCLE_METHOD_NAME.includes(name)) {
+            this.entryMethods.push(mtd);
+        }
+    }
     addBranches(whileBlock, countLocal, dummyCfg) {
         let lastBlocks = [whileBlock];
         let count = 0;
-        // step1: create the block for aboutToRecycle and aboutToReuse
-        if (this.componentRecycleMethods.length > 0 || this.componentReuseMethods.length > 0) {
-            lastBlocks = this.createConditionAndInvokeBlockPair(count++, countLocal, dummyCfg, lastBlocks, [...this.componentRecycleMethods, ...this.componentReuseMethods]);
+        // step1: create the blocks for paired lifecycle method groups
+        for (let i = 0; i < entryMethodUtils_1.LIFECYCLE_PAIRED_METHOD_GROUPS.length; i++) {
+            const group = this.pairedMethodGroups.get(i);
+            if (group && group.length > 0) {
+                lastBlocks = this.createConditionAndInvokeBlockPair(count++, countLocal, dummyCfg, lastBlocks, group);
+            }
         }
-        // step2: create the blocks for other lifecycle methods
+        // step2: create the blocks for other (unpaired) lifecycle methods
         for (let method of this.entryMethods) {
             lastBlocks = this.createConditionAndInvokeBlockPair(count++, countLocal, dummyCfg, lastBlocks, [method]);
         }
@@ -254,9 +319,7 @@ class DummyMainCreater {
         dummyCfg.setStartingStmt(startingStmt);
         this.addStaticInit(firstBlock);
         this.addClassInit(firstBlock);
-        this.addMethodsInvokeStmt(firstBlock, this.abilityCreateMethods);
-        this.addMethodsInvokeStmt(firstBlock, this.abilityStageCreateMethods);
-        this.addMethodsInvokeStmt(firstBlock, this.componentAppearMethods);
+        this.addStartMethods(firstBlock);
         const countLocal = new Local_1.Local('count', Type_1.NumberType.getInstance());
         this.dummyMain.getBody().addLocal(countLocal.getName(), countLocal);
         const zero = ValueUtil_1.ValueUtil.getOrCreateNumberConst(0);
@@ -274,11 +337,7 @@ class DummyMainCreater {
         this.addBranches(whileBlock, countLocal, dummyCfg);
         // step4: create the last return block
         const returnBlock = new BasicBlock_1.BasicBlock(this.tempBlockIndex++);
-        this.addMethodsInvokeStmt(returnBlock, this.componentDisappearMethods);
-        this.addMethodsInvokeStmt(returnBlock, this.abilityStageWillDestroyMethods);
-        this.addMethodsInvokeStmt(returnBlock, this.abilityStageDestroyMethods);
-        this.addMethodsInvokeStmt(returnBlock, this.componentDetachedMethods);
-        this.addMethodsInvokeStmt(returnBlock, this.abilityDestroyMethods);
+        this.addEndMethods(returnBlock);
         const returnStmt = new Stmt_1.ArkReturnVoidStmt();
         returnBlock.addStmt(returnStmt);
         dummyCfg.addBlock(returnBlock);
@@ -294,7 +353,7 @@ class DummyMainCreater {
                 const invokeStmt = new Stmt_1.ArkInvokeStmt(invokeExpr);
                 block.addStmt(invokeStmt);
                 local.addUsedStmt(invokeStmt);
-                if (this.extraInstanceAssign) {
+                if (this.extraInstanceAssign && local) {
                     const assignStmt = new Stmt_1.ArkAssignStmt(local, local);
                     block.addStmt(assignStmt);
                     local.addUsedStmt(assignStmt);
@@ -340,30 +399,7 @@ class DummyMainCreater {
             .forEach(cls => {
             this.entryClasses.push(cls);
             for (const mtd of cls.getMethods()) {
-                const name = mtd.getName();
-                if (name === Const_1.COMPONENT_START_METHOD) {
-                    this.componentAppearMethods.push(mtd);
-                    continue;
-                }
-                if (name === Const_1.COMPONENT_DISAPPEAR_METHOD) {
-                    this.componentDisappearMethods.push(mtd);
-                    continue;
-                }
-                if (name === Const_1.COMPONENT_DETACHED_METHOD) {
-                    this.componentDetachedMethods.push(mtd);
-                    continue;
-                }
-                if (name === Const_1.COMPONENT_RECYCLE_METHOD) {
-                    this.componentRecycleMethods.push(mtd);
-                    continue;
-                }
-                if (name === Const_1.COMPONENT_REUSE_METHOD) {
-                    this.componentReuseMethods.push(mtd);
-                    continue;
-                }
-                if (entryMethodUtils_1.COMPONENT_LIFECYCLE_METHOD_NAME.includes(name)) {
-                    this.entryMethods.push(mtd);
-                }
+                this.classifyMethod(mtd);
             }
         });
     }
@@ -397,30 +433,7 @@ class DummyMainCreater {
             .forEach(cls => {
             this.entryClasses.push(cls);
             for (const mtd of cls.getMethods()) {
-                const name = mtd.getName();
-                if (name === Const_1.ABILITY_CREATE_METHOD) {
-                    this.abilityCreateMethods.push(mtd);
-                    continue;
-                }
-                if (name === Const_1.ABILITY_STAGE_CREATE_METHOD) {
-                    this.abilityStageCreateMethods.push(mtd);
-                    continue;
-                }
-                if (name === Const_1.ABILITY_STAGE_WILL_DESTROY_METHOD) {
-                    this.abilityStageWillDestroyMethods.push(mtd);
-                    continue;
-                }
-                if (name === Const_1.ABILITY_STAGE_DESTROY_METHOD) {
-                    this.abilityStageDestroyMethods.push(mtd);
-                    continue;
-                }
-                if (name === Const_1.ABILITY_DESTROY_METHOD) {
-                    this.abilityDestroyMethods.push(mtd);
-                    continue;
-                }
-                if (entryMethodUtils_1.LIFECYCLE_METHOD_NAME.includes(name)) {
-                    this.entryMethods.push(mtd);
-                }
+                this.classifyMethod(mtd);
             }
         });
     }
@@ -457,7 +470,8 @@ class CoverageAnalysis {
         this.totalStmts = new Set();
         this.totalMethods.forEach(method => {
             var _a;
-            (_a = method.getCfg()) === null || _a === void 0 ? void 0 : _a.getStmts().forEach(stmt => {
+            (_a = method
+                .getCfg()) === null || _a === void 0 ? void 0 : _a.getStmts().forEach(stmt => {
                 this.totalStmts.add(stmt);
             });
         });

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

@@ -48,6 +48,7 @@ export declare const COMPONENT_FOR_EACH: string;
 export declare const COMPONENT_LAZY_FOR_EACH: string;
 export declare const BUILDIN_SYSTEM_COMPONENT: Set<string>;
 export declare const BUILDIN_ATOMIC_COMPONENT: Set<string>;
+export declare const DEFAULT_COMPONENTS: string[];
 export declare const COMPONENT_DECORATOR: Set<string>;
 export declare const ENTRY_DECORATOR: string;
 export declare const BUILDER_DECORATOR: string;
@@ -56,6 +57,7 @@ export declare const COMPONENT_BEHAVIOR: string;
 export declare function isEtsAtomicComponent(name: string): boolean;
 export declare function isEtsSystemComponent(name: string): boolean;
 export declare function isEtsContainerComponent(name: string): boolean;
+export declare function addSystemComponent(componentNames: string[]): void;
 export declare const COMPONENT_CREATE_FUNCTION: string;
 export declare const COMPONENT_POP_FUNCTION: string;
 export declare const COMPONENT_CUSTOMVIEW: string;

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

@@ -1 +1 @@
-{"version":3,"file":"EtsConst.d.ts","sourceRoot":"","sources":["../../../src/core/common/EtsConst.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAy4BhC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,MAAkB,CAAC;AACpD,eAAO,MAAM,uBAAuB,EAAE,MAAsB,CAAC;AAE7D,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAkG,CAAC;AAEpJ,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAqD/C,CAAC;AAEH,eAAO,MAAM,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAqE,CAAC;AAClH,eAAO,MAAM,eAAe,EAAE,MAAgB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,EAAE,MAAkB,CAAC;AACnD,eAAO,MAAM,uBAAuB,EAAE,MAAuB,CAAC;AAC9D,eAAO,MAAM,kBAAkB,EAAE,MAAmB,CAAC;AAErD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,sBAAsB,EAAE,MAAc,CAAC;AACpD,eAAO,MAAM,oBAAoB,EAAE,MAAe,CAAC;AACnD,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AAEjD,eAAO,MAAM,YAAY,EAAE,MAAa,CAAC;AACzC,eAAO,MAAM,mBAAmB,EAAE,MAAmB,CAAC;AACtD,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,wBAAwB,EAAE,MAAgB,CAAC;AAExD,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,MAAM,CAAwF,CAAC;AAE7I,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AACjD,eAAO,MAAM,kBAAkB,EAAE,MAAmB,CAAC;AAErD,eAAO,MAAM,mBAAmB,EAAE,MAAoB,CAAC;AACvD,eAAO,MAAM,SAAS,EAAE,MAAmB,CAAC;AAC5C,eAAO,MAAM,MAAM,EAAE,GAAG,CAAC,MAAM,CAA0B,CAAC;AAE1D,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AACzD,eAAO,MAAM,SAAS,EAAE,MAAoB,CAAC;AAC7C,eAAO,MAAM,aAAa,EAAE,MAAuB,CAAC;AACpD,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,MAAM,CAAqD,CAAC;AAEzG,eAAO,MAAM,cAAc,kBAAkB,CAAC;AAC9C,eAAO,MAAM,cAAc,wBAAwB,CAAC;AAEpD,eAAO,MAAM,IAAI,EAAE,MAAgB,CAAC;AACpC,eAAO,MAAM,UAAU,EAAE,MAAqB,CAAC;AAC/C,eAAO,MAAM,aAAa,aAAa,CAAC;AAExC,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,eAAO,MAAM,eAAe,cAAc,CAAC;AAC3C,eAAO,MAAM,YAAY,MAAM,CAAC;AAChC,eAAO,MAAM,QAAQ,QAAQ,CAAC;AAC9B,eAAO,MAAM,cAAc,MAAM,CAAC;AAClC,eAAO,MAAM,aAAa,SAAS,CAAC"}
+{"version":3,"file":"EtsConst.d.ts","sourceRoot":"","sources":["../../../src/core/common/EtsConst.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+wBhC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,MAAkB,CAAC;AACpD,eAAO,MAAM,uBAAuB,EAAE,MAAsB,CAAC;AAE7D,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAA0D,CAAC;AAE5G,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAqD/C,CAAC;AAEH,eAAO,MAAM,kBAAkB,UA0H9B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAqE,CAAC;AAClH,eAAO,MAAM,eAAe,EAAE,MAAgB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,EAAE,MAAkB,CAAC;AACnD,eAAO,MAAM,uBAAuB,EAAE,MAAuB,CAAC;AAC9D,eAAO,MAAM,kBAAkB,EAAE,MAAmB,CAAC;AAErD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,IAAI,CAKjE;AAED,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,sBAAsB,EAAE,MAAc,CAAC;AACpD,eAAO,MAAM,oBAAoB,EAAE,MAAe,CAAC;AACnD,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AAEjD,eAAO,MAAM,YAAY,EAAE,MAAa,CAAC;AACzC,eAAO,MAAM,mBAAmB,EAAE,MAAmB,CAAC;AACtD,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,wBAAwB,EAAE,MAAgB,CAAC;AAExD,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,MAAM,CAAwF,CAAC;AAE7I,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AACjD,eAAO,MAAM,kBAAkB,EAAE,MAAmB,CAAC;AAErD,eAAO,MAAM,mBAAmB,EAAE,MAAoB,CAAC;AACvD,eAAO,MAAM,SAAS,EAAE,MAAmB,CAAC;AAC5C,eAAO,MAAM,MAAM,EAAE,GAAG,CAAC,MAAM,CAA0B,CAAC;AAE1D,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AACzD,eAAO,MAAM,SAAS,EAAE,MAAoB,CAAC;AAC7C,eAAO,MAAM,aAAa,EAAE,MAAuB,CAAC;AACpD,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,MAAM,CAAqD,CAAC;AAEzG,eAAO,MAAM,cAAc,kBAAkB,CAAC;AAC9C,eAAO,MAAM,cAAc,wBAAwB,CAAC;AAEpD,eAAO,MAAM,IAAI,EAAE,MAAgB,CAAC;AACpC,eAAO,MAAM,UAAU,EAAE,MAAqB,CAAC;AAC/C,eAAO,MAAM,aAAa,aAAa,CAAC;AAExC,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,eAAO,MAAM,eAAe,cAAc,CAAC;AAC3C,eAAO,MAAM,YAAY,MAAM,CAAC;AAChC,eAAO,MAAM,QAAQ,QAAQ,CAAC;AAC9B,eAAO,MAAM,cAAc,MAAM,CAAC;AAClC,eAAO,MAAM,aAAa,SAAS,CAAC"}