mac/behavior3editor
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check build tree

Browse Source
This commit is contained in:
codetypes committed 2024-07-23 11:40:50 +08:00
1 parent 472bbbfbb8
commit 6d6fdf8c07
3 files changed
+145 -96
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/components/inspector.tsx
+36 -23
View File
@@ -107,7 +107,7 @@ const NodeInspector: FC = () => {
form.setFieldValue("children", def.children);
}
def.args?.forEach((v) => {
if (v.type === "object" || v.type === "object?") {
if (v.type === "json" || v.type === "json?") {
form.setFieldValue(
`args.${v.name}`,
JSON.stringify(data.args?.[v.name] ?? v.default, null, 2)
@@ -187,29 +187,42 @@ const NodeInspector: FC = () => {
data.desc = values.desc && values.desc !== def.desc ? values.desc : undefined;
data.path = values.path || undefined;
def.args?.forEach((arg) => {
const v = values[`args.${arg.name}`];
if (v !== null && v !== undefined && v !== "") {
data.args ||= {};
if (arg.type === "object" || arg.type === "object?") {
data.args[arg.name] = JSON.parse(v);
} else {
data.args[arg.name] = v;
if (def.args?.length) {
def.args?.forEach((arg) => {
const v = values[`args.${arg.name}`];
if (v !== null && v !== undefined && v !== "") {
data.args ||= {};
if (arg.type === "json" || arg.type === "json?") {
data.args[arg.name] = JSON.parse(v);
} else {
data.args[arg.name] = v;
}
}
}
});
});
} else {
data.args = {};
}
def.input?.forEach((_, i) => {
const v = values[`input.${i}`];
data.input ||= [];
data.input.push(v ?? "");
});
if (def.input?.length) {
def.input?.forEach((_, i) => {
const v = values[`input.${i}`];
data.input ||= [];
data.input.push(v ?? "");
});
} else {
data.input = [];
}
if (def.output?.length) {
def.output?.forEach((_, i) => {
const v = values[`output.${i}`];
data.output ||= [];
data.output.push(v ?? "");
});
} else {
data.output = [];
}
def.output?.forEach((_, i) => {
const v = values[`output.${i}`];
data.output ||= [];
data.output.push(v ?? "");
});
workspace.editing?.dispatch("updateNode", {
data: data,
} as EditNode);
@@ -390,7 +403,7 @@ const NodeInspector: FC = () => {
{ required, message: t("node.fileRequired", { field: v.desc }) },
({ getFieldValue, setFieldValue, isFieldValidating, validateFields }) => ({
validator(_, value) {
if (value && (v.type == "object" || v.type == "object?")) {
if (value && (v.type == "json" || v.type == "json?")) {
try {
JSON.parse(value);
} catch (e) {
@@ -439,7 +452,7 @@ const NodeInspector: FC = () => {
{type === "string" && (
<TextArea autoSize disabled={disabled} onBlur={form.submit} />
)}
{type === "object" && (
{type === "json" && (
<TextArea autoSize disabled={disabled} onBlur={form.submit} />
)}
{type === "int" && (
src/misc/b3type.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import { TreeGraphData as G6TreeGraphData } from "@antv/g6";
export type NodeArgType = "boolean" | "string" | "int" | "float" | "object" | "enum" | "code";
export type NodeArgType = "boolean" | "string" | "int" | "float" | "json" | "enum" | "code";
export type NodeType = "Action" | "Composite" | "Decorator" | "Condition" | "Other" | "Error";
export interface NodeArgOption {
src/misc/b3util.ts
+108 -72
View File
@@ -67,6 +67,10 @@ export const isNodeEqual = (node1: NodeModel, node2: NodeModel) => {
return false;
};
const error = (data: NodeModel, msg: string) => {
console.error(`check ${data.id}|${data.name}: ${msg}`);
};
export const checkNodeData = (data: NodeModel | null | undefined) => {
if (!data) {
return false;
@@ -77,9 +81,7 @@ export const checkNodeData = (data: NodeModel | null | undefined) => {
const count = data.children?.length || 0;
if (conf.children !== count) {
hasError = true;
console.error(
`check ${data.id}|${data.name}: expect ${conf.children} children, but got ${count}`
);
error(data, `expect ${conf.children} children, but got ${count}`);
}
}
if (conf.input) {
@@ -91,11 +93,14 @@ export const checkNodeData = (data: NodeModel | null | undefined) => {
data.input[i] = "";
}
if (conf.input[i].indexOf("?") === -1 && !data.input[i]) {
console.error(`check ${data.id}|${data.name}: intput field '${conf.input[i]}' is required`);
error(data, `intput field '${conf.input[i]}' is required`);
hasError = true;
}
}
}
if (data.input) {
data.input.length = conf.input?.length || 0;
}
if (conf.output) {
for (let i = 0; i < conf.output.length; i++) {
if (!data.output) {
@@ -105,69 +110,74 @@ export const checkNodeData = (data: NodeModel | null | undefined) => {
data.output[i] = "";
}
if (conf.output[i].indexOf("?") === -1 && !data.output[i]) {
console.error(
`check ${data.id}|${data.name}: output field '${conf.output[i]}' is required`
);
error(data, `output field '${conf.output[i]}' is required`);
hasError = true;
}
}
}
if (data.output) {
data.output.length = conf.output?.length || 0;
}
if (conf.args) {
for (let i = 0; i < conf.args.length; i++) {
const arg = conf.args[i];
const arg = conf.args[i] as NodeArg;
const type = arg.type.replace("?", "") as NodeArgType;
const value = data.args?.[arg.name];
if (type === "float") {
if (!(typeof value === "number" || (value === undefined && arg.type === "float?"))) {
console.error(`check ${data.id}|${data.name}: '${arg.name}=${value}' is not a number`);
const isNumber = typeof value === "number";
const isOptional = value === undefined && arg.type === "float?";
if (!(isNumber || isOptional)) {
error(data, `'${arg.name}=${value}' is not a number`);
hasError = true;
}
} else if (type === "int") {
if (
!(
(typeof value === "number" && value === Math.floor(value)) ||
(value === undefined && arg.type === "int?")
)
) {
console.error(`check ${data.id}|${data.name}: '${arg.name}=${value}' is not a int`);
const isInt = typeof value === "number" && value === Math.floor(value);
const isOptional = value === undefined && arg.type === "int?";
if (!(isInt || isOptional)) {
error(data, `'${arg.name}=${value}' is not a int`);
hasError = true;
}
} else if (type === "string") {
if (
!(
(typeof value === "string" && value) ||
((value === undefined || value === "") && arg.type === "string?")
)
) {
console.error(`check ${data.id}|${data.name}: '${arg.name}=${value}' is not a string`);
const isString = typeof value === "string" && value;
const isOptional = (value === undefined || value === "") && arg.type === "string?";
if (!(isString || isOptional)) {
error(data, `'${arg.name}=${value}' is not a string`);
hasError = true;
}
} else if (type === "enum") {
const found = !!arg.options?.find((option) => option.value === value);
if (!(found || (value === undefined && arg.type === "enum?"))) {
console.error(
`check ${data.id}|${data.name}: '${arg.name}=${value}' is not a one of the option values`
);
const isEnum = !!arg.options?.find((option) => option.value === value);
const isOptional = value === undefined && arg.type === "enum?";
if (!(isEnum || isOptional)) {
error(data, `'${arg.name}=${value}' is not a one of the option values`);
hasError = true;
}
} else if (type == "code") {
if (
!(
(typeof value === "string" && value) ||
((value === undefined || value === "") && arg.type === "code?")
)
) {
console.error(`check ${data.id}|${data.name}: '${arg.name}=${value}' is not a string`);
const isCode = typeof value === "string" && value;
const isOptional = (value === undefined || value === "") && arg.type === "code?";
if (!(isCode || isOptional)) {
error(data, `'${arg.name}=${value}' is not a string`);
hasError = true;
}
} else if (type == "object") {
if (!((value !== undefined && value !== null && value !== "") || arg.type === "object?")) {
console.error(
`check ${data.id}|${data.name}: '${arg.name}=${value}' is not an invalid object`
);
} else if (type == "json") {
const isJson = value !== undefined && value !== null && value !== "";
const isOptional = arg.type === "json?";
if (!(isJson || isOptional)) {
error(data, `'${arg.name}=${value}' is not an invalid object`);
hasError = true;
}
}
if (arg.oneof !== undefined) {
const idx = conf.input?.findIndex((v) => v.startsWith(arg.oneof!)) ?? -1;
const inputValue = data.input?.[idx] ?? "";
const argValue = data.args?.[arg.name] ?? "";
if ((inputValue !== "" && argValue !== "") || (inputValue === "" && argValue === "")) {
error(
data,
`only one is allowed for between argument '${arg.name}' and input '${data.input?.[idx]}'`
);
return false;
}
}
}
}
@@ -390,35 +400,50 @@ export const checkTreeData = (data: TreeGraphData) => {
if (conf.args) {
for (let i = 0; i < conf.args.length; i++) {
const arg = conf.args[i] as NodeArg;
if (arg.type.indexOf("?") === -1) {
const type = arg.type as NodeArgType;
const value = data.args?.[arg.name];
if (type === "float") {
if (typeof value !== "number") {
return false;
}
} else if (type === "int") {
if (typeof value !== "number" || value !== Math.floor(value)) {
return false;
}
} else if (type === "string") {
if (!value || typeof value !== "string") {
return false;
}
} else if (type === "enum") {
if (!arg.options?.find((option) => option.value === value)) {
return false;
}
} else if (type === "code") {
if (!value || typeof value !== "string") {
return false;
}
const type = arg.type.replace("?", "") as NodeArgType;
const value = data.args?.[arg.name];
if (type === "float") {
const isNumber = typeof value === "number";
const isOptional = value === undefined && arg.type === "float?";
if (!(isNumber || isOptional)) {
return false;
}
} else if (arg.oneof !== undefined) {
} else if (type === "int") {
const isInt = typeof value === "number" && value === Math.floor(value);
const isOptional = value === undefined && arg.type === "int?";
if (!(isInt || isOptional)) {
return false;
}
} else if (type === "string") {
const isString = typeof value === "string" && value;
const isOptional = (value === undefined || value === "") && arg.type === "string?";
if (!(isString || isOptional)) {
return false;
}
} else if (type === "enum") {
const isEnum = !!arg.options?.find((option) => option.value === value);
const isOptional = value === undefined && arg.type === "enum?";
if (!(isEnum || isOptional)) {
return false;
}
} else if (type === "code") {
const isCode = typeof value === "string" && value;
const isOptional = (value === undefined || value === "") && arg.type === "code?";
if (!(isCode || isOptional)) {
return false;
}
} else if (type == "json") {
const isJson = value !== undefined && value !== null && value !== "";
const isOptional = arg.type === "json?";
if (!(isJson || isOptional)) {
return false;
}
}
if (arg.oneof !== undefined) {
const idx = conf.input?.findIndex((v) => v.startsWith(arg.oneof!)) ?? -1;
const input = data.input?.[idx] ?? "";
const value = data.args?.[arg.name] ?? "";
if ((input !== "" && value !== "") || (input === "" && value === "")) {
const inputValue = data.input?.[idx] ?? "";
const argValue = data.args?.[arg.name] ?? "";
if ((inputValue !== "" && argValue !== "") || (inputValue === "" && argValue === "")) {
return false;
}
}
@@ -473,9 +498,9 @@ export const createTreeData = (node: NodeModel, parent?: string) => {
treeData.parent = parent;
treeData.id = node.id.toFixed();
treeData.size = calcTreeDataSize(treeData);
} catch (error) {
} catch (e) {
message.error(`解析子树失败：${node.path}`);
console.log("parse subtree:", error);
console.log("parse subtree:", e);
}
parsingStack.pop();
}
@@ -491,8 +516,8 @@ export const createBuildData = (path: string) => {
refreshTreeDataId(data);
treeModel.root = createFileData(data, true);
return treeModel as TreeModel;
} catch (error) {
console.log("build error:", path, error);
} catch (e) {
console.log("build error:", path, e);
}
return null;
};
@@ -509,6 +534,17 @@ export const createFileData = (data: TreeGraphData, includeSubtree?: boolean) =>
disabled: data.disabled || undefined,
path: data.path || undefined,
};
const conf = useWorkspace.getState().getNodeDef(data.name);
if (!conf.input?.length) {
nodeData.input = undefined;
}
if (!conf.output?.length) {
nodeData.output = undefined;
}
if (!conf.args?.length) {
nodeData.args = undefined;
}
if (data.children?.length && (includeSubtree || !isSubtreeRoot(data))) {
nodeData.children = [];
data.children.forEach((child) => {