@ldsg/workflow-node-type 0.2.10 → 0.2.12

package/dist/__tests__/unit.js

@@ -1,28 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const handler_1 = require("@ldsg/handler");
-const workflow_1 = require("@ldsg/workflow");
 const resource_1 = require("../resource");
-const handler = (params) => {
-    const { workflowNodeProperties } = params;
+const handler = async (params) => {
+    const { workflowInputVariables, workflowVariablesRecord, workflowNodeProperties, } = params;
     const { name } = workflowNodeProperties;
-    class AWorkflowNodeExecuter extends workflow_1.WorkflowNodeExecuter {
-        constructor() {
-            super(...arguments);
-            this.execute = async () => {
-                const { setVariables } = this;
-                setVariables({
-                    variables: name,
-                });
-            };
-        }
+    let variables;
+    if (workflowInputVariables) {
+        variables = workflowInputVariables;
+    }
+    else {
+        variables = name;
     }
     const res = {
-        Executer: AWorkflowNodeExecuter,
+        variables,
     };
     return res;
 };
-test("field type", () => {
+test("field type", async () => {
     new handler_1.HandlerResource({
         id: "test-handler",
         kind: "handler",
@@ -55,18 +50,20 @@ test("field type", () => {
             handlerResourceId: "test-handler",
         },
     });
-    const { extraWorkflowNodeInfo } = workflowNodeTypeResource.getExtraWorkflowNodeInfo({
+    const { workflowNodeTypeInfo: { execute: workflowNodeTypeExecute }, } = workflowNodeTypeResource.getWorkflowNodeTypeInfo();
+    const { variables: variables1 } = await workflowNodeTypeExecute({
+        workflowInputVariables: { hello: "world" },
+        workflowVariablesRecord: {},
         workflowNodeProperties: {
             name: "test",
         },
     });
-    expect(extraWorkflowNodeInfo).toMatchSnapshot();
-    const { Executer } = extraWorkflowNodeInfo;
-    const nodeIdToVariablesMap = new Map();
-    const executer = new Executer({
-        nodeId: "test-node",
-        nodeIdToVariablesMap,
+    expect(variables1).toEqual({ hello: "world" });
+    const { variables: variables2 } = await workflowNodeTypeExecute({
+        workflowVariablesRecord: {},
+        workflowNodeProperties: {
+            name: "test",
+        },
     });
-    executer.execute();
-    expect(executer.nodeIdToVariablesMap).toMatchSnapshot();
+    expect(variables2).toEqual({ name: "test" });
 });

package/dist/index.d.ts

@@ -4,4 +4,5 @@ export * from "./instantiate-resource";
 export * from "./resource";
 export * from "./resource-records";
 export * from "./types";
+export * from "./utils";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,wBAAwB,CAAC;AACvC,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,wBAAwB,CAAC;AACvC,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}

package/dist/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./instantiate-resource"), exports);
 __exportStar(require("./resource"), exports);
 __exportStar(require("./resource-records"), exports);
 __exportStar(require("./types"), exports);
+__exportStar(require("./utils"), exports);

package/dist/resource-records/end/handler/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/resource-records/end/handler/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,+BAA+B,EAChC,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AA8C7C,eAAO,MAAM,wCAAwC,EAAE,cAAc,CAAC,+BAA+B,CAYlG,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/resource-records/end/handler/index.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,+BAA+B,EAChC,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAW7C,eAAO,MAAM,wCAAwC,EAAE,cAAc,CAAC,+BAA+B,CAYlG,CAAC"}

package/dist/resource-records/end/handler/index.js

@@ -1,37 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.endWorkflowNodeTypeHandlerResourceRecord = void 0;
 const constants_1 = require("@ldsg/constants");
 const handler_1 = require("@ldsg/handler");
-const workflow_1 = require("@ldsg/workflow");
-const jsonata_1 = __importDefault(require("jsonata"));
+const utils_1 = require("../../../utils");
 const constants_2 = require("./constants");
-function handler(params) {
-    const { workflowNodeProperties } = params;
-    const { input, output } = workflowNodeProperties;
-    const { jsonataStr } = output;
-    const expression = (0, jsonata_1.default)(jsonataStr);
-    class EndWorkflowNodeExecuter extends workflow_1.WorkflowNodeExecuter {
-        constructor() {
-            super(...arguments);
-            this.execute = async () => {
-                const { setVariables, nodeIdToVariablesMap } = this;
-                const nodeIdToVariablesMapObject = Object.fromEntries(nodeIdToVariablesMap);
-                const variables = await expression.evaluate(nodeIdToVariablesMapObject);
-                setVariables({
-                    variables,
-                });
-            };
-        }
-    }
-    const res = {
-        Executer: EndWorkflowNodeExecuter,
-    };
+const handler = async (params) => {
+    const res = (0, utils_1.getInputVariables)(params);
     return res;
-}
+};
 exports.endWorkflowNodeTypeHandlerResourceRecord = {
     id: constants_2.END_WORKFLOW_NODE_TYPE_HANDLER_RESOURCE_ID,
     kind: handler_1.RESOURCE_DEFINITION_SPECIFIC_RESOURCE_SETTINGS.kind,

package/dist/resource-records/start/handler/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/resource-records/start/handler/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,+BAA+B,EAChC,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAoC7C,eAAO,MAAM,0CAA0C,EAAE,cAAc,CAAC,+BAA+B,CAYpG,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/resource-records/start/handler/index.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,+BAA+B,EAChC,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAW7C,eAAO,MAAM,0CAA0C,EAAE,cAAc,CAAC,+BAA+B,CAYpG,CAAC"}

package/dist/resource-records/start/handler/index.js

@@ -3,27 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.startWorkflowNodeTypeHandlerResourceRecord = void 0;
 const constants_1 = require("@ldsg/constants");
 const handler_1 = require("@ldsg/handler");
-const workflow_1 = require("@ldsg/workflow");
+const utils_1 = require("../../../utils");
 const constants_2 = require("./constants");
-function handler(params) {
-    const { workflowNodeProperties } = params;
-    const { input, output } = workflowNodeProperties;
-    class StartWorkflowNodeExecuter extends workflow_1.WorkflowNodeExecuter {
-        constructor() {
-            super(...arguments);
-            this.execute = () => {
-                const { setVariables, inputVariables } = this;
-                setVariables({
-                    variables: inputVariables,
-                });
-            };
-        }
-    }
-    const res = {
-        Executer: StartWorkflowNodeExecuter,
-    };
+const handler = async (params) => {
+    const res = (0, utils_1.getInputVariables)(params);
     return res;
-}
+};
 exports.startWorkflowNodeTypeHandlerResourceRecord = {
     id: constants_2.START_WORKFLOW_NODE_TYPE_HANDLER_RESOURCE_ID,
     kind: handler_1.RESOURCE_DEFINITION_SPECIFIC_RESOURCE_SETTINGS.kind,

package/dist/resource.d.ts

@@ -1,6 +1,10 @@
 import { HandlerExtendedResource } from "@ldsg/handler";
-import { GetExtraWorkflowNodeInfo, WorkflowNodeTypeSpecificResourceSettings } from "./types";
+import { WorkflowNodeTypeInfo, WorkflowNodeTypeSpecificResourceSettings } from "./types";
+export interface GetWorkflowNodeTypeInfoRes {
+    workflowNodeTypeInfo: WorkflowNodeTypeInfo;
+}
+export type GetWorkflowNodeTypeInfo = () => GetWorkflowNodeTypeInfoRes;
 export declare class WorkflowNodeTypeResource extends HandlerExtendedResource<WorkflowNodeTypeSpecificResourceSettings> {
-    getExtraWorkflowNodeInfo: GetExtraWorkflowNodeInfo;
+    getWorkflowNodeTypeInfo: GetWorkflowNodeTypeInfo;
 }
 //# sourceMappingURL=resource.d.ts.map

package/dist/resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EACL,wBAAwB,EACxB,wCAAwC,EACzC,MAAM,SAAS,CAAC;AAEjB,qBAAa,wBAAyB,SAAQ,uBAAuB,CAAC,wCAAwC,CAAC;IAC7G,wBAAwB,EAAE,wBAAwB,CAiBhD;CACH"}
+{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EACL,oBAAoB,EAEpB,wCAAwC,EACzC,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,0BAA0B;IACzC,oBAAoB,EAAE,oBAAoB,CAAC;CAC5C;AAED,MAAM,MAAM,uBAAuB,GAAG,MAAM,0BAA0B,CAAC;AAEvE,qBAAa,wBAAyB,SAAQ,uBAAuB,CAAC,wCAAwC,CAAC;IAC7G,uBAAuB,EAAE,uBAAuB,CAa9C;CACH"}

package/dist/resource.js

@@ -5,16 +5,13 @@ const handler_1 = require("@ldsg/handler");
 class WorkflowNodeTypeResource extends handler_1.HandlerExtendedResource {
     constructor() {
         super(...arguments);
-        this.getExtraWorkflowNodeInfo = (params) => {
-            var _a;
-            const { workflowNodeProperties } = params;
-            const { getExtendedHandlerOrUndefined } = this;
-            const extendedHandlerOrUndefined = getExtendedHandlerOrUndefined();
-            const extraWorkflowNodeInfo = (_a = extendedHandlerOrUndefined === null || extendedHandlerOrUndefined === void 0 ? void 0 : extendedHandlerOrUndefined({
-                workflowNodeProperties,
-            })) !== null && _a !== void 0 ? _a : {};
+        this.getWorkflowNodeTypeInfo = () => {
+            const { getExtendedHandler } = this;
+            const extendedHandler = getExtendedHandler();
             const res = {
-                extraWorkflowNodeInfo,
+                workflowNodeTypeInfo: {
+                    execute: extendedHandler,
+                },
             };
             return res;
         };

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./extra-workflow-node-info";
 export * from "./specific-resource-settings";
+export * from "./workflow-node-type";
 //# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sBAAsB,CAAC"}

package/dist/types/index.js

@@ -14,5 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./extra-workflow-node-info"), exports);
 __exportStar(require("./specific-resource-settings"), exports);
+__exportStar(require("./workflow-node-type"), exports);

package/dist/types/workflow-node-type.d.ts

@@ -0,0 +1,23 @@
+import { WorkflowNodeExecuteParams, WorkflowNodeExecuteRes } from "@ldsg/workflow";
+export interface WorkflowNodeTypeExecuteParams extends WorkflowNodeExecuteParams {
+    /**
+     * Workflow Node Properties
+     */
+    workflowNodeProperties: any;
+}
+export interface WorkflowNodeTypeExecuteRes extends WorkflowNodeExecuteRes {
+}
+/**
+ * 工作流执行方法
+ * 工作执行时，实际运行的方法
+ */
+export type WorkflowNodeTypeExecute = (params: WorkflowNodeTypeExecuteParams) => Promise<WorkflowNodeTypeExecuteRes>;
+export interface WorkflowNodeTypeInfo {
+    /**
+     * 工作流节点类型执行方法
+     * 工作流节点类型执行时，实际运行的方法
+     */
+    execute: WorkflowNodeTypeExecute;
+}
+export type WorkflowNodeTypeResourceHandler = WorkflowNodeTypeExecute;
+//# sourceMappingURL=workflow-node-type.d.ts.map

package/dist/types/workflow-node-type.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflow-node-type.d.ts","sourceRoot":"","sources":["../../src/types/workflow-node-type.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,6BACf,SAAQ,yBAAyB;IACjC;;OAEG;IACH,sBAAsB,EAAE,GAAG,CAAC;CAC7B;AAED,MAAM,WAAW,0BAA2B,SAAQ,sBAAsB;CAAG;AAE7E;;;GAGG;AACH,MAAM,MAAM,uBAAuB,GAAG,CACpC,MAAM,EAAE,6BAA6B,KAClC,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAEzC,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,OAAO,EAAE,uBAAuB,CAAC;CAClC;AAED,MAAM,MAAM,+BAA+B,GAAG,uBAAuB,CAAC"}

package/dist/utils/get-input-variables.d.ts

@@ -0,0 +1,4 @@
+import { WorkflowNodeTypeExecuteParams, WorkflowNodeTypeExecuteRes } from "../types";
+export type GetInputVariables = (params: WorkflowNodeTypeExecuteParams) => Promise<WorkflowNodeTypeExecuteRes>;
+export declare const getInputVariables: GetInputVariables;
+//# sourceMappingURL=get-input-variables.d.ts.map

package/dist/utils/get-input-variables.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-input-variables.d.ts","sourceRoot":"","sources":["../../src/utils/get-input-variables.ts"],"names":[],"mappings":"AACA,OAAO,EACL,6BAA6B,EAC7B,0BAA0B,EAC3B,MAAM,UAAU,CAAC;AAElB,MAAM,MAAM,iBAAiB,GAAG,CAC9B,MAAM,EAAE,6BAA6B,KAClC,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAEzC,eAAO,MAAM,iBAAiB,EAAE,iBAwB/B,CAAC"}

package/dist/utils/get-input-variables.js

@@ -0,0 +1,24 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInputVariables = void 0;
+const jsonata_1 = __importDefault(require("jsonata"));
+const getInputVariables = async (params) => {
+    const { workflowInputVariables, workflowVariablesRecord, workflowNodeProperties, } = params;
+    let inputVariables;
+    if (workflowInputVariables) {
+        inputVariables = workflowInputVariables;
+    }
+    else {
+        const { query } = workflowNodeProperties === null || workflowNodeProperties === void 0 ? void 0 : workflowNodeProperties.input;
+        const expression = (0, jsonata_1.default)(query);
+        inputVariables = await expression.evaluate(workflowVariablesRecord);
+    }
+    const res = {
+        variables: inputVariables,
+    };
+    return res;
+};
+exports.getInputVariables = getInputVariables;

package/dist/utils/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./get-input-variables";
+//# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC"}

package/dist/utils/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./get-input-variables"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ldsg/workflow-node-type",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "",
   "main": "dist/index.js",
   "files": [
@@ -17,15 +17,15 @@
     "json-schema": "0.4.0",
     "jsonata": "^2.0.6",
     "lodash": "^4.17.21",
-    "@ldsg/handler": "0.2.10",
-    "@ldsg/workflow": "0.2.10",
-    "@ldsg/resource": "0.2.10",
-    "@ldsg/resource-definition": "0.2.10"
+    "@ldsg/handler": "0.2.12",
+    "@ldsg/resource": "0.2.12",
+    "@ldsg/workflow": "0.2.12",
+    "@ldsg/resource-definition": "0.2.12"
   },
   "devDependencies": {
     "@types/json-schema": "^7.0.15",
     "@types/lodash": "^4.14.202",
-    "@ldsg/types": "0.2.10"
+    "@ldsg/types": "0.2.12"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",

package/dist/types/extra-workflow-node-info.d.ts

@@ -1,16 +0,0 @@
-import { WorkflowNodeInfo } from "@ldsg/workflow";
-export interface GetExtraWorkflowNodeInfoParams {
-    /**
-     * Workflow Node Properties
-     */
-    workflowNodeProperties?: any;
-}
-export type ExtraWorkflowNodeInfo = Pick<WorkflowNodeInfo, "Executer">;
-export interface GetExtraWorkflowNodeInfoRes {
-    /**
-     * Extra Workflow Node Info
-     */
-    extraWorkflowNodeInfo: ExtraWorkflowNodeInfo;
-}
-export type GetExtraWorkflowNodeInfo = (params: GetExtraWorkflowNodeInfoParams) => GetExtraWorkflowNodeInfoRes;
-//# sourceMappingURL=extra-workflow-node-info.d.ts.map

package/dist/types/extra-workflow-node-info.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"extra-workflow-node-info.d.ts","sourceRoot":"","sources":["../../src/types/extra-workflow-node-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,WAAW,8BAA8B;IAC7C;;OAEG;IACH,sBAAsB,CAAC,EAAE,GAAG,CAAC;CAC9B;AAED,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;AAEvE,MAAM,WAAW,2BAA2B;IAC1C;;OAEG;IACH,qBAAqB,EAAE,qBAAqB,CAAC;CAC9C;AAED,MAAM,MAAM,wBAAwB,GAAG,CACrC,MAAM,EAAE,8BAA8B,KACnC,2BAA2B,CAAC"}