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

!122 修复代码告警处理

Browse Source 
Merge pull request !122 from 程顺/master
This commit is contained in:
openharmony_ci
2023-08-30 06:13:49 +00:00
committed by Gitee
parent 4239d0cb30 3c3ca29d62
commit 6799eb86fe
6 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
automock/build_jsmock_system_plugin.js
+1 -5
View File
@@ -81,13 +81,9 @@ const configJSAPIMockOutput = {
rollup.rollup(configJSAPIMockInput).then(bundle => {
bundle.write(configJSAPIMockOutput).then(() => {
console.log(configJSAPIMockOutput.file)
countSize(configJSAPIMockOutput.file);
const fileContent = fs.readFileSync(configJSAPIMockOutput.file, 'utf-8');
fs.writeFileSync(configJSAPIMockOutput.file,
fileContent
.replace(/\$\d*/g, '')
, 'utf-8')
fs.writeFileSync(configJSAPIMockOutput.file, fileContent.replace(/\$\d*/g, ''), 'utf-8');
});
});
automock/mock-generate/src/common/commonUtils.ts
+5 -5
View File
@@ -20,7 +20,7 @@ import {
MethodSignature, ModifiersArray, ModuleDeclaration, NodeArray, ParameterDeclaration, PropertyName, SourceFile
} from 'typescript';
import fs from 'fs';
import { ImportElementEntity } from '../declaration-node/importAndExportDeclaration';
import type { ImportElementEntity } from '../declaration-node/importAndExportDeclaration';
const paramIndex = 2;
@@ -332,10 +332,10 @@ export function getJsSdkDir(): string {
* @returns
*/
export function hasBeenImported(importDeclarations: ImportElementEntity[], typeName: string): boolean {
if (!typeName.trim()){
return;
if (!typeName.trim()) {
return true;
}
if (isFirstCharLowerCase(typeName)){
if (isFirstCharLowerCase(typeName)) {
return true;
}
return importDeclarations.some(importDeclaration => importDeclaration.importElements.includes(typeName));
@@ -358,4 +358,4 @@ export const specialFiles = [
'@internal/component/ets/enums.d.ts',
'@internal/component/ets/alert_dialog.d.ts',
'@internal/component/ets/ability_component.d.ts'
]
];
automock/mock-generate/src/generate/generateClassDeclaration.ts
+4 -4
View File
@@ -40,10 +40,10 @@ export function generateClassDeclaration(rootName: string, classEntity: ClassEnt
const className = firstCharacterToUppercase(classEntity.className);
let classBody = '';
if ((classEntity.exportModifiers.includes(SyntaxKind.ExportKeyword)
|| classEntity.exportModifiers.includes(SyntaxKind.DeclareKeyword))
&& !isInnerMockFunction) {
classBody += `export const ${className} = class ${className} `;
if ((classEntity.exportModifiers.includes(SyntaxKind.ExportKeyword) ||
classEntity.exportModifiers.includes(SyntaxKind.DeclareKeyword)) &&
!isInnerMockFunction) {
classBody += `export const ${className} = class ${className} `;
} else {
classBody += `const ${className} = class ${className} `;
}
automock/mock-generate/src/generate/generateInterfaceDeclaration.ts
+31 -18
View File
@@ -14,14 +14,15 @@
*/
import fs from 'fs';
import path from 'path';
import { SourceFile } from 'typescript';
import { InterfaceEntity } from '../declaration-node/interfaceDeclaration';
import { generateCommonMethodSignature } from './generateCommonMethodSignature';
import { generateIndexSignature } from './generateIndexSignature';
import { generatePropertySignatureDeclaration } from './generatePropertySignatureDeclaration';
import { dtsFileList, getApiInputPath, hasBeenImported, specialFiles } from '../common/commonUtils'
import { ImportElementEntity } from '../declaration-node/importAndExportDeclaration';
import path from 'path';
import { dtsFileList, getApiInputPath, hasBeenImported, specialFiles } from '../common/commonUtils';
import type { ImportElementEntity } from '../declaration-node/importAndExportDeclaration';
import type { PropertySignatureEntity } from '../declaration-node/propertySignatureDeclaration';
/**
* generate interface
@@ -107,25 +108,37 @@ function generateHeritageInterface(interfaceEntity: InterfaceEntity, sourceFile:
return interfaceBody;
}
function addExtraImport(extraImport: string[], importDeclarations: ImportElementEntity[], sourceFile: SourceFile, value) {
if (extraImport && importDeclarations){
/**
*
* @param extraImport
* @param importDeclarations
* @param sourceFile
* @param value
* @returns
*/
function addExtraImport(
extraImport: string[],
importDeclarations: ImportElementEntity[],
sourceFile: SourceFile,
value: PropertySignatureEntity): void {
if (extraImport && importDeclarations) {
const propertyTypeName = value.propertyTypeName.split('.')[0].split('|')[0].split('&')[0].replace(/"'/g, '').trim();
if (propertyTypeName.includes('/')){
if (propertyTypeName.includes('/')) {
return;
}
if (hasBeenImported(importDeclarations, propertyTypeName)) {
return;
}
const specialFilesList = [...specialFiles.map(specialFile=>path.join(getApiInputPath(), ...specialFile.split('/')))];
if (!specialFilesList.includes(sourceFile.fileName)){
if (!specialFilesList.includes(sourceFile.fileName)) {
specialFilesList.unshift(sourceFile.fileName);
}
for (let i=0; i < specialFilesList.length; i++) {
for (let i = 0; i < specialFilesList.length; i++) {
const specialFilePath = specialFilesList[i];
const specialFileContent = fs.readFileSync(specialFilePath, 'utf-8');
const regex = new RegExp(`\\s${propertyTypeName}\\s({|=|extends)`);
const results = specialFileContent.match(regex)
if (!results){
const results = specialFileContent.match(regex);
if (!results) {
continue;
}
if (sourceFile.fileName === specialFilePath) {
@@ -135,24 +148,24 @@ function addExtraImport(extraImport: string[], importDeclarations: ImportElement
if (!specialFileRelatePath.startsWith('./') && !specialFileRelatePath.startsWith('../')) {
specialFileRelatePath = './' + specialFileRelatePath;
}
if (!dtsFileList.includes(specialFilePath)){
dtsFileList.push(specialFilePath)
if (!dtsFileList.includes(specialFilePath)) {
dtsFileList.push(specialFilePath);
}
specialFileRelatePath = specialFileRelatePath.split(path.sep).join('/');
const importStr = `import {${propertyTypeName}} from '${
specialFileRelatePath}${
specialFileRelatePath.endsWith('/') ? '': '/'}${
path.basename(specialFilePath).replace('.d.ts', '').replace('.d.ets', '')}'\n`;
if (extraImport.includes(importStr)){
specialFileRelatePath.endsWith('/') ? '' : '/'}${
path.basename(specialFilePath).replace('.d.ts', '').replace('.d.ets', '')}'\n`;
if (extraImport.includes(importStr)) {
return;
}
extraImport.push(importStr);
return;
}
if (propertyTypeName.includes('<')
|| propertyTypeName.includes('[')){
if (propertyTypeName.includes('<') || propertyTypeName.includes('[')) {
return;
}
}
console.log(sourceFile.fileName, 'propertyTypeName', propertyTypeName);
return;
}
}
automock/mock-generate/src/generate/generateMockJsFile.ts
+2 -2
View File
@@ -69,7 +69,7 @@ export function generateSourceFileElements(rootName: string, sourceFileEntity: S
if (sourceFileEntity.interfaceDeclarations.length > 0) {
sourceFileEntity.interfaceDeclarations.forEach(value => {
mockApi += generateInterfaceDeclaration('', value, sourceFile, true, sourceFileEntity.interfaceDeclarations,
sourceFileEntity.importDeclarations, extraImport) + '\n';
sourceFileEntity.importDeclarations, extraImport) + '\n';
mockFunctionElements.push({ elementName: value.interfaceName, type: 'interface' });
});
}
@@ -148,7 +148,7 @@ export function generateSourceFileElements(rootName: string, sourceFileEntity: S
}
});
}
mockApi = extraImport.join('') + mockApi
mockApi = extraImport.join('') + mockApi;
return mockApi;
}
automock/mock-generate/src/main.ts
+1 -1
View File
@@ -31,7 +31,7 @@ import { generateSystemIndex } from './generate/generateSystemIndex';
*/
function getAllDtsFile(dir: string): Array<string> {
const arr = fs.readdirSync(dir);
if (!dir.toString().includes('node_modules') && !dir.toString().includes(path.join('@internal','component'))) {
if (!dir.toString().includes('node_modules') && !dir.toString().includes(path.join('@internal', 'component'))) {
arr.forEach(value => {
const fullPath = path.join(dir, value);
const stats = fs.statSync(fullPath);