@nocobase/flow-engine 2.0.0-beta.9 → 2.0.1

package/src/ViewScopedFlowEngine.ts

@@ -8,6 +8,7 @@
  */
 
 import { FlowEngine } from './flowEngine';
+import { ENGINE_SCOPE_KEY, VIEW_ENGINE_SCOPE } from './views/viewEvents';
 
 /**
  * ViewScopedFlowEngine（视图作用域引擎）
@@ -24,6 +25,8 @@ import { FlowEngine } from './flowEngine';
  */
 export function createViewScopedEngine(parent: FlowEngine): FlowEngine {
   const local = new FlowEngine();
+  // Mark for view-stack traversal (used by view activation events).
+  Object.defineProperty(local, ENGINE_SCOPE_KEY, { value: VIEW_ENGINE_SCOPE, configurable: true });
   if (parent.modelRepository) {
     local.setModelRepository(parent.modelRepository);
   }
@@ -43,6 +46,7 @@ export function createViewScopedEngine(parent: FlowEngine): FlowEngine {
     '_applyFlowCache',
     'executor',
     'context',
+    ENGINE_SCOPE_KEY,
     'previousEngine',
     'nextEngine',
     // 调度器与事件总线局部化

package/src/__tests__/JSRunner.test.ts

@@ -9,6 +9,7 @@
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { JSRunner } from '../JSRunner';
+import { createSafeWindow } from '../utils';
 
 describe('JSRunner', () => {
   let originalSearch: string;
@@ -48,6 +49,69 @@ describe('JSRunner', () => {
     expect(res2.value).toBe('baz');
   });
 
+  it('auto-lifts Blob from injected window to top-level globals', async () => {
+    if (typeof Blob === 'undefined') {
+      return;
+    }
+
+    const runner = new JSRunner({
+      globals: {
+        window: createSafeWindow(),
+      },
+    });
+
+    const result = await runner.run('return new Blob(["x"]).size');
+    expect(result.success).toBe(true);
+    expect(result.value).toBe(1);
+  });
+
+  it('keeps explicit globals.Blob higher priority than auto-lifted Blob', async () => {
+    const explicitBlob = function ExplicitBlob(this: any, chunks: any[]) {
+      this.size = Array.isArray(chunks) ? chunks.length : 0;
+    } as any;
+
+    const runner = new JSRunner({
+      globals: {
+        window: createSafeWindow(),
+        Blob: explicitBlob,
+      },
+    });
+
+    const result = await runner.run('const b = new Blob([1,2,3]); return b.size;');
+    expect(result.success).toBe(true);
+    expect(result.value).toBe(3);
+  });
+
+  it('auto-lifts URL from injected window to top-level globals', async () => {
+    const runner = new JSRunner({
+      globals: {
+        window: createSafeWindow(),
+      },
+    });
+
+    const result = await runner.run('return typeof URL.createObjectURL === "function"');
+    expect(result.success).toBe(true);
+    expect(result.value).toBe(true);
+  });
+
+  it('keeps explicit globals.URL higher priority than auto-lifted URL', async () => {
+    const explicitURL = {
+      createObjectURL: () => 'explicit://url',
+      revokeObjectURL: (_url: string) => undefined,
+    };
+
+    const runner = new JSRunner({
+      globals: {
+        window: createSafeWindow(),
+        URL: explicitURL,
+      },
+    });
+
+    const result = await runner.run('return URL.createObjectURL(new Blob(["x"]))');
+    expect(result.success).toBe(true);
+    expect(result.value).toBe('explicit://url');
+  });
+
   it('exposes console in sandbox by default', async () => {
     const runner = new JSRunner();
     const result = await runner.run('return typeof console !== "undefined"');

package/src/__tests__/createViewMeta.popup.test.ts

@@ -13,7 +13,7 @@ import { FlowEngine } from '../flowEngine';
 import type { FlowView } from '../views/FlowView';
 import { createPopupMeta } from '../views/createViewMeta';
 
-describe('createViewMeta - popup variables', () => {
+describe('createPopupMeta - popup variables', () => {
   function makeCtx() {
     const engine = new FlowEngine();
     const ctx = new FlowContext();
@@ -139,4 +139,65 @@ describe('createViewMeta - popup variables', () => {
     expect((props.record as any).title).toBe('Current popup record');
     expect((props.record as any).hasChildren).toBe(true);
   });
+
+  it('treats views with openerUids as popup (meta visible)', async () => {
+    const { ctx } = makeCtx();
+
+    // openerUids 作为路由栈缺失时的兜底标记：即使没有 navigation.viewStack，也应展示 ctx.popup 元信息
+    const anchorView: FlowView = {
+      type: 'dialog',
+      inputArgs: {
+        openerUids: ['opener-uid-1'],
+        viewUid: 'popup-uid',
+        dataSourceKey: 'main',
+        collectionName: 'posts',
+        filterByTk: 1,
+      },
+      Header: null,
+      Footer: null,
+      close: () => void 0,
+      update: () => void 0,
+    } as any;
+
+    const meta = (await createPopupMeta(ctx, anchorView)())!;
+    expect(typeof meta.hidden).toBe('function');
+    expect((meta.hidden as any)()).toBe(false);
+    expect(typeof meta.disabled).toBe('function');
+    expect((meta.disabled as any)()).toBe(false);
+
+    const vars = (await meta.buildVariablesParams!(ctx)) as any;
+    expect(vars).toBeTruthy();
+    expect(vars.record).toEqual({
+      collection: 'posts',
+      dataSourceKey: 'main',
+      filterByTk: 1,
+      associationName: undefined,
+      sourceId: undefined,
+    });
+  });
+
+  it('does not expose popup.record without filterByTk', async () => {
+    const { ctx } = makeCtx();
+
+    const anchorView: FlowView = {
+      type: 'dialog',
+      inputArgs: {
+        openerUids: ['opener-uid-1'],
+        viewUid: 'popup-uid',
+        dataSourceKey: 'main',
+        collectionName: 'posts',
+        // filterByTk 缺失：不应展示“当前弹窗记录”变量
+      },
+      Header: null,
+      Footer: null,
+      close: () => void 0,
+      update: () => void 0,
+    } as any;
+
+    ctx.defineProperty('view', { value: anchorView });
+
+    const meta = (await createPopupMeta(ctx, anchorView)())!;
+    const props = typeof meta.properties === 'function' ? await (meta.properties as any)() : meta.properties || {};
+    expect(props.record).toBeUndefined();
+  });
 });