arkanalyzer 1.0.24 → 1.0.26
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/lib/Config.d.ts +9 -4
- package/lib/Config.d.ts.map +1 -1
- package/lib/Config.js +31 -5
- package/lib/Scene.d.ts +3 -1
- package/lib/Scene.d.ts.map +1 -1
- package/lib/Scene.js +13 -5
- package/lib/core/common/ArkIRTransformer.d.ts.map +1 -1
- package/lib/core/common/ArkIRTransformer.js +20 -3
- package/lib/core/common/IRInference.d.ts.map +1 -1
- package/lib/core/common/IRInference.js +8 -0
- package/lib/core/common/TypeInference.js +1 -1
- package/lib/core/graph/builder/CfgBuilder.d.ts +1 -0
- package/lib/core/graph/builder/CfgBuilder.d.ts.map +1 -1
- package/lib/core/graph/builder/CfgBuilder.js +26 -1
- package/lib/core/model/ArkField.d.ts +3 -1
- package/lib/core/model/ArkField.d.ts.map +1 -1
- package/lib/core/model/ArkField.js +12 -0
- package/lib/core/model/ArkMethod.d.ts +1 -0
- package/lib/core/model/ArkMethod.d.ts.map +1 -1
- package/lib/core/model/ArkMethod.js +15 -0
- package/lib/core/model/builder/ArkClassBuilder.d.ts.map +1 -1
- package/lib/core/model/builder/ArkClassBuilder.js +37 -0
- package/lib/core/model/builder/ArkFieldBuilder.d.ts.map +1 -1
- package/lib/core/model/builder/ArkFieldBuilder.js +11 -12
- package/lib/core/model/builder/ArkMethodBuilder.d.ts +1 -1
- package/lib/core/model/builder/ArkMethodBuilder.d.ts.map +1 -1
- package/lib/core/model/builder/ArkMethodBuilder.js +61 -77
- package/lib/save/arkir/ArkIRClassPrinter.d.ts.map +1 -1
- package/lib/save/arkir/ArkIRClassPrinter.js +20 -12
- package/lib/save/arkir/ArkIRFieldPrinter.js +1 -1
- package/lib/save/arkir/ArkIRMethodPrinter.d.ts.map +1 -1
- package/lib/save/arkir/ArkIRMethodPrinter.js +11 -15
- package/lib/save/source/SourceTransformer.d.ts.map +1 -1
- package/lib/save/source/SourceTransformer.js +4 -2
- package/lib/utils/FileUtils.d.ts +1 -1
- package/lib/utils/FileUtils.d.ts.map +1 -1
- package/lib/utils/FileUtils.js +5 -2
- package/package.json +2 -2
package/lib/Config.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Language } from './core/model/ArkFile';
|
|
1
2
|
export interface Sdk {
|
|
2
3
|
name: string;
|
|
3
4
|
path: string;
|
|
@@ -31,6 +32,7 @@ export declare class SceneConfig {
|
|
|
31
32
|
private sdkFiles;
|
|
32
33
|
private sdkFilesMap;
|
|
33
34
|
private projectFiles;
|
|
35
|
+
private fileLanguages;
|
|
34
36
|
private options;
|
|
35
37
|
constructor(options?: SceneOptions);
|
|
36
38
|
getOptions(): SceneOptions;
|
|
@@ -44,11 +46,12 @@ export declare class SceneConfig {
|
|
|
44
46
|
*/
|
|
45
47
|
buildConfig(targetProjectName: string, targetProjectDirectory: string, sdks: Sdk[], fullFilePath?: string[]): void;
|
|
46
48
|
/**
|
|
47
|
-
* Create a sceneConfig object for a specified project path and set the target project directory to the
|
|
48
|
-
*
|
|
49
|
+
* Create a sceneConfig object for a specified project path and set the target project directory to the
|
|
50
|
+
* targetProjectDirectory property of the sceneConfig object.
|
|
51
|
+
* @param targetProjectDirectory - the target project directory, such as xxx/xxx/xxx, started from project
|
|
52
|
+
* directory.
|
|
49
53
|
* @example
|
|
50
54
|
* 1. build a sceneConfig object.
|
|
51
|
-
|
|
52
55
|
```typescript
|
|
53
56
|
const projectDir = 'xxx/xxx/xxx';
|
|
54
57
|
const sceneConfig: SceneConfig = new SceneConfig();
|
|
@@ -56,12 +59,14 @@ export declare class SceneConfig {
|
|
|
56
59
|
```
|
|
57
60
|
*/
|
|
58
61
|
buildFromProjectDir(targetProjectDirectory: string): void;
|
|
59
|
-
buildFromProjectFiles(projectName: string, projectDir: string, filesAndDirectorys: string[], sdks?: Sdk[]): void;
|
|
62
|
+
buildFromProjectFiles(projectName: string, projectDir: string, filesAndDirectorys: string[], sdks?: Sdk[], languageTags?: Map<string, Language>): void;
|
|
60
63
|
private processFilePaths;
|
|
64
|
+
private setLanguageTagForFiles;
|
|
61
65
|
buildFromJson(configJsonPath: string): void;
|
|
62
66
|
getTargetProjectName(): string;
|
|
63
67
|
getTargetProjectDirectory(): string;
|
|
64
68
|
getProjectFiles(): string[];
|
|
69
|
+
getFileLanguages(): Map<string, Language>;
|
|
65
70
|
getSdkFiles(): string[];
|
|
66
71
|
getSdkFilesMap(): Map<string[], string>;
|
|
67
72
|
getEtsSdkPath(): string;
|
package/lib/Config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../src/Config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../src/Config.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAIhD,MAAM,WAAW,GAAG;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,QAAQ;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE;YACJ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;SAC3B,CAAC;KACL,CAAC;CAEL;AAED,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;AAC9G,MAAM,WAAW,YAAY;IACzB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,sBAAsB,CAAC,EAAC,OAAO,CAAA;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAAC;CACvC;AAID,qBAAa,WAAW;IACpB,OAAO,CAAC,iBAAiB,CAAc;IACvC,OAAO,CAAC,sBAAsB,CAAc;IAE5C,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,OAAO,CAAa;IAE5B,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,WAAW,CAAsD;IAEzE,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,aAAa,CAAoC;IAEzD,OAAO,CAAC,OAAO,CAAe;gBAElB,OAAO,CAAC,EAAE,YAAY;IAK3B,UAAU,IAAI,YAAY;IAIjC;;;;;;;OAOG;IACI,WAAW,CACd,iBAAiB,EAAE,MAAM,EACzB,sBAAsB,EAAE,MAAM,EAC9B,IAAI,EAAE,GAAG,EAAE,EACX,YAAY,CAAC,EAAE,MAAM,EAAE;IAU3B;;;;;;;;;;;;OAYG;IACI,mBAAmB,CAAC,sBAAsB,EAAE,MAAM;IAUlD,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,EACnF,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,IAAI;IAgBxE,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,sBAAsB;IAiBvB,aAAa,CAAC,cAAc,EAAE,MAAM;IAmCpC,oBAAoB;IAIpB,yBAAyB;IAIzB,eAAe;IAIf,gBAAgB,IAAI,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC;IAIzC,WAAW;IAIX,cAAc;IAId,aAAa;IAIb,UAAU;IAIjB,OAAO,CAAC,iBAAiB;CAY5B"}
|
package/lib/Config.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
|
|
@@ -57,6 +57,7 @@ class SceneConfig {
|
|
|
57
57
|
this.sdkFiles = [];
|
|
58
58
|
this.sdkFilesMap = new Map();
|
|
59
59
|
this.projectFiles = [];
|
|
60
|
+
this.fileLanguages = new Map();
|
|
60
61
|
this.options = { supportFileExts: ['.ets', '.ts'] };
|
|
61
62
|
this.loadDefaultConfig(options);
|
|
62
63
|
}
|
|
@@ -80,11 +81,12 @@ class SceneConfig {
|
|
|
80
81
|
}
|
|
81
82
|
}
|
|
82
83
|
/**
|
|
83
|
-
* Create a sceneConfig object for a specified project path and set the target project directory to the
|
|
84
|
-
*
|
|
84
|
+
* Create a sceneConfig object for a specified project path and set the target project directory to the
|
|
85
|
+
* targetProjectDirectory property of the sceneConfig object.
|
|
86
|
+
* @param targetProjectDirectory - the target project directory, such as xxx/xxx/xxx, started from project
|
|
87
|
+
* directory.
|
|
85
88
|
* @example
|
|
86
89
|
* 1. build a sceneConfig object.
|
|
87
|
-
|
|
88
90
|
```typescript
|
|
89
91
|
const projectDir = 'xxx/xxx/xxx';
|
|
90
92
|
const sceneConfig: SceneConfig = new SceneConfig();
|
|
@@ -96,7 +98,7 @@ class SceneConfig {
|
|
|
96
98
|
this.targetProjectName = path_1.default.basename(targetProjectDirectory);
|
|
97
99
|
this.projectFiles = (0, getAllFiles_1.getAllFiles)(targetProjectDirectory, this.options.supportFileExts, this.options.ignoreFileNames);
|
|
98
100
|
}
|
|
99
|
-
buildFromProjectFiles(projectName, projectDir, filesAndDirectorys, sdks) {
|
|
101
|
+
buildFromProjectFiles(projectName, projectDir, filesAndDirectorys, sdks, languageTags) {
|
|
100
102
|
if (sdks) {
|
|
101
103
|
this.sdksObj = sdks;
|
|
102
104
|
}
|
|
@@ -107,6 +109,9 @@ class SceneConfig {
|
|
|
107
109
|
return;
|
|
108
110
|
}
|
|
109
111
|
filesAndDirectorys.forEach(fileOrDirectory => this.processFilePaths(fileOrDirectory, projectDir));
|
|
112
|
+
languageTags === null || languageTags === void 0 ? void 0 : languageTags.forEach((languageTag, fileOrDirectory) => {
|
|
113
|
+
this.setLanguageTagForFiles(fileOrDirectory, projectDir, languageTag);
|
|
114
|
+
});
|
|
110
115
|
}
|
|
111
116
|
processFilePaths(fileOrDirectory, projectDir) {
|
|
112
117
|
let absoluteFilePath = '';
|
|
@@ -127,6 +132,24 @@ class SceneConfig {
|
|
|
127
132
|
this.projectFiles.push(absoluteFilePath);
|
|
128
133
|
}
|
|
129
134
|
}
|
|
135
|
+
setLanguageTagForFiles(fileOrDirectory, projectDir, languageTag) {
|
|
136
|
+
let absoluteFilePath = '';
|
|
137
|
+
if (fileOrDirectory.includes(projectDir)) {
|
|
138
|
+
absoluteFilePath = fileOrDirectory;
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
absoluteFilePath = path_1.default.join(projectDir, fileOrDirectory);
|
|
142
|
+
}
|
|
143
|
+
if (fs_1.default.statSync(absoluteFilePath).isDirectory()) {
|
|
144
|
+
(0, getAllFiles_1.getAllFiles)(absoluteFilePath, this.getOptions().supportFileExts, this.options.ignoreFileNames)
|
|
145
|
+
.forEach((filePath) => {
|
|
146
|
+
this.fileLanguages.set(filePath, languageTag);
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
this.fileLanguages.set(absoluteFilePath, languageTag);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
130
153
|
buildFromJson(configJsonPath) {
|
|
131
154
|
if (fs_1.default.existsSync(configJsonPath)) {
|
|
132
155
|
let configurationsText;
|
|
@@ -169,6 +192,9 @@ class SceneConfig {
|
|
|
169
192
|
getProjectFiles() {
|
|
170
193
|
return this.projectFiles;
|
|
171
194
|
}
|
|
195
|
+
getFileLanguages() {
|
|
196
|
+
return this.fileLanguages;
|
|
197
|
+
}
|
|
172
198
|
getSdkFiles() {
|
|
173
199
|
return this.sdkFiles;
|
|
174
200
|
}
|
package/lib/Scene.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { SceneConfig, SceneOptions, Sdk } from './Config';
|
|
2
2
|
import { VisibleValue } from './core/common/VisibleValue';
|
|
3
3
|
import { ArkClass } from './core/model/ArkClass';
|
|
4
|
-
import { ArkFile } from './core/model/ArkFile';
|
|
4
|
+
import { ArkFile, Language } from './core/model/ArkFile';
|
|
5
5
|
import { ArkMethod } from './core/model/ArkMethod';
|
|
6
6
|
import { ArkNamespace } from './core/model/ArkNamespace';
|
|
7
7
|
import { ClassSignature, FileSignature, MethodSignature, NamespaceSignature } from './core/model/ArkSignature';
|
|
@@ -44,6 +44,7 @@ export declare class Scene {
|
|
|
44
44
|
private globalModule2PathMapping?;
|
|
45
45
|
private baseUrl?;
|
|
46
46
|
private buildStage;
|
|
47
|
+
private fileLanguages;
|
|
47
48
|
private options;
|
|
48
49
|
private indexPathArray;
|
|
49
50
|
private unhandledFilePaths;
|
|
@@ -185,6 +186,7 @@ export declare class Scene {
|
|
|
185
186
|
*```
|
|
186
187
|
*/
|
|
187
188
|
getFiles(): ArkFile[];
|
|
189
|
+
getFileLanguages(): Map<string, Language>;
|
|
188
190
|
getSdkArkFiles(): ArkFile[];
|
|
189
191
|
getModuleSdkMap(): Map<string, Sdk[]>;
|
|
190
192
|
getProjectSdkMap(): Map<string, Sdk>;
|
package/lib/Scene.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Scene.d.ts","sourceRoot":"","sources":["../src/Scene.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,EAAY,MAAM,UAAU,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"Scene.d.ts","sourceRoot":"","sources":["../src/Scene.ts"],"names":[],"mappings":"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"}
|
package/lib/Scene.js
CHANGED
|
@@ -104,6 +104,7 @@ class Scene {
|
|
|
104
104
|
this.overRides = new Map();
|
|
105
105
|
this.overRideDependencyMap = new Map();
|
|
106
106
|
this.buildStage = SceneBuildStage.BUILD_INIT;
|
|
107
|
+
this.fileLanguages = new Map();
|
|
107
108
|
this.indexPathArray = ['Index.ets', 'Index.ts', 'Index.d.ets', 'Index.d.ts', 'index.ets', 'index.ts', 'index.d.ets', 'index.d.ts'];
|
|
108
109
|
this.unhandledFilePaths = [];
|
|
109
110
|
this.unhandledSdkFilePaths = [];
|
|
@@ -207,6 +208,7 @@ class Scene {
|
|
|
207
208
|
}
|
|
208
209
|
}
|
|
209
210
|
});
|
|
211
|
+
this.fileLanguages = sceneConfig.getFileLanguages();
|
|
210
212
|
}
|
|
211
213
|
parseBuildProfile() {
|
|
212
214
|
const buildProfile = path_1.default.join(this.realProjectDir, EtsConst_1.BUILD_PROFILE_JSON5);
|
|
@@ -282,7 +284,10 @@ class Scene {
|
|
|
282
284
|
for (const file of this.getFiles()) {
|
|
283
285
|
for (const cls of ModelUtils_1.ModelUtils.getAllClassesInFile(file)) {
|
|
284
286
|
(0, ArkMethodBuilder_1.buildDefaultConstructor)(cls);
|
|
285
|
-
|
|
287
|
+
const constructor = cls.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME);
|
|
288
|
+
if (constructor !== null) {
|
|
289
|
+
(0, ArkMethodBuilder_1.addInitInConstructor)(constructor);
|
|
290
|
+
}
|
|
286
291
|
}
|
|
287
292
|
}
|
|
288
293
|
}
|
|
@@ -310,7 +315,7 @@ class Scene {
|
|
|
310
315
|
this.projectFiles.forEach((file) => {
|
|
311
316
|
logger.info('=== parse file:', file);
|
|
312
317
|
try {
|
|
313
|
-
const arkFile = new ArkFile_1.ArkFile(FileUtils_1.FileUtils.getFileLanguage(file));
|
|
318
|
+
const arkFile = new ArkFile_1.ArkFile(FileUtils_1.FileUtils.getFileLanguage(file, this.fileLanguages));
|
|
314
319
|
arkFile.setScene(this);
|
|
315
320
|
(0, ArkFileBuilder_1.buildArkFileFromFile)(file, this.realProjectDir, arkFile, this.projectName);
|
|
316
321
|
this.filesMap.set(arkFile.getFileSignature().toMapKey(), arkFile);
|
|
@@ -340,7 +345,7 @@ class Scene {
|
|
|
340
345
|
return;
|
|
341
346
|
}
|
|
342
347
|
try {
|
|
343
|
-
const arkFile = new ArkFile_1.ArkFile(FileUtils_1.FileUtils.getFileLanguage(projectFile));
|
|
348
|
+
const arkFile = new ArkFile_1.ArkFile(FileUtils_1.FileUtils.getFileLanguage(projectFile, this.fileLanguages));
|
|
344
349
|
arkFile.setScene(this);
|
|
345
350
|
(0, ArkFileBuilder_1.buildArkFileFromFile)(projectFile, this.getRealProjectDir(), arkFile, this.getProjectName());
|
|
346
351
|
for (const [modulePath, moduleName] of this.modulePath2NameMap) {
|
|
@@ -539,7 +544,7 @@ class Scene {
|
|
|
539
544
|
allFiles.forEach((file) => {
|
|
540
545
|
logger.info('=== parse sdk file:', file);
|
|
541
546
|
try {
|
|
542
|
-
const arkFile = new ArkFile_1.ArkFile(FileUtils_1.FileUtils.getFileLanguage(file));
|
|
547
|
+
const arkFile = new ArkFile_1.ArkFile(FileUtils_1.FileUtils.getFileLanguage(file, this.fileLanguages));
|
|
543
548
|
arkFile.setScene(this);
|
|
544
549
|
(0, ArkFileBuilder_1.buildArkFileFromFile)(file, path_1.default.normalize(sdkPath), arkFile, sdkName);
|
|
545
550
|
ModelUtils_1.ModelUtils.getAllClassesInFile(arkFile).forEach(cls => {
|
|
@@ -729,6 +734,9 @@ class Scene {
|
|
|
729
734
|
getFiles() {
|
|
730
735
|
return Array.from(this.filesMap.values());
|
|
731
736
|
}
|
|
737
|
+
getFileLanguages() {
|
|
738
|
+
return this.fileLanguages;
|
|
739
|
+
}
|
|
732
740
|
getSdkArkFiles() {
|
|
733
741
|
return Array.from(this.sdkArkFilesMap.values());
|
|
734
742
|
}
|
|
@@ -1299,7 +1307,7 @@ class ModuleScene {
|
|
|
1299
1307
|
(0, getAllFiles_1.getAllFiles)(this.modulePath, supportFileExts, this.projectScene.getOptions().ignoreFileNames).forEach((file) => {
|
|
1300
1308
|
logger.info('=== parse file:', file);
|
|
1301
1309
|
try {
|
|
1302
|
-
const arkFile = new ArkFile_1.ArkFile(FileUtils_1.FileUtils.getFileLanguage(file));
|
|
1310
|
+
const arkFile = new ArkFile_1.ArkFile(FileUtils_1.FileUtils.getFileLanguage(file, this.projectScene.getFileLanguages()));
|
|
1303
1311
|
arkFile.setScene(this.projectScene);
|
|
1304
1312
|
arkFile.setModuleScene(this);
|
|
1305
1313
|
(0, ArkFileBuilder_1.buildArkFileFromFile)(file, this.projectScene.getRealProjectDir(), arkFile, this.projectScene.getProjectName());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArkIRTransformer.d.ts","sourceRoot":"","sources":["../../../src/core/common/ArkIRTransformer.ts"],"names":[],"mappings":"AAeA,OAAO,EAOH,cAAc,EAGd,aAAa,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAA2E,SAAS,EAAE,MAAM,aAAa,CAAC;AACjH,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EACH,sBAAsB,EAOtB,IAAI,EACP,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"ArkIRTransformer.d.ts","sourceRoot":"","sources":["../../../src/core/common/ArkIRTransformer.ts"],"names":[],"mappings":"AAeA,OAAO,EAOH,cAAc,EAGd,aAAa,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAA2E,SAAS,EAAE,MAAM,aAAa,CAAC;AACjH,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EACH,sBAAsB,EAOtB,IAAI,EACP,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAA6E,MAAM,cAAc,CAAC;AAWpH,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAU/C,OAAO,EAAE,YAAY,EAAmB,MAAM,kBAAkB,CAAC;AAajE,MAAM,MAAM,aAAa,GAAG;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,sBAAsB,EAAE,YAAY,EAAE,CAAC;IACvC,KAAK,EAAE,IAAI,EAAE,CAAA;CAChB,CAAC;AAEF,qBAAa,SAAU,SAAQ,IAAI;gBACnB,IAAI,EAAE,MAAM;IAKjB,QAAQ,IAAI,MAAM;CAG5B;AAED,qBAAa,gBAAgB;IACzB,gBAAuB,2BAA2B,qBAAqB;IACvE,gBAAuB,0BAA0B,yBAAyB;IAC1E,gBAAuB,uCAAuC,SAA0D;IACxH,gBAAuB,wCAAwC,SAA2D;IAC1H,gBAAuB,mCAAmC,SAAuD;IAEjH,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,eAAe,CAAY;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,wBAAwB,CAAS;IACzC,OAAO,CAAC,qBAAqB,CAAwB;IACrD,OAAO,CAAC,mBAAmB,CAAsB;gBAErC,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,EAAE,SAAS;IAO1D,SAAS,IAAI,GAAG,CAAC,KAAK,CAAC;IAIvB,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;IAI3C,YAAY,IAAI,KAAK;IAIrB,eAAe,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;IAInE,aAAa,IAAI,IAAI,EAAE;IAgBvB,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,EAAE;IA6CpC,qBAAqB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,aAAa;IAI1D,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,uBAAuB;IAW/B,OAAO,CAAC,sBAAsB;IAyC9B,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,0BAA0B;IAgBlC,OAAO,CAAC,cAAc;IA0BtB,OAAO,CAAC,6BAA6B;IAoBrC,OAAO,CAAC,2BAA2B;IAwCnC,OAAO,CAAC,qBAAqB;IAiD7B,OAAO,CAAC,qBAAqB;IAyBtB,8BAA8B,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,GAAG,aAAa,EAAE;IAyC3F,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,wBAAwB;IA4FhC,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,wBAAwB;IAIhC,OAAO,CAAC,8BAA8B;IAItC,OAAO,CAAC,kBAAkB;IAyD1B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,kBAAkB;IAgB1B,OAAO,CAAC,yBAAyB;IAOjC,OAAO,CAAC,uBAAuB;IAgBxB,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI;WAU7C,oBAAoB,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,GAAG,aAAa,GAAG,IAAI;WAchE,qBAAqB,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,GAAG,cAAc,GAAG,IAAI;IAsDzE,0BAA0B,CAAC,KAAK,EAAE,KAAK,EAAE,sBAAsB,EAAE,YAAY,EAAE,GAAG,aAAa;IAQ/F,uBAAuB,CAAC,SAAS,EAAE,KAAK,EAAE,uBAAuB,EAAE,YAAY,EAAE,EAAE,UAAU,EAAE,KAAK,EAC5E,wBAAwB,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE;IA+BzE,2BAA2B,CAAC,wBAAwB,EAAE,OAAO,GAAG,IAAI;CAG9E"}
|
|
@@ -62,6 +62,7 @@ const TypeInference_1 = require("./TypeInference");
|
|
|
62
62
|
const TypeExpr_1 = require("../base/TypeExpr");
|
|
63
63
|
const ArkClassBuilder_1 = require("../model/builder/ArkClassBuilder");
|
|
64
64
|
const ArkClass_1 = require("../model/ArkClass");
|
|
65
|
+
const ArkBaseModel_1 = require("../model/ArkBaseModel");
|
|
65
66
|
class DummyStmt extends Stmt_1.Stmt {
|
|
66
67
|
constructor(text) {
|
|
67
68
|
super();
|
|
@@ -203,9 +204,25 @@ class ArkIRTransformer {
|
|
|
203
204
|
const returnStmt = new Stmt_1.ArkReturnStmt(exprValue);
|
|
204
205
|
returnStmt.setOperandOriginalPositions(exprPositions);
|
|
205
206
|
stmts.push(returnStmt);
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
207
|
+
if (this.declaringMethod.getSubSignature().getReturnType() instanceof Type_1.UnknownType) {
|
|
208
|
+
this.declaringMethod.getSubSignature().setReturnType(exprValue.getType());
|
|
209
|
+
}
|
|
210
|
+
return stmts;
|
|
211
|
+
}
|
|
212
|
+
stmts.push(new Stmt_1.ArkReturnVoidStmt());
|
|
213
|
+
if (this.declaringMethod.getSubSignature().getReturnType() instanceof Type_1.UnknownType) {
|
|
214
|
+
if (this.declaringMethod.containsModifier(ArkBaseModel_1.ModifierType.ASYNC)) {
|
|
215
|
+
const promise = this.declaringMethod.getDeclaringArkFile().getScene().getSdkGlobal(TSConst_1.PROMISE);
|
|
216
|
+
if (promise instanceof ArkClass_1.ArkClass) {
|
|
217
|
+
this.declaringMethod.getSubSignature().setReturnType(new Type_1.ClassType(promise.getSignature()));
|
|
218
|
+
}
|
|
219
|
+
else {
|
|
220
|
+
this.declaringMethod.getSubSignature().setReturnType(new Type_1.UnclearReferenceType(TSConst_1.PROMISE, [Type_1.VoidType.getInstance()]));
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
else {
|
|
224
|
+
this.declaringMethod.getSubSignature().setReturnType(Type_1.VoidType.getInstance());
|
|
225
|
+
}
|
|
209
226
|
}
|
|
210
227
|
return stmts;
|
|
211
228
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IRInference.d.ts","sourceRoot":"","sources":["../../../src/core/common/IRInference.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAKH,SAAS,EAKT,IAAI,EAKP,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,OAAO,EACH,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACb,qBAAqB,EAErB,mBAAmB,EACtB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI7C,OAAO,EAGH,cAAc,EAEd,eAAe,EAElB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAEH,WAAW,EAEX,mBAAmB,EACnB,eAAe,EAElB,MAAM,aAAa,CAAC;AAYrB,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAoB,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKlF,qBAAa,WAAW;IAEpB,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAY/B,OAAO,CAAC,MAAM,CAAC,gBAAgB;WAMjB,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;WAwB9B,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,SAAS,GAAG,kBAAkB;
|
|
1
|
+
{"version":3,"file":"IRInference.d.ts","sourceRoot":"","sources":["../../../src/core/common/IRInference.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAKH,SAAS,EAKT,IAAI,EAKP,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,OAAO,EACH,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACb,qBAAqB,EAErB,mBAAmB,EACtB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI7C,OAAO,EAGH,cAAc,EAEd,eAAe,EAElB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAEH,WAAW,EAEX,mBAAmB,EACnB,eAAe,EAElB,MAAM,aAAa,CAAC;AAYrB,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAoB,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKlF,qBAAa,WAAW;IAEpB,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAY/B,OAAO,CAAC,MAAM,CAAC,gBAAgB;WAMjB,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;WAwB9B,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,SAAS,GAAG,kBAAkB;IAqCxG,OAAO,CAAC,MAAM,CAAC,iCAAiC;WAuClC,uBAAuB,CAAC,IAAI,EAAE,qBAAqB,EAAE,SAAS,EAAE,SAAS,GAAG,kBAAkB;IA8B5G;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;WAgBlB,aAAa,CAAC,GAAG,EAAE,mBAAmB,EAAE,SAAS,EAAE,SAAS,GAAG,WAAW;IAiBxF,OAAO,CAAC,MAAM,CAAC,SAAS;IAoBxB,OAAO,CAAC,MAAM,CAAC,QAAQ;WA4BT,qBAAqB,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;WAehF,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,GAAG,IAAI;IAiBxF,OAAO,CAAC,MAAM,CAAC,eAAe;IAoC9B,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAiBvC,OAAO,CAAC,MAAM,CAAC,2BAA2B;IAiB1C,OAAO,CAAC,MAAM,CAAC,gCAAgC;IAqD/C,OAAO,CAAC,MAAM,CAAC,YAAY;WAYb,sBAAsB,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,eAAe,GAAG,eAAe;IAcvG,OAAO,CAAC,MAAM,CAAC,cAAc;WAsBf,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;IA2BjE,OAAO,CAAC,MAAM,CAAC,yBAAyB;WA4C1B,mBAAmB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,EAAE,iBAAiB,EAAE,cAAc,EAAE,GAAG,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,IAAI;IA+B/H,OAAO,CAAC,MAAM,CAAC,eAAe;WAiChB,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,GAAG,YAAY;WAiC3E,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;WA2CnE,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;WAcnE,iBAAiB,CAAC,GAAG,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,GAAG,WAAW;CAmB3F"}
|
|
@@ -114,6 +114,14 @@ class IRInference {
|
|
|
114
114
|
}
|
|
115
115
|
return expr;
|
|
116
116
|
}
|
|
117
|
+
if (methodName === TSConst_1.SUPER_NAME) {
|
|
118
|
+
const superClass = arkClass.getSuperClass();
|
|
119
|
+
if (superClass !== null) {
|
|
120
|
+
const newMethodSignature = new ArkSignature_1.MethodSignature(superClass.getSignature(), expr.getMethodSignature().getMethodSubSignature());
|
|
121
|
+
expr.setMethodSignature(newMethodSignature);
|
|
122
|
+
}
|
|
123
|
+
return expr;
|
|
124
|
+
}
|
|
117
125
|
const className = expr.getMethodSignature().getDeclaringClassSignature().getClassName();
|
|
118
126
|
if (className && className !== Const_1.UNKNOWN_CLASS_NAME) {
|
|
119
127
|
const baseType = TypeInference_1.TypeInference.inferUnclearRefName(className, arkClass);
|
|
@@ -774,7 +774,7 @@ class TypeInference {
|
|
|
774
774
|
static inferFunctionType(argType, paramSubSignature, realTypes) {
|
|
775
775
|
const returnType = argType.getMethodSignature().getMethodSubSignature().getReturnType();
|
|
776
776
|
const declareType = paramSubSignature === null || paramSubSignature === void 0 ? void 0 : paramSubSignature.getReturnType();
|
|
777
|
-
if (declareType instanceof Type_1.GenericType && realTypes && !this.isUnclearType(returnType)) {
|
|
777
|
+
if (declareType instanceof Type_1.GenericType && realTypes && !this.isUnclearType(returnType) && !(returnType instanceof Type_1.VoidType)) {
|
|
778
778
|
realTypes[declareType.getIndex()] = returnType;
|
|
779
779
|
}
|
|
780
780
|
const params = paramSubSignature === null || paramSubSignature === void 0 ? void 0 : paramSubSignature.getParameters();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CfgBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/graph/builder/CfgBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAA0C,MAAM,iBAAiB,CAAC;AAEjG,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIlD,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"CfgBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/graph/builder/CfgBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,13 +42,17 @@ const ts = __importStar(require("ohos-typescript"));
|
|
|
42
42
|
const Stmt_1 = require("../../base/Stmt");
|
|
43
43
|
const BasicBlock_1 = require("../BasicBlock");
|
|
44
44
|
const Cfg_1 = require("../Cfg");
|
|
45
|
+
const ArkClass_1 = require("../../model/ArkClass");
|
|
45
46
|
const ArkIRTransformer_1 = require("../../common/ArkIRTransformer");
|
|
46
47
|
const ModelUtils_1 = require("../../common/ModelUtils");
|
|
47
48
|
const IRUtils_1 = require("../../common/IRUtils");
|
|
49
|
+
const Type_1 = require("../../base/Type");
|
|
48
50
|
const LoopBuilder_1 = require("./LoopBuilder");
|
|
49
51
|
const SwitchBuilder_1 = require("./SwitchBuilder");
|
|
50
52
|
const ConditionBuilder_1 = require("./ConditionBuilder");
|
|
51
53
|
const TrapBuilder_1 = require("./TrapBuilder");
|
|
54
|
+
const TSConst_1 = require("../../common/TSConst");
|
|
55
|
+
const ArkBaseModel_1 = require("../../model/ArkBaseModel");
|
|
52
56
|
class StatementBuilder {
|
|
53
57
|
constructor(type, code, astNode, scopeID) {
|
|
54
58
|
this.addressCode3 = [];
|
|
@@ -1071,7 +1075,7 @@ class CfgBuilder {
|
|
|
1071
1075
|
arkIRTransformer.tsNodeToStmts(statementBuilder.astNode).forEach(s => stmtsInBlock.push(s));
|
|
1072
1076
|
}
|
|
1073
1077
|
else if (statementBuilder.code.startsWith('return')) {
|
|
1074
|
-
stmtsInBlock.push(
|
|
1078
|
+
stmtsInBlock.push(this.generateReturnStmt(arkIRTransformer));
|
|
1075
1079
|
}
|
|
1076
1080
|
}
|
|
1077
1081
|
const blockInCfg = new BasicBlock_1.BasicBlock();
|
|
@@ -1087,6 +1091,27 @@ class CfgBuilder {
|
|
|
1087
1091
|
valueAndStmtsOfSwitchAndCasesAll,
|
|
1088
1092
|
};
|
|
1089
1093
|
}
|
|
1094
|
+
generateReturnStmt(arkIRTransformer) {
|
|
1095
|
+
if (this.name === TSConst_1.CONSTRUCTOR_NAME) {
|
|
1096
|
+
this.declaringMethod.getSubSignature().setReturnType(arkIRTransformer.getThisLocal().getType());
|
|
1097
|
+
return new Stmt_1.ArkReturnStmt(arkIRTransformer.getThisLocal());
|
|
1098
|
+
}
|
|
1099
|
+
if (this.declaringMethod.getSubSignature().getReturnType() instanceof Type_1.UnknownType && !this.declaringMethod.getAsteriskToken()) {
|
|
1100
|
+
if (this.declaringMethod.containsModifier(ArkBaseModel_1.ModifierType.ASYNC)) {
|
|
1101
|
+
const promise = this.declaringMethod.getDeclaringArkFile().getScene().getSdkGlobal(TSConst_1.PROMISE);
|
|
1102
|
+
if (promise instanceof ArkClass_1.ArkClass) {
|
|
1103
|
+
this.declaringMethod.getSubSignature().setReturnType(new Type_1.ClassType(promise.getSignature()));
|
|
1104
|
+
}
|
|
1105
|
+
else {
|
|
1106
|
+
this.declaringMethod.getSubSignature().setReturnType(new Type_1.UnclearReferenceType(TSConst_1.PROMISE, [Type_1.VoidType.getInstance()]));
|
|
1107
|
+
}
|
|
1108
|
+
}
|
|
1109
|
+
else {
|
|
1110
|
+
this.declaringMethod.getSubSignature().setReturnType(Type_1.VoidType.getInstance());
|
|
1111
|
+
}
|
|
1112
|
+
}
|
|
1113
|
+
return new Stmt_1.ArkReturnVoidStmt();
|
|
1114
|
+
}
|
|
1090
1115
|
adjustBlocks(blockBuilderToCfgBlock, blocksContainLoopCondition, basicBlockSet, blockBuildersContainSwitch, valueAndStmtsOfSwitchAndCasesAll, arkIRTransformer) {
|
|
1091
1116
|
const loopBuilder = new LoopBuilder_1.LoopBuilder();
|
|
1092
1117
|
loopBuilder.rebuildBlocksInLoop(blockBuilderToCfgBlock, blocksContainLoopCondition, basicBlockSet, this.blocks);
|
|
@@ -14,7 +14,8 @@ export declare enum FieldCategory {
|
|
|
14
14
|
PROPERTY_SIGNATURE = 4,
|
|
15
15
|
ENUM_MEMBER = 5,
|
|
16
16
|
INDEX_SIGNATURE = 6,
|
|
17
|
-
GET_ACCESSOR = 7
|
|
17
|
+
GET_ACCESSOR = 7,
|
|
18
|
+
PARAMETER_PROPERTY = 8
|
|
18
19
|
}
|
|
19
20
|
/**
|
|
20
21
|
* @category core/model
|
|
@@ -64,5 +65,6 @@ export declare class ArkField extends ArkBaseModel {
|
|
|
64
65
|
*/
|
|
65
66
|
getOriginPosition(): LineColPosition;
|
|
66
67
|
validate(): ArkError;
|
|
68
|
+
isPublic(): boolean;
|
|
67
69
|
}
|
|
68
70
|
//# sourceMappingURL=ArkField.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArkField.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkField.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"ArkField.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkField.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAiB,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,YAAY,EAAgB,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAGrC,oBAAY,aAAa;IACrB,oBAAoB,IAAI;IACxB,mBAAmB,IAAI;IACvB,8BAA8B,IAAI;IAClC,iBAAiB,IAAI;IACrB,kBAAkB,IAAI;IACtB,WAAW,IAAI;IACf,eAAe,IAAI;IACnB,YAAY,IAAI;IAChB,kBAAkB,IAAI;CACzB;AAED;;GAEG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACtC,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,QAAQ,CAAiB;IAEjC,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,gBAAgB,CAAkB;IAE1C,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,cAAc,CAAC,CAAkB;IAEzC,OAAO,CAAC,WAAW,CAAc;;IAMjC;;OAEG;IACI,WAAW,IAAI,QAAQ;IAIvB,oBAAoB;IAIpB,oBAAoB,CAAC,cAAc,EAAE,QAAQ;IAIpD;;;OAGG;IACI,OAAO;IAIP,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,WAAW,IAAI,aAAa;IAI5B,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAI1C,OAAO;IAIP,OAAO,IAAG,IAAI;IAId,YAAY,IAAI,cAAc;IAI9B,YAAY,CAAC,QAAQ,EAAE,cAAc;IAI5C;;;OAGG;IACI,cAAc,IAAI,IAAI,EAAE;IAIxB,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE;IAIlC,gBAAgB,CAAC,aAAa,EAAE,OAAO;IAIvC,mBAAmB,CAAC,gBAAgB,EAAE,OAAO;IAI7C,gBAAgB;IAIhB,mBAAmB;IAInB,iBAAiB,CAAC,QAAQ,EAAE,eAAe;IAIlD;;;OAGG;IACI,iBAAiB,IAAI,eAAe;IAIpC,QAAQ,IAAI,QAAQ;IAKpB,QAAQ,IAAI,OAAO;CAS7B"}
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
exports.ArkField = exports.FieldCategory = void 0;
|
|
18
18
|
const Position_1 = require("../base/Position");
|
|
19
|
+
const ArkClass_1 = require("./ArkClass");
|
|
19
20
|
const ArkBaseModel_1 = require("./ArkBaseModel");
|
|
20
21
|
var FieldCategory;
|
|
21
22
|
(function (FieldCategory) {
|
|
@@ -27,6 +28,7 @@ var FieldCategory;
|
|
|
27
28
|
FieldCategory[FieldCategory["ENUM_MEMBER"] = 5] = "ENUM_MEMBER";
|
|
28
29
|
FieldCategory[FieldCategory["INDEX_SIGNATURE"] = 6] = "INDEX_SIGNATURE";
|
|
29
30
|
FieldCategory[FieldCategory["GET_ACCESSOR"] = 7] = "GET_ACCESSOR";
|
|
31
|
+
FieldCategory[FieldCategory["PARAMETER_PROPERTY"] = 8] = "PARAMETER_PROPERTY";
|
|
30
32
|
})(FieldCategory = exports.FieldCategory || (exports.FieldCategory = {}));
|
|
31
33
|
/**
|
|
32
34
|
* @category core/model
|
|
@@ -115,5 +117,15 @@ class ArkField extends ArkBaseModel_1.ArkBaseModel {
|
|
|
115
117
|
validate() {
|
|
116
118
|
return this.validateFields(['category', 'declaringClass', 'fieldSignature']);
|
|
117
119
|
}
|
|
120
|
+
// For class field, it is default public if there is not any access modify
|
|
121
|
+
isPublic() {
|
|
122
|
+
if (!this.containsModifier(ArkBaseModel_1.ModifierType.PUBLIC) &&
|
|
123
|
+
!this.containsModifier(ArkBaseModel_1.ModifierType.PRIVATE) &&
|
|
124
|
+
!this.containsModifier(ArkBaseModel_1.ModifierType.PROTECTED) &&
|
|
125
|
+
this.getDeclaringArkClass().getCategory() === ArkClass_1.ClassCategory.CLASS) {
|
|
126
|
+
return true;
|
|
127
|
+
}
|
|
128
|
+
return this.containsModifier(ArkBaseModel_1.ModifierType.PUBLIC);
|
|
129
|
+
}
|
|
118
130
|
}
|
|
119
131
|
exports.ArkField = ArkField;
|
|
@@ -266,5 +266,6 @@ export declare class ArkMethod extends ArkBaseModel implements ArkExport {
|
|
|
266
266
|
getFunctionLocal(name: string): Local | null;
|
|
267
267
|
setQuestionToken(questionToken: boolean): void;
|
|
268
268
|
getQuestionToken(): boolean;
|
|
269
|
+
isPublic(): boolean;
|
|
269
270
|
}
|
|
270
271
|
//# sourceMappingURL=ArkMethod.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArkMethod.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkMethod.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAc,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAgC,IAAI,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAA2B,WAAW,EAA2B,IAAI,EAAa,MAAM,cAAc,CAAC;AAC9G,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAiB,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEpD,OAAO,EAAuB,OAAO,EAAmB,MAAM,kBAAkB,CAAC;AACjF,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"ArkMethod.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkMethod.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ const ArkError_1 = require("../common/ArkError");
|
|
|
27
27
|
const EtsConst_1 = require("../common/EtsConst");
|
|
28
28
|
const Constant_1 = require("../base/Constant");
|
|
29
29
|
const Local_1 = require("../base/Local");
|
|
30
|
+
const TSConst_1 = require("../common/TSConst");
|
|
30
31
|
exports.arkMethodNodeKind = ['MethodDeclaration', 'Constructor', 'FunctionDeclaration', 'GetAccessor',
|
|
31
32
|
'SetAccessor', 'ArrowFunction', 'FunctionExpression', 'MethodSignature', 'ConstructSignature', 'CallSignature'];
|
|
32
33
|
/**
|
|
@@ -601,5 +602,19 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
|
|
|
601
602
|
getQuestionToken() {
|
|
602
603
|
return this.questionToken;
|
|
603
604
|
}
|
|
605
|
+
// For class method, if there is no public/private/protected access modifier, it is actually public
|
|
606
|
+
isPublic() {
|
|
607
|
+
if (!this.containsModifier(ArkBaseModel_1.ModifierType.PUBLIC) &&
|
|
608
|
+
!this.containsModifier(ArkBaseModel_1.ModifierType.PRIVATE) &&
|
|
609
|
+
!this.containsModifier(ArkBaseModel_1.ModifierType.PROTECTED) &&
|
|
610
|
+
!this.getDeclaringArkClass().isDefaultArkClass() &&
|
|
611
|
+
!this.isGenerated() &&
|
|
612
|
+
!this.isAnonymousMethod() &&
|
|
613
|
+
this.getName() !== TSConst_1.CONSTRUCTOR_NAME &&
|
|
614
|
+
this.getDeclaringArkClass().getCategory() === ArkClass_1.ClassCategory.CLASS) {
|
|
615
|
+
return true;
|
|
616
|
+
}
|
|
617
|
+
return this.containsModifier(ArkBaseModel_1.ModifierType.PUBLIC);
|
|
618
|
+
}
|
|
604
619
|
}
|
|
605
620
|
exports.ArkMethod = ArkMethod;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,
|
|
1
|
+
{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAA4B,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AAyBtD,MAAM,MAAM,aAAa,GACrB,EAAE,CAAC,gBAAgB,GACnB,EAAE,CAAC,oBAAoB,GACvB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,iBAAiB,GACpB,EAAE,CAAC,uBAAuB,CAAC;AAU/B,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,QAI/G;AAED,wBAAgB,oCAAoC,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAClD,MAAM,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAI3G;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAChE,eAAe,CAAC,EAAE,SAAS,QAO3E;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EACvD,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QAYpG;AAED,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,EACjE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QAazG;AAgBD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QA2BhI"}
|
|
@@ -41,6 +41,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
41
41
|
};
|
|
42
42
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
43
43
|
exports.buildNormalArkClass = exports.buildNormalArkClassFromArkNamespace = exports.buildNormalArkClassFromArkFile = exports.buildNormalArkClassFromArkMethod = exports.buildDefaultArkClassFromArkNamespace = exports.buildDefaultArkClassFromArkFile = void 0;
|
|
44
|
+
const ArkField_1 = require("../ArkField");
|
|
44
45
|
const ArkMethod_1 = require("../ArkMethod");
|
|
45
46
|
const logger_1 = __importStar(require("../../../utils/logger"));
|
|
46
47
|
const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
|
|
@@ -148,6 +149,7 @@ function init4InstanceInitMethod(cls) {
|
|
|
148
149
|
instanceInit.setDeclaringArkClass(cls);
|
|
149
150
|
instanceInit.setIsGeneratedFlag(true);
|
|
150
151
|
const methodSubSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSubSignatureFromMethodName(Const_1.INSTANCE_INIT_METHOD_NAME);
|
|
152
|
+
methodSubSignature.setReturnType(Type_1.VoidType.getInstance());
|
|
151
153
|
const methodSignature = new ArkSignature_1.MethodSignature(instanceInit.getDeclaringArkClass().getSignature(), methodSubSignature);
|
|
152
154
|
instanceInit.setImplementationSignature(methodSignature);
|
|
153
155
|
instanceInit.setLineCol(0);
|
|
@@ -160,6 +162,7 @@ function init4StaticInitMethod(cls) {
|
|
|
160
162
|
staticInit.setDeclaringArkClass(cls);
|
|
161
163
|
staticInit.setIsGeneratedFlag(true);
|
|
162
164
|
const methodSubSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSubSignatureFromMethodName(Const_1.STATIC_INIT_METHOD_NAME);
|
|
165
|
+
methodSubSignature.setReturnType(Type_1.VoidType.getInstance());
|
|
163
166
|
const methodSignature = new ArkSignature_1.MethodSignature(staticInit.getDeclaringArkClass().getSignature(), methodSubSignature);
|
|
164
167
|
staticInit.setImplementationSignature(methodSignature);
|
|
165
168
|
staticInit.setLineCol(0);
|
|
@@ -370,7 +373,38 @@ function buildMethodsForClass(clsNode, cls, sourceFile) {
|
|
|
370
373
|
if (ohos_typescript_1.default.isGetAccessor(member)) {
|
|
371
374
|
(0, ArkFieldBuilder_1.buildGetAccessor2ArkField)(member, mthd, sourceFile);
|
|
372
375
|
}
|
|
376
|
+
else if (ohos_typescript_1.default.isConstructorDeclaration(member)) {
|
|
377
|
+
buildParameterProperty2ArkField(member.parameters, cls, sourceFile);
|
|
378
|
+
}
|
|
379
|
+
}
|
|
380
|
+
});
|
|
381
|
+
}
|
|
382
|
+
// params of constructor method may have modifiers such as public or private to directly define class properties with constructor
|
|
383
|
+
function buildParameterProperty2ArkField(params, cls, sourceFile) {
|
|
384
|
+
if (params.length === 0) {
|
|
385
|
+
return;
|
|
386
|
+
}
|
|
387
|
+
params.forEach((parameter) => {
|
|
388
|
+
if (parameter.modifiers === undefined || !ohos_typescript_1.default.isIdentifier(parameter.name)) {
|
|
389
|
+
return;
|
|
390
|
+
}
|
|
391
|
+
let field = new ArkField_1.ArkField();
|
|
392
|
+
field.setDeclaringArkClass(cls);
|
|
393
|
+
field.setCode(parameter.getText(sourceFile));
|
|
394
|
+
field.setCategory(ArkField_1.FieldCategory.PARAMETER_PROPERTY);
|
|
395
|
+
field.setOriginPosition(Position_1.LineColPosition.buildFromNode(parameter, sourceFile));
|
|
396
|
+
let fieldName = parameter.name.text;
|
|
397
|
+
let fieldType;
|
|
398
|
+
if (parameter.type) {
|
|
399
|
+
fieldType = ((0, builderUtils_1.buildGenericType)((0, builderUtils_1.tsNode2Type)(parameter.type, sourceFile, field), field));
|
|
373
400
|
}
|
|
401
|
+
else {
|
|
402
|
+
fieldType = Type_1.UnknownType.getInstance();
|
|
403
|
+
}
|
|
404
|
+
const fieldSignature = new ArkSignature_1.FieldSignature(fieldName, cls.getSignature(), fieldType, false);
|
|
405
|
+
field.setSignature(fieldSignature);
|
|
406
|
+
field.setModifiers((0, builderUtils_1.buildModifiers)(parameter));
|
|
407
|
+
cls.addField(field);
|
|
374
408
|
});
|
|
375
409
|
}
|
|
376
410
|
function buildStaticBlocksForClass(clsNode, cls, sourceFile) {
|
|
@@ -419,5 +453,8 @@ function getInitStmts(transformer, field, initNode) {
|
|
|
419
453
|
stmt.setOriginalText(fieldSourceCode);
|
|
420
454
|
}
|
|
421
455
|
field.setInitializer(stmts);
|
|
456
|
+
if (field.getType() instanceof Type_1.UnknownType) {
|
|
457
|
+
field.getSignature().setType(initValue.getType());
|
|
458
|
+
}
|
|
422
459
|
}
|
|
423
460
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArkFieldBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkFieldBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAUzC,MAAM,MAAM,YAAY,GAAG,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,CAAC;AAE1E,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,2BAA2B,GACxH,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,iBAAiB,GAAG,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"ArkFieldBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkFieldBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAUzC,MAAM,MAAM,YAAY,GAAG,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,CAAC;AAE1E,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,2BAA2B,GACxH,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,iBAAiB,GAAG,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,GAAG,QAAQ,CAqDpH;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,EAAE,CAAC,yBAAyB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,QAmB1H;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,EAAE,CAAC,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAiCtH"}
|
|
@@ -80,24 +80,23 @@ function buildProperty2ArkField(member, sourceFile, cls) {
|
|
|
80
80
|
else {
|
|
81
81
|
logger.warn("Other type of property name found!");
|
|
82
82
|
}
|
|
83
|
-
if ((ohos_typescript_1.default.isPropertyDeclaration(member) || ohos_typescript_1.default.isPropertySignature(member)) && member.modifiers) {
|
|
84
|
-
let modifiers = (0, builderUtils_1.buildModifiers)(member);
|
|
85
|
-
field.addModifier(modifiers);
|
|
86
|
-
field.setDecorators((0, builderUtils_1.buildDecorators)(member, sourceFile));
|
|
87
|
-
}
|
|
88
83
|
let fieldType = Type_1.UnknownType.getInstance();
|
|
89
|
-
if ((ohos_typescript_1.default.isPropertyDeclaration(member) || ohos_typescript_1.default.isPropertySignature(member))
|
|
90
|
-
|
|
84
|
+
if ((ohos_typescript_1.default.isPropertyDeclaration(member) || ohos_typescript_1.default.isPropertySignature(member))) {
|
|
85
|
+
if (member.modifiers) {
|
|
86
|
+
field.addModifier((0, builderUtils_1.buildModifiers)(member));
|
|
87
|
+
}
|
|
88
|
+
field.addModifier(0);
|
|
89
|
+
field.setDecorators((0, builderUtils_1.buildDecorators)(member, sourceFile));
|
|
90
|
+
field.setQuestionToken(member.questionToken !== undefined);
|
|
91
|
+
if (member.type) {
|
|
92
|
+
fieldType = (0, builderUtils_1.buildGenericType)((0, builderUtils_1.tsNode2Type)(member.type, sourceFile, cls), field);
|
|
93
|
+
}
|
|
91
94
|
}
|
|
92
95
|
if (ohos_typescript_1.default.isEnumMember(member)) {
|
|
93
96
|
field.addModifier(ArkBaseModel_1.ModifierType.STATIC);
|
|
94
97
|
fieldType = new Type_1.ClassType(cls.getSignature());
|
|
95
98
|
}
|
|
96
|
-
|
|
97
|
-
field.setSignature(fieldSignature);
|
|
98
|
-
if ((ohos_typescript_1.default.isPropertyDeclaration(member) || ohos_typescript_1.default.isPropertySignature(member)) && member.questionToken) {
|
|
99
|
-
field.setQuestionToken(true);
|
|
100
|
-
}
|
|
99
|
+
field.setSignature(new ArkSignature_1.FieldSignature(fieldName, cls.getSignature(), fieldType, field.isStatic()));
|
|
101
100
|
if (ohos_typescript_1.default.isPropertyDeclaration(member) && member.exclamationToken) {
|
|
102
101
|
field.setExclamationToken(true);
|
|
103
102
|
}
|
|
@@ -58,7 +58,7 @@ export declare class MethodParameter implements Value {
|
|
|
58
58
|
}
|
|
59
59
|
export declare function buildDefaultConstructor(arkClass: ArkClass): boolean;
|
|
60
60
|
export declare function buildInitMethod(initMethod: ArkMethod, fieldInitializerStmts: Stmt[], thisLocal: Local): void;
|
|
61
|
-
export declare function addInitInConstructor(
|
|
61
|
+
export declare function addInitInConstructor(constructor: ArkMethod): void;
|
|
62
62
|
export declare function isMethodImplementation(node: MethodLikeNode): boolean;
|
|
63
63
|
export declare function checkAndUpdateMethod(method: ArkMethod, cls: ArkClass): void;
|
|
64
64
|
//# sourceMappingURL=ArkMethodBuilder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArkMethodBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkMethodBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAa,IAAI,EAAe,MAAM,iBAAiB,CAAC;AAG/D,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAgBjC,OAAO,
|
|
1
|
+
{"version":3,"file":"ArkMethodBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkMethodBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -114,9 +114,7 @@ function buildArkMethodFromArkClass(methodNode, declaringClass, mtd, sourceFile,
|
|
|
114
114
|
if (mtd.hasBuilderDecorator()) {
|
|
115
115
|
mtd.setViewTree((0, ViewTreeBuilder_1.buildViewTree)(mtd));
|
|
116
116
|
}
|
|
117
|
-
else if (declaringClass.hasComponentDecorator() &&
|
|
118
|
-
mtd.getSubSignature().toString() === 'build()' &&
|
|
119
|
-
!mtd.isStatic()) {
|
|
117
|
+
else if (declaringClass.hasComponentDecorator() && mtd.getSubSignature().toString() === 'build()' && !mtd.isStatic()) {
|
|
120
118
|
declaringClass.setViewTree((0, ViewTreeBuilder_1.buildViewTree)(mtd));
|
|
121
119
|
}
|
|
122
120
|
checkAndUpdateMethod(mtd, declaringClass);
|
|
@@ -294,85 +292,62 @@ class MethodParameter {
|
|
|
294
292
|
exports.MethodParameter = MethodParameter;
|
|
295
293
|
function needDefaultConstructorInClass(arkClass) {
|
|
296
294
|
const originClassType = arkClass.getCategory();
|
|
297
|
-
return arkClass.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME)
|
|
295
|
+
return arkClass.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME) === null &&
|
|
298
296
|
(originClassType === ArkClass_1.ClassCategory.CLASS || originClassType === ArkClass_1.ClassCategory.OBJECT) &&
|
|
299
297
|
arkClass.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME &&
|
|
300
298
|
!arkClass.isDeclare();
|
|
301
299
|
}
|
|
300
|
+
function recursivelyCheckAndBuildSuperConstructor(arkClass) {
|
|
301
|
+
let superClass = arkClass.getSuperClass();
|
|
302
|
+
while (superClass !== null) {
|
|
303
|
+
if (superClass.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME) === null) {
|
|
304
|
+
buildDefaultConstructor(superClass);
|
|
305
|
+
}
|
|
306
|
+
superClass = superClass.getSuperClass();
|
|
307
|
+
}
|
|
308
|
+
}
|
|
302
309
|
function buildDefaultConstructor(arkClass) {
|
|
310
|
+
var _a;
|
|
303
311
|
if (!needDefaultConstructorInClass(arkClass)) {
|
|
304
312
|
return false;
|
|
305
313
|
}
|
|
306
|
-
|
|
307
|
-
let superClass = arkClass.getSuperClass() || null;
|
|
308
|
-
while (superClass != null) {
|
|
309
|
-
parentConstructor = superClass.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME);
|
|
310
|
-
if (parentConstructor != null) {
|
|
311
|
-
break;
|
|
312
|
-
}
|
|
313
|
-
superClass = superClass.getSuperClass() || null;
|
|
314
|
-
}
|
|
314
|
+
recursivelyCheckAndBuildSuperConstructor(arkClass);
|
|
315
315
|
const defaultConstructor = new ArkMethod_1.ArkMethod();
|
|
316
316
|
defaultConstructor.setDeclaringArkClass(arkClass);
|
|
317
317
|
defaultConstructor.setCode('');
|
|
318
318
|
defaultConstructor.setIsGeneratedFlag(true);
|
|
319
|
-
|
|
319
|
+
defaultConstructor.setLineCol(0);
|
|
320
|
+
const thisLocal = new Local_1.Local(TSConst_1.THIS_NAME, new Type_1.ClassType(arkClass.getSignature()));
|
|
320
321
|
const locals = new Set([thisLocal]);
|
|
321
322
|
const basicBlock = new BasicBlock_1.BasicBlock();
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
const methodSignature = new ArkSignature_1.MethodSignature(defaultConstructor.getDeclaringArkClass().getSignature(), methodSubSignature);
|
|
332
|
-
defaultConstructor.setImplementationSignature(methodSignature);
|
|
333
|
-
defaultConstructor.setLineCol(0);
|
|
334
|
-
const stmts = [];
|
|
335
|
-
let index = 0;
|
|
336
|
-
const parameterLocals = [];
|
|
337
|
-
for (const methodParameter of defaultConstructor.getParameters()) {
|
|
338
|
-
const parameterRef = new Ref_1.ArkParameterRef(index, methodParameter.getType());
|
|
339
|
-
const parameterLocal = new Local_1.Local(methodParameter.getName(), parameterRef.getType());
|
|
323
|
+
basicBlock.setId(0);
|
|
324
|
+
let parameters = [];
|
|
325
|
+
let parameterArgs = [];
|
|
326
|
+
const superConstructor = (_a = arkClass.getSuperClass()) === null || _a === void 0 ? void 0 : _a.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME);
|
|
327
|
+
if (superConstructor) {
|
|
328
|
+
parameters = superConstructor.getParameters();
|
|
329
|
+
for (let index = 0; index < parameters.length; index++) {
|
|
330
|
+
const parameterRef = new Ref_1.ArkParameterRef(index, parameters[index].getType());
|
|
331
|
+
const parameterLocal = new Local_1.Local(parameters[index].getName(), parameterRef.getType());
|
|
340
332
|
locals.add(parameterLocal);
|
|
341
|
-
|
|
342
|
-
|
|
333
|
+
parameterArgs.push(parameterLocal);
|
|
334
|
+
basicBlock.addStmt(new Stmt_1.ArkAssignStmt(parameterLocal, parameterRef));
|
|
343
335
|
index++;
|
|
344
336
|
}
|
|
345
|
-
const superMethodSubSignature = new ArkSignature_1.MethodSubSignature(TSConst_1.SUPER_NAME, parentConstructor.getParameters(), defaultConstructor.getReturnType());
|
|
346
|
-
const superMethodSignature = new ArkSignature_1.MethodSignature(arkClass.getSignature(), superMethodSubSignature);
|
|
347
|
-
const superInvokeExpr = new Expr_1.ArkStaticInvokeExpr(superMethodSignature, parameterLocals);
|
|
348
|
-
const superInvokeStmt = new Stmt_1.ArkInvokeStmt(superInvokeExpr);
|
|
349
|
-
basicBlock.addStmt(superInvokeStmt);
|
|
350
|
-
const returnVoidStmt = new Stmt_1.ArkReturnVoidStmt();
|
|
351
|
-
basicBlock.addStmt(returnVoidStmt);
|
|
352
337
|
}
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
const
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
const superClass = arkClass.getSuperClass();
|
|
360
|
-
const superMethodSubSignature = new ArkSignature_1.MethodSubSignature(TSConst_1.SUPER_NAME, [], Type_1.UnknownType.getInstance());
|
|
361
|
-
const superMethodSignature = new ArkSignature_1.MethodSignature(superClass.getSignature(), superMethodSubSignature);
|
|
362
|
-
const superInvokeExpr = new Expr_1.ArkStaticInvokeExpr(superMethodSignature, []);
|
|
363
|
-
const superInvokeStmt = new Stmt_1.ArkInvokeStmt(superInvokeExpr);
|
|
364
|
-
basicBlock.addStmt(superInvokeStmt);
|
|
365
|
-
const returnVoidStmt = new Stmt_1.ArkReturnVoidStmt();
|
|
366
|
-
basicBlock.addStmt(returnVoidStmt);
|
|
367
|
-
}
|
|
368
|
-
else {
|
|
369
|
-
const returnVoidStmt = new Stmt_1.ArkReturnVoidStmt();
|
|
370
|
-
basicBlock.addStmt(returnVoidStmt);
|
|
371
|
-
}
|
|
338
|
+
basicBlock.addStmt(new Stmt_1.ArkAssignStmt(thisLocal, new Ref_1.ArkThisRef(new Type_1.ClassType(arkClass.getSignature()))));
|
|
339
|
+
if (superConstructor) {
|
|
340
|
+
const superMethodSubSignature = new ArkSignature_1.MethodSubSignature(TSConst_1.SUPER_NAME, parameters, superConstructor.getReturnType());
|
|
341
|
+
const superMethodSignature = new ArkSignature_1.MethodSignature(arkClass.getSignature(), superMethodSubSignature);
|
|
342
|
+
const superInvokeExpr = new Expr_1.ArkStaticInvokeExpr(superMethodSignature, parameterArgs);
|
|
343
|
+
basicBlock.addStmt(new Stmt_1.ArkInvokeStmt(superInvokeExpr));
|
|
372
344
|
}
|
|
345
|
+
const methodSubSignature = new ArkSignature_1.MethodSubSignature(TSConst_1.CONSTRUCTOR_NAME, parameters, thisLocal.getType(), defaultConstructor.isStatic());
|
|
346
|
+
defaultConstructor.setImplementationSignature(new ArkSignature_1.MethodSignature(arkClass.getSignature(), methodSubSignature));
|
|
347
|
+
basicBlock.addStmt(new Stmt_1.ArkReturnStmt(thisLocal));
|
|
373
348
|
const cfg = new Cfg_1.Cfg();
|
|
374
349
|
cfg.addBlock(basicBlock);
|
|
375
|
-
cfg.setStartingStmt(
|
|
350
|
+
cfg.setStartingStmt(basicBlock.getHead());
|
|
376
351
|
cfg.setDeclaringMethod(defaultConstructor);
|
|
377
352
|
cfg.getStmts().forEach(s => s.setCfg(cfg));
|
|
378
353
|
defaultConstructor.setBody(new ArkBody_1.ArkBody(locals, cfg));
|
|
@@ -385,6 +360,7 @@ function buildInitMethod(initMethod, fieldInitializerStmts, thisLocal) {
|
|
|
385
360
|
const classType = new Type_1.ClassType(initMethod.getDeclaringArkClass().getSignature());
|
|
386
361
|
const assignStmt = new Stmt_1.ArkAssignStmt(thisLocal, new Ref_1.ArkThisRef(classType));
|
|
387
362
|
const block = new BasicBlock_1.BasicBlock();
|
|
363
|
+
block.setId(0);
|
|
388
364
|
block.addStmt(assignStmt);
|
|
389
365
|
const locals = new Set([thisLocal]);
|
|
390
366
|
for (const stmt of fieldInitializerStmts) {
|
|
@@ -405,27 +381,35 @@ function buildInitMethod(initMethod, fieldInitializerStmts, thisLocal) {
|
|
|
405
381
|
initMethod.setBody(new ArkBody_1.ArkBody(locals, cfg));
|
|
406
382
|
}
|
|
407
383
|
exports.buildInitMethod = buildInitMethod;
|
|
408
|
-
function addInitInConstructor(
|
|
384
|
+
function addInitInConstructor(constructor) {
|
|
409
385
|
var _a, _b;
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
386
|
+
const thisLocal = (_a = constructor.getBody()) === null || _a === void 0 ? void 0 : _a.getLocals().get(TSConst_1.THIS_NAME);
|
|
387
|
+
if (!thisLocal) {
|
|
388
|
+
return;
|
|
389
|
+
}
|
|
390
|
+
const blocks = (_b = constructor.getCfg()) === null || _b === void 0 ? void 0 : _b.getBlocks();
|
|
391
|
+
if (!blocks) {
|
|
392
|
+
return;
|
|
393
|
+
}
|
|
394
|
+
const firstBlockStmts = [...blocks][0].getStmts();
|
|
395
|
+
let index = 0;
|
|
396
|
+
for (let i = 0; i < firstBlockStmts.length; i++) {
|
|
397
|
+
const stmt = firstBlockStmts[i];
|
|
398
|
+
if (stmt instanceof Stmt_1.ArkInvokeStmt && stmt.getInvokeExpr().getMethodSignature().getMethodSubSignature().getMethodName() === TSConst_1.SUPER_NAME) {
|
|
399
|
+
index++;
|
|
400
|
+
continue;
|
|
401
|
+
}
|
|
402
|
+
if (stmt instanceof Stmt_1.ArkAssignStmt) {
|
|
403
|
+
const rightOp = stmt.getRightOp();
|
|
404
|
+
if (rightOp instanceof Ref_1.ArkParameterRef || rightOp instanceof Ref_1.ArkThisRef || rightOp instanceof Ref_1.ClosureFieldRef) {
|
|
405
|
+
index++;
|
|
419
406
|
continue;
|
|
420
407
|
}
|
|
421
|
-
const firstBlockStmts = [...blocks][0].getStmts();
|
|
422
|
-
let index = 0;
|
|
423
|
-
if (firstBlockStmts[0].getDef() instanceof Local_1.Local && firstBlockStmts[0].getDef().getName() === TSConst_1.THIS_NAME) {
|
|
424
|
-
index = 1;
|
|
425
|
-
}
|
|
426
|
-
firstBlockStmts.splice(index, 0, initInvokeStmt);
|
|
427
408
|
}
|
|
409
|
+
break;
|
|
428
410
|
}
|
|
411
|
+
const initInvokeStmt = new Stmt_1.ArkInvokeStmt(new Expr_1.ArkInstanceInvokeExpr(thisLocal, constructor.getDeclaringArkClass().getInstanceInitMethod().getSignature(), []));
|
|
412
|
+
firstBlockStmts.splice(index, 0, initInvokeStmt);
|
|
429
413
|
}
|
|
430
414
|
exports.addInitInConstructor = addInitInConstructor;
|
|
431
415
|
function isMethodImplementation(node) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArkIRClassPrinter.d.ts","sourceRoot":"","sources":["../../../src/save/arkir/ArkIRClassPrinter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAIxD;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;IAC9C,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC;gBAEL,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAW;IAK9C,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;
|
|
1
|
+
{"version":3,"file":"ArkIRClassPrinter.d.ts","sourceRoot":"","sources":["../../../src/save/arkir/ArkIRClassPrinter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAIxD;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;IAC9C,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC;gBAEL,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAW;IAK9C,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;IA4DrB,SAAS,CAAC,YAAY,IAAI,IAAI,EAAE;IAQhC,OAAO,CAAC,WAAW;CAOtB"}
|
|
@@ -56,10 +56,26 @@ class ArkIRClassPrinter extends BasePrinter_1.BasePrinter {
|
|
|
56
56
|
this.printer.writeLine(' {');
|
|
57
57
|
this.printer.incIndent();
|
|
58
58
|
let items = [];
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
items.
|
|
59
|
+
let fieldItems = this.printFields();
|
|
60
|
+
fieldItems.sort((a, b) => a.getLine() - b.getLine());
|
|
61
|
+
items.push(...fieldItems);
|
|
62
|
+
let methodItems = this.printMethods();
|
|
63
|
+
methodItems.sort((a, b) => a.getLine() - b.getLine());
|
|
64
|
+
items.push(...methodItems);
|
|
65
|
+
let isFirstMethod = true;
|
|
66
|
+
let hasField = false;
|
|
62
67
|
items.forEach((v) => {
|
|
68
|
+
if (v instanceof ArkIRMethodPrinter_1.ArkIRMethodPrinter) {
|
|
69
|
+
if (!isFirstMethod || hasField) {
|
|
70
|
+
this.printer.writeLine('');
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
isFirstMethod = false;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
else if (v instanceof ArkIRFieldPrinter_1.ArkIRFieldPrinter) {
|
|
77
|
+
hasField = true;
|
|
78
|
+
}
|
|
63
79
|
this.printer.write(v.dump());
|
|
64
80
|
});
|
|
65
81
|
this.printer.decIndent();
|
|
@@ -68,17 +84,9 @@ class ArkIRClassPrinter extends BasePrinter_1.BasePrinter {
|
|
|
68
84
|
}
|
|
69
85
|
printMethods() {
|
|
70
86
|
let items = [];
|
|
71
|
-
for (let method of this.cls.getMethods()) {
|
|
87
|
+
for (let method of this.cls.getMethods(true)) {
|
|
72
88
|
items.push(new ArkIRMethodPrinter_1.ArkIRMethodPrinter(method, this.printer.getIndent()));
|
|
73
89
|
}
|
|
74
|
-
let instanceInitMethod = this.cls.getInstanceInitMethod();
|
|
75
|
-
if (instanceInitMethod.getImplementationSignature()) {
|
|
76
|
-
items.push(new ArkIRMethodPrinter_1.ArkIRMethodPrinter(this.cls.getInstanceInitMethod(), this.printer.getIndent()));
|
|
77
|
-
}
|
|
78
|
-
let staticInitMethod = this.cls.getStaticInitMethod();
|
|
79
|
-
if (staticInitMethod.getImplementationSignature()) {
|
|
80
|
-
items.push(new ArkIRMethodPrinter_1.ArkIRMethodPrinter(this.cls.getStaticInitMethod(), this.printer.getIndent()));
|
|
81
|
-
}
|
|
82
90
|
return items;
|
|
83
91
|
}
|
|
84
92
|
printFields() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArkIRMethodPrinter.d.ts","sourceRoot":"","sources":["../../../src/save/arkir/ArkIRMethodPrinter.ts"],"names":[],"mappings":"
|
|
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;IAehB,OAAO,CAAC,eAAe;CA2B1B"}
|
|
@@ -15,7 +15,6 @@
|
|
|
15
15
|
*/
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
exports.ArkIRMethodPrinter = void 0;
|
|
18
|
-
const Type_1 = require("../../core/base/Type");
|
|
19
18
|
const ArkStream_1 = require("../ArkStream");
|
|
20
19
|
const Stmt_1 = require("../../core/base/Stmt");
|
|
21
20
|
const ArkMetadata_1 = require("../../core/model/ArkMetadata");
|
|
@@ -64,7 +63,7 @@ class ArkIRMethodPrinter extends BasePrinter_1.BasePrinter {
|
|
|
64
63
|
this.printer.writeIndent().write(this.methodProtoToString(method));
|
|
65
64
|
// abstract function no body
|
|
66
65
|
if (!method.getBody()) {
|
|
67
|
-
this.printer.writeLine('
|
|
66
|
+
this.printer.writeLine('');
|
|
68
67
|
return;
|
|
69
68
|
}
|
|
70
69
|
this.printer.writeLine(' {');
|
|
@@ -72,7 +71,6 @@ class ArkIRMethodPrinter extends BasePrinter_1.BasePrinter {
|
|
|
72
71
|
this.printBody(method);
|
|
73
72
|
this.printer.decIndent();
|
|
74
73
|
this.printer.writeIndent().writeLine('}');
|
|
75
|
-
this.printer.writeLine('');
|
|
76
74
|
}
|
|
77
75
|
printBody(method) {
|
|
78
76
|
if (method.getCfg()) {
|
|
@@ -110,21 +108,19 @@ class ArkIRMethodPrinter extends BasePrinter_1.BasePrinter {
|
|
|
110
108
|
});
|
|
111
109
|
code.write(`(${parameters.join(', ')})`);
|
|
112
110
|
const returnType = method.getReturnType();
|
|
113
|
-
|
|
114
|
-
code.write(`: ${returnType.toString()}`);
|
|
115
|
-
}
|
|
111
|
+
code.write(`: ${returnType.toString()}`);
|
|
116
112
|
return code.toString();
|
|
117
113
|
}
|
|
118
114
|
printCfg(cfg) {
|
|
119
115
|
let blocks = cfg.getBlocks();
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
116
|
+
let firstBB = true;
|
|
117
|
+
for (const block of blocks) {
|
|
118
|
+
if (!firstBB) {
|
|
119
|
+
this.printer.writeLine('');
|
|
120
|
+
}
|
|
121
|
+
this.printBasicBlock(block);
|
|
122
|
+
if (firstBB) {
|
|
123
|
+
firstBB = false;
|
|
128
124
|
}
|
|
129
125
|
}
|
|
130
126
|
}
|
|
@@ -153,7 +149,7 @@ class ArkIRMethodPrinter extends BasePrinter_1.BasePrinter {
|
|
|
153
149
|
this.printer.writeIndent().writeLine(stmt.toString());
|
|
154
150
|
});
|
|
155
151
|
}
|
|
156
|
-
this.printer.decIndent()
|
|
152
|
+
this.printer.decIndent();
|
|
157
153
|
}
|
|
158
154
|
}
|
|
159
155
|
exports.ArkIRMethodPrinter = ArkIRMethodPrinter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SourceTransformer.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceTransformer.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAMH,qBAAqB,EAKrB,mBAAmB,EAKtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,OAAO,EAGH,SAAS,EAQT,IAAI,EAKP,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAmE,MAAM,qBAAqB,CAAC;AACnH,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AASnD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAU7D,MAAM,WAAW,kBAAkB;IAC/B,UAAU,IAAI,OAAO,CAAC;IAEtB,wBAAwB,IAAI,YAAY,GAAG,SAAS,CAAC;IAErD,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,CAAC;IAExD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;IAErD,UAAU,IAAI,aAAa,CAAC;IAE5B,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;IAEpC,iBAAiB,IAAI,OAAO,CAAC;CAChC;AAED,qBAAa,iBAAiB;IAC1B,SAAS,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAE1B,OAAO,EAAE,kBAAkB;IAIvC,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,sBAAsB;IAKvB,0BAA0B,CAAC,UAAU,EAAE,qBAAqB,GAAG,MAAM;IAkBrE,wBAAwB,CAAC,UAAU,EAAE,mBAAmB,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"SourceTransformer.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceTransformer.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAMH,qBAAqB,EAKrB,mBAAmB,EAKtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,OAAO,EAGH,SAAS,EAQT,IAAI,EAKP,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAmE,MAAM,qBAAqB,CAAC;AACnH,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AASnD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAU7D,MAAM,WAAW,kBAAkB;IAC/B,UAAU,IAAI,OAAO,CAAC;IAEtB,wBAAwB,IAAI,YAAY,GAAG,SAAS,CAAC;IAErD,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,CAAC;IAExD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;IAErD,UAAU,IAAI,aAAa,CAAC;IAE5B,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;IAEpC,iBAAiB,IAAI,OAAO,CAAC;CAChC;AAED,qBAAa,iBAAiB;IAC1B,SAAS,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAE1B,OAAO,EAAE,kBAAkB;IAIvC,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,sBAAsB;IAKvB,0BAA0B,CAAC,UAAU,EAAE,qBAAqB,GAAG,MAAM;IAkBrE,wBAAwB,CAAC,UAAU,EAAE,mBAAmB,GAAG,MAAM;IA4DxE,OAAO,CAAC,oBAAoB;IAYrB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,GAAE,MAAa,GAAG,MAAM;WASvD,aAAa,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM;IAUpD,OAAO,CAAC,YAAY;IA2Db,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM;IA8BvC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IAiDtD,qBAAqB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM;IAW9C,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IA+DvC,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,2BAA2B;IAQnC,OAAO,CAAC,gBAAgB;CAkB3B"}
|
|
@@ -107,7 +107,9 @@ class SourceTransformer {
|
|
|
107
107
|
if (methodName === EtsConst_1.COMPONENT_CREATE_FUNCTION) {
|
|
108
108
|
// Anonymous @Builder method
|
|
109
109
|
if (args.length > 1) {
|
|
110
|
-
|
|
110
|
+
// remove the substring '() =>' or '(x, y): type =>' at the beginning of args[1]
|
|
111
|
+
const pattern = /^\([^)]*\)\s*:\s*\w*\s*=>\s*/;
|
|
112
|
+
args[1] = args[1].replace(pattern, '');
|
|
111
113
|
}
|
|
112
114
|
return `${args.join(' ')}`;
|
|
113
115
|
}
|
|
@@ -134,7 +136,7 @@ class SourceTransformer {
|
|
|
134
136
|
return '}';
|
|
135
137
|
}
|
|
136
138
|
}
|
|
137
|
-
if (className && className.length > 0) {
|
|
139
|
+
if (className && className.length > 0 && methodName !== TSConst_1.SUPER_NAME) {
|
|
138
140
|
return `${className}.${methodName}${genericCode}(${args.join(', ')})`;
|
|
139
141
|
}
|
|
140
142
|
return `${methodName}${genericCode}(${args.join(', ')})`;
|
package/lib/utils/FileUtils.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export declare class FileUtils {
|
|
|
10
10
|
static generateModuleMap(ohPkgContentMap: Map<string, {
|
|
11
11
|
[k: string]: unknown;
|
|
12
12
|
}>): Map<string, ModulePath>;
|
|
13
|
-
static getFileLanguage(file: string): Language;
|
|
13
|
+
static getFileLanguage(file: string, fileTags?: Map<string, Language>): Language;
|
|
14
14
|
}
|
|
15
15
|
export declare class ModulePath {
|
|
16
16
|
path: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/FileUtils.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD,qBAAa,SAAS;IAClB,gBAAuB,WAAW;;;MAGjC;WAEa,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;WASzC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;WASrC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIrC,iBAAiB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;WA4BxE,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;
|
|
1
|
+
{"version":3,"file":"FileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/FileUtils.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD,qBAAa,SAAS;IAClB,gBAAuB,WAAW;;;MAGjC;WAEa,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;WASzC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;WASrC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIrC,iBAAiB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;WA4BxE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,QAAQ;CAc1F;AAED,qBAAa,UAAU;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;gBAED,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAIzC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,GAAG,CAAC,MAAM,CAAqB,GAAG,MAAM,CA0BrH"}
|
package/lib/utils/FileUtils.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
|
|
@@ -95,7 +95,10 @@ class FileUtils {
|
|
|
95
95
|
});
|
|
96
96
|
return moduleMap;
|
|
97
97
|
}
|
|
98
|
-
static getFileLanguage(file) {
|
|
98
|
+
static getFileLanguage(file, fileTags) {
|
|
99
|
+
if (fileTags && fileTags.has(file)) {
|
|
100
|
+
return fileTags.get(file);
|
|
101
|
+
}
|
|
99
102
|
const extension = path_1.default.extname(file).toLowerCase();
|
|
100
103
|
switch (extension) {
|
|
101
104
|
case '.ts':
|