diff --git a/build-tools/delete_systemapi_plugin.js b/build-tools/delete_systemapi_plugin.js index 163c6b9dad99c83b75c7f08b3917059c5285554a..c051fe289a5161fa2ee81a813af06057977f79cb 100644 --- a/build-tools/delete_systemapi_plugin.js +++ b/build-tools/delete_systemapi_plugin.js @@ -478,7 +478,7 @@ function writeFile(url, data, option) { if (err) { console.log(`ERROR FOR CREATE PATH ${err}`); } else { - if (data === '') { + if (data === '' || data.trim() === `'use static';` || data.trim() === `'use static'`) { fs.rmSync(newFilePath); return; } diff --git a/build-tools/handleApiFiles.js b/build-tools/handleApiFiles.js index 2f90a245d69742e3cdf6370cc1b627b68ee2a010..847f44f6e9e0f6177bd817bd54bdf8e686e5843e 100755 --- a/build-tools/handleApiFiles.js +++ b/build-tools/handleApiFiles.js @@ -304,7 +304,7 @@ function handleNoTagFileInFirstType(sourceFile, outputPath, fileContent) { return; } fileContent = deleteArktsTag(fileContent); - fileContent = joinFileJsdoc(fileContent, sourceFile); + fileContent = joinFileJsdoc(fileContent, sourceFile, outputPath); fileContent = handleSinceInFirstType(fileContent); writeFile(outputPath, fileContent); @@ -427,7 +427,7 @@ function getFileJsdoc(firstNode) { */ function handlehasTagFile(sourceFile, outputPath) { dirType = DirType.typeTwo; - let newContent = getDeletionContent(sourceFile); + let newContent = getDeletionContent(sourceFile, outputPath); if (newContent === '') { return; } @@ -456,7 +456,7 @@ function handleNoTagFileInSecondType(sourceFile, outputPath, fullPath) { } return; } - newContent = getDeletionContent(sourceFile); + newContent = getDeletionContent(sourceFile, outputPath); if (newContent === '') { return; } @@ -492,7 +492,7 @@ function saveApiByArktsDefinition(sourceFile, fileContent, outputPath) { * @param {*} sourceFile * @returns */ -function joinFileJsdoc(deletionContent, sourceFile) { +function joinFileJsdoc(deletionContent, sourceFile, outputPath) { const fileJsdoc = sourceFile.getFullText().replace(sourceFile.getText(), ''); const copyrightMessage = hasCopyright(fileJsdoc.split('*/')[0]) ? fileJsdoc.split('*/')[0] + '*/\r\n' : ''; const regx = /@kit | @file/g; @@ -513,18 +513,18 @@ function joinFileJsdoc(deletionContent, sourceFile) { newContent = deletionContent.replace(copyrightMessage, joinFileJsdoc); } - if (dirType !== DirType.typeOne) { - // TODO:添加use static字符串 + if (dirType !== DirType.typeOne && !isStaticFile(outputPath)) { + newContent = addStaticString(newContent, copyrightMessage); } return newContent; } -function getDeletionContent(sourceFile) { +function getDeletionContent(sourceFile, outputPath) { const deletionContent = deleteApi(sourceFile); if (deletionContent === '') { return ''; } - let newContent = joinFileJsdoc(deletionContent, sourceFile); + let newContent = joinFileJsdoc(deletionContent, sourceFile, outputPath); // 处理since版本 newContent = handleSinceInSecondType(newContent); @@ -562,7 +562,7 @@ function addStaticString(fileContent, copyrightMessage) { const staticMessage = 'use static'; let newContent = fileContent; if (!hasStaticMessage) { - const newfileJsdoc = `${copyrightMessage}'${staticMessage}'\r\n`; + const newfileJsdoc = `'${staticMessage}'\r\n${copyrightMessage}`; newContent = newContent.replace(regex, newfileJsdoc); } return newContent;