arkanalyzer 1.0.32 → 1.0.34
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/config/arkanalyzer.json +1 -0
- package/lib/Config.d.ts +1 -0
- package/lib/Config.d.ts.map +1 -1
- package/lib/Config.js +26 -18
- package/lib/Scene.d.ts +5 -5
- package/lib/Scene.d.ts.map +1 -1
- package/lib/Scene.js +21 -19
- package/lib/VFG/DVFG.d.ts.map +1 -1
- package/lib/VFG/builder/DVFGBuilder.d.ts +2 -2
- package/lib/VFG/builder/DVFGBuilder.d.ts.map +1 -1
- package/lib/VFG/builder/DVFGBuilder.js +15 -7
- package/lib/callgraph/algorithm/AbstractAnalysis.d.ts +1 -0
- package/lib/callgraph/algorithm/AbstractAnalysis.d.ts.map +1 -1
- package/lib/callgraph/algorithm/AbstractAnalysis.js +24 -8
- package/lib/callgraph/algorithm/ClassHierarchyAnalysis.d.ts.map +1 -1
- package/lib/callgraph/algorithm/ClassHierarchyAnalysis.js +3 -2
- package/lib/callgraph/algorithm/RapidTypeAnalysis.d.ts.map +1 -1
- package/lib/callgraph/algorithm/RapidTypeAnalysis.js +4 -3
- package/lib/callgraph/common/Statistics.d.ts +9 -7
- package/lib/callgraph/common/Statistics.d.ts.map +1 -1
- package/lib/callgraph/common/Statistics.js +18 -6
- package/lib/callgraph/model/CallGraph.d.ts +2 -0
- package/lib/callgraph/model/CallGraph.d.ts.map +1 -1
- package/lib/callgraph/model/CallGraph.js +14 -8
- package/lib/callgraph/model/builder/CallGraphBuilder.d.ts +1 -0
- package/lib/callgraph/model/builder/CallGraphBuilder.d.ts.map +1 -1
- package/lib/callgraph/model/builder/CallGraphBuilder.js +9 -4
- package/lib/callgraph/pointerAnalysis/Context.d.ts.map +1 -1
- package/lib/callgraph/pointerAnalysis/Context.js +2 -2
- package/lib/callgraph/pointerAnalysis/DummyCallCreator.d.ts.map +1 -1
- package/lib/callgraph/pointerAnalysis/DummyCallCreator.js +4 -2
- package/lib/callgraph/pointerAnalysis/PTAUtils.d.ts.map +1 -1
- package/lib/callgraph/pointerAnalysis/PTAUtils.js +2 -3
- package/lib/callgraph/pointerAnalysis/Pag.d.ts.map +1 -1
- package/lib/callgraph/pointerAnalysis/Pag.js +27 -35
- package/lib/callgraph/pointerAnalysis/PagBuilder.d.ts.map +1 -1
- package/lib/callgraph/pointerAnalysis/PagBuilder.js +63 -46
- package/lib/callgraph/pointerAnalysis/PointerAnalysis.d.ts.map +1 -1
- package/lib/callgraph/pointerAnalysis/PointerAnalysis.js +12 -12
- package/lib/callgraph/pointerAnalysis/PointerAnalysisConfig.d.ts.map +1 -1
- package/lib/callgraph/pointerAnalysis/PtsDS.d.ts +1 -1
- package/lib/callgraph/pointerAnalysis/PtsDS.d.ts.map +1 -1
- package/lib/callgraph/pointerAnalysis/PtsDS.js +10 -6
- package/lib/core/base/Constant.js +2 -2
- package/lib/core/base/DefUseChain.d.ts.map +1 -1
- package/lib/core/base/DefUseChain.js +1 -1
- package/lib/core/base/Expr.d.ts.map +1 -1
- package/lib/core/base/Expr.js +3 -5
- package/lib/core/base/Local.d.ts.map +1 -1
- package/lib/core/base/Local.js +7 -2
- package/lib/core/base/Position.d.ts.map +1 -1
- package/lib/core/base/Position.js +1 -1
- package/lib/core/base/Ref.d.ts.map +1 -1
- package/lib/core/base/Ref.js +3 -1
- package/lib/core/base/Stmt.d.ts.map +1 -1
- package/lib/core/base/Stmt.js +1 -4
- package/lib/core/base/Trap.js +1 -1
- package/lib/core/base/Type.d.ts.map +1 -1
- package/lib/core/base/Type.js +2 -2
- package/lib/core/base/Value.d.ts +1 -1
- package/lib/core/base/Value.d.ts.map +1 -1
- package/lib/core/base/Value.js +1 -1
- package/lib/core/common/ArkError.js +1 -1
- package/lib/core/common/ArkIRTransformer.d.ts.map +1 -1
- package/lib/core/common/ArkIRTransformer.js +46 -36
- package/lib/core/common/ArkValueTransformer.d.ts.map +1 -1
- package/lib/core/common/ArkValueTransformer.js +295 -109
- package/lib/core/common/Builtin.d.ts.map +1 -1
- package/lib/core/common/DummyMainCreater.d.ts.map +1 -1
- package/lib/core/common/DummyMainCreater.js +10 -4
- package/lib/core/common/EtsConst.d.ts.map +1 -1
- package/lib/core/common/EtsConst.js +3 -12
- package/lib/core/common/ExprUseReplacer.js +1 -1
- package/lib/core/common/IRInference.d.ts.map +1 -1
- package/lib/core/common/IRInference.js +40 -20
- package/lib/core/common/IRUtils.d.ts.map +1 -1
- package/lib/core/common/IRUtils.js +5 -4
- package/lib/core/common/ModelUtils.d.ts +1 -1
- package/lib/core/common/ModelUtils.d.ts.map +1 -1
- package/lib/core/common/ModelUtils.js +40 -29
- package/lib/core/common/RefUseReplacer.js +1 -1
- package/lib/core/common/SdkUtils.d.ts +3 -0
- package/lib/core/common/SdkUtils.d.ts.map +1 -1
- package/lib/core/common/SdkUtils.js +29 -10
- package/lib/core/common/StmtDefReplacer.d.ts.map +1 -1
- package/lib/core/common/StmtDefReplacer.js +1 -1
- package/lib/core/common/StmtUseReplacer.d.ts.map +1 -1
- package/lib/core/common/StmtUseReplacer.js +1 -1
- package/lib/core/common/TSConst.d.ts.map +1 -1
- package/lib/core/common/TypeInference.d.ts.map +1 -1
- package/lib/core/common/TypeInference.js +25 -17
- package/lib/core/common/ValueUtil.d.ts.map +1 -1
- package/lib/core/common/ValueUtil.js +1 -1
- package/lib/core/common/VisibleValue.d.ts.map +1 -1
- package/lib/core/common/VisibleValue.js +5 -5
- package/lib/core/dataflow/DataflowProblem.d.ts.map +1 -1
- package/lib/core/dataflow/DataflowProblem.js +1 -1
- package/lib/core/dataflow/DataflowResult.js +1 -1
- package/lib/core/dataflow/DataflowSolver.d.ts.map +1 -1
- package/lib/core/dataflow/DataflowSolver.js +5 -3
- package/lib/core/dataflow/Edge.d.ts.map +1 -1
- package/lib/core/dataflow/Edge.js +1 -1
- package/lib/core/dataflow/Fact.js +1 -1
- package/lib/core/dataflow/GenericDataFlow.js +5 -5
- package/lib/core/dataflow/ReachingDef.js +4 -4
- package/lib/core/dataflow/UndefinedVariable.d.ts.map +1 -1
- package/lib/core/dataflow/UndefinedVariable.js +17 -13
- package/lib/core/dataflow/Util.d.ts +4 -4
- package/lib/core/dataflow/Util.d.ts.map +1 -1
- package/lib/core/dataflow/Util.js +3 -5
- package/lib/core/graph/BaseExplicitGraph.d.ts.map +1 -1
- package/lib/core/graph/BaseExplicitGraph.js +1 -1
- package/lib/core/graph/BaseImplicitGraph.d.ts.map +1 -1
- package/lib/core/graph/BasicBlock.d.ts.map +1 -1
- package/lib/core/graph/BasicBlock.js +11 -7
- package/lib/core/graph/Cfg.d.ts.map +1 -1
- package/lib/core/graph/Cfg.js +10 -4
- package/lib/core/graph/DependsGraph.d.ts.map +1 -1
- package/lib/core/graph/DependsGraph.js +1 -1
- package/lib/core/graph/DominanceFinder.d.ts.map +1 -1
- package/lib/core/graph/DominanceFinder.js +4 -4
- package/lib/core/graph/DominanceTree.js +1 -1
- package/lib/core/graph/GraphTraits.js +1 -1
- package/lib/core/graph/Scc.js +2 -2
- package/lib/core/graph/ViewTree.js +1 -1
- package/lib/core/graph/builder/CfgBuilder.d.ts.map +1 -1
- package/lib/core/graph/builder/CfgBuilder.js +22 -13
- package/lib/core/graph/builder/ConditionBuilder.d.ts.map +1 -1
- package/lib/core/graph/builder/ConditionBuilder.js +21 -22
- package/lib/core/graph/builder/LoopBuilder.d.ts.map +1 -1
- package/lib/core/graph/builder/LoopBuilder.js +13 -10
- package/lib/core/graph/builder/SwitchBuilder.d.ts.map +1 -1
- package/lib/core/graph/builder/SwitchBuilder.js +7 -4
- package/lib/core/graph/builder/TrapBuilder.d.ts.map +1 -1
- package/lib/core/graph/builder/TrapBuilder.js +4 -3
- package/lib/core/graph/builder/ViewTreeBuilder.d.ts.map +1 -1
- package/lib/core/graph/builder/ViewTreeBuilder.js +18 -19
- package/lib/core/model/ArkBaseModel.d.ts.map +1 -1
- package/lib/core/model/ArkBaseModel.js +8 -5
- package/lib/core/model/ArkBody.d.ts +1 -0
- package/lib/core/model/ArkBody.d.ts.map +1 -1
- package/lib/core/model/ArkBody.js +11 -1
- package/lib/core/model/ArkClass.d.ts.map +1 -1
- package/lib/core/model/ArkClass.js +3 -5
- package/lib/core/model/ArkExport.d.ts +4 -0
- package/lib/core/model/ArkExport.d.ts.map +1 -1
- package/lib/core/model/ArkExport.js +8 -1
- package/lib/core/model/ArkField.d.ts.map +1 -1
- package/lib/core/model/ArkField.js +2 -2
- package/lib/core/model/ArkFile.d.ts +1 -0
- package/lib/core/model/ArkFile.d.ts.map +1 -1
- package/lib/core/model/ArkFile.js +21 -6
- package/lib/core/model/ArkImport.d.ts.map +1 -1
- package/lib/core/model/ArkImport.js +1 -1
- package/lib/core/model/ArkMetadata.d.ts.map +1 -1
- package/lib/core/model/ArkMetadata.js +1 -1
- package/lib/core/model/ArkMethod.d.ts +6 -5
- package/lib/core/model/ArkMethod.d.ts.map +1 -1
- package/lib/core/model/ArkMethod.js +27 -13
- package/lib/core/model/ArkNamespace.d.ts +1 -1
- package/lib/core/model/ArkNamespace.d.ts.map +1 -1
- package/lib/core/model/ArkNamespace.js +5 -6
- package/lib/core/model/ArkSignature.d.ts +4 -2
- package/lib/core/model/ArkSignature.d.ts.map +1 -1
- package/lib/core/model/ArkSignature.js +17 -17
- package/lib/core/model/builder/ArkClassBuilder.d.ts.map +1 -1
- package/lib/core/model/builder/ArkClassBuilder.js +15 -16
- package/lib/core/model/builder/ArkExportBuilder.d.ts +2 -1
- package/lib/core/model/builder/ArkExportBuilder.d.ts.map +1 -1
- package/lib/core/model/builder/ArkExportBuilder.js +17 -11
- package/lib/core/model/builder/ArkFieldBuilder.d.ts.map +1 -1
- package/lib/core/model/builder/ArkFieldBuilder.js +6 -7
- package/lib/core/model/builder/ArkFileBuilder.d.ts.map +1 -1
- package/lib/core/model/builder/ArkFileBuilder.js +22 -11
- package/lib/core/model/builder/ArkImportBuilder.d.ts.map +1 -1
- package/lib/core/model/builder/ArkImportBuilder.js +13 -8
- package/lib/core/model/builder/ArkMethodBuilder.d.ts.map +1 -1
- package/lib/core/model/builder/ArkMethodBuilder.js +3 -3
- package/lib/core/model/builder/ArkNamespaceBuilder.d.ts.map +1 -1
- package/lib/core/model/builder/ArkNamespaceBuilder.js +7 -9
- package/lib/core/model/builder/ArkSignatureBuilder.d.ts.map +1 -1
- package/lib/core/model/builder/ArkSignatureBuilder.js +1 -1
- package/lib/core/model/builder/BodyBuilder.d.ts.map +1 -1
- package/lib/core/model/builder/BodyBuilder.js +8 -5
- package/lib/core/model/builder/builderUtils.d.ts.map +1 -1
- package/lib/core/model/builder/builderUtils.js +15 -13
- package/lib/index.d.ts.map +1 -1
- package/lib/save/ArkStream.d.ts.map +1 -1
- package/lib/save/ArkStream.js +1 -1
- package/lib/save/DotPrinter.d.ts.map +1 -1
- package/lib/save/DotPrinter.js +2 -4
- package/lib/save/GraphPrinter.d.ts.map +1 -1
- package/lib/save/GraphPrinter.js +2 -3
- package/lib/save/JsonPrinter.d.ts.map +1 -1
- package/lib/save/JsonPrinter.js +29 -29
- package/lib/save/Printer.js +1 -1
- package/lib/save/PrinterBuilder.d.ts.map +1 -1
- package/lib/save/PrinterBuilder.js +1 -1
- package/lib/save/ViewTreePrinter.d.ts.map +1 -1
- package/lib/save/ViewTreePrinter.js +3 -3
- package/lib/save/arkir/ArkIRClassPrinter.js +1 -1
- package/lib/save/arkir/ArkIRMethodPrinter.js +5 -5
- package/lib/save/arkir/ArkIRNamespacePrinter.d.ts.map +1 -1
- package/lib/save/arkir/ArkIRNamespacePrinter.js +2 -3
- package/lib/save/base/BasePrinter.js +2 -2
- package/lib/save/base/ExportPrinter.d.ts.map +1 -1
- package/lib/save/base/ExportPrinter.js +3 -6
- package/lib/save/base/ImportPrinter.d.ts.map +1 -1
- package/lib/save/base/ImportPrinter.js +2 -6
- package/lib/save/base/PrinterUtils.d.ts.map +1 -1
- package/lib/save/base/PrinterUtils.js +2 -4
- package/lib/save/serializeArkIR.d.ts.map +1 -1
- package/lib/save/serializeArkIR.js +2 -2
- package/lib/save/source/SourceBase.d.ts.map +1 -1
- package/lib/save/source/SourceBase.js +1 -3
- package/lib/save/source/SourceBody.d.ts.map +1 -1
- package/lib/save/source/SourceBody.js +1 -5
- package/lib/save/source/SourceClass.d.ts.map +1 -1
- package/lib/save/source/SourceClass.js +2 -3
- package/lib/save/source/SourceField.js +2 -2
- package/lib/save/source/SourceFilePrinter.d.ts.map +1 -1
- package/lib/save/source/SourceMethod.d.ts.map +1 -1
- package/lib/save/source/SourceMethod.js +5 -6
- package/lib/save/source/SourceNamespace.d.ts.map +1 -1
- package/lib/save/source/SourceNamespace.js +2 -3
- package/lib/save/source/SourceStmt.d.ts.map +1 -1
- package/lib/save/source/SourceStmt.js +9 -14
- package/lib/save/source/SourceTransformer.d.ts.map +1 -1
- package/lib/save/source/SourceTransformer.js +6 -10
- package/lib/transformer/FunctionTransformer.d.ts.map +1 -1
- package/lib/transformer/FunctionTransformer.js +1 -1
- package/lib/transformer/SceneTransformer.d.ts.map +1 -1
- package/lib/transformer/SceneTransformer.js +1 -1
- package/lib/transformer/StaticSingleAssignmentFormer.d.ts.map +1 -1
- package/lib/transformer/StaticSingleAssignmentFormer.js +1 -1
- package/lib/transformer/Transformer.d.ts.map +1 -1
- package/lib/transformer/Transformer.js +2 -3
- package/lib/utils/AstTreeUtils.d.ts.map +1 -1
- package/lib/utils/AstTreeUtils.js +1 -1
- package/lib/utils/CfgStructualAnalysis.d.ts.map +1 -1
- package/lib/utils/CfgStructualAnalysis.js +6 -18
- package/lib/utils/FileUtils.d.ts.map +1 -1
- package/lib/utils/FileUtils.js +7 -7
- package/lib/utils/SparseBitVector.d.ts.map +1 -1
- package/lib/utils/SparseBitVector.js +6 -5
- package/lib/utils/callGraphUtils.d.ts.map +1 -1
- package/lib/utils/callGraphUtils.js +9 -7
- package/lib/utils/crypto_utils.d.ts.map +1 -1
- package/lib/utils/crypto_utils.js +2 -2
- package/lib/utils/entryMethodUtils.d.ts.map +1 -1
- package/lib/utils/entryMethodUtils.js +18 -18
- package/lib/utils/getAllFiles.d.ts.map +1 -1
- package/lib/utils/json5parser.d.ts.map +1 -1
- package/lib/utils/json5parser.js +1 -1
- package/lib/utils/logger.d.ts.map +1 -1
- package/lib/utils/pathTransfer.d.ts +0 -1
- package/lib/utils/pathTransfer.d.ts.map +1 -1
- package/lib/utils/pathTransfer.js +2 -11
- package/package.json +2 -2
package/lib/save/JsonPrinter.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/*
|
|
3
|
-
* Copyright (c) 2024 Huawei Device Co., Ltd.
|
|
3
|
+
* Copyright (c) 2024-2025 Huawei Device Co., Ltd.
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
5
|
* you may not use this file except in compliance with the License.
|
|
6
6
|
* You may obtain a copy of the License at
|
|
@@ -39,17 +39,17 @@ class JsonPrinter extends Printer_1.Printer {
|
|
|
39
39
|
serializeArkFile(file) {
|
|
40
40
|
return {
|
|
41
41
|
signature: this.serializeFileSignature(file.getFileSignature()),
|
|
42
|
-
namespaces: file.getNamespaces().map(
|
|
43
|
-
classes: file.getClasses().map(
|
|
44
|
-
importInfos: file.getImportInfos().map(
|
|
45
|
-
exportInfos: file.getExportInfos().map(
|
|
42
|
+
namespaces: file.getNamespaces().map(ns => this.serializeNamespace(ns)),
|
|
43
|
+
classes: file.getClasses().map(cls => this.serializeClass(cls)),
|
|
44
|
+
importInfos: file.getImportInfos().map(info => this.serializeImportInfo(info)),
|
|
45
|
+
exportInfos: file.getExportInfos().map(info => this.serializeExportInfo(info)),
|
|
46
46
|
};
|
|
47
47
|
}
|
|
48
48
|
serializeNamespace(namespace) {
|
|
49
49
|
return {
|
|
50
50
|
signature: this.serializeNamespaceSignature(namespace.getSignature()),
|
|
51
|
-
classes: namespace.getClasses().map(
|
|
52
|
-
namespaces: namespace.getNamespaces().map(
|
|
51
|
+
classes: namespace.getClasses().map(cls => this.serializeClass(cls)),
|
|
52
|
+
namespaces: namespace.getNamespaces().map(ns => this.serializeNamespace(ns)),
|
|
53
53
|
};
|
|
54
54
|
}
|
|
55
55
|
serializeClass(clazz) {
|
|
@@ -57,19 +57,19 @@ class JsonPrinter extends Printer_1.Printer {
|
|
|
57
57
|
return {
|
|
58
58
|
signature: this.serializeClassSignature(clazz.getSignature()),
|
|
59
59
|
modifiers: clazz.getModifiers(),
|
|
60
|
-
decorators: clazz.getDecorators().map(
|
|
61
|
-
typeParameters: (_a = clazz.getGenericsTypes()) === null || _a === void 0 ? void 0 : _a.map(
|
|
60
|
+
decorators: clazz.getDecorators().map(decorator => this.serializeDecorator(decorator)),
|
|
61
|
+
typeParameters: (_a = clazz.getGenericsTypes()) === null || _a === void 0 ? void 0 : _a.map(type => this.serializeType(type)),
|
|
62
62
|
superClassName: clazz.getSuperClassName(),
|
|
63
63
|
implementedInterfaceNames: clazz.getImplementedInterfaceNames(),
|
|
64
|
-
fields: clazz.getFields().map(
|
|
65
|
-
methods: clazz.getMethods(true).map(
|
|
64
|
+
fields: clazz.getFields().map(field => this.serializeField(field)),
|
|
65
|
+
methods: clazz.getMethods(true).map(method => this.serializeMethod(method)),
|
|
66
66
|
};
|
|
67
67
|
}
|
|
68
68
|
serializeField(field) {
|
|
69
69
|
return {
|
|
70
70
|
signature: this.serializeFieldSignature(field.getSignature()),
|
|
71
71
|
modifiers: field.getModifiers(),
|
|
72
|
-
decorators: field.getDecorators().map(
|
|
72
|
+
decorators: field.getDecorators().map(decorator => this.serializeDecorator(decorator)),
|
|
73
73
|
questionToken: field.getQuestionToken(),
|
|
74
74
|
exclamationToken: field.getExclamationToken(),
|
|
75
75
|
};
|
|
@@ -80,14 +80,14 @@ class JsonPrinter extends Printer_1.Printer {
|
|
|
80
80
|
return {
|
|
81
81
|
signature: this.serializeMethodSignature(method.getSignature()),
|
|
82
82
|
modifiers: method.getModifiers(),
|
|
83
|
-
decorators: method.getDecorators().map(
|
|
83
|
+
decorators: method.getDecorators().map(decorator => this.serializeDecorator(decorator)),
|
|
84
84
|
typeParameters: (_a = method.getGenericTypes()) === null || _a === void 0 ? void 0 : _a.map(type => this.serializeType(type)),
|
|
85
85
|
body: body && this.serializeMethodBody(body),
|
|
86
86
|
};
|
|
87
87
|
}
|
|
88
88
|
serializeMethodBody(body) {
|
|
89
89
|
return {
|
|
90
|
-
locals: Array.from(body.getLocals().values()).map(
|
|
90
|
+
locals: Array.from(body.getLocals().values()).map(local => this.serializeLocal(local)),
|
|
91
91
|
cfg: this.serializeCfg(body.getCfg()),
|
|
92
92
|
};
|
|
93
93
|
}
|
|
@@ -158,13 +158,13 @@ class JsonPrinter extends Printer_1.Printer {
|
|
|
158
158
|
else if (type instanceof Type_1.UnionType) {
|
|
159
159
|
return {
|
|
160
160
|
_: 'UnionType',
|
|
161
|
-
types: type.getTypes().map(
|
|
161
|
+
types: type.getTypes().map(type => this.serializeType(type)),
|
|
162
162
|
};
|
|
163
163
|
}
|
|
164
164
|
else if (type instanceof Type_1.TupleType) {
|
|
165
165
|
return {
|
|
166
166
|
_: 'TupleType',
|
|
167
|
-
types: type.getTypes().map(
|
|
167
|
+
types: type.getTypes().map(type => this.serializeType(type)),
|
|
168
168
|
};
|
|
169
169
|
}
|
|
170
170
|
else if (type instanceof Type_1.BooleanType) {
|
|
@@ -210,14 +210,14 @@ class JsonPrinter extends Printer_1.Printer {
|
|
|
210
210
|
return {
|
|
211
211
|
_: 'ClassType',
|
|
212
212
|
signature: this.serializeClassSignature(type.getClassSignature()),
|
|
213
|
-
typeParameters: (_a = type.getRealGenericTypes()) === null || _a === void 0 ? void 0 : _a.map(
|
|
213
|
+
typeParameters: (_a = type.getRealGenericTypes()) === null || _a === void 0 ? void 0 : _a.map(type => this.serializeType(type)),
|
|
214
214
|
};
|
|
215
215
|
}
|
|
216
216
|
else if (type instanceof Type_1.FunctionType) {
|
|
217
217
|
return {
|
|
218
218
|
_: 'FunctionType',
|
|
219
219
|
signature: this.serializeMethodSignature(type.getMethodSignature()),
|
|
220
|
-
typeParameters: (_b = type.getRealGenericTypes()) === null || _b === void 0 ? void 0 : _b.map(
|
|
220
|
+
typeParameters: (_b = type.getRealGenericTypes()) === null || _b === void 0 ? void 0 : _b.map(type => this.serializeType(type)),
|
|
221
221
|
};
|
|
222
222
|
}
|
|
223
223
|
else if (type instanceof Type_1.ArrayType) {
|
|
@@ -231,7 +231,7 @@ class JsonPrinter extends Printer_1.Printer {
|
|
|
231
231
|
return {
|
|
232
232
|
_: 'UnclearReferenceType',
|
|
233
233
|
name: type.getName(),
|
|
234
|
-
typeParameters: type.getGenericTypes().map(
|
|
234
|
+
typeParameters: type.getGenericTypes().map(type => this.serializeType(type)),
|
|
235
235
|
};
|
|
236
236
|
}
|
|
237
237
|
else if (type instanceof Type_1.GenericType) {
|
|
@@ -316,7 +316,7 @@ class JsonPrinter extends Printer_1.Printer {
|
|
|
316
316
|
parameters: method
|
|
317
317
|
.getMethodSubSignature()
|
|
318
318
|
.getParameters()
|
|
319
|
-
.map(
|
|
319
|
+
.map(param => this.serializeMethodParameter(param)),
|
|
320
320
|
returnType: this.serializeType(method.getType()),
|
|
321
321
|
};
|
|
322
322
|
}
|
|
@@ -344,19 +344,19 @@ class JsonPrinter extends Printer_1.Printer {
|
|
|
344
344
|
stack.push(...block.getSuccessors());
|
|
345
345
|
}
|
|
346
346
|
return {
|
|
347
|
-
blocks: Array.from(visited).map(
|
|
347
|
+
blocks: Array.from(visited).map(block => this.serializeBasicBlock(block)),
|
|
348
348
|
};
|
|
349
349
|
}
|
|
350
350
|
serializeBasicBlock(block) {
|
|
351
|
-
const successors = block.getSuccessors().map(
|
|
351
|
+
const successors = block.getSuccessors().map(succ => succ.getId());
|
|
352
352
|
successors.sort((a, b) => a - b);
|
|
353
|
-
const predecessors = block.getPredecessors().map(
|
|
353
|
+
const predecessors = block.getPredecessors().map(pred => pred.getId());
|
|
354
354
|
predecessors.sort((a, b) => a - b);
|
|
355
355
|
return {
|
|
356
356
|
id: block.getId(),
|
|
357
357
|
successors,
|
|
358
358
|
predecessors,
|
|
359
|
-
stmts: block.getStmts().map(
|
|
359
|
+
stmts: block.getStmts().map(stmt => this.serializeStmt(stmt)),
|
|
360
360
|
};
|
|
361
361
|
}
|
|
362
362
|
serializeLocal(local) {
|
|
@@ -435,8 +435,8 @@ class JsonPrinter extends Printer_1.Printer {
|
|
|
435
435
|
const argToBlock = value.getArgToBlock();
|
|
436
436
|
return {
|
|
437
437
|
_: 'PhiExpr',
|
|
438
|
-
args: args.map(
|
|
439
|
-
blocks: args.map(
|
|
438
|
+
args: args.map(arg => this.serializeValue(arg)),
|
|
439
|
+
blocks: args.map(arg => argToBlock.get(arg).getId()),
|
|
440
440
|
type: this.serializeType(value.getType()),
|
|
441
441
|
};
|
|
442
442
|
}
|
|
@@ -472,14 +472,14 @@ class JsonPrinter extends Printer_1.Printer {
|
|
|
472
472
|
_: 'InstanceCallExpr',
|
|
473
473
|
instance: this.serializeValue(value.getBase()),
|
|
474
474
|
method: this.serializeMethodSignature(value.getMethodSignature()),
|
|
475
|
-
args: value.getArgs().map(
|
|
475
|
+
args: value.getArgs().map(arg => this.serializeValue(arg)),
|
|
476
476
|
};
|
|
477
477
|
}
|
|
478
478
|
else if (value instanceof Expr_1.ArkStaticInvokeExpr) {
|
|
479
479
|
return {
|
|
480
480
|
_: 'StaticCallExpr',
|
|
481
481
|
method: this.serializeMethodSignature(value.getMethodSignature()),
|
|
482
|
-
args: value.getArgs().map(
|
|
482
|
+
args: value.getArgs().map(arg => this.serializeValue(arg)),
|
|
483
483
|
};
|
|
484
484
|
}
|
|
485
485
|
else if (value instanceof Expr_1.ArkPtrInvokeExpr) {
|
|
@@ -487,7 +487,7 @@ class JsonPrinter extends Printer_1.Printer {
|
|
|
487
487
|
_: 'PtrCallExpr',
|
|
488
488
|
ptr: this.serializeValue(value.getFuncPtrLocal()),
|
|
489
489
|
method: this.serializeMethodSignature(value.getMethodSignature()),
|
|
490
|
-
args: value.getArgs().map(
|
|
490
|
+
args: value.getArgs().map(arg => this.serializeValue(arg)),
|
|
491
491
|
};
|
|
492
492
|
}
|
|
493
493
|
else if (value instanceof Expr_1.AbstractInvokeExpr) {
|
package/lib/save/Printer.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/*
|
|
3
|
-
* Copyright (c) 2024 Huawei Device Co., Ltd.
|
|
3
|
+
* Copyright (c) 2024-2025 Huawei Device Co., Ltd.
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
5
|
* you may not use this file except in compliance with the License.
|
|
6
6
|
* You may obtain a copy of the License at
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PrinterBuilder.d.ts","sourceRoot":"","sources":["../../src/save/PrinterBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGhD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,cAAc,EAAqB,MAAM,oBAAoB,CAAC;AAEvE;;;;;;;;;;;;;;;;;;;GAmBG;AACH,qBAAa,cAAc;IACvB,SAAS,EAAE,MAAM,CAAC;gBACN,SAAS,GAAE,MAAW;WAIpB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"PrinterBuilder.d.ts","sourceRoot":"","sources":["../../src/save/PrinterBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGhD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,cAAc,EAAqB,MAAM,oBAAoB,CAAC;AAEvE;;;;;;;;;;;;;;;;;;;GAmBG;AACH,qBAAa,cAAc;IACvB,SAAS,EAAE,MAAM,CAAC;gBACN,SAAS,GAAE,MAAW;WAIpB,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAIzD,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IAQzC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,IAAI;IAWzE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,IAAI;IAcxE,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,IAAI;IAW1E,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,MAAM,GAAG,SAAqB,GAAG,IAAI;CAalF;AAED;;;;;;;;GAQG;AACH,qBAAa,YAAY;IACrB,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,cAAc,CAAC;gBAEZ,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc;IAS7D,SAAS,IAAI,IAAI;IAMjB,QAAQ,IAAI,IAAI;IAOhB,UAAU,IAAI,IAAI;IAMlB,QAAQ,IAAI,IAAI;CAK1B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/*
|
|
3
|
-
* Copyright (c) 2024 Huawei Device Co., Ltd.
|
|
3
|
+
* Copyright (c) 2024-2025 Huawei Device Co., Ltd.
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
5
|
* you may not use this file except in compliance with the License.
|
|
6
6
|
* You may obtain a copy of the License at
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewTreePrinter.d.ts","sourceRoot":"","sources":["../../src/save/ViewTreePrinter.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAgB,MAAM,wBAAwB,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,qBAAa,eAAgB,SAAQ,OAAO;IACxC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,MAAM,CAAS;gBAEX,QAAQ,EAAE,QAAQ;IAMvB,IAAI,IAAI,MAAM;IAerB,OAAO,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"ViewTreePrinter.d.ts","sourceRoot":"","sources":["../../src/save/ViewTreePrinter.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAgB,MAAM,wBAAwB,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,qBAAa,eAAgB,SAAQ,OAAO;IACxC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,MAAM,CAAS;gBAEX,QAAQ,EAAE,QAAQ;IAMvB,IAAI,IAAI,MAAM;IAerB,OAAO,CAAC,IAAI;IAUZ,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,SAAS;IAoCjB,OAAO,CAAC,oBAAoB;IAiB5B,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,CAAC,kBAAkB;CAU7B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/*
|
|
3
|
-
* Copyright (c) 2024 Huawei Device Co., Ltd.
|
|
3
|
+
* Copyright (c) 2024-2025 Huawei Device Co., Ltd.
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
5
|
* you may not use this file except in compliance with the License.
|
|
6
6
|
* You may obtain a copy of the License at
|
|
@@ -53,7 +53,7 @@ class ViewTreePrinter extends Printer_1.Printer {
|
|
|
53
53
|
const PRE_FIX_LEN = 5;
|
|
54
54
|
let label = content.join('|');
|
|
55
55
|
if (label.length > MAX_LABEL_LEN) {
|
|
56
|
-
return
|
|
56
|
+
return label.substring(0, PRE_FIX_LEN) + '...' + label.substring(label.length - MAX_LABEL_LEN + PRE_FIX_LEN);
|
|
57
57
|
}
|
|
58
58
|
return label;
|
|
59
59
|
}
|
|
@@ -93,7 +93,7 @@ class ViewTreePrinter extends Printer_1.Printer {
|
|
|
93
93
|
if (item.stateValues.size > 0) {
|
|
94
94
|
let stateValuesId = `${id}val`;
|
|
95
95
|
let content = [];
|
|
96
|
-
item.stateValues.forEach(
|
|
96
|
+
item.stateValues.forEach(value => {
|
|
97
97
|
content.push(value.getName());
|
|
98
98
|
});
|
|
99
99
|
this.printer.write(` ${stateValuesId} [shape=ellipse label="StateValues\n ${this.escapeDotLabel(content)}" fontsize=10 height=.1 style=filled color=".7 .3 1.0" ]\n`);
|
|
@@ -45,7 +45,7 @@ class ArkIRClassPrinter extends BasePrinter_1.BasePrinter {
|
|
|
45
45
|
this.printer.write(this.cls.getName());
|
|
46
46
|
const genericsTypes = this.cls.getGenericsTypes();
|
|
47
47
|
if (genericsTypes) {
|
|
48
|
-
this.printer.write(`<${genericsTypes.map(
|
|
48
|
+
this.printer.write(`<${genericsTypes.map(v => v.toString()).join(', ')}>`);
|
|
49
49
|
}
|
|
50
50
|
if (this.cls.getSuperClassName() && !this.cls.hasComponentDecorator()) {
|
|
51
51
|
this.printer.write(` extends ${this.cls.getSuperClassName()}`);
|
|
@@ -49,7 +49,7 @@ class ArkIRMethodPrinter extends BasePrinter_1.BasePrinter {
|
|
|
49
49
|
if (cfg) {
|
|
50
50
|
cfg.getStmts()
|
|
51
51
|
.reverse()
|
|
52
|
-
.forEach(
|
|
52
|
+
.forEach(stmt => stmts.push(stmt));
|
|
53
53
|
}
|
|
54
54
|
for (const stmt of stmts) {
|
|
55
55
|
if (stmt.getOriginPositionInfo().getLineNo() > 0) {
|
|
@@ -87,13 +87,13 @@ class ArkIRMethodPrinter extends BasePrinter_1.BasePrinter {
|
|
|
87
87
|
const genericTypes = method.getGenericTypes();
|
|
88
88
|
if (genericTypes && genericTypes.length > 0) {
|
|
89
89
|
let typeParameters = [];
|
|
90
|
-
genericTypes.forEach(
|
|
90
|
+
genericTypes.forEach(genericType => {
|
|
91
91
|
typeParameters.push(genericType.toString());
|
|
92
92
|
});
|
|
93
93
|
code.write(`<${genericTypes.join(', ')}>`);
|
|
94
94
|
}
|
|
95
95
|
let parameters = [];
|
|
96
|
-
method.getParameters().forEach(
|
|
96
|
+
method.getParameters().forEach(parameter => {
|
|
97
97
|
let str = parameter.getName();
|
|
98
98
|
if (parameter.hasDotDotDotToken()) {
|
|
99
99
|
str = `...${parameter.getName()}`;
|
|
@@ -129,7 +129,7 @@ class ArkIRMethodPrinter extends BasePrinter_1.BasePrinter {
|
|
|
129
129
|
this.printer.writeIndent().writeLine(`label${block.getId()}:`);
|
|
130
130
|
this.printer.incIndent();
|
|
131
131
|
if (successors.length === 1) {
|
|
132
|
-
block.getStmts().map(
|
|
132
|
+
block.getStmts().map(stmt => {
|
|
133
133
|
this.printer.writeIndent().writeLine(stmt.toString());
|
|
134
134
|
});
|
|
135
135
|
this.printer.writeIndent().writeLine(`goto label${successors[0].getId()}`);
|
|
@@ -145,7 +145,7 @@ class ArkIRMethodPrinter extends BasePrinter_1.BasePrinter {
|
|
|
145
145
|
}
|
|
146
146
|
}
|
|
147
147
|
else {
|
|
148
|
-
block.getStmts().map(
|
|
148
|
+
block.getStmts().map(stmt => {
|
|
149
149
|
this.printer.writeIndent().writeLine(stmt.toString());
|
|
150
150
|
});
|
|
151
151
|
}
|
|
@@ -1 +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;
|
|
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"}
|
|
@@ -34,12 +34,11 @@ class ArkIRNamespacePrinter extends BasePrinter_1.BasePrinter {
|
|
|
34
34
|
const commentsMetadata = this.ns.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS);
|
|
35
35
|
if (commentsMetadata instanceof ArkMetadata_1.CommentsMetadata) {
|
|
36
36
|
const comments = commentsMetadata.getComments();
|
|
37
|
-
comments.forEach(
|
|
37
|
+
comments.forEach(comment => {
|
|
38
38
|
this.printer.writeIndent().writeLine(comment.content);
|
|
39
39
|
});
|
|
40
40
|
}
|
|
41
|
-
this.printer.writeIndent().writeSpace(this.modifiersToString(this.ns.getModifiers()))
|
|
42
|
-
.writeLine(`namespace ${this.ns.getName()} {`);
|
|
41
|
+
this.printer.writeIndent().writeSpace(this.modifiersToString(this.ns.getModifiers())).writeLine(`namespace ${this.ns.getName()} {`);
|
|
43
42
|
this.printer.incIndent();
|
|
44
43
|
let items = [];
|
|
45
44
|
// print class
|
|
@@ -29,13 +29,13 @@ class BasePrinter extends Printer_1.Printer {
|
|
|
29
29
|
super(indent);
|
|
30
30
|
}
|
|
31
31
|
printDecorator(docorator) {
|
|
32
|
-
docorator.forEach(
|
|
32
|
+
docorator.forEach(value => {
|
|
33
33
|
this.printer.writeIndent().writeLine(value.toString());
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
36
|
printComments(commentsMetadata) {
|
|
37
37
|
const comments = commentsMetadata.getComments();
|
|
38
|
-
comments.forEach(
|
|
38
|
+
comments.forEach(comment => {
|
|
39
39
|
this.printer.writeIndent().writeLine(comment.content);
|
|
40
40
|
});
|
|
41
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExportPrinter.d.ts","sourceRoot":"","sources":["../../../src/save/base/ExportPrinter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAc,MAAM,4BAA4B,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,aAAc,SAAQ,WAAW;IAC1C,IAAI,EAAE,UAAU,CAAC;gBAEE,IAAI,EAAE,UAAU,EAAE,MAAM,GAAE,MAAW;IAKjD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;
|
|
1
|
+
{"version":3,"file":"ExportPrinter.d.ts","sourceRoot":"","sources":["../../../src/save/base/ExportPrinter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAc,MAAM,4BAA4B,CAAC;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,aAAc,SAAQ,WAAW;IAC1C,IAAI,EAAE,UAAU,CAAC;gBAEE,IAAI,EAAE,UAAU,EAAE,MAAM,GAAE,MAAW;IAKjD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;CAoCxB"}
|
|
@@ -32,17 +32,14 @@ class ExportPrinter extends BasePrinter_1.BasePrinter {
|
|
|
32
32
|
if (commentsMetadata instanceof ArkMetadata_1.CommentsMetadata) {
|
|
33
33
|
this.printComments(commentsMetadata);
|
|
34
34
|
}
|
|
35
|
-
if (!this.info.getFrom() &&
|
|
36
|
-
this.info.getExportClauseType() === ArkExport_1.ExportType.LOCAL ||
|
|
37
|
-
this.info.getExportClauseType() === ArkExport_1.ExportType.TYPE)) {
|
|
35
|
+
if (!this.info.getFrom() &&
|
|
36
|
+
(this.info.isExport() || this.info.getExportClauseType() === ArkExport_1.ExportType.LOCAL || this.info.getExportClauseType() === ArkExport_1.ExportType.TYPE)) {
|
|
38
37
|
return this.printer.toString();
|
|
39
38
|
}
|
|
40
39
|
if (this.info.getExportClauseName() === '*') {
|
|
41
40
|
// just like: export * as xx from './yy'
|
|
42
41
|
if (this.info.getNameBeforeAs() && this.info.getNameBeforeAs() !== '*') {
|
|
43
|
-
this.printer
|
|
44
|
-
.writeIndent()
|
|
45
|
-
.write(`export ${this.info.getNameBeforeAs()} as ${this.info.getExportClauseName()}`);
|
|
42
|
+
this.printer.writeIndent().write(`export ${this.info.getNameBeforeAs()} as ${this.info.getExportClauseName()}`);
|
|
46
43
|
}
|
|
47
44
|
else {
|
|
48
45
|
this.printer.writeIndent().write(`export ${this.info.getExportClauseName()}`);
|
|
@@ -1 +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;
|
|
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"}
|
|
@@ -52,9 +52,7 @@ class ImportPrinter extends BasePrinter_1.BasePrinter {
|
|
|
52
52
|
}
|
|
53
53
|
else if (info.getImportType() === 'EqualsImport') {
|
|
54
54
|
// sample: import mmmm = require('./xxx')
|
|
55
|
-
this.printer
|
|
56
|
-
.writeIndent()
|
|
57
|
-
.writeLine(`import ${info.getImportClauseName()} = require('${info.getFrom()}');`);
|
|
55
|
+
this.printer.writeIndent().writeLine(`import ${info.getImportClauseName()} = require('${info.getFrom()}');`);
|
|
58
56
|
}
|
|
59
57
|
else {
|
|
60
58
|
// sample: import '../xxx'
|
|
@@ -64,9 +62,7 @@ class ImportPrinter extends BasePrinter_1.BasePrinter {
|
|
|
64
62
|
if (namedImports.length > 0) {
|
|
65
63
|
clauseNames.push(`{${namedImports.join(', ')}}`);
|
|
66
64
|
}
|
|
67
|
-
this.printer
|
|
68
|
-
.writeIndent()
|
|
69
|
-
.writeLine(`import ${clauseNames.join(', ')} from '${this.infos[0].getFrom()}';`);
|
|
65
|
+
this.printer.writeIndent().writeLine(`import ${clauseNames.join(', ')} from '${this.infos[0].getFrom()}';`);
|
|
70
66
|
return this.printer.toString();
|
|
71
67
|
}
|
|
72
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PrinterUtils.d.ts","sourceRoot":"","sources":["../../../src/save/base/PrinterUtils.ts"],"names":[],"mappings":"AAgBA,OAAO,
|
|
1
|
+
{"version":3,"file":"PrinterUtils.d.ts","sourceRoot":"","sources":["../../../src/save/base/PrinterUtils.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,qBAAqB,EAAsB,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5H,OAAO,EAAiB,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAS3D,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AAGpE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAM7D,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAE5C,qBAAa,YAAY;IACrB,OAAc,uBAAuB,sBAQlC;WAEW,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIvC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIrC,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIxC,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAI1C,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,EAAE,EAAE,EAAE,oBAAoB,GAAG,OAAO;WAqBvE,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAI7B,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,MAAM;WAOpC,cAAc,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO;WAWxD,iBAAiB,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO;WAW3D,0BAA0B,CAAC,UAAU,EAAE,qBAAqB,EAAE,OAAO,GAAE,GAAG,CAAC,qBAAqB,CAAa,GAAG,OAAO;WA2BvH,yBAAyB,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO;WAUnE,uBAAuB,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO;WAajE,4BAA4B,CAAC,cAAc,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,MAAM;WAoB9F,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAevC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAY7C"}
|
|
@@ -95,8 +95,7 @@ class PrinterUtils {
|
|
|
95
95
|
static isComponentPop(invokeExpr) {
|
|
96
96
|
let className = invokeExpr.getMethodSignature().getDeclaringClassSignature().getClassName();
|
|
97
97
|
let methodName = invokeExpr.getMethodSignature().getMethodSubSignature().getMethodName();
|
|
98
|
-
if (methodName === EtsConst_1.COMPONENT_POP_FUNCTION &&
|
|
99
|
-
((0, EtsConst_1.isEtsSystemComponent)(className) || EtsConst_1.SPECIAL_CONTAINER_COMPONENT.has(className))) {
|
|
98
|
+
if (methodName === EtsConst_1.COMPONENT_POP_FUNCTION && ((0, EtsConst_1.isEtsSystemComponent)(className) || EtsConst_1.SPECIAL_CONTAINER_COMPONENT.has(className))) {
|
|
100
99
|
return true;
|
|
101
100
|
}
|
|
102
101
|
return false;
|
|
@@ -104,8 +103,7 @@ class PrinterUtils {
|
|
|
104
103
|
static isComponentCreate(invokeExpr) {
|
|
105
104
|
let className = invokeExpr.getMethodSignature().getDeclaringClassSignature().getClassName();
|
|
106
105
|
let methodName = invokeExpr.getMethodSignature().getMethodSubSignature().getMethodName();
|
|
107
|
-
if (methodName === EtsConst_1.COMPONENT_CREATE_FUNCTION &&
|
|
108
|
-
((0, EtsConst_1.isEtsSystemComponent)(className) || EtsConst_1.SPECIAL_CONTAINER_COMPONENT.has(className))) {
|
|
106
|
+
if (methodName === EtsConst_1.COMPONENT_CREATE_FUNCTION && ((0, EtsConst_1.isEtsSystemComponent)(className) || EtsConst_1.SPECIAL_CONTAINER_COMPONENT.has(className))) {
|
|
109
107
|
return true;
|
|
110
108
|
}
|
|
111
109
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializeArkIR.d.ts","sourceRoot":"","sources":["../../src/save/serializeArkIR.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAG1D,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAKhD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,KAAK,CAY1F;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,KAAK,CAS1F;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAWxE;AAED,wBAAgB,cAAc,
|
|
1
|
+
{"version":3,"file":"serializeArkIR.d.ts","sourceRoot":"","sources":["../../src/save/serializeArkIR.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAG1D,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAKhD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,KAAK,CAY1F;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,KAAK,CAS1F;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAWxE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,IAAI,CAc3F;AAwLD,eAAO,MAAM,OAAO,SAoCd,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/*
|
|
3
|
-
* Copyright (c) 2024 Huawei Device Co., Ltd.
|
|
3
|
+
* Copyright (c) 2024-2025 Huawei Device Co., Ltd.
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
5
|
* you may not use this file except in compliance with the License.
|
|
6
6
|
* You may obtain a copy of the License at
|
|
@@ -167,7 +167,7 @@ function serializeMultipleTsFiles(inputDir, outDir, options) {
|
|
|
167
167
|
let files = scene.getFiles();
|
|
168
168
|
if (options.verbose) {
|
|
169
169
|
console.log(`Scene contains ${files.length} files`);
|
|
170
|
-
files.forEach(
|
|
170
|
+
files.forEach(f => console.log(`- '${f.getName()}'`));
|
|
171
171
|
}
|
|
172
172
|
if (options.inferTypes) {
|
|
173
173
|
if (options.verbose) {
|
|
@@ -1 +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,
|
|
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"}
|
|
@@ -52,9 +52,7 @@ class SourceBase extends BasePrinter_1.BasePrinter {
|
|
|
52
52
|
continue;
|
|
53
53
|
}
|
|
54
54
|
if (keyword.endsWith('Keyword')) {
|
|
55
|
-
keyword = keyword
|
|
56
|
-
.substring(0, keyword.length - 'Keyword'.length)
|
|
57
|
-
.toLowerCase();
|
|
55
|
+
keyword = keyword.substring(0, keyword.length - 'Keyword'.length).toLowerCase();
|
|
58
56
|
}
|
|
59
57
|
types.push(keyword);
|
|
60
58
|
}
|
|
@@ -1 +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,GAAG,MAAM;IASnC,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;
|
|
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,GAAG,MAAM;IASnC,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"}
|
|
@@ -199,11 +199,7 @@ class SourceBody {
|
|
|
199
199
|
}
|
|
200
200
|
}
|
|
201
201
|
getStmts() {
|
|
202
|
-
return this.stmts.filter(
|
|
203
|
-
if (!this.skipStmts.has(value.original)) {
|
|
204
|
-
return value;
|
|
205
|
-
}
|
|
206
|
-
});
|
|
202
|
+
return this.stmts.filter(value => !this.skipStmts.has(value.original));
|
|
207
203
|
}
|
|
208
204
|
pushStmt(stmt) {
|
|
209
205
|
let lastLine = this.getLastLine();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SourceClass.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceClass.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAE3C;;GAEG;AACH,qBAAa,WAAY,SAAQ,UAAU;IACvC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC;IACxB,OAAO,CAAC,WAAW,CAAoB;gBAEpB,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAW;IAM9C,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;IA4DrB,OAAO,CAAC,UAAU;IAwBlB,OAAO,CAAC,eAAe;IAmBvB,SAAS,CAAC,YAAY,IAAI,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"SourceClass.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceClass.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAE3C;;GAEG;AACH,qBAAa,WAAY,SAAQ,UAAU;IACvC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC;IACxB,OAAO,CAAC,WAAW,CAAoB;gBAEpB,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAW;IAM9C,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;IA4DrB,OAAO,CAAC,UAAU;IAwBlB,OAAO,CAAC,eAAe;IAmBvB,SAAS,CAAC,YAAY,IAAI,IAAI,EAAE;IAgBhC,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,oBAAoB;CAU/B;AAED,qBAAa,kBAAmB,SAAQ,WAAW;gBAC5B,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAW;IAI9C,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;CAIxB"}
|
|
@@ -51,7 +51,7 @@ class SourceClass extends SourceBase_1.SourceBase {
|
|
|
51
51
|
const commentsMetadata = this.cls.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS);
|
|
52
52
|
if (commentsMetadata instanceof ArkMetadata_1.CommentsMetadata) {
|
|
53
53
|
const comments = commentsMetadata.getComments();
|
|
54
|
-
comments.forEach(
|
|
54
|
+
comments.forEach(comment => {
|
|
55
55
|
this.printer.writeIndent().writeLine(comment.content);
|
|
56
56
|
});
|
|
57
57
|
}
|
|
@@ -131,8 +131,7 @@ class SourceClass extends SourceBase_1.SourceBase {
|
|
|
131
131
|
printMethods() {
|
|
132
132
|
let items = [];
|
|
133
133
|
for (let method of this.cls.getMethods()) {
|
|
134
|
-
if (method.isGenerated() ||
|
|
135
|
-
(PrinterUtils_1.PrinterUtils.isConstructorMethod(method.getName()) && this.cls.hasViewTree())) {
|
|
134
|
+
if (method.isGenerated() || (PrinterUtils_1.PrinterUtils.isConstructorMethod(method.getName()) && this.cls.hasViewTree())) {
|
|
136
135
|
continue;
|
|
137
136
|
}
|
|
138
137
|
if (method.isDefaultArkMethod()) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/*
|
|
3
|
-
* Copyright (c) 2024 Huawei Device Co., Ltd.
|
|
3
|
+
* Copyright (c) 2024-2025 Huawei Device Co., Ltd.
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
5
|
* you may not use this file except in compliance with the License.
|
|
6
6
|
* You may obtain a copy of the License at
|
|
@@ -38,7 +38,7 @@ class SourceField extends SourceBase_1.SourceBase {
|
|
|
38
38
|
const commentsMetadata = this.field.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS);
|
|
39
39
|
if (commentsMetadata instanceof ArkMetadata_1.CommentsMetadata) {
|
|
40
40
|
const comments = commentsMetadata.getComments();
|
|
41
|
-
comments.forEach(
|
|
41
|
+
comments.forEach(comment => {
|
|
42
42
|
this.printer.writeIndent().writeLine(comment.content);
|
|
43
43
|
});
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SourceFilePrinter.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceFilePrinter.ts"],"names":[],"mappings":"AAkCA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAO3C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGrC;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,OAAO;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,IAAI,EAAE,CAAM;gBAEP,OAAO,EAAE,OAAO;IAK5B,OAAO,CAAC,uBAAuB;
|
|
1
|
+
{"version":3,"file":"SourceFilePrinter.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceFilePrinter.ts"],"names":[],"mappings":"AAkCA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAO3C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGrC;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,OAAO;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,IAAI,EAAE,CAAM;gBAEP,OAAO,EAAE,OAAO;IAK5B,OAAO,CAAC,uBAAuB;IAUxB,IAAI,IAAI,MAAM;CA8BxB"}
|
|
@@ -1 +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;
|
|
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"}
|
|
@@ -45,7 +45,7 @@ class SourceMethod extends SourceBase_1.SourceBase {
|
|
|
45
45
|
const commentsMetadata = this.method.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS);
|
|
46
46
|
if (commentsMetadata instanceof ArkMetadata_1.CommentsMetadata) {
|
|
47
47
|
const comments = commentsMetadata.getComments();
|
|
48
|
-
comments.forEach(
|
|
48
|
+
comments.forEach(comment => {
|
|
49
49
|
this.printer.writeIndent().writeLine(comment.content);
|
|
50
50
|
});
|
|
51
51
|
}
|
|
@@ -73,7 +73,7 @@ class SourceMethod extends SourceBase_1.SourceBase {
|
|
|
73
73
|
if (cfg) {
|
|
74
74
|
cfg.getStmts()
|
|
75
75
|
.reverse()
|
|
76
|
-
.forEach(
|
|
76
|
+
.forEach(stmt => stmts.push(stmt));
|
|
77
77
|
}
|
|
78
78
|
for (const stmt of stmts) {
|
|
79
79
|
if (stmt.getOriginPositionInfo().getLineNo() > 0) {
|
|
@@ -140,7 +140,7 @@ class SourceMethod extends SourceBase_1.SourceBase {
|
|
|
140
140
|
methodSig
|
|
141
141
|
.getMethodSubSignature()
|
|
142
142
|
.getParameters()
|
|
143
|
-
.forEach(
|
|
143
|
+
.forEach(parameter => {
|
|
144
144
|
let str = parameter.getName();
|
|
145
145
|
if (parameter.hasDotDotDotToken()) {
|
|
146
146
|
str = `...${parameter.getName()}`;
|
|
@@ -157,8 +157,7 @@ class SourceMethod extends SourceBase_1.SourceBase {
|
|
|
157
157
|
});
|
|
158
158
|
code.write(`(${parameters.join(', ')})`);
|
|
159
159
|
const returnType = methodSig.getMethodSubSignature().getReturnType();
|
|
160
|
-
if (methodSig.getMethodSubSignature().getMethodName() !== 'constructor' &&
|
|
161
|
-
!(returnType instanceof Type_1.UnknownType)) {
|
|
160
|
+
if (methodSig.getMethodSubSignature().getMethodName() !== 'constructor' && !(returnType instanceof Type_1.UnknownType)) {
|
|
162
161
|
code.write(`: ${this.transformer.typeToString(returnType)}`);
|
|
163
162
|
}
|
|
164
163
|
if (PrinterUtils_1.PrinterUtils.isAnonymousMethod(methodSig.getMethodSubSignature().getMethodName())) {
|
|
@@ -169,7 +168,7 @@ class SourceMethod extends SourceBase_1.SourceBase {
|
|
|
169
168
|
toArrowFunctionTypeString() {
|
|
170
169
|
let code = new ArkStream_1.ArkCodeBuffer();
|
|
171
170
|
let parameters = [];
|
|
172
|
-
this.method.getParameters().forEach(
|
|
171
|
+
this.method.getParameters().forEach(parameter => {
|
|
173
172
|
let str = parameter.getName();
|
|
174
173
|
if (parameter.isOptional()) {
|
|
175
174
|
str += '?';
|
|
@@ -1 +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;
|
|
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"}
|
|
@@ -46,12 +46,11 @@ class SourceNamespace extends SourceBase_1.SourceBase {
|
|
|
46
46
|
const commentsMetadata = this.ns.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS);
|
|
47
47
|
if (commentsMetadata instanceof ArkMetadata_1.CommentsMetadata) {
|
|
48
48
|
const comments = commentsMetadata.getComments();
|
|
49
|
-
comments.forEach(
|
|
49
|
+
comments.forEach(comment => {
|
|
50
50
|
this.printer.writeIndent().writeLine(comment.content);
|
|
51
51
|
});
|
|
52
52
|
}
|
|
53
|
-
this.printer.writeIndent().writeSpace(this.modifiersToString(this.ns.getModifiers()))
|
|
54
|
-
.writeLine(`namespace ${this.ns.getName()} {`);
|
|
53
|
+
this.printer.writeIndent().writeSpace(this.modifiersToString(this.ns.getModifiers())).writeLine(`namespace ${this.ns.getName()} {`);
|
|
55
54
|
this.printer.incIndent();
|
|
56
55
|
let items = [];
|
|
57
56
|
// print class
|