openharmony/developtools_ace-ets2bundle
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_ace-ets2bundle.git synced 2026-07-19 16:43:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

lihong67@huawei.com

Browse Source 
update component declare file.

Signed-off-by: lihong <lihong67@huawei.com>
Change-Id: I6765bcb1ccd1934d4481ce515453d1bf600079d4
This commit is contained in:
lihong
2022-01-13 15:58:08 +08:00
parent 15216e4f78
commit d3ffe73ac8
3 changed files with 74 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BUILD.gn
+9 -1
View File
@@ -141,7 +141,6 @@ ets_loader_sources = [
"compiler/package.json",
"compiler/tsconfig.json",
"compiler/webpack.config.js",
ets_loader_component_config_file,
]
ohos_copy("ets_loader") {
@@ -155,6 +154,15 @@ ohos_copy("ets_loader") {
module_install_name = ""
}
ohos_copy("ets_loader_component_config") {
deps = [ ":build_ets_loader_library" ]
sources = [ ets_loader_component_config_file ]
outputs = [ target_out_dir + "/$target_name/{{source_file_part}}" ]
module_source_dir = target_out_dir + "/$target_name"
module_install_name = ""
}
ohos_copy("ets_loader_library") {
deps = [ ":build_ets_loader_library" ]
sources = [ ets_loader_lib_dir ]
compiler/build_declarations_file.js
+64 -18
View File
@@ -43,10 +43,14 @@ function generateTargetFile(filePath, output) {
* limitations under the License.
*/`;
files.forEach((item) => {
const content = fs.readFileSync(item, 'utf8');
let content = fs.readFileSync(item, 'utf8');
const fileName = path.resolve(output, path.basename(item));
const newContent = license + '\n\n' + processsFile(content, fileName);
fs.writeFile(fileName, newContent, err => {
if (item === globalTsFile) {
content = license + '\n\n' + processsFile(content, fileName, true);
} else {
content = license + '\n\n' + processsFile(content, fileName, false);
}
fs.writeFile(fileName, content, err => {
if (err) {
console.error(err);
return;
@@ -76,28 +80,59 @@ function mkDir(filePath) {
fs.mkdirSync(filePath);
}
function processsFile(content, fileName) {
function processsFile(content, fileName, isGlobal) {
let sourceFile = ts.createSourceFile(fileName, content, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
const newStatements = [];
if (sourceFile.statements && sourceFile.statements.length) {
sourceFile.statements.forEach((node) => {
if (!ts.isImportDeclaration(node)) {
if (node.modifiers && node.modifiers.length && node.modifiers[0].kind === ts.SyntaxKind.ExportKeyword) {
node.modifiers.splice(0, 1);
if (isGlobal) {
sourceFile.statements.forEach((node) => {
if (!ts.isImportDeclaration(node)) {
if (node.modifiers && node.modifiers.length && node.modifiers[0].kind === ts.SyntaxKind.ExportKeyword) {
node.modifiers.splice(0, 1);
}
if (isVariable(node)) {
const name = node.declarationList.declarations[0].name.getText();
const type = node.declarationList.declarations[0].type.getText();
if (name.indexOf(type) !== -1) {
const declarationNode = ts.factory.updateVariableDeclaration(node.declarationList.declarations[0],
ts.factory.createIdentifier(type), node.declarationList.declarations[0].exclamationToken,
node.declarationList.declarations[0].type, node.declarationList.declarations[0].initializer);
node.declarationList = ts.factory.updateVariableDeclarationList(node.declarationList, [declarationNode]);
}
}
newStatements.push(node);
}
if (isVariable(node)) {
const name = node.declarationList.declarations[0].name.getText();
const type = node.declarationList.declarations[0].type.getText();
if (name.indexOf(type) !== -1) {
const declarationNode = ts.factory.updateVariableDeclaration(node.declarationList.declarations[0],
ts.factory.createIdentifier(type), node.declarationList.declarations[0].exclamationToken,
node.declarationList.declarations[0].type, node.declarationList.declarations[0].initializer);
node.declarationList = ts.factory.updateVariableDeclarationList(node.declarationList, [declarationNode]);
});
} else {
sourceFile.statements.forEach((node) => {
let extendNode = null;
if (isInterface(node)) {
const componentName = node.name.getText().replace(/Interface$/, '');
let isComponentName = false;
if (node.members) {
for (let i = 0; i < node.members.length; i++) {
const callSignNode = node.members[i];
if (isSignNode(callSignNode)) {
const callSignName = callSignNode.type.name.getText().repleace(/Attribute$/, '');
if (componentName === callSignName) {
extendNode = callSignNode.type.typeName;
isComponentName = true;
break;
}
}
}
}
if (isComponentName) {
const heritageClause = ts.factory.createHeritageClause(ts.SyntaxKind.ExtendsKeyword,
[ts.factory.createExpressionWithTypeArguments(extendNode, undefined)]);
extendNode = null;
node = ts.factory.updateInterfaceDeclaration(node, node.decorators, node.modifiers,
node.name, node.typeParameters, [heritageClause], node.members);
}
}
newStatements.push(node);
}
});
});
}
}
sourceFile = ts.factory.updateSourceFile(sourceFile, newStatements);
const printer = ts.createPrinter({ removeComments: true, newLine: ts.NewLineKind.LineFeed });
@@ -114,6 +149,17 @@ function isVariable(node) {
return false;
}
function isInterface(node) {
return ts.isInterfaceDeclaration(node) && node.name && ts.isIdentifier(node.name) &&
/Interface$/.test(node.name.getText());
}
function isSignNode(node) {
return (ts.isCallSignatureDeclaration(node) || ts.isConstructSignatureDeclaration(node)) &&
node.type && ts.isTypeReferenceNode(node.type) && node.type.name && ts.isIdentifier(node.type.name) &&
/Attribute$/.test(node.type.name.getText());
}
generateComponentConfig(process.argv[4]);
function generateComponentConfig(dir) {
const configFile = path.resolve(dir, 'component_map.js');
compiler/src/compile_info.ts
+1 -1
View File
@@ -256,7 +256,7 @@ export class ResultStates {
const componentNameReg: RegExp = /'typeof\s*(\$?[_a-zA-Z0-9]+)' is not callable/;
const stateInfoReg: RegExp = /Property\s*'(\$[_a-zA-Z0-9]+)' does not exist on type/;
const extendInfoReg: RegExp =
/Property\s*'([_a-zA-Z0-9]+)' does not exist on type\s*'([_a-zA-Z0-9]+)'\./;
/Property\s*'([_a-zA-Z0-9]+)' does not exist on type\s*'([_a-zA-Z0-9]+)(Attribute|Interface)'\./;
if (this.matchMessage(message, props, propInfoReg) ||
this.matchMessage(message, [...componentCollection.customComponents], componentNameReg) ||
this.matchMessage(message, props, stateInfoReg) ||