arkanalyzer 1.0.89 → 1.0.90

package/lib/index.js

@@ -31,8 +31,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArkNamespace = exports.ArkFile = exports.SCCDetection = exports.BaseExplicitGraph = exports.BaseNode = exports.BaseEdge = exports.DominanceTree = exports.DominanceFinder = exports.Cfg = exports.BasicBlock = exports.UndefinedVariableSolver = exports.UndefinedVariableChecker = exports.Fact = exports.PathEdge = exports.PathEdgePoint = exports.DataflowSolver = exports.DataflowResult = exports.DataflowProblem = exports.Scope = exports.VisibleValue = exports.ValueUtil = exports.TypeInference = exports.StmtUseReplacer = exports.RefUseReplacer = exports.IRUtils = exports.ExprUseReplacer = exports.DummyMainCreater = exports.ModelUtils = exports.FullPosition = exports.LineColPosition = exports.Local = exports.DefUseChain = exports.Decorator = exports.Constant = exports.DVFGBuilder = exports.DVFG = exports.DiffPTData = exports.PtsSet = exports.PointerAnalysisConfig = exports.PointerAnalysis = exports.PagBuilder = exports.CSFuncID = exports.DummyCallCreator = exports.CallGraphBuilder = exports.CGStat = exports.PAGStat = exports.PTAStat = exports.RapidTypeAnalysis = exports.ClassHierarchyAnalysis = exports.AbstractAnalysis = void 0;
-exports.ts = exports.PackedSparseMap = exports.IntWorkList = exports.IntMap = exports.Logger = exports.LOG_MODULE_TYPE = exports.LOG_LEVEL = exports.ViewTreePrinter = exports.GraphPrinter = exports.JsonPrinter = exports.SourceFilePrinter = exports.SourceNamespacePrinter = exports.SourceClassPrinter = exports.SourceMethodPrinter = exports.DotFilePrinter = exports.DotNamespacePrinter = exports.DotClassPrinter = exports.DotMethodPrinter = exports.PrinterBuilder = exports.Printer = exports.getCxxSourceFileExtensions = exports.getCxxSourceFileExtensionSet = exports.getCxxImplementationFileExtensions = exports.getCxxImplementationFileExtensionSet = exports.CppFrontend = exports.ArktsFrontend = exports.FrontendBuilder = exports.Scene = exports.buildSceneConfigFromProject = exports.SceneConfig = exports.ArkBody = exports.ImportInfo = exports.ExportInfo = exports.ArkField = exports.ArkMethod = exports.ArkClass = void 0;
+exports.ExportInfo = exports.ArkField = exports.ArkMethod = exports.ArkClass = exports.ArkNamespace = exports.ArkFile = exports.SCCDetection = exports.BaseExplicitGraph = exports.BaseNode = exports.BaseEdge = exports.DominanceTree = exports.DominanceFinder = exports.Cfg = exports.BasicBlock = exports.MFPDataFlowSolver = exports.Solution = exports.ReachingDefTransferFunction = exports.ReachingDefProblem = exports.Scope = exports.VisibleValue = exports.ValueUtil = exports.TypeInference = exports.StmtUseReplacer = exports.RefUseReplacer = exports.IRUtils = exports.ExprUseReplacer = exports.DummyMainCreater = exports.ModelUtils = exports.FullPosition = exports.LineColPosition = exports.Local = exports.DefUseChain = exports.Decorator = exports.Constant = exports.DVFGBuilder = exports.DVFG = exports.DiffPTData = exports.PtsSet = exports.PointerAnalysisConfig = exports.PointerAnalysis = exports.PagBuilder = exports.CSFuncID = exports.DummyCallCreator = exports.CallGraphBuilder = exports.CGStat = exports.PAGStat = exports.PTAStat = exports.RapidTypeAnalysis = exports.ClassHierarchyAnalysis = exports.AbstractAnalysis = void 0;
+exports.ts = exports.PackedSparseMap = exports.IntWorkList = exports.IntMap = exports.Logger = exports.LOG_MODULE_TYPE = exports.LOG_LEVEL = exports.ViewTreePrinter = exports.GraphPrinter = exports.JsonPrinter = exports.SourceFilePrinter = exports.SourceNamespacePrinter = exports.SourceClassPrinter = exports.SourceMethodPrinter = exports.DotFilePrinter = exports.DotNamespacePrinter = exports.DotClassPrinter = exports.DotMethodPrinter = exports.PrinterBuilder = exports.Printer = exports.getCxxSourceFileExtensions = exports.getCxxSourceFileExtensionSet = exports.getCxxImplementationFileExtensions = exports.getCxxImplementationFileExtensionSet = exports.CppFrontend = exports.ArktsFrontend = exports.FrontendBuilder = exports.Scene = exports.buildSceneConfigFromProject = exports.SceneConfig = exports.ArkBody = exports.ImportInfo = void 0;
 // callgraph/algorithm
 var AbstractAnalysis_1 = require("./callgraph/algorithm/AbstractAnalysis");
 Object.defineProperty(exports, "AbstractAnalysis", { enumerable: true, get: function () { return AbstractAnalysis_1.AbstractAnalysis; } });
@@ -107,20 +107,12 @@ var VisibleValue_1 = require("./core/common/VisibleValue");
 Object.defineProperty(exports, "VisibleValue", { enumerable: true, get: function () { return VisibleValue_1.VisibleValue; } });
 Object.defineProperty(exports, "Scope", { enumerable: true, get: function () { return VisibleValue_1.Scope; } });
 // core/dataflow
-var DataflowProblem_1 = require("./core/dataflow/DataflowProblem");
-Object.defineProperty(exports, "DataflowProblem", { enumerable: true, get: function () { return DataflowProblem_1.DataflowProblem; } });
-var DataflowResult_1 = require("./core/dataflow/DataflowResult");
-Object.defineProperty(exports, "DataflowResult", { enumerable: true, get: function () { return DataflowResult_1.DataflowResult; } });
-var DataflowSolver_1 = require("./core/dataflow/DataflowSolver");
-Object.defineProperty(exports, "DataflowSolver", { enumerable: true, get: function () { return DataflowSolver_1.DataflowSolver; } });
-var Edge_1 = require("./core/dataflow/Edge");
-Object.defineProperty(exports, "PathEdgePoint", { enumerable: true, get: function () { return Edge_1.PathEdgePoint; } });
-Object.defineProperty(exports, "PathEdge", { enumerable: true, get: function () { return Edge_1.PathEdge; } });
-var Fact_1 = require("./core/dataflow/Fact");
-Object.defineProperty(exports, "Fact", { enumerable: true, get: function () { return Fact_1.Fact; } });
-var UndefinedVariable_1 = require("./core/dataflow/UndefinedVariable");
-Object.defineProperty(exports, "UndefinedVariableChecker", { enumerable: true, get: function () { return UndefinedVariable_1.UndefinedVariableChecker; } });
-Object.defineProperty(exports, "UndefinedVariableSolver", { enumerable: true, get: function () { return UndefinedVariable_1.UndefinedVariableSolver; } });
+var ReachingDef_1 = require("./core/dataflow/ReachingDef");
+Object.defineProperty(exports, "ReachingDefProblem", { enumerable: true, get: function () { return ReachingDef_1.ReachingDefProblem; } });
+Object.defineProperty(exports, "ReachingDefTransferFunction", { enumerable: true, get: function () { return ReachingDef_1.ReachingDefTransferFunction; } });
+var GenericDataFlow_1 = require("./core/dataflow/GenericDataFlow");
+Object.defineProperty(exports, "Solution", { enumerable: true, get: function () { return GenericDataFlow_1.Solution; } });
+Object.defineProperty(exports, "MFPDataFlowSolver", { enumerable: true, get: function () { return GenericDataFlow_1.MFPDataFlowSolver; } });
 // core/graph
 var BasicBlock_1 = require("./core/graph/BasicBlock");
 Object.defineProperty(exports, "BasicBlock", { enumerable: true, get: function () { return BasicBlock_1.BasicBlock; } });
@@ -167,12 +159,12 @@ var ArktsFrontend_1 = require("./frontend/arktsFrontend/ArktsFrontend");
 Object.defineProperty(exports, "ArktsFrontend", { enumerable: true, get: function () { return ArktsFrontend_1.ArktsFrontend; } });
 var CppFrontend_1 = require("./frontend/cppFrontend/CppFrontend");
 Object.defineProperty(exports, "CppFrontend", { enumerable: true, get: function () { return CppFrontend_1.CppFrontend; } });
-// cpp_frontend
-var ast_1 = require("./frontend/cppFrontend/ast");
-Object.defineProperty(exports, "getCxxImplementationFileExtensionSet", { enumerable: true, get: function () { return ast_1.getCxxImplementationFileExtensionSet; } });
-Object.defineProperty(exports, "getCxxImplementationFileExtensions", { enumerable: true, get: function () { return ast_1.getCxxImplementationFileExtensions; } });
-Object.defineProperty(exports, "getCxxSourceFileExtensionSet", { enumerable: true, get: function () { return ast_1.getCxxSourceFileExtensionSet; } });
-Object.defineProperty(exports, "getCxxSourceFileExtensions", { enumerable: true, get: function () { return ast_1.getCxxSourceFileExtensions; } });
+// cpp_frontend (extension helpers; C++ parse runtime is optional @arkanalyzer/cxx-ast-parser)
+var cppUtils_1 = require("./frontend/cppFrontend/utils/cppUtils");
+Object.defineProperty(exports, "getCxxImplementationFileExtensionSet", { enumerable: true, get: function () { return cppUtils_1.getCxxImplementationFileExtensionSet; } });
+Object.defineProperty(exports, "getCxxImplementationFileExtensions", { enumerable: true, get: function () { return cppUtils_1.getCxxImplementationFileExtensions; } });
+Object.defineProperty(exports, "getCxxSourceFileExtensionSet", { enumerable: true, get: function () { return cppUtils_1.getCxxSourceFileExtensionSet; } });
+Object.defineProperty(exports, "getCxxSourceFileExtensions", { enumerable: true, get: function () { return cppUtils_1.getCxxSourceFileExtensions; } });
 // save
 var Printer_1 = require("./save/Printer");
 Object.defineProperty(exports, "Printer", { enumerable: true, get: function () { return Printer_1.Printer; } });

package/lib/save/arkir/ArkIRClassPrinter.js

@@ -28,7 +28,8 @@ class ArkIRClassPrinter extends BasePrinter_1.BasePrinter {
         this.cls = cls;
     }
     getLine() {
-        return this.cls.getLine();
+        var _a, _b;
+        return (_b = (_a = this.cls.getOriginFullPosition()) === null || _a === void 0 ? void 0 : _a.getFirstLine()) !== null && _b !== void 0 ? _b : 0;
     }
     dump() {
         this.printer.clear();

package/lib/save/arkir/ArkIRFieldPrinter.js

@@ -28,7 +28,7 @@ class ArkIRFieldPrinter extends BasePrinter_1.BasePrinter {
         this.field = field;
     }
     getLine() {
-        return this.field.getOriginPosition().getLineNo();
+        return this.field.getOriginFullPosition().getFirstLine();
     }
     dump() {
         this.printer.clear();

package/lib/save/arkir/ArkIRMethodPrinter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkIRMethodPrinter.d.ts","sourceRoot":"","sources":["../../../src/save/arkir/ArkIRMethodPrinter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAKvD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIlD;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IAC/C,OAAO,CAAC,MAAM,CAAY;gBAEP,MAAM,EAAE,SAAS,EAAE,MAAM,GAAE,MAAW;IAKlD,IAAI,IAAI,MAAM;IAYd,OAAO,IAAI,MAAM;IAyBxB,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,SAAS;IAMjB,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAsCxD,OAAO,CAAC,QAAQ;IAWhB,OAAO,CAAC,eAAe;CA2B1B"}
+{"version":3,"file":"ArkIRMethodPrinter.d.ts","sourceRoot":"","sources":["../../../src/save/arkir/ArkIRMethodPrinter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAKvD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIlD;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;IAC/C,OAAO,CAAC,MAAM,CAAY;gBAEP,MAAM,EAAE,SAAS,EAAE,MAAM,GAAE,MAAW;IAKlD,IAAI,IAAI,MAAM;IAYd,OAAO,IAAI,MAAM;IAuBxB,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,SAAS;IAMjB,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAsCxD,OAAO,CAAC,QAAQ;IAWhB,OAAO,CAAC,eAAe;CA2B1B"}

package/lib/save/arkir/ArkIRMethodPrinter.js

@@ -37,10 +37,9 @@ class ArkIRMethodPrinter extends BasePrinter_1.BasePrinter {
         return this.printer.toString();
     }
     getLine() {
-        let line = this.method.getLine();
-        if (line === null) {
-            line = 0;
-        }
+        var _a, _b, _c, _d, _e;
+        const position = this.method.getImplOriginFullPosition();
+        let line = (_a = position === null || position === void 0 ? void 0 : position.getFirstLine()) !== null && _a !== void 0 ? _a : 0;
         if (line > 0) {
             return line;
         }
@@ -52,8 +51,8 @@ class ArkIRMethodPrinter extends BasePrinter_1.BasePrinter {
                 .forEach(stmt => stmts.push(stmt));
         }
         for (const stmt of stmts) {
-            if (stmt.getOriginPositionInfo().getLineNo() > 0) {
-                return stmt.getOriginPositionInfo().getLineNo();
+            if (((_c = (_b = stmt.getOriginFullPosition()) === null || _b === void 0 ? void 0 : _b.getFirstLine()) !== null && _c !== void 0 ? _c : 0) > 0) {
+                return (_e = (_d = stmt.getOriginFullPosition()) === null || _d === void 0 ? void 0 : _d.getFirstLine()) !== null && _e !== void 0 ? _e : 0;
             }
         }
         return line;

package/lib/save/arkir/ArkIRNamespacePrinter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkIRNamespacePrinter.d.ts","sourceRoot":"","sources":["../../../src/save/arkir/ArkIRNamespacePrinter.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAQ,MAAM,qBAAqB,CAAC;AAIxD;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,WAAW;IAClD,EAAE,EAAE,YAAY,CAAC;gBAEE,EAAE,EAAE,YAAY,EAAE,MAAM,GAAE,MAAW;IAKjD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;CAiCxB"}
+{"version":3,"file":"ArkIRNamespacePrinter.d.ts","sourceRoot":"","sources":["../../../src/save/arkir/ArkIRNamespacePrinter.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAQ,MAAM,qBAAqB,CAAC;AAIxD;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,WAAW;IAClD,EAAE,EAAE,YAAY,CAAC;gBAEE,EAAE,EAAE,YAAY,EAAE,MAAM,GAAE,MAAW;IAKjD,OAAO,IAAI,MAAM;IAKjB,IAAI,IAAI,MAAM;CAiCxB"}

package/lib/save/arkir/ArkIRNamespacePrinter.js

@@ -28,7 +28,8 @@ class ArkIRNamespacePrinter extends BasePrinter_1.BasePrinter {
         this.ns = ns;
     }
     getLine() {
-        return this.ns.getLine();
+        const positions = this.ns.getOriginFullPositions();
+        return positions.length > 0 ? positions[0].getFirstLine() : 0;
     }
     dump() {
         const commentsMetadata = this.ns.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS);

package/lib/save/base/ExportPrinter.js

@@ -25,7 +25,7 @@ class ExportPrinter extends BasePrinter_1.BasePrinter {
         this.info = info;
     }
     getLine() {
-        return this.info.getOriginTsPosition().getLineNo();
+        return this.info.getOriginFullPosition().getFirstLine();
     }
     dump() {
         this.printer.clear();

package/lib/save/base/ImportPrinter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImportPrinter.d.ts","sourceRoot":"","sources":["../../../src/save/base/ImportPrinter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAElD,qBAAa,aAAc,SAAQ,WAAW;IAC1C,KAAK,EAAE,UAAU,EAAE,CAAC;gBAED,KAAK,EAAE,UAAU,EAAE,EAAE,MAAM,GAAE,MAAW;IAKpD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;CAuCxB;AAeD,wBAAgB,YAAY,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,CAQ1E"}
+{"version":3,"file":"ImportPrinter.d.ts","sourceRoot":"","sources":["../../../src/save/base/ImportPrinter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAc,MAAM,4BAA4B,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAElD,qBAAa,aAAc,SAAQ,WAAW;IAC1C,KAAK,EAAE,UAAU,EAAE,CAAC;gBAED,KAAK,EAAE,UAAU,EAAE,EAAE,MAAM,GAAE,MAAW;IAKpD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;CAwCxB;AAeD,wBAAgB,YAAY,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,CAQ1E"}

package/lib/save/base/ImportPrinter.js

@@ -15,6 +15,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printImports = exports.ImportPrinter = void 0;
+const ArkImport_1 = require("../../core/model/ArkImport");
 const ArkMetadata_1 = require("../../core/model/ArkMetadata");
 const BasePrinter_1 = require("./BasePrinter");
 class ImportPrinter extends BasePrinter_1.BasePrinter {
@@ -23,7 +24,7 @@ class ImportPrinter extends BasePrinter_1.BasePrinter {
         this.infos = infos;
     }
     getLine() {
-        return this.infos[0].getOriginTsPosition().getLineNo();
+        return this.infos[0].getOriginFullPosition().getFirstLine();
     }
     dump() {
         const commentsMetadata = this.infos[0].getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS);
@@ -33,11 +34,12 @@ class ImportPrinter extends BasePrinter_1.BasePrinter {
         let clauseNames = [];
         let namedImports = [];
         for (const info of this.infos) {
-            if (info.getImportType() === 'Identifier') {
+            const importTypeTag = info.getImportTypeTag();
+            if (importTypeTag === ArkImport_1.ImportType.IDENTIFIER_IMPORT) {
                 // sample: import fs from 'fs'
                 clauseNames.push(info.getImportClauseName());
             }
-            else if (info.getImportType() === 'NamedImports') {
+            else if (importTypeTag === ArkImport_1.ImportType.NAMED_IMPORTS_IMPORT) {
                 // sample: import {xxx} from './yyy'
                 if (info.getNameBeforeAs()) {
                     namedImports.push(`${info.getNameBeforeAs()} as ${info.getImportClauseName()}`);
@@ -46,11 +48,11 @@ class ImportPrinter extends BasePrinter_1.BasePrinter {
                     namedImports.push(info.getImportClauseName());
                 }
             }
-            else if (info.getImportType() === 'NamespaceImport') {
+            else if (importTypeTag === ArkImport_1.ImportType.NAMESPACE_IMPORT) {
                 // sample: import * as ts from 'ohos-typescript'
                 clauseNames.push(`* as ${info.getImportClauseName()}`);
             }
-            else if (info.getImportType() === 'EqualsImport') {
+            else if (importTypeTag === ArkImport_1.ImportType.EQUALS_IMPORT) {
                 // sample: import mmmm = require('./xxx')
                 this.printer.writeIndent().writeLine(`import ${info.getImportClauseName()} =  require('${info.getFrom()}');`);
             }
@@ -70,7 +72,7 @@ exports.ImportPrinter = ImportPrinter;
 function mergeImportInfos(infos) {
     let map = new Map();
     for (let info of infos) {
-        let key = `${info.getOriginTsPosition().getLineNo()}-${info.getFrom()}`;
+        let key = `${info.getOriginFullPosition().getFirstLine()}-${info.getFrom()}`;
         let merge = map.get(key) || [];
         merge.push(info);
         map.set(key, merge);

package/lib/save/json/JsonSerialization.d.ts.map

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

package/lib/save/json/JsonSerialization.js

@@ -16,6 +16,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeStmt = exports.serializeValue = exports.serializeConstant = exports.serializeType = exports.serializeLocal = exports.serializeBasicBlock = exports.serializeCfg = exports.serializeAliasTypeSignature = exports.serializeMethodSignature = exports.serializeFieldSignature = exports.serializeClassSignature = exports.serializeNamespaceSignature = exports.serializeFileSignature = exports.serializeLineColPosition = exports.serializeDecorator = exports.serializeExportInfo = exports.serializeImportInfo = exports.serializeMethodParameter = exports.serializeMethodBody = exports.serializeMethod = exports.serializeField = exports.serializeClass = exports.serializeNamespace = exports.serializeArkFile = exports.serializeArkScene = void 0;
 const __1 = require("../..");
+const ArkImport_1 = require("../../core/model/ArkImport");
 const JsonDto_1 = require("./JsonDto");
 const Expr_1 = require("../../frontend/cppFrontend/base/Expr");
 const Type_1 = require("../../frontend/cppFrontend/base/Type");
@@ -98,9 +99,26 @@ function serializeMethodParameter(parameter) {
 }
 exports.serializeMethodParameter = serializeMethodParameter;
 function serializeImportInfo(importInfo) {
+    const importTypeTag = importInfo.getImportTypeTag();
+    let importTypeStr = '';
+    if (importTypeTag === ArkImport_1.ImportType.TYPE_ALIAS_IMPORT) {
+        importTypeStr = 'TypeAlias';
+    }
+    else if (importTypeTag === ArkImport_1.ImportType.EQUALS_IMPORT) {
+        importTypeStr = 'EqualsImport';
+    }
+    else if (importTypeTag === ArkImport_1.ImportType.NAMESPACE_IMPORT) {
+        importTypeStr = 'NamespaceImport';
+    }
+    else if (importTypeTag === ArkImport_1.ImportType.NAMED_IMPORTS_IMPORT) {
+        importTypeStr = 'NamedImports';
+    }
+    else if (importTypeTag === ArkImport_1.ImportType.IDENTIFIER_IMPORT) {
+        importTypeStr = 'Identifier';
+    }
     return {
         importName: importInfo.getImportClauseName(),
-        importType: importInfo.getImportType(),
+        importType: importTypeStr,
         importFrom: importInfo.getFrom(),
         nameBeforeAs: importInfo.getNameBeforeAs(),
         modifiers: importInfo.getModifiers(),

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

@@ -16,7 +16,8 @@ export declare abstract class SourceBase extends BasePrinter implements Transfor
     getMethod(signature: MethodSignature): ArkMethod | null;
     getClass(signature: ClassSignature): ArkClass | null;
     getPrinter(): ArkCodeBuffer;
-    transTemp2Code(temp: Local): string;
+    transTemp2Code(temp: Local, _isLeftOp?: boolean): string;
+    getTempCode(_tempName: string): string | undefined;
     isInBuilderMethod(): boolean;
     protected resolveKeywordType(keywordStr: string): string;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"SourceBase.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceBase.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,8BAAsB,UAAW,SAAQ,WAAY,YAAW,kBAAkB;IAC9E,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;gBAElB,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,MAAW;IAKjD,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,UAAU,IAAI,OAAO;IAIrB,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAIvD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAIpD,UAAU,IAAI,aAAa;IAI3B,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IAInC,iBAAiB,IAAI,OAAO;IAInC,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;CAgB3D"}
+{"version":3,"file":"SourceBase.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceBase.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,8BAAsB,UAAW,SAAQ,WAAY,YAAW,kBAAkB;IAC9E,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;gBAElB,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,MAAW;IAKjD,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,UAAU,IAAI,OAAO;IAIrB,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAIvD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAIpD,UAAU,IAAI,aAAa;IAI3B,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,GAAE,OAAe,GAAG,MAAM;IAI/D,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIlD,iBAAiB,IAAI,OAAO;IAInC,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;CAgB3D"}

package/lib/save/source/SourceBase.js

@@ -37,9 +37,12 @@ class SourceBase extends BasePrinter_1.BasePrinter {
     getPrinter() {
         return this.printer;
     }
-    transTemp2Code(temp) {
+    transTemp2Code(temp, _isLeftOp = false) {
         return temp.getName();
     }
+    getTempCode(_tempName) {
+        return undefined;
+    }
     isInBuilderMethod() {
         return this.inBuilder;
     }

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

@@ -14,6 +14,7 @@ export declare class SourceBody implements StmtPrinterContext {
     private method;
     private cfgUtils;
     private tempCodeMap;
+    private objectLiteralPropMap;
     private tempVisitor;
     private skipStmts;
     private stmtReader;
@@ -33,6 +34,9 @@ export declare class SourceBody implements StmtPrinterContext {
     isLocalDefined(local: Local): boolean;
     getStmtReader(): StmtReader;
     setTempCode(temp: string, code: string): void;
+    getTempCode(tempName: string): string | undefined;
+    setObjectLiteralProp(objectLiteralLocalName: string, propName: string, rhsCode: string): void;
+    private objectLiteralLocalToCode;
     transTemp2Code(temp: Local, isLeftOp?: boolean): string;
     getTempCodeMap(): Map<string, string>;
     hasTempVisit(temp: string): boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"SourceBody.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceBody.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAA2C,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAGrF,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAWH,UAAU,EAIV,kBAAkB,EACrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhF,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAI7D,qBAAa,UAAW,YAAW,kBAAkB;IACjD,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IACjC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,QAAQ,CAAoB;IACpC,OAAO,CAAC,WAAW,CAAsB;IACzC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,aAAa,CAAa;IAClC,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,QAAQ,CAAO;gBAEJ,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO;IAcxE,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAI7B,iBAAiB,IAAI,OAAO;IAG5B,iBAAiB,IAAI,OAAO;IAGrB,UAAU,IAAI,OAAO;IAIrB,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAQvD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAIpD,SAAS,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC;IAI/B,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAI/B,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAIrC,aAAa,IAAI,UAAU;IAI3B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAI7C,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,GAAE,OAAe,GAAG,MAAM;IAU9D,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAInC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIhC,UAAU,IAAI,aAAa;IAI3B,IAAI,IAAI,MAAM;IAKrB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,eAAe;IAmDvB,OAAO,CAAC,UAAU;IASX,QAAQ,IAAI,UAAU,EAAE;IAIxB,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IASvC,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,QAAQ;CAqCnB;AAED,qBAAa,UAAU;IACnB,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,GAAG,CAAS;gBAER,KAAK,EAAE,IAAI,EAAE;IAKzB,KAAK,IAAI,IAAI;IAIb,OAAO,IAAI,OAAO;IAIlB,IAAI,IAAI,IAAI;IAUZ,QAAQ,IAAI,IAAI;CAOnB"}
+{"version":3,"file":"SourceBody.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceBody.ts"],"names":[],"mappings":"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"}

package/lib/save/source/SourceBody.js

@@ -55,6 +55,7 @@ class SourceBody {
         this.arkBody = method.getBody();
         this.cfgUtils = new CfgStructualAnalysis_1.AbstractFlowGraph(method.getCfg(), this.arkBody.getTraps());
         this.tempCodeMap = new Map();
+        this.objectLiteralPropMap = new Map();
         this.tempVisitor = new Set();
         this.definedLocals = new Set();
         this.inBuilder = inBuilder;
@@ -103,11 +104,75 @@ class SourceBody {
     setTempCode(temp, code) {
         this.tempCodeMap.set(temp, code);
     }
+    getTempCode(tempName) {
+        return this.tempCodeMap.get(tempName);
+    }
+    setObjectLiteralProp(objectLiteralLocalName, propName, rhsCode) {
+        if (!this.objectLiteralPropMap.has(objectLiteralLocalName)) {
+            this.objectLiteralPropMap.set(objectLiteralLocalName, new Map());
+        }
+        this.objectLiteralPropMap.get(objectLiteralLocalName).set(propName, rhsCode);
+    }
+    objectLiteralLocalToCode(objectLiteralShape, propsKey) {
+        var _a;
+        const props = this.objectLiteralPropMap.get(propsKey);
+        if (!props) {
+            return null;
+        }
+        const inner = objectLiteralShape.trim().slice(1, -1).trim(); // remove '{' and '}'
+        const keys = inner.length > 0 ? inner.split(',').map(s => s.trim()).filter(Boolean) : [];
+        const parts = [];
+        const visited = new Set();
+        const normalizeKey = (k) => {
+            const kk = k.trim();
+            if ((kk.startsWith('\'') && kk.endsWith('\'')) || (kk.startsWith('"') && kk.endsWith('"'))) {
+                return kk.slice(1, -1);
+            }
+            return kk;
+        };
+        const normalizedToOriginal = new Map();
+        for (const k of keys) {
+            normalizedToOriginal.set(normalizeKey(k), k);
+        }
+        for (const k of keys) {
+            const nk = normalizeKey(k);
+            visited.add(nk);
+            const rhs = (_a = props.get(k)) !== null && _a !== void 0 ? _a : props.get(nk);
+            if (rhs !== undefined) {
+                parts.push(`${k}: ${rhs}`);
+            }
+            else {
+                // quoted keys can't be shorthand in TS; fallback to explicit form
+                if (k !== nk) {
+                    parts.push(`${k}: ${nk}`);
+                }
+                else {
+                    parts.push(k);
+                }
+            }
+        }
+        // append any extra props not present in the shorthand list
+        for (const [k, rhs] of props.entries()) {
+            if (visited.has(k)) {
+                continue;
+            }
+            const original = normalizedToOriginal.get(k);
+            parts.push(`${original !== null && original !== void 0 ? original : k}: ${rhs}`);
+        }
+        return `{${parts.join(', ')}}`;
+    }
     transTemp2Code(temp, isLeftOp = false) {
         // if the temp local is not the left op of ArkAssignStmt, it should get the actual text from tempCodeMap
         if (!isLeftOp && this.tempCodeMap.has(temp.getName()) && PrinterUtils_1.PrinterUtils.isTemp(temp.getName())) {
             this.tempVisitor.add(temp.getName());
-            return this.tempCodeMap.get(temp.getName());
+            const raw = this.tempCodeMap.get(temp.getName());
+            if (raw.startsWith('{') && raw.endsWith('}')) {
+                const merged = this.objectLiteralLocalToCode(raw, temp.getName());
+                if (merged) {
+                    return merged;
+                }
+            }
+            return raw;
         }
         return temp.getName();
     }

package/lib/save/source/SourceClass.js

@@ -38,7 +38,8 @@ class SourceClass extends SourceBase_1.SourceBase {
         return this.cls.getDeclaringArkNamespace();
     }
     getLine() {
-        return this.cls.getLine();
+        var _a, _b;
+        return (_b = (_a = this.cls.getOriginFullPosition()) === null || _a === void 0 ? void 0 : _a.getFirstLine()) !== null && _b !== void 0 ? _b : 0;
     }
     dump() {
         this.printer.clear();
@@ -177,7 +178,8 @@ class SourceDefaultClass extends SourceClass {
         super(cls, indent);
     }
     getLine() {
-        return this.cls.getLine();
+        var _a, _b;
+        return (_b = (_a = this.cls.getOriginFullPosition()) === null || _a === void 0 ? void 0 : _a.getFirstLine()) !== null && _b !== void 0 ? _b : 0;
     }
     dump() {
         this.printMethods();

package/lib/save/source/SourceField.js

@@ -31,7 +31,7 @@ class SourceField extends SourceBase_1.SourceBase {
         this.initializer = initializer;
     }
     getLine() {
-        return this.field.getOriginPosition().getLineNo();
+        return this.field.getOriginFullPosition().getFirstLine();
     }
     dump() {
         this.printer.clear();

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

@@ -1 +1 @@
-{"version":3,"file":"SourceMethod.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceMethod.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAM7D;;GAEG;AACH,qBAAa,YAAa,SAAQ,UAAU;IACxC,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,WAAW,CAAoB;gBAEpB,MAAM,EAAE,SAAS,EAAE,MAAM,GAAE,MAAW;IAOlD,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAItC,IAAI,IAAI,MAAM;IAiBd,OAAO,IAAI,MAAM;IA4BjB,iBAAiB,IAAI,UAAU,EAAE;IAKxC,OAAO,CAAC,WAAW;IAoCnB,OAAO,CAAC,SAAS;IAKjB,OAAO,CAAC,mBAAmB;IAgDpB,yBAAyB,IAAI,MAAM;IAuB1C,OAAO,CAAC,aAAa;CAQxB"}
+{"version":3,"file":"SourceMethod.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceMethod.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAK7D;;GAEG;AACH,qBAAa,YAAa,SAAQ,UAAU;IACxC,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,WAAW,CAAoB;gBAEpB,MAAM,EAAE,SAAS,EAAE,MAAM,GAAE,MAAW;IAOlD,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAItC,IAAI,IAAI,MAAM;IAiBd,OAAO,IAAI,MAAM;IA0BjB,iBAAiB,IAAI,UAAU,EAAE;IAKxC,OAAO,CAAC,WAAW;IAoCnB,OAAO,CAAC,SAAS;IAKjB,OAAO,CAAC,mBAAmB;IAgDpB,yBAAyB,IAAI,MAAM;IAuB1C,OAAO,CAAC,aAAa;CAQxB"}

package/lib/save/source/SourceMethod.js

@@ -22,7 +22,6 @@ const SourceBody_1 = require("./SourceBody");
 const SourceTransformer_1 = require("./SourceTransformer");
 const PrinterUtils_1 = require("../base/PrinterUtils");
 const ArkMetadata_1 = require("../../core/model/ArkMetadata");
-const Position_1 = require("../../core/base/Position");
 const Const_1 = require("../../core/common/Const");
 /**
  * @category save
@@ -58,12 +57,11 @@ class SourceMethod extends SourceBase_1.SourceBase {
         return this.printer.toString();
     }
     getLine() {
-        let line = this.method.getLine();
-        if (line === null && this.method.getDeclareLineCols()) {
-            line = (0, Position_1.getLineNo)(this.method.getDeclareLineCols()[0]);
-        }
-        if (line === null) {
-            line = 0;
+        var _a, _b, _c, _d, _e;
+        const implPosition = this.method.getImplOriginFullPosition();
+        let line = (_a = implPosition === null || implPosition === void 0 ? void 0 : implPosition.getFirstLine()) !== null && _a !== void 0 ? _a : 0;
+        if (line === 0 && this.method.getDeclareOriginFullPositions()) {
+            line = this.method.getDeclareOriginFullPositions()[0].getFirstLine();
         }
         if (line > 0) {
             return line;
@@ -76,8 +74,8 @@ class SourceMethod extends SourceBase_1.SourceBase {
                 .forEach(stmt => stmts.push(stmt));
         }
         for (const stmt of stmts) {
-            if (stmt.getOriginPositionInfo().getLineNo() > 0) {
-                return stmt.getOriginPositionInfo().getLineNo();
+            if ((_c = (_b = stmt.getOriginFullPosition()) === null || _b === void 0 ? void 0 : _b.getFirstLine()) !== null && _c !== void 0 ? _c : 0 > 0) {
+                return (_e = (_d = stmt.getOriginFullPosition()) === null || _d === void 0 ? void 0 : _d.getFirstLine()) !== null && _e !== void 0 ? _e : 0;
             }
         }
         return line;

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;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;CAwCxB"}
+{"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;IAKxB,OAAO,CAAC,4BAA4B;IAU7B,IAAI,IAAI,MAAM;CAwCxB"}

package/lib/save/source/SourceNamespace.js

@@ -30,7 +30,8 @@ class SourceNamespace extends SourceBase_1.SourceBase {
         this.ns = ns;
     }
     getLine() {
-        return this.ns.getLine();
+        const positions = this.ns.getOriginFullPositions();
+        return positions.length > 0 ? positions[0].getFirstLine() : 0;
     }
     printDefaultClassInNamespace(items, cls) {
         for (let method of cls.getMethods()) {

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

@@ -14,6 +14,7 @@ export interface StmtPrinterContext extends TransformerContext {
     hasTempVisit(temp: string): boolean;
     setTempVisit(temp: string): void;
     setSkipStmt(stmt: Stmt): void;
+    setObjectLiteralProp(objectLiteralLocalNameOrTemp: string, propName: string, rhsCode: string): void;
     getLocals(): Map<string, Local>;
     defineLocal(local: Local): void;
     isLocalDefined(local: Local): boolean;

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

@@ -60,10 +60,11 @@ const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER,
 const IGNOR_TYPES = new Set(['any', 'Map', 'Set']);
 class SourceStmt {
     constructor(context, original) {
+        var _a, _b;
         this.text = '';
         this.original = original;
         this.context = context;
-        this.line = original.getOriginPositionInfo().getLineNo();
+        this.line = (_b = (_a = original.getOriginFullPosition()) === null || _a === void 0 ? void 0 : _a.getFirstLine()) !== null && _b !== void 0 ? _b : 0;
         this.transformer = new SourceTransformer_1.SourceTransformer(context);
     }
     getLine() {
@@ -133,6 +134,28 @@ class SourceAssignStmt extends SourceStmt {
     transfer2ts() {
         this.leftOp = this.original.getLeftOp();
         this.rightOp = this.original.getRightOp();
+        if (this.leftOp instanceof Ref_1.ArkInstanceFieldRef && this.leftOp.getBase() instanceof Local_1.Local) {
+            const baseLocal = this.leftOp.getBase();
+            const baseName = baseLocal.getName();
+            const rhsCode = this.transformer.valueToString(this.rightOp);
+            // 1) Direct object-literal placeholder local like "{x, y}"
+            if (baseName.startsWith('{') && baseName.endsWith('}')) {
+                this.context.setObjectLiteralProp(baseName, this.leftOp.getFieldName(), rhsCode);
+                this.context.setSkipStmt(this.original);
+                this.setText('');
+                this.dumpType = AssignStmtDumpType.NORMAL;
+                return;
+            }
+            // 2) Temp local mapped to "{x, y}" via tempCodeMap
+            const baseTempCode = this.context.getTempCode(baseName);
+            if (baseTempCode && baseTempCode.startsWith('{') && baseTempCode.endsWith('}')) {
+                this.context.setObjectLiteralProp(baseName, this.leftOp.getFieldName(), rhsCode);
+                this.context.setSkipStmt(this.original);
+                this.setText('');
+                this.dumpType = AssignStmtDumpType.NORMAL;
+                return;
+            }
+        }
         if (this.rightOp instanceof Ref_1.ArkParameterRef) {
             this.setText('');
             this.dumpType = AssignStmtDumpType.PARAM_REPLACE;
@@ -707,7 +730,8 @@ class SourceReturnVoidStmt extends SourceStmt {
         super(context, original);
     }
     transfer2ts() {
-        if (this.original.getOriginPositionInfo().getLineNo() <= 0) {
+        var _a, _b;
+        if (((_b = (_a = this.original.getOriginFullPosition()) === null || _a === void 0 ? void 0 : _a.getFirstLine()) !== null && _b !== void 0 ? _b : 0) <= 0) {
             this.setText('');
         }
         else {
@@ -766,7 +790,8 @@ class SourceTypeAliasStmt extends SourceStmt {
                 this.setText(`${modifier}type ${this.aliasType.getName()}${genericTypes} = ${typeOf}${this.transformer.typeToString(typeObject)};`);
             }
             else if (typeObject instanceof Type_1.FunctionType) {
-                this.setText(`${modifier}type ${this.aliasType.getName()}${genericTypes} = ${typeOf}${typeObject.getMethodSignature().getMethodSubSignature().getMethodName()}${realGenericTypes};`);
+                const methodName = typeObject.getMethodSignature().getMethodSubSignature().getMethodName();
+                this.setText(`${modifier}type ${this.aliasType.getName()}${genericTypes} = ${typeOf}${methodName}${realGenericTypes};`);
             }
             else {
                 this.setText(`${modifier}type ${this.aliasType.getName()}${genericTypes} = ${typeOf}${this.transformer.typeToString(typeObject)}${realGenericTypes};`);

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

@@ -17,6 +17,7 @@ export interface TransformerContext {
     getClass(signature: ClassSignature): ArkClass | null;
     getPrinter(): ArkCodeBuffer;
     transTemp2Code(temp: Local, isLeftOp: boolean): string;
+    getTempCode(tempName: string): string | undefined;
     isInBuilderMethod(): boolean;
 }
 export declare class SourceTransformer {