@nocobase/plugin-workflow-sql 0.18.0-alpha.1 → 0.18.0-alpha.9

package/dist/client/SQLInstruction.d.ts

@@ -26,8 +26,13 @@ export default class extends Instruction {
         title: any;
     }, { types, fieldNames }: {
         types: any;
-        fieldNames?: import("@nocobase/client").FieldNames;
+        fieldNames?: {
+            readonly label: "label";
+            readonly value: "value";
+            readonly children: "children";
+        };
     }): {
-        [x: string]: any;
+        value: any;
+        label: any;
     };
 }

package/dist/client/index.js

@@ -1,4 +1,4 @@
-(function(o,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("@nocobase/client"),require("@nocobase/plugin-workflow/client"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","@nocobase/plugin-workflow/client","react-i18next"],e):(o=typeof globalThis!="undefined"?globalThis:o||self,e(o["@nocobase/plugin-workflow-sql"]={},o["@nocobase/client"],o["@nocobase/plugin-workflow"]))})(this,function(o,e,t){"use strict";var p=Object.defineProperty;var w=(o,e,t)=>e in o?p(o,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):o[e]=t;var s=(o,e,t)=>(w(o,typeof e!="symbol"?e+"":e,t),t);var c=(o,e,t)=>new Promise((i,l)=>{var u=n=>{try{r(t.next(n))}catch(a){l(a)}},f=n=>{try{r(t.throw(n))}catch(a){l(a)}},r=n=>n.done?i(n.value):Promise.resolve(n.value).then(u,f);r((t=t.apply(o,e)).next())});const i="workflow-sql";class l extends t.Instruction{constructor(){super(...arguments);s(this,"title",`{{t("SQL action", { ns: "${i}" })}}`);s(this,"type","sql");s(this,"group","collection");s(this,"description",`{{t("Execute a SQL statement in database.", { ns: "${i}" })}}`);s(this,"fieldset",{sql:{type:"string",required:!0,title:"SQL",description:`{{t("Usage of SQL query result is not supported yet.", { ns: "${i}" })}}`,"x-decorator":"FormItem","x-component":"WorkflowVariableRawTextArea","x-component-props":{rows:20,className:e.css`
+(function(e,o){typeof exports=="object"&&typeof module!="undefined"?o(exports,require("@nocobase/client"),require("@nocobase/plugin-workflow/client"),require("react-i18next")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","@nocobase/plugin-workflow/client","react-i18next"],o):(e=typeof globalThis!="undefined"?globalThis:e||self,o(e["@nocobase/plugin-workflow-sql"]={},e["@nocobase/client"],e["@nocobase/plugin-workflow"]))})(this,function(e,o,t){"use strict";var p=Object.defineProperty;var w=(e,o,t)=>o in e?p(e,o,{enumerable:!0,configurable:!0,writable:!0,value:t}):e[o]=t;var s=(e,o,t)=>(w(e,typeof o!="symbol"?o+"":o,t),t);var c=(e,o,t)=>new Promise((r,l)=>{var u=n=>{try{i(t.next(n))}catch(a){l(a)}},f=n=>{try{i(t.throw(n))}catch(a){l(a)}},i=n=>n.done?r(n.value):Promise.resolve(n.value).then(u,f);i((t=t.apply(e,o)).next())});const r="workflow-sql";class l extends t.Instruction{constructor(){super(...arguments);s(this,"title",`{{t("SQL action", { ns: "${r}" })}}`);s(this,"type","sql");s(this,"group","collection");s(this,"description",`{{t("Execute a SQL statement in database.", { ns: "${r}" })}}`);s(this,"fieldset",{sql:{type:"string",required:!0,title:"SQL",description:`{{t("Usage of SQL query result is not supported yet.", { ns: "${r}" })}}`,"x-decorator":"FormItem","x-component":"WorkflowVariableRawTextArea","x-component-props":{rows:20,className:o.css`
           font-size: 80%;
           font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-        `}}});s(this,"components",{WorkflowVariableRawTextArea:t.WorkflowVariableRawTextArea})}useVariables({key:n,title:a},{types:b,fieldNames:d=e.defaultFieldNames}){return{[d.value]:n,[d.label]:a}}}class u extends e.Plugin{afterAdd(){return c(this,null,function*(){})}beforeLoad(){return c(this,null,function*(){})}load(){return c(this,null,function*(){const r=this.app.pm.get("workflow"),n=new l;r.instructions.register(n.type,n)})}}o.default=u,Object.defineProperties(o,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+        `}}});s(this,"components",{WorkflowVariableRawTextArea:t.WorkflowVariableRawTextArea})}useVariables({key:n,title:a},{types:b,fieldNames:d=t.defaultFieldNames}){return{[d.value]:n,[d.label]:a}}}class u extends o.Plugin{afterAdd(){return c(this,null,function*(){})}beforeLoad(){return c(this,null,function*(){})}load(){return c(this,null,function*(){this.app.pm.get("workflow").registerInstruction("sql",l)})}}e.default=u,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/externalVersion.js

@@ -1,6 +1,6 @@
 module.exports = {
-  "@nocobase/client": "0.18.0-alpha.1",
-  "@nocobase/plugin-workflow": "0.18.0-alpha.1",
+  "@nocobase/client": "0.18.0-alpha.9",
+  "@nocobase/plugin-workflow": "0.18.0-alpha.9",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "0.18.0-alpha.1"
+  "@nocobase/server": "0.18.0-alpha.9"
 };

package/dist/server/Plugin.d.ts

@@ -1,6 +1,4 @@
 import { Plugin } from '@nocobase/server';
-import 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_SQLInstruction = __toESM(require("./SQLInstruction"));
 class Plugin_default extends import_server.Plugin {
-  workflow;
   async load() {
-    const workflowPlugin = this.app.getPlugin("workflow");
-    this.workflow = workflowPlugin;
-    workflowPlugin.instructions.register("sql", new import_SQLInstruction.default(workflowPlugin));
+    const workflowPlugin = this.app.getPlugin(import_plugin_workflow.default);
+    workflowPlugin.registerInstruction("sql", import_SQLInstruction.default);
   }
 }

package/dist/server/SQLInstruction.d.ts

@@ -1,10 +1,10 @@
 import { Processor, Instruction, FlowNodeModel } from '@nocobase/plugin-workflow';
 export default class extends Instruction {
     run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
-        status: number;
+        status: 1;
         result?: undefined;
     } | {
         result: [unknown[], unknown];
-        status: number;
+        status: 1;
     }>;
 }

package/dist/server/SQLInstruction.js

@@ -31,7 +31,7 @@ class SQLInstruction_default extends import_plugin_workflow.Instruction {
       };
     }
     const result = await sequelize.query(sql, {
-      transaction: processor.transaction
+      // transaction: processor.transaction,
       // plain: true,
       // model: db.getCollection(node.config.collection).model
     });

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：SQL 节点",
   "description": "Execute SQL statements in workflow.",
   "description.zh-CN": "可用于在工作流中对数据库执行任意 SQL 语句。",
-  "version": "0.18.0-alpha.1",
+  "version": "0.18.0-alpha.9",
   "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": "0f5f1c0a37dc397a9dc4c8eec0c4ec20fd8107b0"
+  "gitHead": "34ca0df4eede2e83fc86297b0fe19eba970e2b1b"
 }

package/src/client/SQLInstruction.tsx

@@ -1,6 +1,6 @@
-import { css, defaultFieldNames } from '@nocobase/client';
+import { css } from '@nocobase/client';
 
-import { Instruction, WorkflowVariableRawTextArea } from '@nocobase/plugin-workflow/client';
+import { Instruction, WorkflowVariableRawTextArea, defaultFieldNames } from '@nocobase/plugin-workflow/client';
 
 import { NAMESPACE } from '../locale';
 

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 sqlInstruction = new SQLInstruction();
-    workflow.instructions.register(sqlInstruction.type, sqlInstruction);
+    workflow.registerInstruction('sql', SQLInstruction);
   }
 }

package/src/server/Plugin.ts

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

package/src/server/SQLInstruction.ts

@@ -11,7 +11,7 @@ export default class extends Instruction {
     }
 
     const result = await sequelize.query(sql, {
-      transaction: processor.transaction,
+      // transaction: processor.transaction,
       // plain: true,
       // model: db.getCollection(node.config.collection).model
     });