@nocobase/plugin-workflow 0.14.0-alpha.7 → 0.15.0-alpha.1

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

@@ -177,8 +177,8 @@ declare const _default: {
         };
         AssociatedConfig: typeof AssociatedConfig;
     };
-    useVariables({ id, title }: {
-        id: any;
+    useVariables({ key, title }: {
+        key: any;
         title: any;
     }, { types, fieldNames }: {
         types: any;
@@ -188,7 +188,7 @@ declare const _default: {
             readonly children: "children";
         };
     }): {
-        value: string;
+        value: any;
         label: any;
     };
     useInitializers(node: any): SchemaInitializerItemOptions | null;

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

@@ -1,6 +1,7 @@
 import { SchemaInitializerItemOptions } from '@nocobase/client';
 import React from 'react';
 import { RadioWithTooltip } from '../components/RadioWithTooltip';
+import { WorkflowVariableInput, WorkflowVariableTextArea } from '../variable';
 declare const _default: {
     title: string;
     type: string;
@@ -36,6 +37,9 @@ declare const _default: {
             title: string;
             'x-decorator': string;
             'x-component': string;
+            'x-component-props': {
+                changeOnSelect: boolean;
+            };
             "x-validator"(value: any, rules: any, { form }: {
                 form: any;
             }): string;
@@ -65,6 +69,15 @@ declare const _default: {
             'x-component': string;
             'x-component-props': {
                 changeOnSelect: boolean;
+                variableOptions: {
+                    types: {
+                        type: string;
+                        options: {
+                            collection: string;
+                            entity: boolean;
+                        };
+                    }[];
+                };
             };
             'x-reactions': {
                 dependencies: string[];
@@ -81,19 +94,20 @@ declare const _default: {
         renderEngineReference: (key: string) => React.JSX.Element;
     };
     components: {
-        CalculationExpression(props: any): React.JSX.Element;
-        ScopeSelect(props: any): React.JSX.Element;
-        CalculationResult({ dataSource }: {
-            dataSource: any;
-        }): string | React.JSX.Element;
+        WorkflowVariableInput: typeof WorkflowVariableInput;
+        WorkflowVariableTextArea: typeof WorkflowVariableTextArea;
         RadioWithTooltip: typeof RadioWithTooltip;
         DynamicConfig: ({ value, onChange }: {
             value: any;
             onChange: any;
         }) => React.JSX.Element;
+        ValueBlock: (() => JSX.Element) & {
+            Initializer: (props: any) => JSX.Element;
+            Result: (props: any) => JSX.Element;
+        };
     };
-    useVariables({ id, title }: {
-        id: any;
+    useVariables({ key, title }: {
+        key: any;
         title: any;
     }, { types, fieldNames }: {
         types: any;

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

@@ -38,6 +38,7 @@ declare const _default: {
                     'x-decorator': string;
                     'x-component': string;
                     'x-component-props': {
+                        title: string;
                         multiple: boolean;
                         useCollection(): any;
                     };
@@ -60,8 +61,8 @@ declare const _default: {
     components: {
         CollectionFieldset: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Omit<any, "ref">>>;
     };
-    useVariables({ id, title, config }: {
-        id: any;
+    useVariables({ key: name, title, config }: {
+        key: any;
         title: any;
         config: any;
     }, options: any): import("../variable").VariableOption;

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

@@ -1,6 +1,6 @@
+import React from 'react';
 import { ISchema } from '@formily/react';
 import { SchemaInitializerItemOptions } from '@nocobase/client';
-import React from 'react';
 import { VariableOption, VariableOptions } from '../variable';
 export interface Instruction {
     title: string;
@@ -23,13 +23,13 @@ export interface Instruction {
         [key: string]: any;
     };
     component?(props: any): JSX.Element;
-    endding?: boolean;
     useVariables?(node: any, options?: any): VariableOption;
     useScopeVariables?(node: any, options?: any): VariableOptions;
     useInitializers?(node: any): SchemaInitializerItemOptions | null;
     initializers?: {
         [key: string]: any;
     };
+    isAvailable?(ctx: object): boolean;
 }
 export declare const instructions: any;
 export declare const NodeContext: React.Context<any>;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { VariableOption, useWorkflowVariableOptions } from '../variable';
+import { VariableOption, WorkflowVariableInput } from '../variable';
 declare const _default: {
     title: string;
     type: string;
@@ -13,7 +13,6 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                scope: string;
                 changeOnSelect: boolean;
                 useTypedConstant: string[];
                 className: string;
@@ -25,10 +24,10 @@ declare const _default: {
     component: ({ data }: {
         data: any;
     }) => React.JSX.Element;
-    scope: {
-        useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
+    scope: {};
+    components: {
+        WorkflowVariableInput: typeof WorkflowVariableInput;
     };
-    components: {};
     useScopeVariables(node: any, options: any): VariableOption[];
 };
 export default _default;

package/dist/client/nodes/manual/SchemaConfig.d.ts

@@ -1,5 +1,5 @@
-import { ISchema } from '@formily/react';
 import React from 'react';
+import { ISchema } from '@formily/react';
 import { SchemaInitializerItemOptions } from '@nocobase/client';
 import { JOB_STATUS } from '../../constants';
 type ValueOf<T> = T[keyof T];

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

@@ -58,8 +58,8 @@ declare const _default: {
         ModeConfig: typeof ModeConfig;
         AssigneesSelect: typeof AssigneesSelect;
     };
-    useVariables({ id, title, config }: {
-        id: any;
+    useVariables({ key, title, config }: {
+        key: any;
         title: any;
         config: any;
     }, { types, fieldNames }: {
@@ -70,7 +70,7 @@ declare const _default: {
             readonly children: "children";
         };
     }): {
-        value: string;
+        value: any;
         label: any;
         children: {
             key: string;

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { SchemaInitializerItemOptions, useCollectionDataSource } from '@nocobase/client';
 import { FilterDynamicComponent } from '../components/FilterDynamicComponent';
-import { useWorkflowVariableOptions } from '../variable';
+import { WorkflowVariableInput } from '../variable';
 declare const _default: {
     title: string;
     type: string;
@@ -126,7 +126,6 @@ declare const _default: {
                                             'x-decorator': string;
                                             'x-component': string;
                                             'x-component-props': {
-                                                scope: string;
                                                 useTypedConstant: string[];
                                             };
                                             default: number;
@@ -161,6 +160,7 @@ declare const _default: {
                     'x-decorator': string;
                     'x-component': string;
                     'x-component-props': {
+                        title: string;
                         multiple: boolean;
                         useCollection(): any;
                     };
@@ -193,7 +193,6 @@ declare const _default: {
     view: {};
     scope: {
         useCollectionDataSource: typeof useCollectionDataSource;
-        useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
         useSortableFields(): {
             value: any;
             label: any;
@@ -207,9 +206,10 @@ declare const _default: {
         };
         FilterDynamicComponent: typeof FilterDynamicComponent;
         SchemaComponentContext: import("react").Context<import("@nocobase/client").ISchemaComponentContext>;
+        WorkflowVariableInput: typeof WorkflowVariableInput;
     };
-    useVariables({ id, title, config }: {
-        id: any;
+    useVariables({ key: name, title, config }: {
+        key: any;
         title: any;
         config: any;
     }, options: any): import("../variable").VariableOption;

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

@@ -1,5 +1,4 @@
-import React from 'react';
-import { useWorkflowVariableOptions } from '../variable';
+import { WorkflowVariableInput, WorkflowVariableJSON } from '../variable';
 declare const _default: {
     title: string;
     type: string;
@@ -60,7 +59,6 @@ declare const _default: {
                                 'x-decorator': string;
                                 'x-component': string;
                                 'x-component-props': {
-                                    scope: string;
                                     useTypedConstant: boolean;
                                 };
                             };
@@ -106,7 +104,6 @@ declare const _default: {
                                 'x-decorator': string;
                                 'x-component': string;
                                 'x-component-props': {
-                                    scope: string;
                                     useTypedConstant: boolean;
                                 };
                             };
@@ -163,16 +160,24 @@ declare const _default: {
         };
     };
     view: {};
-    scope: {
-        useWorkflowVariableOptions: typeof useWorkflowVariableOptions;
-    };
+    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> & {
+        ArrayItems: import("@formily/reactive-react").ReactFC<import("react").HTMLAttributes<HTMLDivElement>> & import("@formily/antd-v5").ArrayBaseMixins & {
+            Item: import("@formily/reactive-react").ReactFC<import("react").HTMLAttributes<HTMLDivElement> & {
                 type?: "divide" | "card";
             }>;
         };
-        RequestBody(props: any): React.JSX.Element;
+        WorkflowVariableInput: typeof WorkflowVariableInput;
+        WorkflowVariableJSON: typeof WorkflowVariableJSON;
+    };
+    useVariables({ key, title }: {
+        key: any;
+        title: any;
+    }, { types, fieldNames }: {
+        types: any;
+        fieldNames?: import("@nocobase/client").FieldNames;
+    }): {
+        [x: string]: any;
     };
 };
 export default _default;

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import { WorkflowVariableRawTextArea } from '../variable';
 declare const _default: {
     title: string;
     type: string;
@@ -20,7 +20,16 @@ declare const _default: {
     };
     scope: {};
     components: {
-        SQLInput(props: any): React.JSX.Element;
+        WorkflowVariableRawTextArea: typeof WorkflowVariableRawTextArea;
+    };
+    useVariables({ key, title }: {
+        key: any;
+        title: any;
+    }, { types, fieldNames }: {
+        types: any;
+        fieldNames?: import("@nocobase/client").FieldNames;
+    }): {
+        [x: string]: any;
     };
 };
 export default _default;

package/dist/client/schemas/collection.d.ts

@@ -116,7 +116,6 @@ export declare const pagination: {
                             'x-decorator': string;
                             'x-component': string;
                             'x-component-props': {
-                                scope: string;
                                 useTypedConstant: string[];
                             };
                             default: number;
@@ -151,6 +150,7 @@ export declare const appends: {
     'x-decorator': string;
     'x-component': string;
     'x-component-props': {
+        title: string;
         multiple: boolean;
         useCollection(): any;
     };

package/dist/client/triggers/collection.d.ts

@@ -95,6 +95,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                title: string;
                 multiple: boolean;
                 useCollection(): any;
             };

package/dist/client/triggers/form.d.ts

@@ -23,6 +23,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                title: string;
                 multiple: boolean;
                 useCollection(): any;
             };
@@ -43,6 +44,7 @@ declare const _default: {
     useVariables(config: any, options: any): import("../variable").VariableOption[];
     useInitializers(config: any): SchemaInitializerItemOptions | null;
     initializers: {};
+    useActionTriggerable: boolean;
 };
 export default _default;
 export declare function useTriggerWorkflowsActionProps(): {

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

@@ -19,6 +19,7 @@ export interface Trigger {
     };
     useInitializers?(config: any): SchemaInitializerItemOptions | null;
     initializers?: any;
+    useActionTriggerable?: boolean | (() => boolean);
 }
 export declare const triggers: any;
 export declare const TriggerConfig: () => React.JSX.Element;
@@ -27,4 +28,7 @@ export declare function getTriggersOptions(): {
     value: any;
     label: any;
     color: string;
+    options: {
+        [x: string]: any;
+    };
 }[];

package/dist/client/variable.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export type VariableOption = {
     key?: string;
     value?: string;
@@ -21,6 +22,8 @@ export type OptionsOfUseVariableOptions = {
         children?: string;
     };
     appends?: string[] | null;
+    depth?: number;
+    current?: any;
 };
 export declare const defaultFieldNames: {
     readonly label: "label";
@@ -57,10 +60,24 @@ export declare const BaseTypeSets: {
     date: Set<string>;
 };
 export declare function useWorkflowVariableOptions(options?: OptionsOfUseVariableOptions): {
-    label: any;
-    value: any;
+    [x: number]: any;
     key: any;
-    children: any;
     disabled: boolean;
 }[];
 export declare function getCollectionFieldOptions(options: any): VariableOption[];
+export declare function WorkflowVariableInput({ variableOptions, ...props }: {
+    [x: string]: any;
+    variableOptions: any;
+}): JSX.Element;
+export declare function WorkflowVariableTextArea({ variableOptions, ...props }: {
+    [x: string]: any;
+    variableOptions: any;
+}): JSX.Element;
+export declare function WorkflowVariableRawTextArea({ variableOptions, ...props }: {
+    [x: string]: any;
+    variableOptions: any;
+}): JSX.Element;
+export declare function WorkflowVariableJSON({ variableOptions, ...props }: {
+    [x: string]: any;
+    variableOptions: any;
+}): JSX.Element;

package/dist/externalVersion.js

@@ -1,24 +1,23 @@
 module.exports = {
   "@ant-design/icons": "5.1.4",
-  "@nocobase/client": "0.14.0-alpha.7",
+  "@nocobase/client": "0.15.0-alpha.1",
   "antd": "5.8.6",
   "react": "18.2.0",
-  "@nocobase/utils": "0.14.0-alpha.7",
+  "@nocobase/utils": "0.15.0-alpha.1",
   "react-router-dom": "6.14.1",
   "react-i18next": "11.18.6",
   "winston": "3.9.0",
-  "@nocobase/database": "0.14.0-alpha.7",
-  "@nocobase/server": "0.14.0-alpha.7",
-  "@nocobase/logger": "0.14.0-alpha.7",
-  "@nocobase/evaluators": "0.14.0-alpha.7",
+  "@nocobase/database": "0.15.0-alpha.1",
+  "@nocobase/server": "0.15.0-alpha.1",
+  "@nocobase/logger": "0.15.0-alpha.1",
+  "@nocobase/evaluators": "0.15.0-alpha.1",
   "@formily/react": "2.2.27",
   "@formily/core": "2.2.27",
-  "@formily/antd-v5": "1.1.0",
+  "@formily/antd-v5": "1.1.7",
   "lodash": "4.17.21",
-  "@nocobase/actions": "0.14.0-alpha.7",
+  "@nocobase/actions": "0.15.0-alpha.1",
   "axios": "0.26.1",
   "sequelize": "6.32.1",
-  "@emotion/css": "11.11.2",
   "dayjs": "1.11.9",
-  "@nocobase/resourcer": "0.14.0-alpha.7"
+  "@nocobase/resourcer": "0.15.0-alpha.1"
 };

package/dist/locale/zh-CN.d.ts

@@ -83,6 +83,7 @@ declare const _default: {
     Advanced: string;
     End: string;
     'Node result': string;
+    'Variable key of node': string;
     Calculator: string;
     'Calculate an expression based on a calculation engine and obtain a value as the result. Variables in the upstream nodes can be used in the expression. The expression can be static or dynamic one from an expression collections.': string;
     'String operation': string;
@@ -99,6 +100,7 @@ declare const _default: {
     Aborted: string;
     Canceled: string;
     Rejected: string;
+    'Retry needed': string;
     'Triggered but still waiting in queue to execute.': string;
     'Started and executing, maybe waiting for an async callback (manual, delay etc.).': string;
     'Successfully finished.': string;
@@ -107,6 +109,7 @@ declare const _default: {
     'Running of some node was aborted by program flow.': string;
     'Manually canceled whole execution when waiting.': string;
     'Rejected from a manual node.': string;
+    'General failed but should do another try.': string;
     'Continue the process': string;
     'Terminate the process': string;
     'Save temporarily': string;
@@ -213,8 +216,7 @@ declare const _default: {
     'Field to aggregate': string;
     Distinct: string;
     'Query result': string;
-    'Trigger in executed workflow cannot be modified': string;
-    'Node in executed workflow cannot be modified': string;
+    'Executed workflow cannot be modified': string;
     'Can not delete': string;
     'The result of this node has been referenced by other nodes ({{nodes}}), please remove the usage before deleting.': string;
     'HTTP request': string;
@@ -234,7 +236,7 @@ declare const _default: {
     'Input request data': string;
     'Only support standard JSON data': string;
     '"Content-Type" only support "application/json", and no need to specify': string;
-    'Ignore fail request and continue workflow': string;
+    'Ignore failed request and continue workflow': string;
     'Workflow todos': string;
     Task: string;
     'Dynamic expression': string;

package/dist/locale/zh-CN.js

@@ -105,6 +105,7 @@ var zh_CN_default = {
   Advanced: "\u9AD8\u7EA7\u6A21\u5F0F",
   End: "\u7ED3\u675F",
   "Node result": "\u8282\u70B9\u6570\u636E",
+  "Variable key of node": "\u8282\u70B9\u53D8\u91CF\u6807\u8BC6",
   Calculator: "\u8FD0\u7B97",
   "Calculate an expression based on a calculation engine and obtain a value as the result. Variables in the upstream nodes can be used in the expression. The expression can be static or dynamic one from an expression collections.": "\u57FA\u4E8E\u8BA1\u7B97\u5F15\u64CE\u5BF9\u4E00\u4E2A\u8868\u8FBE\u5F0F\u8FDB\u884C\u8BA1\u7B97\uFF0C\u5E76\u83B7\u5F97\u4E00\u4E2A\u503C\u4F5C\u4E3A\u7ED3\u679C\u3002\u8868\u8FBE\u5F0F\u4E2D\u53EF\u4EE5\u4F7F\u7528\u4E0A\u6E38\u8282\u70B9\u91CC\u7684\u53D8\u91CF\u3002\u8868\u8FBE\u5F0F\u53EF\u4EE5\u662F\u9759\u6001\u7684\uFF0C\u4E5F\u53EF\u4EE5\u662F\u8868\u8FBE\u5F0F\u8868\u4E2D\u7684\u52A8\u6001\u8868\u8FBE\u5F0F\u3002",
   "String operation": "\u5B57\u7B26\u4E32",
@@ -121,6 +122,7 @@ var zh_CN_default = {
   Aborted: "\u5DF2\u7EC8\u6B62",
   Canceled: "\u5DF2\u53D6\u6D88",
   Rejected: "\u5DF2\u62D2\u7EDD",
+  "Retry needed": "\u9700\u91CD\u8BD5",
   "Triggered but still waiting in queue to execute.": "\u5DF2\u89E6\u53D1\u4F46\u4ECD\u5728\u961F\u5217\u4E2D\u7B49\u5F85\u6267\u884C\u3002",
   "Started and executing, maybe waiting for an async callback (manual, delay etc.).": "\u5DF2\u5F00\u59CB\u6267\u884C\uFF0C\u53EF\u80FD\u5728\u7B49\u5F85\u5F02\u6B65\u56DE\u8C03\uFF08\u4EBA\u5DE5\u3001\u5EF6\u65F6\u7B49\uFF09\u3002",
   "Successfully finished.": "\u6210\u529F\u5B8C\u6210\u3002",
@@ -129,6 +131,7 @@ var zh_CN_default = {
   "Running of some node was aborted by program flow.": "\u67D0\u4E2A\u8282\u70B9\u88AB\u7A0B\u5E8F\u6D41\u7A0B\u7EC8\u6B62\u3002",
   "Manually canceled whole execution when waiting.": "\u7B49\u5F85\u65F6\u88AB\u624B\u52A8\u53D6\u6D88\u6574\u4E2A\u6267\u884C\u3002",
   "Rejected from a manual node.": "\u88AB\u4EBA\u5DE5\u8282\u70B9\u62D2\u7EDD\u7EE7\u7EED\u3002",
+  "General failed but should do another try.": "\u6267\u884C\u5931\u8D25\uFF0C\u9700\u91CD\u8BD5\u3002",
   "Continue the process": "\u7EE7\u7EED\u6D41\u7A0B",
   "Terminate the process": "\u7EC8\u6B62\u6D41\u7A0B",
   "Save temporarily": "\u6682\u5B58",
@@ -235,8 +238,7 @@ var zh_CN_default = {
   "Field to aggregate": "\u805A\u5408\u5B57\u6BB5",
   Distinct: "\u53BB\u91CD",
   "Query result": "\u67E5\u8BE2\u7ED3\u679C",
-  "Trigger in executed workflow cannot be modified": "\u5DF2\u7ECF\u6267\u884C\u8FC7\u5DE5\u4F5C\u6D41\u7684\u89E6\u53D1\u5668\u4E0D\u80FD\u88AB\u4FEE\u6539",
-  "Node in executed workflow cannot be modified": "\u5DF2\u7ECF\u6267\u884C\u8FC7\u5DE5\u4F5C\u6D41\u4E2D\u7684\u8282\u70B9\u4E0D\u80FD\u88AB\u4FEE\u6539",
+  "Executed workflow cannot be modified": "\u5DF2\u7ECF\u6267\u884C\u8FC7\u7684\u5DE5\u4F5C\u6D41\u4E0D\u80FD\u88AB\u4FEE\u6539",
   "Can not delete": "\u65E0\u6CD5\u5220\u9664",
   "The result of this node has been referenced by other nodes ({{nodes}}), please remove the usage before deleting.": "\u8BE5\u8282\u70B9\u7684\u6267\u884C\u7ED3\u679C\u5DF2\u88AB\u5176\u4ED6\u8282\u70B9\uFF08{{nodes}}\uFF09\u5F15\u7528\uFF0C\u5220\u9664\u524D\u8BF7\u5148\u79FB\u9664\u5F15\u7528\u3002",
   "HTTP request": "HTTP \u8BF7\u6C42",
@@ -256,7 +258,7 @@ var zh_CN_default = {
   "Input request data": "\u8F93\u5165\u8BF7\u6C42\u6570\u636E",
   "Only support standard JSON data": "\u4EC5\u652F\u6301\u6807\u51C6 JSON \u6570\u636E",
   '"Content-Type" only support "application/json", and no need to specify': '"Content-Type" \u8BF7\u6C42\u5934\u4EC5\u652F\u6301 "application/json"\uFF0C\u65E0\u9700\u586B\u5199',
-  "Ignore fail request and continue workflow": "\u5FFD\u7565\u5931\u8D25\u7684\u8BF7\u6C42\u5E76\u7EE7\u7EED\u5DE5\u4F5C\u6D41",
+  "Ignore failed request and continue workflow": "\u5FFD\u7565\u5931\u8D25\u7684\u8BF7\u6C42\u5E76\u7EE7\u7EED\u5DE5\u4F5C\u6D41",
   "Workflow todos": "\u5DE5\u4F5C\u6D41\u5F85\u529E",
   Task: "\u4EFB\u52A1",
   "Dynamic expression": "\u52A8\u6001\u8868\u8FBE\u5F0F",

package/dist/node_modules/cron-parser/package.json

@@ -1 +1 @@
-{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2023-10-07T08:33:03.346Z"}
+{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2023-11-13T03:13:09.200Z"}

package/dist/node_modules/lru-cache/package.json

@@ -1 +1 @@
-{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2023-10-07T08:33:02.747Z"}
+{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2023-11-13T03:13:08.897Z"}

package/dist/server/Plugin.js

@@ -288,7 +288,10 @@ class WorkflowPlugin extends import_server.Plugin {
       } else {
         const execution = await this.db.getRepository("executions").findOne({
           filter: {
-            status: import_constants.EXECUTION_STATUS.QUEUEING
+            status: import_constants.EXECUTION_STATUS.QUEUEING,
+            "workflow.id": {
+              [import_database.Op.not]: null
+            }
           },
           appends: ["workflow"],
           sort: "createdAt"

package/dist/server/Processor.d.ts

@@ -16,8 +16,8 @@ export default class Processor {
     nodes: FlowNodeModel[];
     nodesMap: Map<number, FlowNodeModel>;
     jobsMap: Map<number, JobModel>;
-    jobsMapByNodeId: {
-        [key: number]: any;
+    jobsMapByNodeKey: {
+        [key: string]: any;
     };
     constructor(execution: ExecutionModel, options: ProcessorOptions);
     private makeNodes;
@@ -41,8 +41,8 @@ export default class Processor {
     findBranchLastJob(node: FlowNodeModel, job: JobModel): JobModel | null;
     getScope(sourceNodeId: number): {
         $context: any;
-        $jobsMapByNodeId: {
-            [key: number]: any;
+        $jobsMapByNodeKey: {
+            [key: string]: any;
         };
         $system: {};
         $scopes: {};

package/dist/server/Processor.js

@@ -37,14 +37,15 @@ class Processor {
     [import_constants.JOB_STATUS.ERROR]: import_constants.EXECUTION_STATUS.ERROR,
     [import_constants.JOB_STATUS.ABORTED]: import_constants.EXECUTION_STATUS.ABORTED,
     [import_constants.JOB_STATUS.CANCELED]: import_constants.EXECUTION_STATUS.CANCELED,
-    [import_constants.JOB_STATUS.REJECTED]: import_constants.EXECUTION_STATUS.REJECTED
+    [import_constants.JOB_STATUS.REJECTED]: import_constants.EXECUTION_STATUS.REJECTED,
+    [import_constants.JOB_STATUS.RETRY_NEEDED]: import_constants.EXECUTION_STATUS.RETRY_NEEDED
   };
   logger;
   transaction;
   nodes = [];
   nodesMap = /* @__PURE__ */ new Map();
   jobsMap = /* @__PURE__ */ new Map();
-  jobsMapByNodeId = {};
+  jobsMapByNodeKey = {};
   // make dual linked nodes list then cache
   makeNodes(nodes = []) {
     this.nodes = nodes;
@@ -63,7 +64,8 @@ class Processor {
   makeJobs(jobs) {
     jobs.forEach((job) => {
       this.jobsMap.set(job.id, job);
-      this.jobsMapByNodeId[job.nodeId] = job.result;
+      const node = this.nodesMap.get(job.nodeId);
+      this.jobsMapByNodeKey[node.key] = job.result;
     });
   }
   async getTransaction() {
@@ -214,7 +216,8 @@ class Processor {
       );
     }
     this.jobsMap.set(job.id, job);
-    this.jobsMapByNodeId[job.nodeId] = job.result;
+    const node = this.nodesMap.get(job.nodeId);
+    this.jobsMapByNodeKey[node.key] = job.result;
     return job;
   }
   getBranches(node) {
@@ -290,12 +293,12 @@ class Processor {
     for (let n = this.findBranchParentNode(node); n; n = this.findBranchParentNode(n)) {
       const instruction = this.options.plugin.instructions.get(n.type);
       if (typeof instruction.getScope === "function") {
-        $scopes[n.id] = instruction.getScope(n, this.jobsMapByNodeId[n.id], this);
+        $scopes[n.id] = $scopes[n.key] = instruction.getScope(n, this.jobsMapByNodeKey[n.key], this);
       }
     }
     return {
       $context: this.execution.context,
-      $jobsMapByNodeId: this.jobsMapByNodeId,
+      $jobsMapByNodeKey: this.jobsMapByNodeKey,
       $system: systemFns,
       $scopes
     };