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

use behavitor3-ts types

Browse Source
This commit is contained in:
codetypes committed 2025-03-01 09:51:58 +08:00
1 parent cd84575197
commit 05b5afdfbc
6 files changed
+36 -102
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/components/explorer.tsx
+2 -1
View File
@@ -10,8 +10,9 @@ import { FaExclamationTriangle, FaSwatchbook } from "react-icons/fa";
import { FiCommand, FiDelete } from "react-icons/fi"; import { FiCommand, FiDelete } from "react-icons/fi";
import { IoMdReturnLeft } from "react-icons/io"; import { IoMdReturnLeft } from "react-icons/io";
import { PiTreeStructureFill } from "react-icons/pi"; import { PiTreeStructureFill } from "react-icons/pi";
import { NodeDef } from "../behavior3/src/behavior3";
import { FileTreeType, useWorkspace } from "../contexts/workspace-context"; import { FileTreeType, useWorkspace } from "../contexts/workspace-context";
import { NodeDef, getNodeType } from "../misc/b3type"; import { getNodeType } from "../misc/b3type";
import * as b3util from "../misc/b3util"; import * as b3util from "../misc/b3util";
import { modal } from "../misc/hooks"; import { modal } from "../misc/hooks";
import i18n from "../misc/i18n"; import i18n from "../misc/i18n";
src/components/register-node.ts
+27 -26
View File
@@ -140,18 +140,19 @@ G6.registerNode(
}, },
}, },
draw(cfg, group) { draw(cfg, group) {
const nodeDef = nodeDefs.get(cfg.name as string); const data = cfg as TreeGraphData;
const nodeDef = nodeDefs.get(data.name);
let classify = getNodeType(nodeDef); let classify = getNodeType(nodeDef);
let color = nodeDef.color || NODE_COLORS[classify] || NODE_COLORS["Other"]; let color = nodeDef.color || NODE_COLORS[classify] || NODE_COLORS["Other"];
if ( if (
!nodeDefs.has(cfg.name as string) || !nodeDefs.has(data.name) ||
(cfg.path && (!cfg.children || (cfg.children as []).length === 0)) || (data.path && !data.children?.length) ||
!checkTreeData(cfg as TreeGraphData) !checkTreeData(data)
) { ) {
classify = "Error"; classify = "Error";
color = NODE_COLORS[classify]; color = NODE_COLORS[classify];
} }
const size = cfg.size ? (cfg.size as number[]) : [150, 40]; const size = data.size ? data.size : [150, 40];
const w = size[0]; const w = size[0];
const h = size[1]; const h = size[1];
const r = 4; const r = 4;
@@ -159,7 +160,7 @@ G6.registerNode(
let bgColor = "white"; let bgColor = "white";
let textColor = "black"; let textColor = "black";
if (cfg.highlightGray) { if (data.highlightGray) {
bgColor = "#0d1117"; bgColor = "#0d1117";
color = "#30363d"; color = "#30363d";
textColor = "#666"; textColor = "#666";
@@ -207,7 +208,7 @@ G6.registerNode(
); );
// is subtree // is subtree
if (cfg.path && cfg.id !== "1") { if (data.path && data.id !== "1") {
addShape("rect", { addShape("rect", {
attrs: { attrs: {
x: -10, x: -10,
@@ -246,7 +247,7 @@ G6.registerNode(
y: h / 2 - 8, y: h / 2 - 8,
fontSize: 20, fontSize: 20,
lineHeight: 20, lineHeight: 20,
text: cfg.id, text: data.id,
textAlign: "right", textAlign: "right",
fill: "white", fill: "white",
stroke: textColor, stroke: textColor,
@@ -269,7 +270,7 @@ G6.registerNode(
}); });
// status // status
const status = (((cfg.status ?? 0) as number) & 0b111).toString(2).padStart(3, "0"); const status = ((data.status ?? 0) & 0b111).toString(2).padStart(3, "0");
addShape("image", { addShape("image", {
attrs: { attrs: {
x: 204, x: 204,
@@ -288,7 +289,7 @@ G6.registerNode(
x: 26, x: 26,
y: 5, y: 5,
fontWeight: 800, fontWeight: 800,
text: cfg.name, text: data.name,
fill: textColor, fill: textColor,
fontSize: 13, fontSize: 13,
}, },
@@ -296,7 +297,7 @@ G6.registerNode(
}); });
// debug // debug
if (cfg.debug) { if (data.debug) {
addShape("image", { addShape("image", {
attrs: { attrs: {
x: 192, x: 192,
@@ -309,10 +310,10 @@ G6.registerNode(
}); });
} }
if (cfg.disabled) { if (data.disabled) {
addShape("image", { addShape("image", {
attrs: { attrs: {
x: 200 - (cfg.debug ? 25 : 8), x: 200 - (data.debug ? 25 : 8),
y: 4, y: 4,
height: 16, height: 16,
width: 16, width: 16,
@@ -325,7 +326,7 @@ G6.registerNode(
const x = 6; const x = 6;
let y = 32; let y = 32;
// desc text // desc text
let desc = (cfg.desc || nodeDef.desc) as string; let desc = (data.desc || nodeDef.desc) as string;
if (desc) { if (desc) {
desc = i18n.t("regnode.mark") + desc; desc = i18n.t("regnode.mark") + desc;
desc = cutWordTo(desc, w - 15); desc = cutWordTo(desc, w - 15);
@@ -343,7 +344,7 @@ G6.registerNode(
}); });
} }
const args: any = cfg.args; const args: any = data.args;
if (nodeDef.args && args && Object.keys(args).length > 0) { if (nodeDef.args && args && Object.keys(args).length > 0) {
const { str, line } = toBreakWord(`${i18n.t("regnode.args")}${JSON.stringify(args)}`, 200); const { str, line } = toBreakWord(`${i18n.t("regnode.args")}${JSON.stringify(args)}`, 200);
addShape("text", { addShape("text", {
@@ -361,13 +362,13 @@ G6.registerNode(
y += 20 * line; y += 20 * line;
} }
const input: [] = cfg.input ? (cfg.input as []) : []; const input = data.input ?? [];
if (nodeDef.input && input.length > 0) { if (nodeDef.input && input.length > 0) {
const { str, line } = toBreakWord( const { str, line } = toBreakWord(
`${i18n.t("regnode.input")}${JSON.stringify(input)}`, `${i18n.t("regnode.input")}${JSON.stringify(input)}`,
200 200
); );
if (cfg.highlightInput) { if (data.highlightInput) {
addShape("rect", { addShape("rect", {
attrs: { attrs: {
x: x - 2, x: x - 2,
@@ -389,8 +390,8 @@ G6.registerNode(
y: y + 20, y: y + 20,
lineHeight: 20, lineHeight: 20,
text: str, text: str,
fill: cfg.highlightInput ? "white" : textColor, fill: data.highlightInput ? "white" : textColor,
fontWeight: cfg.highlightInput ? "bolder" : undefined, fontWeight: data.highlightInput ? "bolder" : undefined,
}, },
name: "input-text", name: "input-text",
}, },
@@ -399,13 +400,13 @@ G6.registerNode(
y += 20 * line; y += 20 * line;
} }
const output: [] = cfg.output ? (cfg.output as []) : []; const output = data.output ?? [];
if (nodeDef.output && output.length > 0) { if (nodeDef.output && output.length > 0) {
const { str, line } = toBreakWord( const { str, line } = toBreakWord(
`${i18n.t("regnode.output")}${JSON.stringify(output)}`, `${i18n.t("regnode.output")}${JSON.stringify(output)}`,
200 200
); );
if (cfg.highlightOutput) { if (data.highlightOutput) {
addShape("rect", { addShape("rect", {
attrs: { attrs: {
x: x - 2, x: x - 2,
@@ -427,8 +428,8 @@ G6.registerNode(
y: y + 20, y: y + 20,
lineHeight: 20, lineHeight: 20,
text: str, text: str,
fill: cfg.highlightOutput ? "white" : textColor, fill: data.highlightOutput ? "white" : textColor,
fontWeight: cfg.highlightOutput ? "bolder" : undefined, fontWeight: data.highlightOutput ? "bolder" : undefined,
}, },
name: "output-text", name: "output-text",
}, },
@@ -437,8 +438,8 @@ G6.registerNode(
y += 20 * line; y += 20 * line;
} }
if (cfg.path) { if (data.path) {
let path = (i18n.t("regnode.subtree") + cfg.path) as string; let path = (i18n.t("regnode.subtree") + data.path) as string;
path = cutWordTo(path, w - 15); path = cutWordTo(path, w - 15);
addShape("text", { addShape("text", {
attrs: { attrs: {
@@ -505,7 +506,7 @@ G6.registerNode(
draggable: true, draggable: true,
}); });
if (Array.isArray(cfg.children) && cfg.children.length > 0) { if (data.children?.length) {
addShape("marker", { addShape("marker", {
attrs: { attrs: {
x: w, x: w,
src/components/titlebar.tsx
+1 -1
View File
@@ -1,8 +1,8 @@
import { SearchOutlined } from "@ant-design/icons"; import { SearchOutlined } from "@ant-design/icons";
import { Button, Flex, LayoutProps, Select } from "antd"; import { Button, Flex, LayoutProps, Select } from "antd";
import React, { FC, useMemo } from "react"; import React, { FC, useMemo } from "react";
import { NodeDef } from "../behavior3/src/behavior3";
import { useWorkspace } from "../contexts/workspace-context"; import { useWorkspace } from "../contexts/workspace-context";
import { NodeDef } from "../misc/b3type";
import { Hotkey, isMacos } from "../misc/keys"; import { Hotkey, isMacos } from "../misc/keys";
import Path from "../misc/path"; import Path from "../misc/path";
import { Menu } from "./menu"; import { Menu } from "./menu";
src/contexts/workspace-context.ts
+2 -1
View File
@@ -4,7 +4,8 @@ import { ipcRenderer } from "electron";
import * as fs from "fs"; import * as fs from "fs";
import React from "react"; import React from "react";
import { create } from "zustand"; import { create } from "zustand";
import { NodeDef, NodeModel, TreeGraphData, TreeModel } from "../misc/b3type"; import { NodeDef } from "../behavior3/src/behavior3";
import { NodeModel, TreeGraphData, TreeModel } from "../misc/b3type";
import * as b3util from "../misc/b3util"; import * as b3util from "../misc/b3util";
import { message } from "../misc/hooks"; import { message } from "../misc/hooks";
import i18n from "../misc/i18n"; import i18n from "../misc/i18n";
src/misc/b3type.ts
+3 -72
View File
@@ -1,43 +1,8 @@
import { TreeGraphData as G6TreeGraphData } from "@antv/g6"; import { TreeGraphData as G6TreeGraphData } from "@antv/g6";
import { NodeDef } from "../behavior3/src/behavior3";
export type NodeType = "Action" | "Composite" | "Decorator" | "Condition" | "Other" | "Error"; export type NodeType = NodeDef["type"] | "Other" | "Error";
export type NodeArg = Exclude<NodeDef["args"], undefined>[number];
export interface NodeArg {
name: string;
type:
| "bool"
| "bool?"
| "bool[]"
| "bool[]?"
| "int"
| "int?"
| "int[]"
| "int[]?"
| "float"
| "float?"
| "float[]"
| "float[]?"
| "string"
| "string?"
| "string[]"
| "string[]?"
| "json"
| "json?"
| "json[]"
| "json[]?"
| "enum"
| "enum?"
| "enum[]"
| "enum[]?"
| "expr"
| "expr?"
| "expr[]"
| "expr[]?";
desc: string;
oneof?: string;
default?: unknown;
options?: { name: string; value: string | number }[];
}
export const isIntType = (type: string) => type.startsWith("int"); export const isIntType = (type: string) => type.startsWith("int");
export const isFloatType = (type: string) => type.startsWith("float"); export const isFloatType = (type: string) => type.startsWith("float");
@@ -47,40 +12,6 @@ export const isEnumType = (type: string) => type.startsWith("enum");
export const isExprType = (type: string) => type.startsWith("expr") || type.startsWith("code"); export const isExprType = (type: string) => type.startsWith("expr") || type.startsWith("code");
export const isJsonType = (type: string) => type.startsWith("json"); export const isJsonType = (type: string) => type.startsWith("json");
export interface NodeDef {
name: string;
type: NodeType;
desc?: string;
args?: NodeArg[];
input?: string[];
output?: string[];
doc?: string;
color?: string;
icon?: string;
/**
* + `!success` !(child_success|child_success|...)
* + `!failure` !(child_failure|child_failure|...)
* + `|success` child_success|child_success|...
* + `|failure` child_failure|child_failure|...
* + `|running` child_running|child_running|...
* + `&success` child_success&child_success&...
* + `&failure` child_failure&child_failure&...
*/
status?: (
| "success"
| "failure"
| "running"
| "!success"
| "!failure"
| "|success"
| "|failure"
| "|running"
| "&success"
| "&failure"
)[];
children?: -1 | 0 | 1;
}
export interface NodeModel { export interface NodeModel {
id: number; id: number;
name: string; name: string;
src/misc/b3util.ts
+1 -1
View File
@@ -1,4 +1,5 @@
import * as fs from "fs"; import * as fs from "fs";
import { NodeDef } from "../behavior3/src/behavior3";
import { import {
isBoolType, isBoolType,
isEnumType, isEnumType,
@@ -8,7 +9,6 @@ import {
isJsonType, isJsonType,
isStringType, isStringType,
NodeArg, NodeArg,
NodeDef,
NodeModel, NodeModel,
TreeGraphData, TreeGraphData,
TreeModel, TreeModel,