@nocobase/plugin-flow-engine 2.2.0-beta.3 → 2.2.0-beta.6

package/dist/server/flow-surfaces/runjs-authoring/scan/index.d.ts

@@ -149,16 +149,6 @@ export declare function scanJavaScriptSource(source: string, ast?: any, context?
         alias: string;
         index: number;
     }[];
-    windowDocumentNavigatorUses: {
-        root: string;
-        member: string;
-        index: number;
-    }[];
-    windowDocumentNavigatorAliases: {
-        alias: string;
-        root: string;
-        index: number;
-    }[];
     ctxAliases: {
         alias: string;
         index: number;
@@ -179,10 +169,6 @@ export declare function scanJavaScriptSource(source: string, ast?: any, context?
         ruleId: "runjs-ctx-member-not-callable";
     }[];
     invalidCtxLibMemberAccesses: import("../internal-types").InvalidCtxLibMemberAccess[];
-    forbiddenBareGlobals: {
-        name: string;
-        index: number;
-    }[];
     ctxMemberAccesses: {
         member: string;
         index: number;

package/dist/server/flow-surfaces/runjs-authoring/scan/index.js

@@ -71,10 +71,7 @@ function scanJavaScriptSource(source, ast, context = {}, modelUse = "") {
   const flowResourceAliases = (0, import_source_patterns.collectFlowResourceAliases)(masked, sourceBindings);
   const directDomWrites = (0, import_source_patterns.collectDirectDomWrites)(source, masked, sourceBindings);
   const directDomAliases = (0, import_source_patterns.collectDirectDomAliases)(masked, sourceBindings);
-  const windowDocumentNavigatorUses = (0, import_source_patterns.collectWindowDocumentNavigatorUses)(source, masked, sourceBindings);
-  const windowDocumentNavigatorAliases = (0, import_source_patterns.collectWindowDocumentNavigatorAliases)(masked, sourceBindings);
   const ctxAliases = (0, import_source_patterns.collectCtxAliases)(masked, sourceBindings);
-  const forbiddenBareGlobals = (0, import_source_patterns.collectForbiddenBareGlobals)(masked, sourceBindings);
   return {
     source,
     masked,
@@ -126,14 +123,11 @@ function scanJavaScriptSource(source, ast, context = {}, modelUse = "") {
     ),
     directDomWrites,
     directDomAliases,
-    windowDocumentNavigatorUses,
-    windowDocumentNavigatorAliases,
     ctxAliases,
     ctxLibMemberCaseMismatches: (0, import_source_patterns.collectCtxLibMemberCaseMismatches)(source, masked, sourceBindings),
     invalidCtxApiMemberAccesses: (astInspection == null ? void 0 : astInspection.invalidCtxApiMemberAccesses) || [],
     invalidCtxNonFunctionCalls: (astInspection == null ? void 0 : astInspection.invalidCtxNonFunctionCalls) || [],
     invalidCtxLibMemberAccesses: (astInspection == null ? void 0 : astInspection.invalidCtxLibMemberAccesses) || [],
-    forbiddenBareGlobals,
     ctxMemberAccesses: (0, import_source_patterns.collectCtxMemberAccesses)(masked, sourceBindings),
     dynamicCtxAccesses: (0, import_static_values.findUnboundCtxMatches)(masked, /\bctx\s*(?:\?\.\s*)?\[/g, sourceBindings),
     isTopLevelFunctionWrapper: (0, import_source_patterns.isTopLevelFunctionWrapper)(masked, functionRanges, topLevelReachableCtxRenderCalls)
@@ -159,7 +153,7 @@ function collectAstUnknownBareGlobalsFromAst(ast, identifierBindings, modelUse)
       if (!name) {
         return;
       }
-      if (allowedGlobals.has(name) || import_constants.FORBIDDEN_BARE_GLOBALS.has(name)) {
+      if (allowedGlobals.has(name)) {
         return;
       }
       const index = typeof node.start === "number" ? node.start : 0;

package/dist/server/flow-surfaces/runjs-authoring/scan/source-patterns.d.ts

@@ -7,10 +7,6 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import type { CtxLibMemberCaseMismatch, FlowResourceAlias, ReactComponentAlias, ResourceCallInReactHook, SourceBinding, SourceRange, StringLiteralBinding } from '../internal-types';
-export declare function collectForbiddenBareGlobals(masked: string, bindings: SourceBinding[]): {
-    name: string;
-    index: number;
-}[];
 export declare function collectInvalidApiResourceCalls(source: string, masked: string, bindings: SourceBinding[]): {
     index: number;
     match: string;
@@ -64,16 +60,6 @@ export declare function collectDirectDomWrites(source: string, masked: string, b
     index: number;
     match: string;
 }[];
-export declare function collectWindowDocumentNavigatorUses(source: string, masked: string, bindings: SourceBinding[]): {
-    root: string;
-    member: string;
-    index: number;
-}[];
-export declare function collectWindowDocumentNavigatorAliases(masked: string, bindings: SourceBinding[]): {
-    alias: string;
-    root: string;
-    index: number;
-}[];
 export declare function collectDirectDomAliases(masked: string, bindings: SourceBinding[]): {
     alias: string;
     index: number;

package/dist/server/flow-surfaces/runjs-authoring/scan/source-patterns.js

@@ -33,7 +33,6 @@ __export(source_patterns_exports, {
   collectDirectDomAliases: () => collectDirectDomAliases,
   collectDirectDomWrites: () => collectDirectDomWrites,
   collectFlowResourceAliases: () => collectFlowResourceAliases,
-  collectForbiddenBareGlobals: () => collectForbiddenBareGlobals,
   collectInvalidApiResourceCalls: () => collectInvalidApiResourceCalls,
   collectInvalidFlowResourceListCalls: () => collectInvalidFlowResourceListCalls,
   collectInvalidResourceTypeCalls: () => collectInvalidResourceTypeCalls,
@@ -43,8 +42,6 @@ __export(source_patterns_exports, {
   collectReactHookCalls: () => collectReactHookCalls,
   collectResourceCallsInReactHooks: () => collectResourceCallsInReactHooks,
   collectUnboundReactCreateElementCalls: () => collectUnboundReactCreateElementCalls,
-  collectWindowDocumentNavigatorAliases: () => collectWindowDocumentNavigatorAliases,
-  collectWindowDocumentNavigatorUses: () => collectWindowDocumentNavigatorUses,
   getResourceLikeCtxRunjsEntrypoint: () => getResourceLikeCtxRunjsEntrypoint,
   isResourceLikeCtxRequest: () => isResourceLikeCtxRequest,
   isTopLevelFunctionWrapper: () => isTopLevelFunctionWrapper
@@ -53,18 +50,6 @@ module.exports = __toCommonJS(source_patterns_exports);
 var import_constants = require("../runtime/constants");
 var import_bindings = require("../ast/bindings");
 var import_source = require("../ast/source");
-function collectForbiddenBareGlobals(masked, bindings) {
-  const entries = [];
-  for (const name of import_constants.FORBIDDEN_BARE_GLOBALS) {
-    const pattern = new RegExp(`(?<![.$\\w])${(0, import_source.escapeRegExp)(name)}\\b`, "g");
-    for (const match of masked.matchAll(pattern)) {
-      if (!(0, import_bindings.isNameBoundAtIndex)(bindings, name, match.index || 0) && !isObjectPropertyKey(masked, match.index || 0, name)) {
-        entries.push({ name, index: match.index || 0 });
-      }
-    }
-  }
-  return entries.sort((left, right) => left.index - right.index);
-}
 function collectInvalidApiResourceCalls(source, masked, bindings) {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const resourceMethods = /* @__PURE__ */ new Set(["list", "get", "create", "update", "destroy"]);
@@ -618,6 +603,16 @@ function collectDirectDomWrites(source, masked, bindings) {
     }
     entries.push({ index, match: match[0].replace(/\s*(?:\?\.)?\($/, "") });
   }
+  for (const match of masked.matchAll(
+    /\b(document)\s*(?:\?\.|\.)\s*body\s*(?:\?\.|\.)\s*(innerHTML|insertAdjacentHTML)\b|(?<![.$\w])((window|globalThis)\s*(?:\?\.|\.)\s*document)\s*(?:\?\.|\.)\s*body\s*(?:\?\.|\.)\s*(innerHTML|insertAdjacentHTML)\b/g
+  )) {
+    const index = match.index || 0;
+    const root = match[1] || match[4];
+    if (root && (0, import_bindings.isNameBoundAtIndex)(bindings, root, index)) {
+      continue;
+    }
+    entries.push({ index, match: match[0] });
+  }
   for (const match of commentMasked.matchAll(
     /\b(ctx)\s*(?:\?\.|\.)\s*element\s*(?:\?\.\s*)?\[\s*(?:(['"])([A-Za-z_$][\w$]*)\2|([^\]]+))\s*\]/g
   )) {
@@ -639,71 +634,24 @@ function collectDirectDomWrites(source, masked, bindings) {
     }
   }
   for (const match of commentMasked.matchAll(
-    /\b(element)\s*(?:\?\.\s*)?\[\s*(?:(['"])([A-Za-z_$][\w$]*)\2|([^\]]+))\s*\]/g
+    /(?<![.$\w])(window|globalThis)\s*(?:\?\.\s*)?\[\s*(['"])document\2\s*\]\s*(?:(?:\?\.|\.)\s*createElement|(?:\?\.\s*)?\[\s*(['"])createElement\3\s*\])/g
   )) {
     const index = match.index || 0;
-    const member = match[3] || "";
-    const dynamicMember = Boolean(match[4]);
-    if (isCodeTokenAt(masked, index, match[1]) && !(0, import_bindings.isNameBoundAtIndex)(bindings, match[1], index) && (dynamicMember || isDirectDomMember(member))) {
+    if (isCodeTokenAt(masked, index, match[1]) && !(0, import_bindings.isNameBoundAtIndex)(bindings, match[1], index)) {
       entries.push({ index, match: match[0] });
     }
   }
-  return entries;
-}
-function collectWindowDocumentNavigatorUses(source, masked, bindings) {
-  const commentMasked = (0, import_source.maskJavaScriptComments)(source);
-  const entries = [...masked.matchAll(/\b(window|document|navigator)\s*(?:\?\.|\.)\s*([A-Za-z_$][\w$]*)/g)].filter((match) => !(0, import_bindings.isNameBoundAtIndex)(bindings, match[1], match.index || 0)).map((match) => ({
-    root: match[1],
-    member: match[2],
-    index: match.index || 0
-  }));
   for (const match of commentMasked.matchAll(
-    /\b(window|document|navigator)\s*(?:\?\.\s*)?\[\s*(?:(['"])([A-Za-z_$][\w$]*)\2|([^\]]+))\s*\]/g
+    /\b(element)\s*(?:\?\.\s*)?\[\s*(?:(['"])([A-Za-z_$][\w$]*)\2|([^\]]+))\s*\]/g
   )) {
     const index = match.index || 0;
-    const root = match[1];
-    if (!isCodeTokenAt(masked, index, root) || (0, import_bindings.isNameBoundAtIndex)(bindings, root, index)) {
-      continue;
-    }
-    entries.push({
-      root,
-      member: match[3] || "[dynamic]",
-      index
-    });
-  }
-  return entries.sort((left, right) => left.index - right.index);
-}
-function collectWindowDocumentNavigatorAliases(masked, bindings) {
-  const entries = [];
-  collectAliasMatches(
-    masked,
-    [
-      /\b(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*(window|document|navigator)\b/g,
-      /(?<![.$\w])([A-Za-z_$][\w$]*)\s*=\s*(window|document|navigator)\b/g
-    ],
-    (match) => {
-      const alias = match[1];
-      const root = match[2];
-      const rootIndex = (match.index || 0) + match[0].lastIndexOf(root);
-      if (alias === root || (0, import_bindings.isNameBoundAtIndex)(bindings, root, rootIndex)) {
-        return;
-      }
-      entries.push({ alias, root, index: rootIndex });
-    }
-  );
-  for (const match of masked.matchAll(
-    /\b(?:const|let|var)\s*\{([^}]*)\}\s*=\s*(window|document|navigator)\b(?!\s*(?:\.|\?\.))/g
-  )) {
-    const root = match[2];
-    const rootIndex = (match.index || 0) + match[0].lastIndexOf(root);
-    if ((0, import_bindings.isNameBoundAtIndex)(bindings, root, rootIndex)) {
-      continue;
+    const member = match[3] || "";
+    const dynamicMember = Boolean(match[4]);
+    if (isCodeTokenAt(masked, index, match[1]) && !(0, import_bindings.isNameBoundAtIndex)(bindings, match[1], index) && (dynamicMember || isDirectDomMember(member))) {
+      entries.push({ index, match: match[0] });
     }
-    collectObjectBindingAliases(match[1]).forEach((alias) => {
-      entries.push({ alias, root, index: rootIndex });
-    });
   }
-  return dedupeAliasEntries(entries);
+  return entries;
 }
 function collectDirectDomAliases(masked, bindings) {
   const entries = [];
@@ -871,7 +819,6 @@ function isResourceLikeRunjsEntrypointExpression(value) {
   collectDirectDomAliases,
   collectDirectDomWrites,
   collectFlowResourceAliases,
-  collectForbiddenBareGlobals,
   collectInvalidApiResourceCalls,
   collectInvalidFlowResourceListCalls,
   collectInvalidResourceTypeCalls,
@@ -881,8 +828,6 @@ function isResourceLikeRunjsEntrypointExpression(value) {
   collectReactHookCalls,
   collectResourceCallsInReactHooks,
   collectUnboundReactCreateElementCalls,
-  collectWindowDocumentNavigatorAliases,
-  collectWindowDocumentNavigatorUses,
   getResourceLikeCtxRunjsEntrypoint,
   isResourceLikeCtxRequest,
   isTopLevelFunctionWrapper

package/dist/server/flow-surfaces/runjs-authoring/types.d.ts

@@ -6,7 +6,7 @@
  * 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 type RunJsAuthoringRepairClass = 'syntax-stop' | 'nested-runjs-stop' | 'source-limit-stop' | 'switch-to-resource-api' | 'missing-top-level-return' | 'value-surface-forbids-render' | 'unknown-surface-stop' | 'unknown-model-stop' | 'replace-innerhtml-with-render' | 'render-top-level-function-wrapper' | 'render-unreachable-render-call' | 'blocked-global-stop' | 'unknown-global-stop' | 'blocked-capability-reroute' | 'react-runtime-contract-stop' | 'resource-runtime-contract-stop' | 'ctx-libs-member-mismatch-stop' | 'ctx-root-mismatch-stop';
+export type RunJsAuthoringRepairClass = 'syntax-stop' | 'nested-runjs-stop' | 'source-limit-stop' | 'switch-to-resource-api' | 'missing-top-level-return' | 'value-surface-forbids-render' | 'unknown-surface-stop' | 'unknown-model-stop' | 'replace-innerhtml-with-render' | 'render-top-level-function-wrapper' | 'render-unreachable-render-call' | 'unknown-global-stop' | 'blocked-capability-reroute' | 'react-runtime-contract-stop' | 'resource-runtime-contract-stop' | 'ctx-libs-member-mismatch-stop' | 'ctx-root-mismatch-stop';
 export type RunJsAuthoringSurfaceStyle = 'render' | 'value' | 'action';
 export interface RunJsAuthoringRuleDefinition {
     repairClass: RunJsAuthoringRepairClass;

package/dist/server/flow-surfaces/runjs-authoring/validators/index.js

@@ -310,58 +310,7 @@ function collectDirectDomErrors(path, source, scan, modelUse, surface, errors) {
     );
   });
 }
-function collectGlobalErrors(path, source, scan, modelUse, surface, errors) {
-  scan.windowDocumentNavigatorAliases.forEach((entry) => {
-    errors.push(
-      (0, import_errors.buildRunJsAuthoringError)({
-        path,
-        repairClass: "blocked-global-stop",
-        message: `flowSurfaces authoring ${path} cannot alias forbidden global ${entry.root}`,
-        modelUse,
-        surface,
-        index: entry.index,
-        source,
-        details: {
-          global: entry.root,
-          alias: entry.alias
-        }
-      })
-    );
-  });
-  scan.windowDocumentNavigatorUses.forEach((entry) => {
-    errors.push(
-      (0, import_errors.buildRunJsAuthoringError)({
-        path,
-        repairClass: "blocked-global-stop",
-        ruleId: `runjs-${entry.root}-property-blocked`,
-        message: `flowSurfaces authoring ${path} cannot access ${entry.root}.${entry.member} in RunJS`,
-        modelUse,
-        surface,
-        index: entry.index,
-        source,
-        details: {
-          global: entry.root,
-          member: entry.member
-        }
-      })
-    );
-  });
-  scan.forbiddenBareGlobals.forEach((entry) => {
-    errors.push(
-      (0, import_errors.buildRunJsAuthoringError)({
-        path,
-        repairClass: "blocked-global-stop",
-        message: `flowSurfaces authoring ${path} cannot access forbidden global ${entry.name}`,
-        modelUse,
-        surface,
-        index: entry.index,
-        source,
-        details: {
-          global: entry.name
-        }
-      })
-    );
-  });
+function collectUnknownGlobalErrors(path, source, scan, modelUse, surface, errors) {
   scan.unknownBareGlobals.forEach((entry) => {
     const suggestion = entry.suggestedCapability ? `; use ${entry.suggestedCapability} or assign it to a local variable first` : "; declare or import it before using it";
     errors.push(
@@ -840,7 +789,14 @@ const RUNJS_INSPECTION_VALIDATORS = [
   ),
   createLegacyValidator("dom-global", (runtime, errors) => {
     collectDirectDomErrors(runtime.input.path, runtime.source, runtime.scan, runtime.modelUse, runtime.surface, errors);
-    collectGlobalErrors(runtime.input.path, runtime.source, runtime.scan, runtime.modelUse, runtime.surface, errors);
+    collectUnknownGlobalErrors(
+      runtime.input.path,
+      runtime.source,
+      runtime.scan,
+      runtime.modelUse,
+      runtime.surface,
+      errors
+    );
   }),
   createLegacyValidator(
     "react-runtime",

package/dist/server/flow-surfaces/service.d.ts

@@ -82,6 +82,14 @@ export declare class FlowSurfacesService {
     private assertMenuRouteUpdatable;
     private assertMenuParentNotSelfOrDescendant;
     private buildMenuResult;
+    private hasDesktopRouteUiLayoutsRelation;
+    private normalizeDesktopRouteRelationId;
+    private readDesktopRouteUiLayoutUids;
+    private resolveDefaultDesktopRouteUiLayoutUids;
+    private resolveInheritedDesktopRouteUiLayoutUids;
+    private setDesktopRouteUiLayouts;
+    private attachDesktopRouteUiLayoutsToRouteAndChildren;
+    private ensureDesktopRouteUiLayouts;
     private isValidMenuIconName;
     private assertVisibleNavigationIcon;
     private assertVisibleNavigationRouteIconUpdate;
@@ -142,6 +150,7 @@ export declare class FlowSurfacesService {
     private getCollectionFilterTargetKey;
     private normalizeFlowContextTemplateValue;
     private isSameConfiguredFlowContextValue;
+    private isPopupCurrentRecordFilterByTkMatch;
     private isPopupAssociatedRecordsSourceIdMatch;
     private classifyPopupRawResourceInit;
     private resolvePopupAssociationField;
@@ -300,6 +309,7 @@ export declare class FlowSurfacesService {
     private createFlowTemplateReferenceBlockModel;
     private buildPopupTemplateReferenceOpenView;
     private shouldHydrateDetachedPopupTemplateBlockResourceContext;
+    private resolveDetachedPopupTemplateBlockCurrentRecordFilterByTk;
     private collectDetachedPopupTemplateBlockResourceContextPatches;
     private hydrateDetachedPopupTemplateBlockResourceContext;
     private hydrateDetachedPopupTemplateSourceContext;
@@ -748,6 +758,9 @@ export declare class FlowSurfacesService {
     private syncFilterActionSettingsForUpdateSettings;
     private resolveFilterActionDefaultFilterRequiredFieldCount;
     private syncMirroredStepParamsForUpdateSettings;
+    private syncActionButtonSettingsForUpdateSettings;
+    private supportsActionButtonSettingsSync;
+    private pickRequestedActionButtonSettings;
     private syncCreatedFieldWrapperTitleFieldStepParams;
     private syncUpdateActionAssignedValuesForUpdateSettings;
     private syncActionTriggerWorkflowsForUpdateSettings;
@@ -1056,14 +1069,19 @@ export declare class FlowSurfacesService {
     private stableSerializeAIEmployeeValue;
     private buildAIEmployeeActionDedupIdentity;
     private normalizeAIEmployeeWorkContextForDedupIdentity;
+    private normalizeAIEmployeeActionWorkContextForDedupIdentity;
+    private normalizeAIEmployeeDefaultActionWorkContextForSelfUid;
+    private normalizeAIEmployeeTaskWorkContextForDedupIdentity;
     private normalizeAIEmployeeTasksForDedupIdentity;
     private assertNoDuplicateAIEmployeeAction;
+    private assertNoDuplicateAIEmployeeActionForUpdateSettings;
     private hasAIEmployeePublicSettings;
     private assertOnlyAIEmployeePublicSettings;
     private aiEmployeeNestedRepairHint;
     private assertOnlyAIEmployeeNestedPublicSettings;
     private assertNoAIEmployeeInternalPropSettings;
     private readAIEmployeePersistedTasks;
+    private normalizeAIEmployeeLegacyInheritedTaskWorkContext;
     private buildAIEmployeeTaskStepParams;
     private mergeAIEmployeeActionSettingsPayload;
     private syncAIEmployeeTaskStepParamsForUpdateSettings;
@@ -1076,6 +1094,7 @@ export declare class FlowSurfacesService {
     private normalizeAIEmployeeUsername;
     private assertAIEmployeeWorkContextType;
     private normalizeAIEmployeeWorkContext;
+    private normalizeAIEmployeeEffectiveActionWorkContext;
     private normalizeAIEmployeeTaskModel;
     private normalizeAIEmployeeSkillSettings;
     private collectAIEmployeePromptVariables;
@@ -1098,9 +1117,13 @@ export declare class FlowSurfacesService {
     private normalizeAIEmployeeTaskMessage;
     private normalizeAIEmployeeTaskPatch;
     private normalizeAIEmployeeTasks;
+    private withAIEmployeeTaskDefaultWorkContext;
+    private shouldMaterializeAIEmployeeTaskDefaultWorkContext;
+    private rebaseAIEmployeeInheritedTaskWorkContext;
     private normalizeAIEmployeeActionSettingsReferences;
     private normalizeAIEmployeeActionPublicSettings;
     private resolveAIEmployeeActionSelfUid;
+    private resolveAIEmployeeActionSelfUidFromParentNode;
     private configureActionNode;
     private normalizeActionPanelActionChanges;
     private buildFieldCatalog;