@nocobase/plugin-workflow 2.2.0-alpha.1 → 2.2.0-alpha.3

package/dist/client/nodeVariableUtils.d.ts

@@ -6,9 +6,10 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export declare function extractDependencyKeys(config: Record<string, any>): Set<string>;
-export declare function stripVariableReferences(value: any, keysToRemove: Set<string>): {
-    value: any;
-    changed: boolean;
-};
-export declare function collectUpstreams(node: any): Set<number>;
+/**
+ * These pure utilities now live in `src/client-v2/canvas/nodeVariableUtils.ts`
+ * and are shared by both canvases (ADR-0003). This module re-exports them via
+ * the allowed `v1 → v2` import direction so existing v1 import sites are
+ * unchanged. Delete this file when the legacy canvas retires.
+ */
+export { extractDependencyKeys, stripVariableReferences, collectUpstreams, } from '../client-v2/canvas/nodeVariableUtils';

package/dist/client/nodes/calculation.d.ts

@@ -6,84 +6,12 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import React from 'react';
 import { SchemaInitializerItemType } from '@nocobase/client';
-import { RadioWithTooltip } from '../components/RadioWithTooltip';
-import { WorkflowVariableTextArea } from '../variable';
-import { Instruction } from '.';
-import { SubModelItem } from '@nocobase/flow-engine';
-export default class extends Instruction {
-    title: string;
-    type: string;
-    group: string;
-    description: string;
-    icon: React.JSX.Element;
-    fieldset: {
-        engine: {
-            type: string;
-            title: string;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                options: any;
-            };
-            required: boolean;
-            default: string;
-        };
-        expression: {
-            type: string;
-            title: string;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                changeOnSelect: boolean;
-            };
-            "x-validator"(value: any, rules: any, { form }: {
-                form: any;
-            }): string;
-            'x-reactions': {
-                dependencies: string[];
-                fulfill: {
-                    schema: {
-                        description: string;
-                    };
-                };
-            }[];
-            required: boolean;
-        };
-    };
-    scope: {
-        renderEngineReference: (key: string) => React.JSX.Element;
-    };
-    components: {
-        WorkflowVariableTextArea: typeof WorkflowVariableTextArea;
-        RadioWithTooltip: typeof RadioWithTooltip;
-        ValueBlock: (() => JSX.Element) & {
-            Initializer: () => JSX.Element;
-            Result: (props: any) => JSX.Element;
-            Designer: () => JSX.Element;
-        };
-    };
-    useVariables({ key, title }: {
-        key: any;
-        title: any;
-    }, { types, fieldNames }: {
-        types: any;
-        fieldNames?: {
-            readonly label: "label";
-            readonly value: "value";
-            readonly children: "children";
-        };
-    }): {
-        value: any;
-        label: any;
-    };
+import type { SubModelItem } from '@nocobase/flow-engine';
+import V2CalculationInstruction from '../../client-v2/nodes/calculation';
+export default class extends V2CalculationInstruction {
     useInitializers(node: any): SchemaInitializerItemType;
-    /**
-     * 2.0
-     */
     getCreateModelMenuItem({ node }: {
         node: any;
     }): SubModelItem;
-    testable: boolean;
 }

package/dist/client/nodes/condition.d.ts

@@ -6,115 +6,11 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import React from 'react';
-import { Instruction } from '.';
-import { RadioWithTooltip } from '../components/RadioWithTooltip';
-import { useWorkflowVariableOptions, WorkflowVariableTextArea } from '../variable';
-import { CalculationConfig } from '../components/Calculation';
-export default class extends Instruction {
-    title: string;
-    type: string;
-    group: string;
-    description: string;
-    icon: React.JSX.Element;
-    fieldset: {
-        rejectOnFalse: {
-            type: string;
-            title: string;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                disabled: boolean;
-            };
-            enum: {
-                value: boolean;
-                label: string;
-            }[];
-        };
-        engine: {
-            type: string;
-            title: string;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                options: unknown;
-            };
-            required: boolean;
-            default: string;
-        };
-        calculation: {
-            type: string;
-            title: string;
-            'x-decorator': string;
-            'x-component': string;
-            'x-reactions': {
-                dependencies: string[];
-                fulfill: {
-                    state: {
-                        visible: string;
-                    };
-                };
-            };
-            required: boolean;
-        };
-        expression: {
-            type: string;
-            title: string;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                changeOnSelect: boolean;
-            };
-            "x-validator"(value: any, rules: any, { form }: {
-                form: any;
-            }): string;
-            'x-reactions': {
-                dependencies: string[];
-                fulfill: {
-                    state: {
-                        visible: string;
-                    };
-                    schema: {
-                        description: string;
-                    };
-                };
-            };
-            required: boolean;
-        };
-    };
-    presetFieldset: {
-        rejectOnFalse: {
-            type: string;
-            title: string;
-            'x-decorator': string;
-            'x-component': string;
-            enum: {
-                label: string;
-                value: boolean;
-            }[];
-            default: boolean;
-        };
-    };
-    branching: ({ rejectOnFalse }?: {
-        rejectOnFalse?: boolean;
-    }) => false | ({
-        label: string;
-        value: 1;
-    } | {
-        label: string;
-        value: 0;
-    })[];
-    scope: {
-        renderEngineReference: (key: string) => React.JSX.Element;
-        useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
-    };
-    components: {
-        CalculationConfig: typeof CalculationConfig;
-        WorkflowVariableTextArea: typeof WorkflowVariableTextArea;
-        RadioWithTooltip: typeof RadioWithTooltip;
-    };
-    Component({ data }: {
-        data: any;
-    }): React.JSX.Element;
-    testable: boolean;
+/**
+ * v1 condition node. After sharing `Branch`, `AddNodeSlot`, and the branch-node
+ * renderer injection across runtimes, the legacy canvas can reuse the v2
+ * `ComponentLoader` directly. This file stays as a thin compatibility entry.
+ */
+import V2ConditionInstruction from '../../client-v2/nodes/condition';
+export default class extends V2ConditionInstruction {
 }

package/dist/client/nodes/create.d.ts

@@ -6,129 +6,8 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import React from 'react';
-import { SchemaInitializerItemType, useCollectionDataSource } from '@nocobase/client';
-import { AssignedFieldsFormSchemaConfig } from '../components/AssignedFieldsFormSchemaConfig';
-import { Instruction, useNodeSavedConfig } from '.';
-import { SubModelItem } from '@nocobase/flow-engine';
-declare function useVariables({ key: name, title, config }: {
-    key: any;
-    title: any;
-    config: any;
-}, options: any): import("../variable").VariableOption;
-export default class extends Instruction {
-    title: string;
-    type: string;
-    group: string;
-    description: string;
-    icon: React.JSX.Element;
-    presetFieldset: {
-        collection: {
-            type: string;
-            title: string;
-            required: boolean;
-            'x-reactions': any[];
-            'x-decorator': string;
-            'x-component': string;
-        };
-    };
-    fieldset: {
-        collection: {
-            'x-disabled': string;
-            'x-reactions': any[];
-            type: string;
-            title: string;
-            required: boolean;
-            'x-decorator': string;
-            'x-component': string;
-        };
-        usingAssignFormSchema: {
-            type: string;
-        };
-        assignFormSchema: {
-            type: string;
-            title: string;
-            'x-decorator': string;
-            'x-component': string;
-            'x-reactions': {
-                dependencies: string[];
-                fulfill: {
-                    state: {
-                        display: string;
-                    };
-                };
-            }[];
-        };
-        params: {
-            type: string;
-            properties: {
-                values: {
-                    'x-reactions': {
-                        dependencies: string[];
-                        fulfill: {
-                            state: {
-                                display: string;
-                            };
-                        };
-                    }[];
-                    type: string;
-                    title: string;
-                    description: string;
-                    'x-decorator': string;
-                    'x-decorator-props': {
-                        labelAlign: string;
-                        className: string;
-                    };
-                    'x-component': string;
-                };
-                appends: {
-                    type: string;
-                    title: string;
-                    description: string;
-                    'x-decorator': string;
-                    'x-component': string;
-                    'x-component-props': {
-                        title: string;
-                        multiple: boolean;
-                        useCollection(): any;
-                    };
-                    'x-reactions': {
-                        dependencies: string[];
-                        fulfill: {
-                            state: {
-                                visible: string;
-                            };
-                        };
-                    }[];
-                };
-            };
-        };
-    };
-    createDefaultConfig(): {
-        usingAssignFormSchema: boolean;
-        assignFormSchema: {};
-    };
-    scope: {
-        useCollectionDataSource: typeof useCollectionDataSource;
-        useNodeSavedConfig: typeof useNodeSavedConfig;
-    };
-    components: {
-        CollectionFieldset: React.MemoExoticComponent<import("@formily/reactive-react").ReactFC<Omit<any, "ref">>>;
-        AssignedFieldsFormSchemaConfig: typeof AssignedFieldsFormSchemaConfig;
-    };
-    useVariables: typeof useVariables;
+import { SchemaInitializerItemType } from '@nocobase/client';
+import V2CreateInstruction from '../../client-v2/nodes/create';
+export default class extends V2CreateInstruction {
     useInitializers(node: any): SchemaInitializerItemType | null;
-    /**
-     * 2.0
-     */
-    getCreateModelMenuItem({ node }: {
-        node: any;
-    }): SubModelItem;
-    useTempAssociationSource(node: any): {
-        collection: any;
-        nodeId: any;
-        nodeKey: any;
-        nodeType: "node";
-    };
 }
-export {};

package/dist/client/nodes/destroy.d.ts

@@ -6,61 +6,6 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import React from 'react';
-import { useCollectionDataSource } from '@nocobase/client';
-import { FilterDynamicComponent } from '../components/FilterDynamicComponent';
-import { Instruction, useNodeSavedConfig } from '.';
-export default class extends Instruction {
-    title: string;
-    type: string;
-    group: string;
-    description: string;
-    icon: React.JSX.Element;
-    presetFieldset: {
-        collection: {
-            type: string;
-            title: string;
-            required: boolean;
-            'x-reactions': any[];
-            'x-decorator': string;
-            'x-component': string;
-        };
-    };
-    fieldset: {
-        collection: {
-            'x-disabled': string;
-            'x-reactions': any[];
-            type: string;
-            title: string;
-            required: boolean;
-            'x-decorator': string;
-            'x-component': string;
-        };
-        params: {
-            type: string;
-            properties: {
-                filter: {
-                    "x-validator"(value: any): string;
-                    type: string;
-                    title: string;
-                    'x-decorator': string;
-                    'x-component': string;
-                    'x-use-component-props': () => {
-                        options: any[];
-                        className: string;
-                    };
-                    'x-component-props': {
-                        dynamicComponent: string;
-                    };
-                };
-            };
-        };
-    };
-    scope: {
-        useNodeSavedConfig: typeof useNodeSavedConfig;
-        useCollectionDataSource: typeof useCollectionDataSource;
-    };
-    components: {
-        FilterDynamicComponent: typeof FilterDynamicComponent;
-    };
+import V2DestroyInstruction from '../../client-v2/nodes/destroy';
+export default class extends V2DestroyInstruction {
 }

package/dist/client/nodes/end.d.ts

@@ -6,27 +6,6 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import React from 'react';
-import { Instruction } from '.';
-export default class extends Instruction {
-    title: string;
-    type: string;
-    group: string;
-    description: string;
-    icon: React.JSX.Element;
-    fieldset: {
-        endStatus: {
-            type: string;
-            title: string;
-            'x-decorator': string;
-            'x-component': string;
-            enum: {
-                label: string;
-                value: number;
-            }[];
-            required: boolean;
-            default: number;
-        };
-    };
-    end: boolean;
+import V2EndInstruction from '../../client-v2/nodes/end';
+export default class extends V2EndInstruction {
 }

package/dist/client/nodes/index.d.ts

@@ -6,104 +6,16 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { ISchema } from '@formily/react';
 import React from 'react';
-import { SchemaInitializerItemType } from '@nocobase/client';
-import WorkflowPlugin from '..';
-import { UseVariableOptions, VariableOption } from '../variable';
-import { SubModelItem } from '@nocobase/flow-engine';
-export type NodeAvailableContext = {
-    engine: WorkflowPlugin;
-    workflow: object;
-    upstream: object;
-    branchIndex: number;
-    syncOnly?: boolean;
-};
-type Config = Record<string, any>;
-type Options = {
-    label: string;
-    value: any;
-}[];
-export declare abstract class Instruction {
-    title: string;
-    type: string;
-    group: string;
-    description?: string;
-    icon?: JSX.Element;
-    async?: boolean;
-    /**
-     * @deprecated migrate to `presetFieldset` instead
-     */
-    options?: {
-        label: string;
-        value: any;
-        key: string;
-    }[];
-    fieldset: Record<string, ISchema>;
-    /**
-     * @experimental
-     */
-    presetFieldset?: Record<string, ISchema>;
-    /**
-     * To presentation if the instruction is creating a branch
-     * @experimental
-     */
-    branching?: boolean | Options | ((config: Config) => boolean | Options);
-    /**
-     * @experimental
-     */
-    view?: ISchema;
-    scope?: Record<string, any>;
-    components?: Record<string, any>;
-    Component?(props: any): JSX.Element;
-    /**
-     * @experimental
-     */
-    createDefaultConfig?(): Config;
-    useVariables?(node: any, options?: UseVariableOptions): VariableOption;
-    useScopeVariables?(node: any, options?: any): VariableOption[];
-    useInitializers?(node: any): SchemaInitializerItemType | null;
-    /**
-     * @experimental
-     */
-    isAvailable?(ctx: NodeAvailableContext): boolean;
-    end?: boolean | ((node: any) => boolean);
-    testable?: boolean;
-    /**
-     * 2.0
-     */
-    getCreateModelMenuItem?({ node, workflow }: {
-        node: any;
-        workflow: any;
-    }): SubModelItem | null;
-    /**
-     * @experimental
-     */
-    useTempAssociationSource?(node: any): TempAssociationSource | null;
-}
-export type TempAssociationSource = {
-    collection: string;
-    nodeId: string | number;
-    nodeKey: string;
-    nodeType: 'workflow' | 'node';
-};
+export { Instruction, NodeContext, useNodeContext, useAvailableUpstreams, useUpstreamScopes, } from '../../client-v2/canvas/Instruction';
+export type { NodeAvailableContext, TempAssociationSource } from '../../client-v2/canvas/Instruction';
 export declare function updateNodeConfig({ api, nodeId, config, resourceName }: {
     api: any;
     nodeId: any;
     config: any;
     resourceName?: string;
 }): Promise<void>;
-export declare const NodeContext: React.Context<any>;
-export declare function useNodeContext(): any;
 export declare function useNodeSavedConfig(keys?: any[]): boolean;
-/**
- * @experimental
- */
-export declare function useAvailableUpstreams(node: any, filter?: any): any[];
-/**
- * @experimental
- */
-export declare function useUpstreamScopes(node: any): any[];
 export declare function Node({ data }: {
     data: any;
 }): React.JSX.Element;
@@ -113,4 +25,3 @@ export declare function LogCollapse({ value }: {
     value: any;
 }): React.JSX.Element;
 export declare function NodeDefaultView(props: any): React.JSX.Element;
-export {};

package/dist/client/nodes/multi-conditions.d.ts

@@ -6,52 +6,14 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import React from 'react';
-import { Instruction } from '.';
-import { RadioWithTooltip } from '../components/RadioWithTooltip';
-import { useWorkflowVariableOptions, WorkflowVariableTextArea } from '../variable';
-declare function NodeComponent({ data }: {
-    data: any;
-}): React.JSX.Element;
-export default class extends Instruction {
-    title: string;
-    type: string;
-    group: string;
-    description: string;
-    icon: React.JSX.Element;
-    fieldset: {
-        continueOnNoMatch: {
-            type: string;
-            title: string;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                options: {
-                    label: string;
-                    value: boolean;
-                }[];
-            };
-            default: boolean;
-        };
-    };
-    branching: {
-        label: string;
-        value: number;
-    }[];
-    scope: {
-        renderEngineReference: (key: string) => React.JSX.Element;
-        useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
-    };
-    components: {
-        WorkflowVariableTextArea: typeof WorkflowVariableTextArea;
-        RadioWithTooltip: typeof RadioWithTooltip;
-    };
-    Component: typeof NodeComponent;
-    createDefaultConfig(): {
-        conditions: {
-            uid: any;
-        }[];
-        continueOnNoMatch: boolean;
-    };
+/**
+ * v1 multi-conditions node. After sharing `Branch`, `AddNodeSlot`, recursive
+ * branch-node rendering, and the add-node controller across runtimes, the
+ * legacy canvas can reuse the v2 branch render directly. Branch condition
+ * configuration is allowed to keep using the v2 dialog; only add-node drawers
+ * remain runtime-specific and are already routed through the shared add-node
+ * context chain.
+ */
+import V2MultiConditionsInstruction from '../../client-v2/nodes/multi-conditions';
+export default class extends V2MultiConditionsInstruction {
 }
-export {};

package/dist/client/nodes/output.d.ts

@@ -6,48 +6,6 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import React from 'react';
-import { Instruction } from '.';
-import { WorkflowVariableInput } from '../variable';
-export default class extends Instruction {
-    title: string;
-    type: string;
-    group: string;
-    description: string;
-    icon: React.JSX.Element;
-    fieldset: {
-        value: {
-            type: string;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                changeOnSelect: boolean;
-                useTypedConstant: boolean;
-                nullable: boolean;
-                autoSize: {
-                    minRows: number;
-                };
-                placeholder: string;
-            };
-            title: string;
-        };
-    };
-    scope: {};
-    components: {
-        ArrayItems: import("@formily/reactive-react").ReactFC<React.HTMLAttributes<HTMLDivElement>> & import("@formily/antd-v5").ArrayBaseMixins & {
-            Item: import("@formily/reactive-react").ReactFC<React.HTMLAttributes<HTMLDivElement> & {
-                type?: "divide" | "card";
-            }>;
-        };
-        WorkflowVariableInput: typeof WorkflowVariableInput;
-    };
-    useVariables({ key, title }: {
-        key: any;
-        title: any;
-    }, { types }: {
-        types: any;
-    }): {
-        value: any;
-        label: any;
-    };
+import V2OutputInstruction from '../../client-v2/nodes/output';
+export default class extends V2OutputInstruction {
 }