@nocobase/plugin-workflow-loop 1.0.0-alpha.1 → 1.0.0-alpha.11

package/dist/client/LoopInstruction.d.ts

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 { VariableOption, WorkflowVariableInput, Instruction } from '@nocobase/plugin-workflow/client';
 export default class extends Instruction {

package/dist/client/index.d.ts

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 { Plugin } from '@nocobase/client';
 export default class extends Plugin {
     afterAdd(): Promise<void>;

package/dist/client/index.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 (function(n,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("@nocobase/client"),require("react/jsx-runtime"),require("@ant-design/icons"),require("@nocobase/plugin-workflow/client"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","react/jsx-runtime","@ant-design/icons","@nocobase/plugin-workflow/client","react-i18next"],e):(n=typeof globalThis!="undefined"?globalThis:n||self,e(n["@nocobase/plugin-workflow-loop"]={},n["@nocobase/client"],n.jsxRuntime,n["@ant-design/icons"],n["@nocobase/plugin-workflow"],n["react-i18next"]))})(this,function(n,e,o,v,t,k){"use strict";var V=Object.defineProperty,W=Object.defineProperties;var P=Object.getOwnPropertyDescriptors;var O=Object.getOwnPropertySymbols;var F=Object.prototype.hasOwnProperty,M=Object.prototype.propertyIsEnumerable;var I=(n,e,o)=>e in n?V(n,e,{enumerable:!0,configurable:!0,writable:!0,value:o}):n[e]=o,N=(n,e)=>{for(var o in e||(e={}))F.call(e,o)&&I(n,o,e[o]);if(O)for(var o of O(e))M.call(e,o)&&I(n,o,e[o]);return n},T=(n,e)=>W(n,P(e));var h=(n,e,o)=>(I(n,typeof e!="symbol"?e+"":e,o),o);var y=(n,e,o)=>new Promise((v,t)=>{var k=i=>{try{d(o.next(i))}catch(w){t(w)}},u=i=>{try{d(o.throw(i))}catch(w){t(w)}},d=i=>i.done?v(i.value):Promise.resolve(i.value).then(k,u);d((o=o.apply(n,e)).next())});const u="workflow-loop";function d(p,g={}){const{t:r}=i(g);return r(p)}function i(p){return k.useTranslation(u,p)}function w(p,g){let r=p,f=null;for(let a=0;a<g.length;a++){const c=g[a],s=r.find(m=>m.value===c);if(!s)return null;f=s,!s.isLeaf&&s.loadChildren&&s.loadChildren(s),s.children&&(r=s.children)}return f}class j extends t.Instruction{constructor(){super(...arguments);h(this,"title",`{{t("Loop", { ns: "${u}" })}}`);h(this,"type","loop");h(this,"group","control");h(this,"description",`{{t("By using a loop node, you can perform the same operation on multiple sets of data. The source of these sets can be either multiple records from a query node or multiple associated records of a single record. Loop node can also be used for iterating a certain number of times or for looping through each character in a string. However, excessive looping may cause performance issues, so use with caution.", { ns: "${u}" })}}`);h(this,"fieldset",{target:{type:"string",title:`{{t("Loop target", { ns: "${u}" })}}`,description:`{{t("A single number will be treated as a loop count, a single string will be treated as an array of characters, and other non-array values will be converted to arrays. The loop node ends when the loop count is reached, or when the array loop is completed. You can also add condition nodes to the loop to terminate it.", { ns: "${u}" })}}`,"x-decorator":"FormItem","x-component":"WorkflowVariableInput","x-component-props":{changeOnSelect:!0,useTypedConstant:["string","number","null"],className:e.css`
           width: 100%;
 

package/dist/externalVersion.js

@@ -1,8 +1,17 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 module.exports = {
   "react": "18.2.0",
   "@ant-design/icons": "5.2.6",
-  "@nocobase/client": "1.0.0-alpha.1",
-  "@nocobase/plugin-workflow": "1.0.0-alpha.1",
+  "@nocobase/client": "1.0.0-alpha.11",
+  "@nocobase/plugin-workflow": "1.0.0-alpha.11",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "1.0.0-alpha.1"
+  "@nocobase/server": "1.0.0-alpha.11"
 };

package/dist/index.d.ts

@@ -1,2 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 * from './server';
 export { default } from './server';

package/dist/index.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/locale/index.d.ts

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 const NAMESPACE = "workflow-loop";
 export declare function useLang(key: string, options?: {}): string;
 export declare function usePluginTranslation(options: any): import("react-i18next").UseTranslationResponse<"workflow-loop", undefined>;

package/dist/locale/index.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/dist/server/LoopInstruction.d.ts

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 { Processor, Instruction, FlowNodeModel, JobModel } from '@nocobase/plugin-workflow';
 export default class extends Instruction {
     run(node: FlowNodeModel, prevJob: JobModel, processor: Processor): Promise<{

package/dist/server/LoopInstruction.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/dist/server/Plugin.d.ts

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 { Plugin } from '@nocobase/server';
 export default class extends Plugin {
     load(): Promise<void>;

package/dist/server/Plugin.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/server/index.d.ts

@@ -1 +1,9 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 { default } from './Plugin';

package/dist/server/index.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：循环节点",
   "description": "Used to repeat the sub-process processing of each value in an array, and can also be used for fixed times of sub-process processing.",
   "description.zh-CN": "用于对一个数组中的每个值进行重复的子流程处理，也可用于固定次数的重复子流程处理。",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.11",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-loop",
@@ -21,7 +21,7 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "c73b6d2032a6151fdfeebeb0ec923d766578c53c",
+  "gitHead": "00ffb260456e5a22701fd16c87112a92708d9dc1",
   "keywords": [
     "Workflow"
   ]

package/src/client/LoopInstruction.tsx

@@ -1,161 +0,0 @@
-import React from 'react';
-import { ArrowUpOutlined } from '@ant-design/icons';
-
-import { css, cx, useCompile } from '@nocobase/client';
-
-import {
-  NodeDefaultView,
-  Branch,
-  useFlowContext,
-  useStyles,
-  VariableOption,
-  WorkflowVariableInput,
-  defaultFieldNames,
-  nodesOptions,
-  scopeOptions,
-  triggerOptions,
-  Instruction,
-} from '@nocobase/plugin-workflow/client';
-import { NAMESPACE, useLang } from '../locale';
-
-function findOption(options: VariableOption[], paths: string[]) {
-  let opts = options;
-  let option = null;
-  for (let i = 0; i < paths.length; i++) {
-    const path = paths[i];
-    const current = opts.find((item) => item.value === path);
-    if (!current) {
-      return null;
-    }
-    option = current;
-    if (!current.isLeaf && current.loadChildren) {
-      current.loadChildren(current);
-    }
-    if (current.children) {
-      opts = current.children;
-    }
-  }
-  return option;
-}
-
-export default class extends Instruction {
-  title = `{{t("Loop", { ns: "${NAMESPACE}" })}}`;
-  type = 'loop';
-  group = 'control';
-  description = `{{t("By using a loop node, you can perform the same operation on multiple sets of data. The source of these sets can be either multiple records from a query node or multiple associated records of a single record. Loop node can also be used for iterating a certain number of times or for looping through each character in a string. However, excessive looping may cause performance issues, so use with caution.", { ns: "${NAMESPACE}" })}}`;
-  fieldset = {
-    target: {
-      type: 'string',
-      title: `{{t("Loop target", { ns: "${NAMESPACE}" })}}`,
-      description: `{{t("A single number will be treated as a loop count, a single string will be treated as an array of characters, and other non-array values will be converted to arrays. The loop node ends when the loop count is reached, or when the array loop is completed. You can also add condition nodes to the loop to terminate it.", { ns: "${NAMESPACE}" })}}`,
-      'x-decorator': 'FormItem',
-      'x-component': 'WorkflowVariableInput',
-      'x-component-props': {
-        changeOnSelect: true,
-        useTypedConstant: ['string', 'number', 'null'],
-        className: css`
-          width: 100%;
-
-          .variable {
-            flex: 1;
-          }
-
-          .ant-input.null-value {
-            width: 100%;
-          }
-        `,
-      },
-      required: true,
-    },
-  };
-  components = {
-    WorkflowVariableInput,
-  };
-  Component({ data }) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const { nodes } = useFlowContext();
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const { styles } = useStyles();
-    const entry = nodes.find((node) => node.upstreamId === data.id && node.branchIndex != null);
-
-    return (
-      <NodeDefaultView data={data}>
-        <div className={styles.nodeSubtreeClass}>
-          <div
-            className={cx(
-              styles.branchBlockClass,
-              css`
-                padding-left: 20em;
-              `,
-            )}
-          >
-            <Branch from={data} entry={entry} branchIndex={entry?.branchIndex ?? 0} />
-
-            <div className={styles.branchClass}>
-              <div className="workflow-branch-lines" />
-              <div className={cx(styles.addButtonClass, styles.loopLineClass)}>
-                <ArrowUpOutlined />
-              </div>
-            </div>
-          </div>
-        </div>
-      </NodeDefaultView>
-    );
-  }
-  useScopeVariables(node, options) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const compile = useCompile();
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const langLoopTarget = useLang('Loop target');
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const langLoopIndex = useLang('Loop index');
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const langLoopLength = useLang('Loop length');
-    const { target } = node.config;
-    if (!target) {
-      return null;
-    }
-
-    const { fieldNames = defaultFieldNames } = options;
-
-    // const { workflow } = useFlowContext();
-    // const current = useNodeContext();
-    // const upstreams = useAvailableUpstreams(current);
-    // find target data model by path described in `config.target`
-    // 1. get options from $context/$jobsMapByNodeKey
-    // 2. route to sub-options and use as loop target options
-    let targetOption: VariableOption = {
-      key: 'item',
-      [fieldNames.value]: 'item',
-      [fieldNames.label]: langLoopTarget,
-    };
-
-    if (typeof target === 'string' && target.startsWith('{{') && target.endsWith('}}')) {
-      const paths = target
-        .slice(2, -2)
-        .split('.')
-        .map((path) => path.trim());
-
-      const targetOptions = [scopeOptions, nodesOptions, triggerOptions].map((item: any) => {
-        const opts = item.useOptions({ ...options, current: node }).filter(Boolean);
-        return {
-          [fieldNames.label]: compile(item.label),
-          [fieldNames.value]: item.value,
-          key: item.value,
-          [fieldNames.children]: opts,
-          disabled: opts && !opts.length,
-        };
-      });
-
-      const found = findOption(targetOptions, paths);
-
-      targetOption = Object.assign({}, found, targetOption);
-    }
-
-    return [
-      targetOption,
-      { key: 'index', [fieldNames.value]: 'index', [fieldNames.label]: langLoopIndex },
-      { key: 'length', [fieldNames.value]: 'length', [fieldNames.label]: langLoopLength },
-    ];
-  }
-}

package/src/client/index.ts

@@ -1,18 +0,0 @@
-import { Plugin } from '@nocobase/client';
-import WorkflowPlugin from '@nocobase/plugin-workflow/client';
-
-import LoopInstruction from './LoopInstruction';
-
-export default class extends Plugin {
-  async afterAdd() {
-    // await this.app.pm.add()
-  }
-
-  async beforeLoad() {}
-
-  // You can get and modify the app instance here
-  async load() {
-    const workflow = this.app.pm.get('workflow') as WorkflowPlugin;
-    workflow.registerInstruction('loop', LoopInstruction);
-  }
-}

package/src/index.ts

@@ -1,2 +0,0 @@
-export * from './server';
-export { default } from './server';

package/src/locale/en-US.json

@@ -1,9 +0,0 @@
-{
-  "Loop": "Loop",
-  "Loop target": "Loop target",
-  "Loop index": "Loop index",
-  "Loop length": "Loop length",
-  "By using a loop node, you can perform the same operation on multiple sets of data. The source of these sets can be either multiple records from a query node or multiple associated records of a single record. Loop node can also be used for iterating a certain number of times or for looping through each character in a string. However, excessive looping may cause performance issues, so use with caution.": "By using a loop node, you can perform the same operation on multiple sets of data. The source of these sets can be either multiple records from a query node or multiple associated records of a single record. Loop node can also be used for iterating a certain number of times or for looping through each character in a string. However, excessive looping may cause performance issues, so use with caution.",
-  "Scope variables": "Scope variables",
-  "A single number will be treated as a loop count, a single string will be treated as an array of characters, and other non-array values will be converted to arrays. The loop node ends when the loop count is reached, or when the array loop is completed. You can also add condition nodes to the loop to terminate it.": "A single number will be treated as a loop count, a single string will be treated as an array of characters, and other non-array values will be converted to arrays. The loop node ends when the loop count is reached, or when the array loop is completed. You can also add condition nodes to the loop to terminate it."
-}

package/src/locale/index.ts

@@ -1,12 +0,0 @@
-import { useTranslation } from 'react-i18next';
-
-export const NAMESPACE = 'workflow-loop';
-
-export function useLang(key: string, options = {}) {
-  const { t } = usePluginTranslation(options);
-  return t(key);
-}
-
-export function usePluginTranslation(options) {
-  return useTranslation(NAMESPACE, options);
-}

package/src/locale/ko_KR.json

@@ -1,10 +0,0 @@
-{
-  "Loop": "루프",
-  "Loop target": "루프 대상",
-  "Loop index": "현재 인덱스",
-  "Loop length": "루프 길이",
-  "By using a loop node, you can perform the same operation on multiple sets of data. The source of these sets can be either multiple records from a query node or multiple associated records of a single record. Loop node can also be used for iterating a certain number of times or for looping through each character in a string. However, excessive looping may cause performance issues, so use with caution.": 
-    "루프 노드를 사용하면 여러 데이터 세트에 동일한 작업을 수행할 수 있습니다. 이러한 세트의 소스는 쿼리 노드에서 가져온 여러 레코드이거나 단일 레코드의 여러 관련 레코드일 수 있습니다. 루프 노드는 특정 횟수만큼 반복하거나 문자열의 각 문자를 반복하는 데에도 사용할 수 있습니다. 그러나 과도한 루핑은 성능 문제를 일으킬 수 있으므로 주의해서 사용하십시오.",
-  "A single number will be treated as a loop count, a single string will be treated as an array of characters, and other non-array values will be converted to arrays. The loop node ends when the loop count is reached, or when the array loop is completed. You can also add condition nodes to the loop to terminate it.": 
-    "단일 숫자는 루프 카운트로 처리되고, 단일 문자열은 문자 배열로 처리되며, 다른 배열이 아닌 값은 배열로 변환됩니다. 루프 노드는 루프 카운트에 도달하거나 배열 루프가 완료되었을 때 종료됩니다. 루프를 종료하려면 루프에 조건 노드를 추가할 수도 있습니다."
-}

package/src/locale/zh-CN.json

@@ -1,8 +0,0 @@
-{
-  "Loop": "循环",
-  "Loop target": "循环对象",
-  "Loop index": "当前索引",
-  "Loop length": "循环长度",
-  "By using a loop node, you can perform the same operation on multiple sets of data. The source of these sets can be either multiple records from a query node or multiple associated records of a single record. Loop node can also be used for iterating a certain number of times or for looping through each character in a string. However, excessive looping may cause performance issues, so use with caution.": "使用循环节点可以对多条数据进行同样的操作，多条数据的来源可以是查询节点的多条结果，或者一条数据的多条关系数据。也可以用于一定次数的循环，或者对字符串中每一个字符的循环处理。循环次数过高可能引起性能问题，请谨慎使用。",
-  "A single number will be treated as a loop count, a single string will be treated as an array of characters, and other non-array values will be converted to arrays. The loop node ends when the loop count is reached, or when the array loop is completed. You can also add condition nodes to the loop to terminate it.": "单一数字值将被视为循环次数，单一字符串值将被视为字符数组，其他非数组值将被转换为数组。达到循环次数，或者将数组循环完成后，循环节点结束。你也可以在循环中添加条件节点，以终止循环。"
-}

package/src/server/LoopInstruction.ts

@@ -1,98 +0,0 @@
-import { Processor, Instruction, JOB_STATUS, FlowNodeModel, JobModel } from '@nocobase/plugin-workflow';
-
-function getTargetLength(target) {
-  let length = 0;
-  if (typeof target === 'number') {
-    if (target < 0) {
-      throw new Error('Loop target in number type must be greater than 0');
-    }
-    length = Math.floor(target);
-  } else {
-    const targets = (Array.isArray(target) ? target : [target]).filter((t) => t != null);
-    length = targets.length;
-  }
-  return length;
-}
-
-export default class extends Instruction {
-  async run(node: FlowNodeModel, prevJob: JobModel, processor: Processor) {
-    const [branch] = processor.getBranches(node);
-    const target = processor.getParsedValue(node.config.target, node.id);
-    const length = getTargetLength(target);
-
-    if (!branch || !length) {
-      return {
-        status: JOB_STATUS.RESOLVED,
-        result: 0,
-      };
-    }
-
-    const job = await processor.saveJob({
-      status: JOB_STATUS.PENDING,
-      // save loop index
-      result: 0,
-      nodeId: node.id,
-      nodeKey: node.key,
-      upstreamId: prevJob?.id ?? null,
-    });
-
-    // TODO: add loop scope to stack
-    // processor.stack.push({
-    //   label: node.title,
-    //   value: node.id
-    // });
-
-    await processor.run(branch, job);
-
-    return null;
-  }
-
-  async resume(node: FlowNodeModel, branchJob, processor: Processor) {
-    const job = processor.findBranchParentJob(branchJob, node) as JobModel;
-    const loop = processor.nodesMap.get(job.nodeId);
-    const [branch] = processor.getBranches(node);
-
-    const { result, status } = job;
-    // if loop has been done (resolved / rejected), do not care newly executed branch jobs.
-    if (status !== JOB_STATUS.PENDING) {
-      return processor.exit();
-    }
-
-    const nextIndex = result + 1;
-
-    const target = processor.getParsedValue(loop.config.target, node.id);
-    // branchJob.status === JOB_STATUS.RESOLVED means branchJob is done, try next loop or exit as resolved
-    if (branchJob.status > JOB_STATUS.PENDING) {
-      job.set({ result: nextIndex });
-
-      const length = getTargetLength(target);
-      if (nextIndex < length) {
-        await processor.saveJob(job);
-        await processor.run(branch, job);
-        return null;
-      }
-    }
-
-    // branchJob.status < JOB_STATUS.PENDING means branchJob is rejected, any rejection should cause loop rejected
-    job.set({
-      status: branchJob.status,
-    });
-
-    return job;
-  }
-
-  getScope(node, index, processor) {
-    const target = processor.getParsedValue(node.config.target, node.id);
-    const targets = (Array.isArray(target) ? target : [target]).filter((t) => t != null);
-    const length = getTargetLength(target);
-    const item = typeof target === 'number' ? index : targets[index];
-
-    const result = {
-      item,
-      index,
-      length,
-    };
-
-    return result;
-  }
-}

package/src/server/Plugin.ts

@@ -1,11 +0,0 @@
-import { Plugin } from '@nocobase/server';
-import { default as WorkflowPlugin } from '@nocobase/plugin-workflow';
-
-import LoopInstruction from './LoopInstruction';
-
-export default class extends Plugin {
-  async load() {
-    const workflowPlugin = this.app.getPlugin<WorkflowPlugin>(WorkflowPlugin);
-    workflowPlugin.registerInstruction('loop', LoopInstruction);
-  }
-}

package/src/server/__tests__/instruction.test.ts

@@ -1,476 +0,0 @@
-import Database from '@nocobase/database';
-import { Application } from '@nocobase/server';
-import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
-import { getApp, sleep } from '@nocobase/plugin-workflow-test';
-
-import Plugin from '..';
-
-describe('workflow > instructions > loop', () => {
-  let app: Application;
-  let db: Database;
-  let PostRepo;
-  let WorkflowModel;
-  let workflow;
-  let plugin;
-
-  beforeEach(async () => {
-    app = await getApp({
-      plugins: [Plugin],
-    });
-    plugin = app.pm.get('workflow');
-
-    db = app.db;
-    WorkflowModel = db.getCollection('workflows').model;
-    PostRepo = db.getCollection('posts').repository;
-
-    workflow = await WorkflowModel.create({
-      enabled: true,
-      type: 'collection',
-      config: {
-        mode: 1,
-        collection: 'posts',
-      },
-    });
-  });
-
-  afterEach(() => app.destroy());
-
-  describe('branch', () => {
-    it('no branch just pass', async () => {
-      const n1 = await workflow.createNode({
-        type: 'loop',
-      });
-
-      const n2 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-      });
-
-      await n1.setDownstream(n2);
-
-      const post = await PostRepo.create({ values: { title: 't1' } });
-
-      await sleep(500);
-
-      const [execution] = await workflow.getExecutions();
-      expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
-      const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
-      expect(jobs.length).toBe(2);
-      expect(jobs[0].status).toBe(JOB_STATUS.RESOLVED);
-      expect(jobs[0].result).toBe(0);
-    });
-
-    it('should exit when branch meets error', async () => {
-      const n1 = await workflow.createNode({
-        type: 'loop',
-        config: {
-          target: 2,
-        },
-      });
-
-      const n2 = await workflow.createNode({
-        type: 'error',
-        upstreamId: n1.id,
-        branchIndex: 0,
-      });
-
-      const n3 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-      });
-
-      await n1.setDownstream(n3);
-
-      const post = await PostRepo.create({ values: { title: 't1' } });
-
-      await sleep(500);
-
-      const [execution] = await workflow.getExecutions();
-      expect(execution.status).toBe(EXECUTION_STATUS.ERROR);
-      const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
-      expect(jobs.length).toBe(2);
-      expect(jobs[0].status).toBe(JOB_STATUS.ERROR);
-      expect(jobs[0].result).toBe(0);
-      expect(jobs[1].status).toBe(JOB_STATUS.ERROR);
-    });
-  });
-
-  describe('config', () => {
-    it('no target just pass', async () => {
-      const n1 = await workflow.createNode({
-        type: 'loop',
-      });
-
-      const n2 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-        branchIndex: 0,
-      });
-
-      const n3 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-      });
-
-      await n1.setDownstream(n3);
-
-      const post = await PostRepo.create({ values: { title: 't1' } });
-
-      await sleep(500);
-
-      const [execution] = await workflow.getExecutions();
-      expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
-      const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
-      expect(jobs.length).toBe(2);
-      expect(jobs[0].status).toBe(JOB_STATUS.RESOLVED);
-      expect(jobs[0].result).toBe(0);
-    });
-
-    it('null target just pass', async () => {
-      const n1 = await workflow.createNode({
-        type: 'loop',
-        config: {
-          target: null,
-        },
-      });
-
-      const n2 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-        branchIndex: 0,
-      });
-
-      const n3 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-      });
-
-      await n1.setDownstream(n3);
-
-      const post = await PostRepo.create({ values: { title: 't1' } });
-
-      await sleep(500);
-
-      const [execution] = await workflow.getExecutions();
-      expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
-      const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
-      expect(jobs.length).toBe(2);
-      expect(jobs[0].status).toBe(JOB_STATUS.RESOLVED);
-      expect(jobs[0].result).toBe(0);
-    });
-
-    it('empty array just pass', async () => {
-      const n1 = await workflow.createNode({
-        type: 'loop',
-        config: {
-          target: [],
-        },
-      });
-
-      const n2 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-        branchIndex: 0,
-      });
-
-      const n3 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-      });
-
-      await n1.setDownstream(n3);
-
-      const post = await PostRepo.create({ values: { title: 't1' } });
-
-      await sleep(500);
-
-      const [execution] = await workflow.getExecutions();
-      expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
-      const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
-      expect(jobs.length).toBe(2);
-      expect(jobs[0].status).toBe(JOB_STATUS.RESOLVED);
-      expect(jobs[0].result).toBe(0);
-    });
-
-    it('target is number, cycle number times', async () => {
-      const n1 = await workflow.createNode({
-        type: 'loop',
-        config: {
-          target: 2.5,
-        },
-      });
-
-      const n2 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-        branchIndex: 0,
-      });
-
-      const n3 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-      });
-
-      await n1.setDownstream(n3);
-
-      const post = await PostRepo.create({ values: { title: 't1' } });
-
-      await sleep(500);
-
-      const [execution] = await workflow.getExecutions();
-      expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
-      const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
-
-      expect(jobs.length).toBe(4);
-      expect(jobs[0].status).toBe(JOB_STATUS.RESOLVED);
-      expect(jobs[0].result).toBe(2);
-    });
-
-    it('target is no array, set as an array', async () => {
-      const n1 = await workflow.createNode({
-        type: 'loop',
-        config: {
-          target: {},
-        },
-      });
-
-      const n2 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-        branchIndex: 0,
-      });
-
-      const n3 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-      });
-
-      await n1.setDownstream(n3);
-
-      const post = await PostRepo.create({ values: { title: 't1' } });
-
-      await sleep(500);
-
-      const [execution] = await workflow.getExecutions();
-      expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
-      const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
-
-      expect(jobs.length).toBe(3);
-      expect(jobs[0].status).toBe(JOB_STATUS.RESOLVED);
-      expect(jobs[0].result).toBe(1);
-    });
-
-    it('multiple targets', async () => {
-      const n1 = await workflow.createNode({
-        type: 'loop',
-        config: {
-          target: [1, 2],
-        },
-      });
-
-      const n2 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-        branchIndex: 0,
-      });
-
-      const n3 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-      });
-
-      await n1.setDownstream(n3);
-
-      const post = await PostRepo.create({ values: { title: 't1' } });
-
-      await sleep(500);
-
-      const [execution] = await workflow.getExecutions();
-      expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
-      const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
-
-      expect(jobs.length).toBe(4);
-      expect(jobs[0].status).toBe(JOB_STATUS.RESOLVED);
-      expect(jobs[0].result).toBe(2);
-      expect(jobs.filter((j) => j.nodeId === n2.id).length).toBe(2);
-    });
-  });
-
-  describe('scope variable', () => {
-    it('item.key', async () => {
-      const n1 = await workflow.createNode({
-        type: 'loop',
-        config: {
-          target: '{{$context.data.comments}}',
-        },
-      });
-
-      const n2 = await workflow.createNode({
-        type: 'calculation',
-        config: {
-          engine: 'formula.js',
-          expression: `{{$scopes.${n1.id}.item.content}}`,
-        },
-        upstreamId: n1.id,
-        branchIndex: 0,
-      });
-
-      const post = await PostRepo.create({
-        values: {
-          title: 't1',
-          comments: [{ content: 'c1' }, { content: 'c2' }],
-        },
-      });
-
-      await sleep(500);
-
-      const [execution] = await workflow.getExecutions();
-      expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
-      const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
-      expect(jobs.length).toBe(3);
-      expect(jobs[1].result).toBe('c1');
-      expect(jobs[2].result).toBe('c2');
-    });
-  });
-
-  describe('mixed', () => {
-    it.skip('loop branch contains parallel branches', async () => {
-      const n1 = await workflow.createNode({
-        type: 'loop',
-        config: {
-          target: 2,
-        },
-      });
-
-      const n2 = await workflow.createNode({
-        type: 'parallel',
-        branchIndex: 0,
-        upstreamId: n1.id,
-        config: {
-          mode: 'any',
-        },
-      });
-
-      const n3 = await workflow.createNode({
-        type: 'condition',
-        config: {
-          rejectOnFalse: true,
-          calculation: {
-            calculator: '<',
-            operands: [`{{$scopes.${n1.id}.item}}`, 1],
-          },
-        },
-        branchIndex: 0,
-        upstreamId: n2.id,
-      });
-      const n4 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n3.id,
-      });
-      await n3.setDownstream(n4);
-
-      const n5 = await workflow.createNode({
-        type: 'condition',
-        config: {
-          rejectOnFalse: true,
-          calculation: {
-            calculator: '<',
-            operands: [`{{$scopes.${n1.id}.item}}`, 1],
-          },
-        },
-        branchIndex: 1,
-        upstreamId: n2.id,
-      });
-      const n6 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n5.id,
-      });
-      await n5.setDownstream(n6);
-
-      const post = await PostRepo.create({ values: { title: 't1' } });
-
-      await sleep(1000);
-
-      const [e1] = await workflow.getExecutions();
-      expect(e1.status).toEqual(EXECUTION_STATUS.FAILED);
-      const e1jobs = await e1.getJobs();
-      expect(e1jobs.length).toBe(7);
-    });
-
-    it('condition contains loop (target as 0)', async () => {
-      const n1 = await workflow.createNode({
-        type: 'condition',
-      });
-
-      const n2 = await workflow.createNode({
-        type: 'loop',
-        branchIndex: 1,
-        upstreamId: n1.id,
-        config: {
-          target: 0,
-        },
-      });
-
-      const n3 = await workflow.createNode({
-        type: 'echo',
-        branchIndex: 0,
-        upstreamId: n2.id,
-      });
-
-      const n4 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-      });
-
-      await n1.setDownstream(n4);
-
-      const post = await PostRepo.create({ values: { title: 't1' } });
-
-      await sleep(500);
-
-      const [e1] = await workflow.getExecutions();
-      expect(e1.status).toEqual(EXECUTION_STATUS.RESOLVED);
-      const jobs = await e1.getJobs({ order: [['id', 'ASC']] });
-      expect(jobs.length).toBe(3);
-      expect(jobs[0].status).toBe(JOB_STATUS.RESOLVED);
-    });
-
-    it('condition contains loop (target as 2)', async () => {
-      const n1 = await workflow.createNode({
-        type: 'condition',
-      });
-
-      const n2 = await workflow.createNode({
-        type: 'loop',
-        branchIndex: 1,
-        upstreamId: n1.id,
-        config: {
-          target: 2,
-        },
-      });
-
-      const n3 = await workflow.createNode({
-        type: 'echo',
-        branchIndex: 0,
-        upstreamId: n2.id,
-      });
-
-      const n4 = await workflow.createNode({
-        type: 'echo',
-        upstreamId: n1.id,
-      });
-
-      await n1.setDownstream(n4);
-
-      const post = await PostRepo.create({ values: { title: 't1' } });
-
-      await sleep(500);
-
-      const [e1] = await workflow.getExecutions();
-      expect(e1.status).toEqual(EXECUTION_STATUS.RESOLVED);
-      const jobs = await e1.getJobs({ order: [['id', 'ASC']] });
-      expect(jobs.length).toBe(5);
-      expect(jobs[0].status).toBe(JOB_STATUS.RESOLVED);
-    });
-  });
-});

package/src/server/index.ts

@@ -1 +0,0 @@
-export { default } from './Plugin';