@nocobase/plugin-workflow-loop 0.17.0-alpha.7 → 0.18.0-alpha.8

package/dist/client/index.js

@@ -1,4 +1,4 @@
-(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,s,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 g=(n,e,o)=>(I(n,typeof e!="symbol"?e+"":e,o),o);var y=(n,e,o)=>new Promise((v,s)=>{var k=i=>{try{d(o.next(i))}catch(w){s(w)}},u=i=>{try{d(o.throw(i))}catch(w){s(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,f={}){const{t}=i(f);return t(p)}function i(p){return k.useTranslation(u,p)}function w(p,f){let t=p,h=null;for(let a=0;a<f.length;a++){const c=f[a],r=t.find(m=>m.value===c);if(!r)return null;h=r,!r.isLeaf&&r.loadChildren&&r.loadChildren(r),r.children&&(t=r.children)}return h}class j extends s.Instruction{constructor(){super(...arguments);g(this,"title",`{{t("Loop", { ns: "${u}" })}}`);g(this,"type","loop");g(this,"group","control");g(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}" })}}`);g(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`
+(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%;
 
           .variable {
@@ -8,6 +8,6 @@
           .ant-input.null-value {
             width: 100%;
           }
-        `},required:!0}});g(this,"components",{WorkflowVariableInput:s.WorkflowVariableInput})}Component({data:t}){var r;const{nodes:h}=s.useFlowContext(),{styles:a}=s.useStyles(),c=h.find(m=>m.upstreamId===t.id&&m.branchIndex!=null);return o.jsx(s.NodeDefaultView,{data:t,children:o.jsx("div",{className:a.nodeSubtreeClass,children:o.jsxs("div",{className:e.cx(a.branchBlockClass,e.css`
+        `},required:!0}});h(this,"components",{WorkflowVariableInput:t.WorkflowVariableInput})}Component({data:r}){var s;const{nodes:f}=t.useFlowContext(),{styles:a}=t.useStyles(),c=f.find(m=>m.upstreamId===r.id&&m.branchIndex!=null);return o.jsx(t.NodeDefaultView,{data:r,children:o.jsx("div",{className:a.nodeSubtreeClass,children:o.jsxs("div",{className:e.cx(a.branchBlockClass,e.css`
                 padding-left: 20em;
-              `),children:[o.jsx(s.Branch,{from:t,entry:c,branchIndex:(r=c==null?void 0:c.branchIndex)!=null?r:0}),o.jsxs("div",{className:a.branchClass,children:[o.jsx("div",{className:"workflow-branch-lines"}),o.jsx("div",{className:e.cx(a.addButtonClass,a.loopLineClass),children:o.jsx(v.ArrowUpOutlined,{})})]})]})})})}useScopeVariables(t,h){const a=e.useCompile(),c=d("Loop target"),r=d("Loop index"),m=d("Loop length"),{target:x}=t.config;if(!x)return null;const{fieldNames:l=s.defaultFieldNames}=h;let L={key:"item",[l.value]:"item",[l.label]:c};if(typeof x=="string"&&x.startsWith("{{")&&x.endsWith("}}")){const S=x.slice(2,-2).split(".").map(b=>b.trim()),A=[s.scopeOptions,s.nodesOptions,s.triggerOptions].map(b=>{const C=b.useOptions(T(N({},h),{current:t})).filter(Boolean);return{[l.label]:a(b.label),[l.value]:b.value,key:b.value,[l.children]:C,disabled:C&&!C.length}}),B=w(A,S);L=Object.assign({},B,L)}return[L,{key:"index",[l.value]:"index",[l.label]:r},{key:"length",[l.value]:"length",[l.label]:m}]}}class q extends e.Plugin{afterAdd(){return y(this,null,function*(){})}beforeLoad(){return y(this,null,function*(){})}load(){return y(this,null,function*(){const f=this.app.pm.get("workflow"),t=new j;f.instructions.register(t.type,t)})}}n.default=q,Object.defineProperties(n,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+              `),children:[o.jsx(t.Branch,{from:r,entry:c,branchIndex:(s=c==null?void 0:c.branchIndex)!=null?s:0}),o.jsxs("div",{className:a.branchClass,children:[o.jsx("div",{className:"workflow-branch-lines"}),o.jsx("div",{className:e.cx(a.addButtonClass,a.loopLineClass),children:o.jsx(v.ArrowUpOutlined,{})})]})]})})})}useScopeVariables(r,f){const a=e.useCompile(),c=d("Loop target"),s=d("Loop index"),m=d("Loop length"),{target:x}=r.config;if(!x)return null;const{fieldNames:l=t.defaultFieldNames}=f;let L={key:"item",[l.value]:"item",[l.label]:c};if(typeof x=="string"&&x.startsWith("{{")&&x.endsWith("}}")){const S=x.slice(2,-2).split(".").map(b=>b.trim()),A=[t.scopeOptions,t.nodesOptions,t.triggerOptions].map(b=>{const C=b.useOptions(T(N({},f),{current:r})).filter(Boolean);return{[l.label]:a(b.label),[l.value]:b.value,key:b.value,[l.children]:C,disabled:C&&!C.length}}),B=w(A,S);L=Object.assign({},B,L)}return[L,{key:"index",[l.value]:"index",[l.label]:s},{key:"length",[l.value]:"length",[l.label]:m}]}}class q extends e.Plugin{afterAdd(){return y(this,null,function*(){})}beforeLoad(){return y(this,null,function*(){})}load(){return y(this,null,function*(){this.app.pm.get("workflow").registerInstruction("loop",j)})}}n.default=q,Object.defineProperties(n,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/externalVersion.js

@@ -1,8 +1,8 @@
 module.exports = {
   "react": "18.2.0",
-  "@ant-design/icons": "5.1.4",
-  "@nocobase/client": "0.17.0-alpha.7",
-  "@nocobase/plugin-workflow": "0.17.0-alpha.7",
+  "@ant-design/icons": "5.2.6",
+  "@nocobase/client": "0.18.0-alpha.8",
+  "@nocobase/plugin-workflow": "0.18.0-alpha.8",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "0.17.0-alpha.7"
+  "@nocobase/server": "0.18.0-alpha.8"
 };

package/dist/locale/zh-CN.json

@@ -4,6 +4,5 @@
   "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.": "使用循环节点可以对多条数据进行同样的操作，多条数据的来源可以是查询节点的多条结果，或者一条数据的多条关系数据。也可以用于一定次数的循环，或者对字符串中每一个字符的循环处理。循环次数过高可能引起性能问题，请谨慎使用。",
-  "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.": "单一数字值将被视为循环次数，单一字符串值将被视为字符数组，其他非数组值将被转换为数组。达到循环次数，或者将数组循环完成后，循环节点结束。你也可以在循环中添加条件节点，以终止循环。"
 }

package/dist/server/LoopInstruction.d.ts

@@ -1,7 +1,7 @@
 import { Processor, Instruction, FlowNodeModel, JobModel } from '@nocobase/plugin-workflow';
 export default class extends Instruction {
     run(node: FlowNodeModel, prevJob: JobModel, processor: Processor): Promise<{
-        status: number;
+        status: 1;
         result: number;
     }>;
     resume(node: FlowNodeModel, branchJob: any, processor: Processor): Promise<any>;

package/dist/server/Plugin.d.ts

@@ -1,6 +1,4 @@
 import { Plugin } from '@nocobase/server';
-import { default as WorkflowPlugin } from '@nocobase/plugin-workflow';
 export default class extends Plugin {
-    workflow: WorkflowPlugin;
     load(): Promise<void>;
 }

package/dist/server/Plugin.js

@@ -31,12 +31,11 @@ __export(Plugin_exports, {
 });
 module.exports = __toCommonJS(Plugin_exports);
 var import_server = require("@nocobase/server");
+var import_plugin_workflow = __toESM(require("@nocobase/plugin-workflow"));
 var import_LoopInstruction = __toESM(require("./LoopInstruction"));
 class Plugin_default extends import_server.Plugin {
-  workflow;
   async load() {
-    const workflowPlugin = this.app.getPlugin("workflow");
-    this.workflow = workflowPlugin;
-    workflowPlugin.instructions.register("loop", new import_LoopInstruction.default(workflowPlugin));
+    const workflowPlugin = this.app.getPlugin(import_plugin_workflow.default);
+    workflowPlugin.registerInstruction("loop", import_LoopInstruction.default);
   }
 }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：循环节点",
   "description": "Useful plugin for doing dynamic calculation based on expression collection records in workflow.",
   "description.zh-CN": "用于在工作流中进行基于数据行的动态表达式计算。",
-  "version": "0.17.0-alpha.7",
+  "version": "0.18.0-alpha.8",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -16,9 +16,8 @@
     "@nocobase/client": "0.x",
     "@nocobase/database": "0.x",
     "@nocobase/plugin-workflow": ">=0.17.0-alpha.3",
-    "@nocobase/plugin-workflow-test": ">=0.17.0-alpha.3",
     "@nocobase/server": "0.x",
     "@nocobase/test": "0.x"
   },
-  "gitHead": "91377a3abd1124f79fb3819f2d0e80905e091a32"
+  "gitHead": "727d42f6f14e5f863831da3dbf3255ba1165b567"
 }

package/src/client/index.ts

@@ -13,7 +13,6 @@ export default class extends Plugin {
   // You can get and modify the app instance here
   async load() {
     const workflow = this.app.pm.get('workflow') as WorkflowPlugin;
-    const loopInstruction = new LoopInstruction();
-    workflow.instructions.register(loopInstruction.type, loopInstruction);
+    workflow.registerInstruction('loop', LoopInstruction);
   }
 }

package/src/locale/zh-CN.json

@@ -4,6 +4,5 @@
   "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.": "使用循环节点可以对多条数据进行同样的操作，多条数据的来源可以是查询节点的多条结果，或者一条数据的多条关系数据。也可以用于一定次数的循环，或者对字符串中每一个字符的循环处理。循环次数过高可能引起性能问题，请谨慎使用。",
-  "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.": "单一数字值将被视为循环次数，单一字符串值将被视为字符数组，其他非数组值将被转换为数组。达到循环次数，或者将数组循环完成后，循环节点结束。你也可以在循环中添加条件节点，以终止循环。"
 }

package/src/server/Plugin.ts

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

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

@@ -1,6 +1,6 @@
 import Database from '@nocobase/database';
 import { Application } from '@nocobase/server';
-import { BRANCH_INDEX, EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
+import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
 import { getApp, sleep } from '@nocobase/plugin-workflow-test';
 
 import Plugin from '..';
@@ -404,7 +404,7 @@ describe('workflow > instructions > loop', () => {
 
       const n2 = await workflow.createNode({
         type: 'loop',
-        branchIndex: BRANCH_INDEX.ON_TRUE,
+        branchIndex: 1,
         upstreamId: n1.id,
         config: {
           target: 0,
@@ -442,7 +442,7 @@ describe('workflow > instructions > loop', () => {
 
       const n2 = await workflow.createNode({
         type: 'loop',
-        branchIndex: BRANCH_INDEX.ON_TRUE,
+        branchIndex: 1,
         upstreamId: n1.id,
         config: {
           target: 2,