Skip to content

Commit

Permalink
update README
Browse files Browse the repository at this point in the history
  • Loading branch information
zhongfq committed Jul 24, 2024
1 parent 907956f commit de5e70e
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 10 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,14 @@ export interface NodeDef {
| "enum?"
| "string"
| "string?"
| "json"
| "json?"
| "code"
| "code?";
desc: string;
default?: unknown;
/** Input `value`, only one is allowed between `value` and this arg.*/
oneof?: string;
options?: { name: string; value: unknown }[];
}[];
status?:
Expand Down
4 changes: 2 additions & 2 deletions src/components/inspector.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EditNode, EditTree, useWorkspace } from "@/contexts/workspace-context";
import { NodeArg, NodeArgType, NodeModel, TreeGraphData } from "@/misc/b3type";
import { NodeArg, NodeModel, TreeGraphData } from "@/misc/b3type";
import { checkOneof } from "@/misc/b3util";
import { Hotkey, isMacos } from "@/misc/keys";
import { EditOutlined } from "@ant-design/icons";
Expand Down Expand Up @@ -388,7 +388,7 @@ const NodeInspector: FC = () => {
</Divider>
{def.args.map((v) => {
const required = v.type.indexOf("?") === -1;
const type = v.type.replace("?", "") as NodeArgType;
const type = v.type.replace("?", "") as NodeArg["type"];
return (
<Form.Item
name={`args.${v.name}`}
Expand Down
42 changes: 36 additions & 6 deletions src/misc/b3type.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { TreeGraphData as G6TreeGraphData } from "@antv/g6";

export type NodeArgType = "boolean" | "string" | "int" | "float" | "json" | "enum" | "code";
export type NodeType = "Action" | "Composite" | "Decorator" | "Condition" | "Other" | "Error";

export interface NodeArgOption {
Expand All @@ -10,7 +9,21 @@ export interface NodeArgOption {

export interface NodeArg {
name: string;
type: NodeArgType | `${NodeArgType}?`;
type:
| "boolean"
| "boolean?"
| "int"
| "int?"
| "float"
| "float?"
| "string"
| "string?"
| "json"
| "json?"
| "enum"
| "enum?"
| "code"
| "code?";
desc: string;
oneof?: string;
default?: unknown;
Expand All @@ -29,10 +42,27 @@ export interface NodeDef {
doc?: string;
color?: string;
icon?: string;
status?: Exclude<
`${Status}` | `!${Status}` | `|${Status}` | `&${Status}`,
"!running" | "&running"
>[];
/**
* + `!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;
}

Expand Down
4 changes: 2 additions & 2 deletions src/misc/b3util.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useWorkspace } from "@/contexts/workspace-context";
import { NodeArg, NodeArgType, NodeDef, NodeModel, TreeGraphData, TreeModel } from "@/misc/b3type";
import { NodeArg, NodeDef, NodeModel, TreeGraphData, TreeModel } from "@/misc/b3type";
import * as fs from "fs";
import { message } from "./hooks";
import Path from "./path";
Expand Down Expand Up @@ -79,7 +79,7 @@ const checkNodeArg = (
) => {
let hasError = false;
const arg = conf.args![i] as NodeArg;
const type = arg.type.replace("?", "") as NodeArgType;
const type = arg.type.replace("?", "") as NodeArg["type"];
const value = data.args?.[arg.name];
if (type === "float") {
const isNumber = typeof value === "number";
Expand Down

0 comments on commit de5e70e

Please sign in to comment.