arkanalyzer 1.0.41 → 1.0.42

package/lib/pass/SceneValidator.js

@@ -0,0 +1,339 @@
+"use strict";
+/*
+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SceneValidator = exports.MethodSummary = exports.SummaryMsg = exports.ClassSummary = exports.FileSummary = exports.SceneSummary = exports.MethodValidator = exports.ClassValidator = exports.FileValidator = exports.ArkValidatorRegistry = exports.ValueValidator = exports.StmtValidator = void 0;
+const ScenePassMgr_1 = require("./ScenePassMgr");
+const Dispatcher_1 = require("./Dispatcher");
+const Pass_1 = require("./Pass");
+const logger_1 = __importStar(require("../utils/logger"));
+const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'Validator');
+/**
+ * Abstract class representing a statement validator.
+ * Provides a mechanism to validate statements of a specific type within a given context.
+ * Implementations must define the `validate` method to perform custom validation logic.
+ */
+class StmtValidator {
+    run(s, ctx, mtd) {
+        let submit = (msg) => {
+            let summary = MethodSummary.getOrNew(ctx, mtd);
+            summary.submitStmt(s, msg);
+        };
+        this.validate(s, {
+            info: (msg) => submit(new SummaryMsg(0 /* SummaryLevel.info */, msg)),
+            warn: (msg) => submit(new SummaryMsg(1 /* SummaryLevel.warn */, msg)),
+            error: (msg) => submit(new SummaryMsg(2 /* SummaryLevel.error */, msg)),
+        });
+    }
+    static register(init) {
+        ArkValidatorRegistry.stmt(init);
+    }
+}
+exports.StmtValidator = StmtValidator;
+/**
+ * Abstract class representing a validator for values of a specific type.
+ * Provides a mechanism to validate values and report the results through a summary reporter.
+ * The validation logic is defined by implementing the `validate` method in derived classes.
+ */
+class ValueValidator {
+    run(s, ctx, mtd) {
+        let submit = (msg) => {
+            let summary = MethodSummary.getOrNew(ctx, mtd);
+            summary.submitValue(s, msg);
+        };
+        this.validate(s, {
+            info: (msg) => submit(new SummaryMsg(0 /* SummaryLevel.info */, msg)),
+            warn: (msg) => submit(new SummaryMsg(1 /* SummaryLevel.warn */, msg)),
+            error: (msg) => submit(new SummaryMsg(2 /* SummaryLevel.error */, msg)),
+        });
+    }
+    static register(init) {
+        ArkValidatorRegistry.value(init);
+    }
+}
+exports.ValueValidator = ValueValidator;
+/**
+ * The ArkValidatorRegistry class is responsible for managing and registering statement and value initializers
+ * used in validation processes. It extends the Dispatcher class and provides mechanisms to dynamically
+ * register and invalidate dispatch configurations.
+ */
+class ArkValidatorRegistry extends Dispatcher_1.Dispatcher {
+    constructor(ctx) {
+        super(ctx, ArkValidatorRegistry.getDispatch());
+        this.fallAction = 0 /* FallAction.Continue */;
+    }
+    static getDispatch() {
+        if (ArkValidatorRegistry.dispatchHolder) {
+            return ArkValidatorRegistry.dispatchHolder;
+        }
+        ArkValidatorRegistry.dispatchHolder = new Dispatcher_1.Dispatch(this.stmtsHolder, this.valuesHolder);
+        return ArkValidatorRegistry.dispatchHolder;
+    }
+    static stmt(init) {
+        this.stmtsHolder.push(init);
+        // invalidate holder
+        ArkValidatorRegistry.dispatchHolder = undefined;
+    }
+    static value(init) {
+        this.valuesHolder.push(init);
+        // invalidate holder
+        ArkValidatorRegistry.dispatchHolder = undefined;
+    }
+}
+exports.ArkValidatorRegistry = ArkValidatorRegistry;
+ArkValidatorRegistry.stmtsHolder = [];
+ArkValidatorRegistry.valuesHolder = [];
+/**
+ * An abstract class that extends FilePass and provides a framework for validating files.
+ * The FileValidator class is designed to be subclassed with specific validation logic
+ * implemented in the `validate` method. It provides a default implementation of the `run`
+ * method, which processes a file and submits validation results (info, warning, or error)
+ * to a summary object associated with the file context.
+ */
+class FileValidator extends Pass_1.FilePass {
+    run(file, ctx) {
+        let submit = (msg) => {
+            let summary = FileSummary.getOrNew(ctx, file);
+            summary.submit(msg);
+        };
+        this.validate(file, {
+            info: (msg) => submit(new SummaryMsg(0 /* SummaryLevel.info */, msg)),
+            warn: (msg) => submit(new SummaryMsg(1 /* SummaryLevel.warn */, msg)),
+            error: (msg) => submit(new SummaryMsg(2 /* SummaryLevel.error */, msg)),
+        });
+    }
+}
+exports.FileValidator = FileValidator;
+class ClassValidator extends Pass_1.ClassPass {
+    run(cls, ctx) {
+        let submit = (msg) => {
+            let summary = ClassSummary.getOrNew(ctx, cls);
+            summary.submit(msg);
+        };
+        this.validate(cls, {
+            info: (msg) => submit(new SummaryMsg(0 /* SummaryLevel.info */, msg)),
+            warn: (msg) => submit(new SummaryMsg(1 /* SummaryLevel.warn */, msg)),
+            error: (msg) => submit(new SummaryMsg(2 /* SummaryLevel.error */, msg)),
+        });
+    }
+}
+exports.ClassValidator = ClassValidator;
+class MethodValidator extends Pass_1.MethodPass {
+    run(mtd, ctx) {
+        let submit = (msg) => {
+            let summary = MethodSummary.getOrNew(ctx, mtd);
+            summary.submit(msg);
+        };
+        this.validate(mtd, {
+            info: (msg) => submit(new SummaryMsg(0 /* SummaryLevel.info */, msg)),
+            warn: (msg) => submit(new SummaryMsg(1 /* SummaryLevel.warn */, msg)),
+            error: (msg) => submit(new SummaryMsg(2 /* SummaryLevel.error */, msg)),
+        });
+    }
+}
+exports.MethodValidator = MethodValidator;
+/**
+ * Represents a summary of a scene, containing metadata and associated file summaries.
+ * The name property provides a default identifier for the scene summary.
+ * The files property maintains a mapping of ArkFile instances to their corresponding FileSummary objects.
+ * This class is used to encapsulate and manage information about a scene and its related files.
+ */
+class SceneSummary {
+    constructor() {
+        this.name = 'validate summary';
+        this.files = new Map();
+    }
+}
+exports.SceneSummary = SceneSummary;
+/**
+ * Represents a summary of a file containing information about classes and messages.
+ * Provides methods to manage and retrieve file summaries within a given context.
+ * The class maintains a collection of messages and a mapping of classes to their summaries.
+ * It supports operations to submit new messages and retrieve or create summaries for files.
+ */
+class FileSummary {
+    constructor() {
+        this.name = 'file summary';
+        this.classes = new Map();
+        this.msgList = [];
+    }
+    submit(msg) {
+        this.msgList.push(msg);
+    }
+    /**
+     * Retrieves an existing FileSummary instance from the given context or creates a new one if it does not exist.
+     *
+     * @param ctx The context object that holds the FileSummary instance. It is used to check if a FileSummary already exists.
+     * @param file The ArkFile object for which the FileSummary is being retrieved or created.
+     * @return The existing or newly created FileSummary instance associated with the provided file.
+     */
+    static getOrNew(ctx, file) {
+        if (ctx.get(FileSummary)) {
+            return ctx.get(FileSummary);
+        }
+        let validate = ctx.upper.get(SceneSummary);
+        if (!validate.files.get(file)) {
+            validate.files.set(file, new FileSummary());
+        }
+        let summary = validate.files.get(file);
+        ctx.set(FileSummary, summary);
+        return summary;
+    }
+}
+exports.FileSummary = FileSummary;
+/**
+ * Represents a summary of a class, containing its name, associated methods, and messages.
+ * Provides functionality to submit messages and retrieve or create a ClassSummary instance.
+ * The class maintains a collection of method summaries and tracks messages related to the class.
+ * It is designed to be used in the context of a larger system that processes class information.
+ */
+class ClassSummary {
+    constructor() {
+        this.name = 'class summary';
+        this.methods = new Map();
+        this.msgList = [];
+    }
+    submit(msg) {
+        this.msgList.push(msg);
+    }
+    /**
+     * Retrieves an existing ClassSummary instance from the given context or creates a new one if it does not exist.
+     * If the ClassSummary is not found in the context, it attempts to retrieve or create a FileSummary for the declaring file of the class.
+     * Ensures that the ClassSummary is associated with the provided class and context before returning it.
+     *
+     * @param ctx The context in which to search for or store the ClassSummary instance.
+     * @param cls The class for which the ClassSummary is being retrieved or created.
+     * @return The existing or newly created ClassSummary instance associated with the provided class and context.
+     */
+    static getOrNew(ctx, cls) {
+        if (ctx.get(ClassSummary)) {
+            return ctx.get(ClassSummary);
+        }
+        let file = FileSummary.getOrNew(ctx.upper, cls.getDeclaringArkFile());
+        if (!file.classes.get(cls)) {
+            file.classes.set(cls, new ClassSummary());
+        }
+        let summary = file.classes.get(cls);
+        ctx.set(ClassSummary, summary);
+        return summary;
+    }
+}
+exports.ClassSummary = ClassSummary;
+/**
+ * Represents a summary message with an associated level and content.
+ * The SummaryMsg class is used to encapsulate messages that have a specific severity or importance level.
+ * It provides a way to associate a textual message with a defined level, making it suitable for logging, notifications, or summaries.
+ * The constructor initializes the message and its level, ensuring both are explicitly defined at creation.
+ */
+class SummaryMsg {
+    constructor(level, msg) {
+        this.level = level;
+        this.msg = msg;
+    }
+}
+exports.SummaryMsg = SummaryMsg;
+/**
+ * Represents a summary of a method, capturing various messages and associations with values and statements.
+ * This class provides methods to submit messages and associate them with specific values or statements.
+ * It also supports retrieving or creating a method summary within a given context.
+ */
+class MethodSummary {
+    constructor() {
+        this.name = 'method summary';
+        this.values = new Map();
+        this.stmts = new Map();
+        this.msgList = [];
+    }
+    submit(msg) {
+        this.msgList.push(msg);
+    }
+    submitValue(value, msg) {
+        if (!this.values.get(value)) {
+            this.values.set(value, []);
+        }
+        this.values.get(value).push(msg);
+    }
+    submitStmt(stmt, msg) {
+        if (this.stmts.get(stmt) === undefined) {
+            this.stmts.set(stmt, []);
+        }
+        logger.info(`submit ${JSON.stringify(msg)}`);
+        this.stmts.get(stmt).push(msg);
+    }
+    /**
+     * Retrieves an existing MethodSummary from the context or creates a new one if it does not exist.
+     *
+     * @param ctx The method context in which the MethodSummary is stored or will be created.
+     * @param mtd The ArkMethod for which the MethodSummary is being retrieved or created.
+     * @return The existing or newly created MethodSummary associated with the provided context and method.
+     */
+    static getOrNew(ctx, mtd) {
+        if (ctx.get(MethodSummary)) {
+            return ctx.get(MethodSummary);
+        }
+        let cls = ClassSummary.getOrNew(ctx.upper, mtd.getDeclaringArkClass());
+        if (!cls.methods.get(mtd)) {
+            cls.methods.set(mtd, new MethodSummary());
+        }
+        let summary = cls.methods.get(mtd);
+        ctx.set(MethodSummary, summary);
+        return summary;
+    }
+}
+exports.MethodSummary = MethodSummary;
+/**
+ * The SceneValidator class is responsible for validating a given scene by leveraging the ScenePassMgr.
+ * It sets up a context for validation, executes the validation process, and retrieves the summary of the validation.
+ *
+ * The validate method initializes a new SceneSummary instance, associates it with the current scene context,
+ * runs the validation process using the configured manager, and finally returns the generated summary.
+ *
+ * This class ensures that the validation logic is encapsulated and provides a clean interface for processing scenes.
+ */
+class SceneValidator {
+    constructor() {
+        this.mgr = new ScenePassMgr_1.ScenePassMgr({ dispatcher: ArkValidatorRegistry });
+    }
+    validate(scene) {
+        let summary = new SceneSummary();
+        this.mgr.sceneContext().set(SceneSummary, summary);
+        this.mgr.run(scene);
+        return this.mgr.sceneContext().remove(SceneSummary);
+    }
+}
+exports.SceneValidator = SceneValidator;

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

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

package/lib/save/JsonPrinter.js

@@ -134,24 +134,16 @@ class JsonPrinter extends Printer_1.Printer {
             throw new Error('Type is undefined');
         }
         if (type instanceof Type_1.AnyType) {
-            return {
-                _: 'AnyType',
-            };
+            return { _: 'AnyType' };
         }
         else if (type instanceof Type_1.UnknownType) {
-            return {
-                _: 'UnknownType',
-            };
+            return { _: 'UnknownType' };
         }
         else if (type instanceof Type_1.VoidType) {
-            return {
-                _: 'VoidType',
-            };
+            return { _: 'VoidType' };
         }
         else if (type instanceof Type_1.NeverType) {
-            return {
-                _: 'NeverType',
-            };
+            return { _: 'NeverType' };
         }
         else if (type instanceof Type_1.UnionType) {
             return {
@@ -172,34 +164,22 @@ class JsonPrinter extends Printer_1.Printer {
             };
         }
         else if (type instanceof Type_1.BooleanType) {
-            return {
-                _: 'BooleanType',
-            };
+            return { _: 'BooleanType' };
         }
         else if (type instanceof Type_1.NumberType) {
-            return {
-                _: 'NumberType',
-            };
+            return { _: 'NumberType' };
         }
         else if (type instanceof Type_1.BigIntType) {
-            return {
-                _: 'BigIntType',
-            };
+            return { _: 'BigIntType' };
         }
         else if (type instanceof Type_1.StringType) {
-            return {
-                _: 'StringType',
-            };
+            return { _: 'StringType' };
         }
         else if (type instanceof Type_1.NullType) {
-            return {
-                _: 'NullType',
-            };
+            return { _: 'NullType' };
         }
         else if (type instanceof Type_1.UndefinedType) {
-            return {
-                _: 'UndefinedType',
-            };
+            return { _: 'UndefinedType' };
         }
         else if (type instanceof Type_1.LiteralType) {
             return {
@@ -392,55 +372,28 @@ class JsonPrinter extends Printer_1.Printer {
             return Object.assign({ _: 'Constant' }, this.serializeConstant(value));
         }
         else if (value instanceof Expr_1.ArkNewExpr) {
-            return {
-                _: 'NewExpr',
-                classType: this.serializeType(value.getClassType()),
-            };
+            return { _: 'NewExpr', classType: this.serializeType(value.getClassType()) };
         }
         else if (value instanceof Expr_1.ArkNewArrayExpr) {
-            return {
-                _: 'NewArrayExpr',
-                elementType: this.serializeType(value.getBaseType()),
-                size: this.serializeValue(value.getSize()),
-            };
+            return { _: 'NewArrayExpr', elementType: this.serializeType(value.getBaseType()), size: this.serializeValue(value.getSize()) };
         }
         else if (value instanceof Expr_1.ArkDeleteExpr) {
-            return {
-                _: 'DeleteExpr',
-                arg: this.serializeValue(value.getField()),
-            };
+            return { _: 'DeleteExpr', arg: this.serializeValue(value.getField()) };
         }
         else if (value instanceof Expr_1.ArkAwaitExpr) {
-            return {
-                _: 'AwaitExpr',
-                arg: this.serializeValue(value.getPromise()),
-            };
+            return { _: 'AwaitExpr', arg: this.serializeValue(value.getPromise()) };
         }
         else if (value instanceof Expr_1.ArkYieldExpr) {
-            return {
-                _: 'YieldExpr',
-                arg: this.serializeValue(value.getYieldValue()),
-            };
+            return { _: 'YieldExpr', arg: this.serializeValue(value.getYieldValue()) };
         }
         else if (value instanceof Expr_1.ArkTypeOfExpr) {
-            return {
-                _: 'TypeOfExpr',
-                arg: this.serializeValue(value.getOp()),
-            };
+            return { _: 'TypeOfExpr', arg: this.serializeValue(value.getOp()) };
         }
         else if (value instanceof Expr_1.ArkInstanceOfExpr) {
-            return {
-                _: 'InstanceOfExpr',
-                arg: this.serializeValue(value.getOp()),
-                checkType: this.serializeType(value.getCheckType()),
-            };
+            return { _: 'InstanceOfExpr', arg: this.serializeValue(value.getOp()), checkType: this.serializeType(value.getCheckType()) };
         }
         else if (value instanceof Expr_1.ArkCastExpr) {
-            return {
-                _: 'CastExpr',
-                arg: this.serializeValue(value.getOp()),
-                type: this.serializeType(value.getType()),
-            };
+            return { _: 'CastExpr', arg: this.serializeValue(value.getOp()), type: this.serializeType(value.getType()) };
         }
         else if (value instanceof Expr_1.ArkPhiExpr) {
             const args = value.getArgs();
@@ -470,11 +423,7 @@ class JsonPrinter extends Printer_1.Printer {
             };
         }
         else if (value instanceof Expr_1.ArkUnopExpr) {
-            return {
-                _: 'UnopExpr',
-                op: value.getOperator(),
-                arg: this.serializeValue(value.getOp()),
-            };
+            return { _: 'UnopExpr', op: value.getOperator(), arg: this.serializeValue(value.getOp()) };
         }
         else if (value instanceof Expr_1.ArkInstanceInvokeExpr) {
             return {
@@ -500,17 +449,10 @@ class JsonPrinter extends Printer_1.Printer {
             };
         }
         else if (value instanceof Ref_1.ArkThisRef) {
-            return {
-                _: 'ThisRef',
-                type: this.serializeType(value.getType()),
-            };
+            return { _: 'ThisRef', type: this.serializeType(value.getType()) };
         }
         else if (value instanceof Ref_1.ArkParameterRef) {
-            return {
-                _: 'ParameterRef',
-                index: value.getIndex(),
-                type: this.serializeType(value.getType()),
-            };
+            return { _: 'ParameterRef', index: value.getIndex(), type: this.serializeType(value.getType()) };
         }
         else if (value instanceof Ref_1.ArkArrayRef) {
             return {
@@ -521,18 +463,11 @@ class JsonPrinter extends Printer_1.Printer {
             };
         }
         else if (value instanceof Ref_1.ArkCaughtExceptionRef) {
-            return {
-                _: 'CaughtExceptionRef',
-                type: this.serializeType(value.getType()),
-            };
+            return { _: 'CaughtExceptionRef', type: this.serializeType(value.getType()) };
         }
         else if (value instanceof Ref_1.GlobalRef) {
             let ref = value.getRef();
-            return {
-                _: 'GlobalRef',
-                name: value.getName(),
-                ref: ref ? this.serializeValue(ref) : null,
-            };
+            return { _: 'GlobalRef', name: value.getName(), ref: ref ? this.serializeValue(ref) : null };
         }
         else if (value instanceof Ref_1.ClosureFieldRef) {
             return {
@@ -543,25 +478,14 @@ class JsonPrinter extends Printer_1.Printer {
             };
         }
         else if (value instanceof Ref_1.ArkInstanceFieldRef) {
-            return {
-                _: 'InstanceFieldRef',
-                instance: this.serializeValue(value.getBase()),
-                field: this.serializeFieldSignature(value.getFieldSignature()),
-            };
+            return { _: 'InstanceFieldRef', instance: this.serializeValue(value.getBase()), field: this.serializeFieldSignature(value.getFieldSignature()) };
         }
         else if (value instanceof Ref_1.ArkStaticFieldRef) {
-            return {
-                _: 'StaticFieldRef',
-                field: this.serializeFieldSignature(value.getFieldSignature()),
-            };
+            return { _: 'StaticFieldRef', field: this.serializeFieldSignature(value.getFieldSignature()) };
         }
         else {
             console.warn(`Unhandled Value: ${value.constructor.name} (${value.toString()})`);
-            return {
-                _: value.constructor.name,
-                text: value.toString(),
-                type: this.serializeType(value.getType()),
-            };
+            return { _: value.constructor.name, text: value.toString(), type: this.serializeType(value.getType()) };
         }
     }
     serializeStmt(stmt) {

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

@@ -92,6 +92,7 @@ export declare class SourceWhileStmt extends SourceStmt {
      * @returns
      */
     private forOf2ts;
+    private getForOf2ts;
     transfer2ts(): void;
     protected valueToString(value: Value): string;
 }

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

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

package/lib/save/source/SourceStmt.js

@@ -449,9 +449,6 @@ class SourceWhileStmt extends SourceStmt {
             return false;
         }
         let temp2 = done.getBase();
-        if (!(temp2 instanceof Local_1.Local)) {
-            return false;
-        }
         stmt = temp2.getDeclaringStmt();
         if (!(stmt instanceof Stmt_1.ArkAssignStmt)) {
             return false;
@@ -464,9 +461,6 @@ class SourceWhileStmt extends SourceStmt {
             return false;
         }
         let temp1 = next.getBase();
-        if (!(temp1 instanceof Local_1.Local)) {
-            return false;
-        }
         stmt = temp1.getDeclaringStmt();
         if (!(stmt instanceof Stmt_1.ArkAssignStmt)) {
             return false;
@@ -478,6 +472,9 @@ class SourceWhileStmt extends SourceStmt {
         if (iterator.getMethodSignature().getMethodSubSignature().getMethodName() !== 'Symbol.iterator') {
             return false;
         }
+        return this.getForOf2ts(temp3, temp1, iterator);
+    }
+    getForOf2ts(temp3, temp1, iterator) {
         let successors = this.block.getSuccessors();
         if (successors.length !== 2) {
             return false;
@@ -486,7 +483,7 @@ class SourceWhileStmt extends SourceStmt {
         if (stmts.length < 2) {
             return false;
         }
-        stmt = stmts[1];
+        let stmt = stmts[1];
         if (!(stmt instanceof Stmt_1.ArkAssignStmt)) {
             return false;
         }

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

@@ -1 +1 @@
-{"version":3,"file":"FileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/FileUtils.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD,qBAAa,SAAS;IAClB,gBAAuB,WAAW;;;MAGhC;WAEY,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;WASzC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;WAOrC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIrC,iBAAiB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;WA4BlG,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,QAAQ;CAgB1F;AAED,qBAAa,UAAU;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;gBAED,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAIzC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,GAAG,CAAC,MAAM,CAAqB,GAAG,MAAM,CA2BrH"}
+{"version":3,"file":"FileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/FileUtils.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD,qBAAa,SAAS;IAClB,gBAAuB,WAAW;;;MAGhC;WAEY,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;WASzC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;WAOrC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIrC,iBAAiB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;WAkClG,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,QAAQ;CAgB1F;AAED,qBAAa,UAAU;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;gBAED,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAIzC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,GAAG,CAAC,MAAM,CAAqB,GAAG,MAAM,CA2BrH"}

package/lib/utils/FileUtils.js

@@ -84,12 +84,19 @@ class FileUtils {
                 if (moduleMap.get(name)) {
                     return;
                 }
-                const modulePath = path_1.default.resolve(path_1.default.dirname(filePath), value.replace('file:', ''));
-                const key = path_1.default.resolve(modulePath, EtsConst_1.OH_PACKAGE_JSON5);
-                const target = ohPkgContentMap.get(key);
-                if (target) {
-                    moduleMap.set(name, new ModulePath(modulePath, target.main ? path_1.default.resolve(modulePath, target.main) : ''));
+                const dir = path_1.default.dirname(filePath);
+                let modulePath = path_1.default.resolve(dir, value.replace('file:', ''));
+                let main = '';
+                if (this.isDirectory(modulePath)) {
+                    const target = ohPkgContentMap.get(path_1.default.resolve(modulePath, EtsConst_1.OH_PACKAGE_JSON5));
+                    if (target === null || target === void 0 ? void 0 : target.main) {
+                        main = path_1.default.resolve(modulePath, target.main);
+                    }
                 }
+                else {
+                    path_1.default.resolve(dir, 'oh_modules', name);
+                }
+                moduleMap.set(name, new ModulePath(modulePath, main));
             });
         });
         return moduleMap;
@@ -119,7 +126,7 @@ FileUtils.FILE_FILTER = {
 class ModulePath {
     constructor(path, main) {
         this.path = (0, pathTransfer_1.transfer2UnixPath)(path);
-        this.main = (0, pathTransfer_1.transfer2UnixPath)(main);
+        this.main = main ? (0, pathTransfer_1.transfer2UnixPath)(main) : main;
     }
 }
 exports.ModulePath = ModulePath;