Oak-Team
/
oak-assistant
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复并支持了formData: function的定义方式

This commit is contained in:
Pan Qiancheng 2024-10-23 14:57:57 +08:00
parent 14b5163483
commit 625b34d5bf
2 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/utils/components.ts
View File

@ -76,11 +76,14 @@ export const scanComponents = (scanPath: string[]): EntityComponentDef[] => {
prop.name.getText() === 'isList'
);
const formData = properties.find(
(prop) =>
ts.isMethodDeclaration(prop) &&
prop.name.getText() === 'formData'
);
const formData = properties.find((prop) => {
return (
(ts.isPropertyAssignment(prop) ||
ts.isMethodDeclaration(prop)) &&
ts.isIdentifier(prop.name) &&
prop.name.text === 'formData'
);
}) as ts.MethodDeclaration | ts.PropertyAssignment | undefined;
const method = properties.find(
(prop) =>

44
src/utils/ts-utils.ts
View File

@ -9,9 +9,15 @@ import { join } from 'path';
* @returns 返回值的attrs
*/
export const getAttrsFromFormData = (
element: ts.ObjectLiteralElementLike
formItem: ts.MethodDeclaration | ts.PropertyAssignment
): string[] => {
const attrs: string[] = [];
let element: ts.Node = formItem;
// 如果是isPropertyAssignment
if (ts.isPropertyAssignment(element)) {
element = element.initializer;
}
element.getChildren().forEach((child) => {
if (ts.isBlock(child)) {
// 拿到block的returnStatement
@ -312,16 +318,36 @@ export async function addAttrToFormData(
const arg = node.arguments[0];
if (ts.isObjectLiteralExpression(arg)) {
const formData = arg.properties.find(
(prop): prop is ts.MethodDeclaration =>
ts.isMethodDeclaration(prop) &&
ts.isIdentifier(prop.name) &&
prop.name.text === 'formData'
);
(prop): prop is ts.MethodDeclaration => {
return (
(ts.isPropertyAssignment(prop) ||
ts.isMethodDeclaration(prop)) &&
ts.isIdentifier(prop.name) &&
prop.name.text === 'formData'
);
}
) as ts.MethodDeclaration | ts.PropertyAssignment | undefined;
if (formData) {
const returnStatement = formData.body?.statements.find(
ts.isReturnStatement
);
let returnStatement;
if (ts.isMethodDeclaration(formData)) {
returnStatement = formData.body?.statements.find(
ts.isReturnStatement
);
} else if (ts.isPropertyAssignment(formData)) {
const functionDeclaration = formData.initializer;
const block = ts.forEachChild(
functionDeclaration,
(child) => {
if (ts.isBlock(child)) {
return child;
}
}
);
returnStatement = block?.statements.find(
ts.isReturnStatement
);
}
if (
returnStatement &&
ts.isObjectLiteralExpression(