@nocobase/flow-engine 2.3.0-beta.7 → 2.3.0-beta.9

package/lib/FlowDefinition.d.ts

@@ -13,6 +13,7 @@ export declare class FlowDefinition {
     _steps: Map<string, FlowStep>;
     protected options: Omit<FlowDefinitionOptions, 'steps'>;
     constructor(options: FlowDefinitionOptions, flowRegistry: IFlowRepository);
+    get model(): import(".").FlowModel<import("./types").DefaultStructure>;
     get key(): string;
     get title(): string;
     set title(title: string);

package/lib/FlowDefinition.js

@@ -53,6 +53,9 @@ const _FlowDefinition = class _FlowDefinition {
   }
   _steps = import_reactive.observable.shallow(/* @__PURE__ */ new Map());
   options;
+  get model() {
+    return this.flowRegistry.model;
+  }
   get key() {
     return this.options.key;
   }

package/lib/flow-registry/BaseFlowRegistry.d.ts

@@ -8,8 +8,10 @@
  */
 import { FlowDefinitionOptions } from '../types';
 import { FlowDefinition } from '../FlowDefinition';
+import type { FlowModel } from '../models';
 type FlowKey = string;
 export interface IFlowRepository {
+    readonly model?: FlowModel;
     addFlows(flowDefs: Record<string, Omit<FlowDefinitionOptions, 'key'>>): void;
     addFlow(flowKey: string, flowOptions: Omit<FlowDefinitionOptions, 'key'>): FlowDefinition | void;
     removeFlow(flowKey: string): void;

package/lib/flow-registry/InstanceFlowRegistry.d.ts

@@ -11,7 +11,7 @@ import { FlowModel } from '../models';
 import { BaseFlowRegistry } from './BaseFlowRegistry';
 type FlowKey = string;
 export declare class InstanceFlowRegistry extends BaseFlowRegistry {
-    protected model: FlowModel;
+    readonly model: FlowModel;
     static readonly _type: "instance";
     constructor(model: FlowModel);
     save(): Promise<void>;

package/lib/flowContext.d.ts

@@ -349,6 +349,7 @@ declare class BaseFlowEngineContext extends FlowContext {
      */
     renderJson: (template: JSONValue) => Promise<any>;
     resolveJsonTemplate: (template: JSONValue, options?: ResolveJsonTemplateOptions) => Promise<any>;
+    variableContractModelUid?: string;
     getVar: (path: string) => Promise<any>;
     request: (options: RequestOptions) => Promise<any>;
     runjs: (code: string, variables?: Record<string, any>, options?: JSRunnerOptions) => Promise<any>;

package/lib/flowContext.js

@@ -2518,7 +2518,7 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
           try {
             const contractRd = (0, import_params_resolvers.buildFlowModelResolveDescriptor)(
               this,
-              options == null ? void 0 : options.contractModelUid
+              (options == null ? void 0 : options.contractModelUid) ?? this.variableContractModelUid
             );
             serverResolved = await (0, import_params_resolvers.enqueueVariablesResolve)(this, {
               ...contractRd ? { contractRd } : {},
@@ -2986,11 +2986,16 @@ __name(_FlowForkModelContext, "FlowForkModelContext");
 let FlowForkModelContext = _FlowForkModelContext;
 const _FlowRuntimeContext = class _FlowRuntimeContext extends BaseFlowModelContext {
   constructor(model, flowKey, _mode = "runtime") {
+    var _a, _b;
     super();
     this.model = model;
     this.flowKey = flowKey;
     this._mode = _mode;
     this.addDelegate(this.model.context);
+    const owner = (_b = (_a = model.getFlow) == null ? void 0 : _a.call(model, flowKey)) == null ? void 0 : _b.model;
+    if (owner && owner.uid !== model.uid) {
+      this.defineProperty("variableContractModelUid", { value: owner.uid });
+    }
     this.defineMethod("getStepParams", (stepKey) => {
       return model.getStepParams(flowKey, stepKey) || {};
     });

package/lib/models/CollectionFieldModel.d.ts

@@ -38,7 +38,7 @@ export declare class CollectionFieldModel<T extends DefaultStructure = DefaultSt
     get collectionField(): CollectionField;
     afterAddAsSubModel(): Promise<void>;
     static getBindingsByField(ctx: FlowEngineContext, collectionField: CollectionField): BindingOptions[];
-    static getDefaultBindingByField(ctx: FlowEngineContext, collectionField: CollectionField, options?: {
+    static getDefaultBindingByField(ctx: FlowEngineContext, collectionField: CollectionField | null | undefined, options?: {
         useStrict?: boolean;
         fallbackToTargetTitleField?: boolean;
         targetCollectionTitleField?: CollectionField;

package/lib/models/CollectionFieldModel.js

@@ -83,7 +83,7 @@ function FieldDeletePlaceholder() {
     const dataSourcePrefix = dataSource ? `${t(dataSource.displayName || dataSource.key)} > ` : "";
     const collectionPrefix = collection ? `${t(collection.title) || collection.name || collection.tableName} > ` : "";
     return `${dataSourcePrefix}${collectionPrefix}${name}`;
-  }, []);
+  }, [collection, dataSource, name, t]);
   return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -111,7 +111,7 @@ function FieldWithoutPermissionPlaceholder() {
     const dataSourcePrefix = `${t(dataSource.displayName || dataSource.key)} > `;
     const collectionPrefix = collection ? `${t(collection.title) || collection.name || collection.tableName} > ` : "";
     return `${dataSourcePrefix}${collectionPrefix}${name}`;
-  }, []);
+  }, [collection, dataSource.displayName, dataSource.key, name, t]);
   const { actionName } = model.forbidden;
   const messageValue = (0, import_react.useMemo)(() => {
     return t(
@@ -121,7 +121,7 @@ function FieldWithoutPermissionPlaceholder() {
         actionName: t(import_lodash.default.capitalize(actionName))
       }
     ).replaceAll(">", ">");
-  }, [nameValue, t]);
+  }, [actionName, nameValue, t]);
   return /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title: messageValue }, /* @__PURE__ */ import_react.default.createElement(import_FormItem.FormItem, { showLabel: true, label: model.context.collectionField.title || name, style: { opacity: "0.4" } }, /* @__PURE__ */ import_react.default.createElement(import_icons.LockOutlined, null)));
 }
 __name(FieldWithoutPermissionPlaceholder, "FieldWithoutPermissionPlaceholder");
@@ -188,6 +188,9 @@ const _CollectionFieldModel = class _CollectionFieldModel extends import_flowMod
     );
   }
   static getDefaultBindingByField(ctx, collectionField, options = {}) {
+    if (!collectionField) {
+      return null;
+    }
     if (options.fallbackToTargetTitleField) {
       const binding = this.getDefaultBindingByField(ctx, collectionField, { useStrict: true });
       if (!binding) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.3.0-beta.7",
+  "version": "2.3.0-beta.9",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -8,8 +8,8 @@
   "dependencies": {
     "@formily/antd-v5": "1.x",
     "@formily/reactive": "2.x",
-    "@nocobase/sdk": "2.3.0-beta.7",
-    "@nocobase/shared": "2.3.0-beta.7",
+    "@nocobase/sdk": "2.3.0-beta.9",
+    "@nocobase/shared": "2.3.0-beta.9",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "3485d95ce53290d6e74d68222a0568ea60420e23"
+  "gitHead": "c215e60ed704afe6c086bd96304f4b0d3b46d02e"
 }

package/src/FlowDefinition.ts

@@ -27,6 +27,10 @@ export class FlowDefinition {
     }
   }
 
+  get model() {
+    return this.flowRegistry.model;
+  }
+
   get key() {
     return this.options.key;
   }

package/src/__tests__/objectVariable.test.ts

@@ -9,7 +9,8 @@
 
 import { describe, expect, it, vi } from 'vitest';
 import { generateFlowModelRdFromToken } from '@nocobase/utils/client';
-import { FlowContext } from '../flowContext';
+import { FlowContext, FlowRuntimeContext } from '../flowContext';
+import { FlowModel } from '../models';
 import { FlowEngine } from '../flowEngine';
 import {
   createAssociationAwareObjectMetaFactory,
@@ -490,4 +491,39 @@ describe('objectVariable utilities', () => {
     expect(resolved).toEqual({ x: 'T1' });
     expect((ctx as any).api.request).not.toHaveBeenCalled();
   });
+
+  it('keeps runtime and configuration descriptors separate for a forwarded instance flow', async () => {
+    const engine = new FlowEngine();
+    const owner = new FlowModel({ uid: 'reference-owner', flowEngine: engine });
+    const target = new FlowModel({ uid: 'reference-target', flowEngine: engine });
+    owner.registerFlow({ key: 'forwarded', steps: {} });
+    const getFlow = vi.spyOn(target, 'getFlow').mockReturnValue(owner.getFlow('forwarded'));
+    const context = new FlowRuntimeContext(target, 'forwarded');
+    getFlow.mockRestore(); // Delayed getVar calls must retain the owner after the event bridge is restored.
+
+    type ResolveItem = { id: string; template: unknown; rd?: string; contractRd?: string };
+    const calls: ResolveItem[] = [];
+    const payload = Buffer.from(JSON.stringify({ userId: 1, signInTime: 'forwarded-flow' })).toString('base64url');
+    const token = `test.${payload}.sig`;
+    engine.context.defineProperty('api', {
+      value: {
+        auth: { token },
+        request: vi.fn(async ({ data }: { data: { values: { batch: ResolveItem[] } } }) => {
+          const batch = data.values.batch;
+          calls.push(...batch);
+          return { data: { data: { results: batch.map((item) => ({ id: item.id, data: 'resolved' })) } } };
+        }),
+      },
+    });
+    target.context.defineProperty('remote', { value: {}, resolveOnServer: true });
+
+    expect(await context.getVar('ctx.remote.name')).toBe('resolved');
+    expect(calls[0].rd).toBe(generateFlowModelRdFromToken(target.uid, token));
+    expect(calls[0].contractRd).toBe(generateFlowModelRdFromToken(owner.uid, token));
+    await context.resolveJsonTemplate('{{ ctx.remote.name }}', { contractModelUid: 'explicit-owner' });
+    expect(calls[1].contractRd).toBe(generateFlowModelRdFromToken('explicit-owner', token));
+    await new FlowRuntimeContext(target, 'local').resolveJsonTemplate('{{ ctx.remote.name }}');
+    expect(calls[2].contractRd).toBeUndefined();
+    expect(owner.getFlow('forwarded')?.serialize()).not.toHaveProperty('model');
+  });
 });

package/src/flow-registry/BaseFlowRegistry.ts

@@ -10,10 +10,12 @@
 import { FlowDefinitionOptions } from '../types';
 import { FlowDefinition } from '../FlowDefinition';
 import { observable } from '@formily/reactive';
+import type { FlowModel } from '../models';
 
 type FlowKey = string;
 
 export interface IFlowRepository {
+  readonly model?: FlowModel;
   addFlows(flowDefs: Record<string, Omit<FlowDefinitionOptions, 'key'>>): void;
   addFlow(flowKey: string, flowOptions: Omit<FlowDefinitionOptions, 'key'>): FlowDefinition | void;
   removeFlow(flowKey: string): void;

package/src/flow-registry/InstanceFlowRegistry.ts

@@ -15,7 +15,7 @@ type FlowKey = string;
 
 export class InstanceFlowRegistry extends BaseFlowRegistry {
   static readonly _type = 'instance' as const;
-  constructor(protected model: FlowModel) {
+  constructor(public readonly model: FlowModel) {
     super();
   }
 

package/src/flowContext.ts

@@ -3051,6 +3051,7 @@ class BaseFlowEngineContext extends FlowContext {
    */
   declare renderJson: (template: JSONValue) => Promise<any>;
   declare resolveJsonTemplate: (template: JSONValue, options?: ResolveJsonTemplateOptions) => Promise<any>;
+  declare variableContractModelUid?: string;
   declare getVar: (path: string) => Promise<any>;
   declare request: (options: RequestOptions) => Promise<any>;
   declare runjs: (code: string, variables?: Record<string, any>, options?: JSRunnerOptions) => Promise<any>;
@@ -3408,7 +3409,7 @@ export class FlowEngineContext extends BaseFlowEngineContext {
           try {
             const contractRd = buildFlowModelResolveDescriptor(
               this as FlowRuntimeContext<FlowModel>,
-              options?.contractModelUid,
+              options?.contractModelUid ?? this.variableContractModelUid,
             );
             serverResolved = await enqueueVariablesResolve(this as FlowRuntimeContext<FlowModel>, {
               ...(contractRd ? { contractRd } : {}),
@@ -3943,6 +3944,11 @@ export class FlowRuntimeContext<
   ) {
     super();
     this.addDelegate(this.model.context);
+    const owner = model.getFlow?.(flowKey)?.model;
+    if (owner && owner.uid !== model.uid) {
+      // A forwarded instance flow keeps its configuration owner, without changing the runtime model.
+      this.defineProperty('variableContractModelUid', { value: owner.uid });
+    }
     this.defineMethod('getStepParams', (stepKey: string) => {
       return model.getStepParams(flowKey, stepKey) || {};
     });

package/src/models/CollectionFieldModel.tsx

@@ -51,7 +51,7 @@ export function FieldDeletePlaceholder() {
     const dataSourcePrefix = dataSource ? `${t(dataSource.displayName || dataSource.key)} > ` : '';
     const collectionPrefix = collection ? `${t(collection.title) || collection.name || collection.tableName} > ` : '';
     return `${dataSourcePrefix}${collectionPrefix}${name}`;
-  }, []);
+  }, [collection, dataSource, name, t]);
   return (
     <Form.Item>
       <div
@@ -80,7 +80,7 @@ function FieldWithoutPermissionPlaceholder() {
     const dataSourcePrefix = `${t(dataSource.displayName || dataSource.key)} > `;
     const collectionPrefix = collection ? `${t(collection.title) || collection.name || collection.tableName} > ` : '';
     return `${dataSourcePrefix}${collectionPrefix}${name}`;
-  }, []);
+  }, [collection, dataSource.displayName, dataSource.key, name, t]);
   const { actionName } = model.forbidden;
   const messageValue = useMemo(() => {
     return t(
@@ -90,7 +90,7 @@ function FieldWithoutPermissionPlaceholder() {
         actionName: t(_.capitalize(actionName)),
       },
     ).replaceAll('&gt;', '>');
-  }, [nameValue, t]);
+  }, [actionName, nameValue, t]);
 
   return (
     <Tooltip title={messageValue}>
@@ -198,13 +198,16 @@ export class CollectionFieldModel<T extends DefaultStructure = DefaultStructure>
 
   static getDefaultBindingByField(
     ctx: FlowEngineContext,
-    collectionField: CollectionField,
+    collectionField: CollectionField | null | undefined,
     options: {
       useStrict?: boolean;
       fallbackToTargetTitleField?: boolean;
       targetCollectionTitleField?: CollectionField;
     } = {},
   ): BindingOptions | null {
+    if (!collectionField) {
+      return null;
+    }
     if (options.fallbackToTargetTitleField) {
       const binding = this.getDefaultBindingByField(ctx, collectionField, { useStrict: true });
       if (!binding) {

package/src/models/__tests__/CollectionFieldModel.test.ts

@@ -108,6 +108,11 @@ describe('CollectionFieldModel', () => {
     expect(defaultBinding).toBeNull();
   });
 
+  it('should return null when the collection field has been deleted', () => {
+    const defaultBinding = TestModel.getDefaultBindingByField(mockContext, undefined);
+    expect(defaultBinding).toBeNull();
+  });
+
   it('should return null if no bindings exist for the interface', () => {
     class Test1Model extends CollectionFieldModel {}
     class Test2Model extends Test1Model {}