@nocobase/plugin-workflow 0.9.2-alpha.2 → 0.9.2-alpha.4

package/lib/client/triggers/schedule/OnField.js

@@ -61,9 +61,9 @@ function OnField({
     setDir = _useState2[1];
   return _react().default.createElement("fieldset", {
     className: (0, _css().css)`
-      display: flex;
-      gap: .5em;
-    `
+        display: flex;
+        gap: 0.5em;
+      `
   }, _react().default.createElement(_DateFieldsSelect.DateFieldsSelect, {
     value: value.field,
     onChange: field => _onChange(_objectSpread(_objectSpread({}, value), {}, {

package/lib/client/triggers/schedule/RepeatField.js

@@ -115,28 +115,28 @@ function RepeatField({
   const locale = languages[localStorage.getItem('NOCOBASE_LOCALE') || 'en-US'];
   return _react().default.createElement("fieldset", {
     className: (0, _css().css)`
-      display: flex;
-      flex-direction: ${typeValue === 'cron' ? 'column' : 'row'};
-      align-items: flex-start;
-      gap: .5em;
+        display: flex;
+        flex-direction: ${typeValue === 'cron' ? 'column' : 'row'};
+        align-items: flex-start;
+        gap: 0.5em;
 
-      .react-js-cron{
-        padding: .5em .5em 0 .5em;
-        border: 1px dashed #ccc;
+        .react-js-cron {
+          padding: 0.5em 0.5em 0 0.5em;
+          border: 1px dashed #ccc;
 
-        .react-js-cron-field{
-          margin-bottom: .5em;
+          .react-js-cron-field {
+            margin-bottom: 0.5em;
 
-          > span{
-            margin: 0 .5em 0 0;
-          }
+            > span {
+              margin: 0 0.5em 0 0;
+            }
 
-          > .react-js-cron-select{
-            margin: 0 .5em 0 0;
+            > .react-js-cron-select {
+              margin: 0 0.5em 0 0;
+            }
           }
         }
-      }
-    `
+      `
   }, _react().default.createElement(_antd().Select, {
     value: typeValue,
     onChange: onTypeChange

package/lib/client/triggers/schedule/ScheduleConfig.js

@@ -225,11 +225,11 @@ const ScheduleConfig = () => {
           'x-component': 'fieldset',
           'x-component-props': {
             className: (0, _css().css)`
-                  .ant-input-number{
+                  .ant-input-number {
                     width: 4em;
                   }
 
-                  .ant-picker{
+                  .ant-picker {
                     width: auto;
                   }
                 `

package/lib/client/utils.js

@@ -19,7 +19,7 @@ function linkNodes(nodes) {
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      let node = _step.value;
+      const node = _step.value;
       if (node.upstreamId) {
         node.upstream = nodesMap.get(node.upstreamId);
       }

package/lib/client/variable.js

@@ -107,7 +107,7 @@ function filterTypedFields(fields, types, depth = 1) {
     return fields;
   }
   return fields.filter(field => {
-    if (isAssociationField(field) && depth && filterTypedFields(useNormallizedFields(field.target), types, depth - 1).length) {
+    if (isAssociationField(field) && depth && filterTypedFields(useNormalizedFields(field.target), types, depth - 1).length) {
       return true;
     }
     return types.some(type => matchFieldType(field, type));
@@ -127,7 +127,7 @@ function useWorkflowVariableOptions(types) {
   });
   return options;
 }
-function useNormallizedFields(collectionName) {
+function useNormalizedFields(collectionName) {
   const compile = (0, _client().useCompile)();
   const _useCollectionManager = (0, _client().useCollectionManager)(),
     getCollection = _useCollectionManager.getCollection;
@@ -151,7 +151,7 @@ function useNormallizedFields(collectionName) {
       const foreignKeyField = foreignKeyFields.find(f => f.name === field.foreignKey);
       if (foreignKeyField) {
         var _field$uiSchema, _field$uiSchema2;
-        otherFields.splice(i, 0, _objectSpread(_objectSpread({}, foreignKeyField), {}, {
+        otherFields.splice(i, 0, _objectSpread(_objectSpread(_objectSpread({}, field), foreignKeyField), {}, {
           uiSchema: _objectSpread(_objectSpread({}, field.uiSchema), {}, {
             title: ((_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) ? `${compile((_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title)} ID` : foreignKeyField.name
           })
@@ -189,7 +189,7 @@ function useCollectionFieldOptions(options) {
     _options$depth = options.depth,
     depth = _options$depth === void 0 ? 1 : _options$depth;
   const compile = (0, _client().useCompile)();
-  const normalizedFields = fields !== null && fields !== void 0 ? fields : useNormallizedFields(collection);
+  const normalizedFields = fields !== null && fields !== void 0 ? fields : useNormalizedFields(collection);
   const result = filterTypedFields(normalizedFields, types, depth).filter(field => !isAssociationField(field) || depth).map(field => {
     var _field$uiSchema5;
     const label = compile(((_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5.title) || field.name);

package/lib/server/Processor.d.ts

@@ -1,9 +1,9 @@
+import { Logger } from '@nocobase/logger';
 import { Transaction, Transactionable } from 'sequelize';
 import Plugin from '.';
 import ExecutionModel from './models/Execution';
-import JobModel from './models/Job';
 import FlowNodeModel from './models/FlowNode';
-import { Logger } from '@nocobase/logger';
+import JobModel from './models/Job';
 export interface ProcessorOptions extends Transactionable {
     plugin: Plugin;
 }

package/lib/server/Processor.js

@@ -4,13 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-  _jsonTemplates = function _jsonTemplates() {
-    return data;
-  };
-  return data;
-}
 function _database() {
   const data = require("@nocobase/database");
   _database = function _database() {
@@ -25,6 +18,13 @@ function _evaluators() {
   };
   return data;
 }
+function _jsonTemplates() {
+  const data = _interopRequireDefault(require("json-templates"));
+  _jsonTemplates = function _jsonTemplates() {
+    return data;
+  };
+  return data;
+}
 var _constants = require("./constants");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -333,7 +333,7 @@ class Processor {
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        let _step$value = _slicedToArray(_step.value, 2),
+        const _step$value = _slicedToArray(_step.value, 2),
           name = _step$value[0],
           fn = _step$value[1];
         systemFns[name] = fn.bind(scope);

package/lib/server/functions/index.d.ts

@@ -1,4 +1,4 @@
-import Plugin from "..";
+import Plugin from '..';
 export default function ({ functions }: Plugin, more?: {
     [key: string]: Function;
 }): void;

package/lib/server/functions/index.js

@@ -23,5 +23,4 @@ function _default({
       fn = _Object$entries$_i[1];
     functions.register(name, fn);
   }
-}
-;
+}

package/lib/server/instructions/calculation.d.ts

@@ -1,3 +1,3 @@
-import { Instruction } from ".";
+import { Instruction } from '.';
 declare const _default: Instruction;
 export default _default;

package/lib/server/instructions/calculation.js

@@ -4,16 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-  _jsonTemplates = function _jsonTemplates() {
+function _evaluators() {
+  const data = require("@nocobase/evaluators");
+  _evaluators = function _evaluators() {
     return data;
   };
   return data;
 }
-function _evaluators() {
-  const data = _interopRequireDefault(require("@nocobase/evaluators"));
-  _evaluators = function _evaluators() {
+function _jsonTemplates() {
+  const data = _interopRequireDefault(require("json-templates"));
+  _jsonTemplates = function _jsonTemplates() {
     return data;
   };
   return data;
@@ -41,7 +41,7 @@ var _default = {
         expression = parsed.expression;
         scope = (_parse2 = (0, _jsonTemplates().default)((_node$config$scope = node.config.scope) !== null && _node$config$scope !== void 0 ? _node$config$scope : '')(scope)) !== null && _parse2 !== void 0 ? _parse2 : {};
       }
-      const evaluator = _evaluators().default.get(engine);
+      const evaluator = _evaluators().evaluators.get(engine);
       try {
         const result = evaluator && expression ? evaluator(expression, scope) : null;
         return {

package/lib/server/instructions/condition.d.ts

@@ -1,5 +1,5 @@
-import { Registry } from "@nocobase/utils";
-import { Instruction } from ".";
+import { Registry } from '@nocobase/utils';
+import { Instruction } from '.';
 export declare const calculators: Registry<Function>;
 declare const _default: Instruction;
 export default _default;

package/lib/server/instructions/condition.js

@@ -4,22 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.calculators = void 0;
-function _utils() {
-  const data = require("@nocobase/utils");
-  _utils = function _utils() {
+function _evaluators() {
+  const data = require("@nocobase/evaluators");
+  _evaluators = function _evaluators() {
     return data;
   };
   return data;
 }
-function _evaluators() {
-  const data = _interopRequireDefault(require("@nocobase/evaluators"));
-  _evaluators = function _evaluators() {
+function _utils() {
+  const data = require("@nocobase/utils");
+  _utils = function _utils() {
     return data;
   };
   return data;
 }
 var _constants = require("../constants");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 const calculators = new (_utils().Registry)();
@@ -106,7 +105,7 @@ var _default = {
         calculation = _ref.calculation,
         expression = _ref.expression,
         rejectOnFalse = _ref.rejectOnFalse;
-      const evaluator = _evaluators().default.get(engine);
+      const evaluator = _evaluators().evaluators.get(engine);
       let result = true;
       try {
         result = evaluator ? evaluator(expression, processor.getScope()) : logicCalculate(processor.getParsedValue(calculation));

package/lib/server/instructions/create.d.ts

@@ -1,4 +1,4 @@
-import FlowNodeModel from "../models/FlowNode";
+import FlowNodeModel from '../models/FlowNode';
 declare const _default: {
     run(node: FlowNodeModel, input: any, processor: any): Promise<{
         result: any;

package/lib/server/instructions/destroy.d.ts

@@ -1,4 +1,4 @@
-import FlowNodeModel from "../models/FlowNode";
+import FlowNodeModel from '../models/FlowNode';
 declare const _default: {
     run(node: FlowNodeModel, input: any, processor: any): Promise<{
         result: any;

package/lib/server/instructions/manual/index.js

@@ -158,5 +158,4 @@ class _default {
     })();
   }
 }
-exports.default = _default;
-;
+exports.default = _default;

package/lib/server/instructions/parallel.d.ts

@@ -1,6 +1,6 @@
-import FlowNodeModel from "../models/FlowNode";
-import JobModel from "../models/Job";
-import Processor from "../Processor";
+import FlowNodeModel from '../models/FlowNode';
+import JobModel from '../models/Job';
+import Processor from '../Processor';
 export declare const PARALLEL_MODE: {
     readonly ALL: "all";
     readonly ANY: "any";

package/lib/server/instructions/query.d.ts

@@ -1,5 +1,5 @@
-import FlowNodeModel from "../models/FlowNode";
-import Processor from "../Processor";
+import FlowNodeModel from '../models/FlowNode';
+import Processor from '../Processor';
 declare const _default: {
     run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
         result: any;

package/lib/server/instructions/request.js

@@ -52,7 +52,6 @@ function _request() {
   });
   return _request.apply(this, arguments);
 }
-;
 class _default {
   constructor(plugin) {
     this.plugin = void 0;

package/lib/server/instructions/update.d.ts

@@ -1,5 +1,5 @@
-import FlowNodeModel from "../models/FlowNode";
-import Processor from "../Processor";
+import FlowNodeModel from '../models/FlowNode';
+import Processor from '../Processor';
 declare const _default: {
     run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
         result: any;

package/lib/server/migrations/20230221071831-calculation-expression.js

@@ -26,19 +26,19 @@ function addQuote(v) {
   return `'${v}'`;
 }
 const calculatorsMap = {
-  'equal': '==',
+  equal: '==',
   '===': '==',
-  'notEqual': '!=',
+  notEqual: '!=',
   '!==': '!=',
-  'gt': '>',
-  'gte': '>=',
-  'lt': '<',
-  'lte': '<=',
-  'add': '+',
-  'minus': '-',
-  'multiple': '*',
-  'divide': '/',
-  'mod': '%',
+  gt: '>',
+  gte: '>=',
+  lt: '<',
+  lte: '<=',
+  add: '+',
+  minus: '-',
+  multiple: '*',
+  divide: '/',
+  mod: '%',
   includes(a, b) {
     return `SEARCH(${b}, ${a}) >= 0`;
   },

package/lib/server/migrations/20230221121203-condition-calculation.js

@@ -19,14 +19,14 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 const calculatorsMap = {
-  'equal': '==',
+  equal: '==',
   '===': '==',
-  'notEqual': '!=',
+  notEqual: '!=',
   '!==': '!=',
-  'gt': '>',
-  'gte': '>=',
-  'lt': '<',
-  'lte': '<=',
+  gt: '>',
+  gte: '>=',
+  lt: '<',
+  lte: '<=',
   includes(a, b) {
     return `SEARCH('${b}', '${a}') >= 0`;
   },

package/lib/server/migrations/20230221162902-jsonb-to-json.js

@@ -22,16 +22,14 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 class _default extends _server().Migration {
   up() {
-    var _arguments = arguments,
-      _this = this;
+    var _this = this;
     return _asyncToGenerator(function* () {
       const match = yield _this.app.version.satisfies('<0.9.0-alpha.3');
       if (!match) {
         return;
       }
-      const _arguments$0$context = _arguments[0].context,
-        sequelize = _arguments$0$context.sequelize,
-        queryInterface = _arguments$0$context.queryInterface;
+      const sequelize = _this.sequelize;
+      const queryInterface = _this.queryInterface;
       const db = _this.app.db;
       yield sequelize.transaction( /*#__PURE__*/function () {
         var _ref = _asyncToGenerator(function* (transaction) {

package/lib/server/migrations/20230411034722-manual-multi-form.js

@@ -185,7 +185,7 @@ function migrateUsedConfig(config, manualForms) {
         }
         return `{{$jobsMapByNodeId.${id}.${manualForms[id]}${path || ''}}}`;
       });
-    } else if (valueType === 'object') {
+    } else if (valueType === 'object' && config[key]) {
       migrateUsedConfig(config[key], manualForms);
     }
   });
@@ -285,8 +285,9 @@ class _default extends _server().Migration {
             }
           });
           yield usedNodes.reduce((promise, node) => promise.then( /*#__PURE__*/_asyncToGenerator(function* () {
+            var _node$config2;
             yield node.update({
-              config: migrateUsedConfig((0, _lodash().cloneDeep)(node.config), nodeForms)
+              config: migrateUsedConfig((0, _lodash().cloneDeep)((_node$config2 = node.config) !== null && _node$config2 !== void 0 ? _node$config2 : {}), nodeForms)
             }, {
               silent: true,
               transaction

package/lib/server/triggers/collection.d.ts

@@ -1,5 +1,5 @@
-import { Trigger } from "..";
-import WorkflowModel from "../models/Workflow";
+import { Trigger } from '..';
+import WorkflowModel from '../models/Workflow';
 export interface CollectionChangeTriggerConfig {
     collection: string;
     mode: number;

package/lib/server/triggers/collection.js

@@ -112,7 +112,7 @@ class CollectionTrigger extends _.Trigger {
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        let _step$value = _slicedToArray(_step.value, 2),
+        const _step$value = _slicedToArray(_step.value, 2),
           key = _step$value[0],
           type = _step$value[1];
         const event = `${collection}.${type}`;
@@ -150,7 +150,7 @@ class CollectionTrigger extends _.Trigger {
       _step2;
     try {
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        let _step2$value = _slicedToArray(_step2.value, 2),
+        const _step2$value = _slicedToArray(_step2.value, 2),
           key = _step2$value[0],
           type = _step2$value[1];
         const event = `${collection}.${type}`;

package/lib/server/triggers/schedule.js

@@ -106,18 +106,20 @@ function getOnTimestampWithOffset(on, now) {
     case 'string':
       return parseDateWithoutMs(on);
     case 'object':
-      const field = on.field,
-        _on$offset = on.offset,
-        offset = _on$offset === void 0 ? 0 : _on$offset,
-        _on$unit = on.unit,
-        unit = _on$unit === void 0 ? 1000 : _on$unit;
-      if (!field) {
-        return null;
+      {
+        const field = on.field,
+          _on$offset = on.offset,
+          offset = _on$offset === void 0 ? 0 : _on$offset,
+          _on$unit = on.unit,
+          unit = _on$unit === void 0 ? 1000 : _on$unit;
+        if (!field) {
+          return null;
+        }
+        const timestamp = now.getTime();
+        // onDate + offset > now
+        // onDate > now - offset
+        return timestamp - offset * unit;
       }
-      const timestamp = now.getTime();
-      // onDate + offset > now
-      // onDate > now - offset
-      return timestamp - offset * unit;
     default:
       return null;
   }
@@ -128,15 +130,19 @@ function getDataOptionTime(data, on, dir = 1) {
   }
   switch (typeof on) {
     case 'string':
-      const time = parseDateWithoutMs(on);
-      return time ? time : null;
+      {
+        const time = parseDateWithoutMs(on);
+        return time ? time : null;
+      }
     case 'object':
-      const field = on.field,
-        _on$offset2 = on.offset,
-        offset = _on$offset2 === void 0 ? 0 : _on$offset2,
-        _on$unit2 = on.unit,
-        unit = _on$unit2 === void 0 ? 1000 : _on$unit2;
-      return data.get(field) ? data.get(field).getTime() - offset * unit * dir : null;
+      {
+        const field = on.field,
+          _on$offset2 = on.offset,
+          offset = _on$offset2 === void 0 ? 0 : _on$offset2,
+          _on$unit2 = on.unit,
+          unit = _on$unit2 === void 0 ? 1000 : _on$unit2;
+        return data.get(field) ? data.get(field).getTime() - offset * unit * dir : null;
+      }
     default:
       return null;
   }
@@ -365,7 +371,7 @@ function matchNext(workflow, now, range = this.cacheCycle) {
   const interval = _cronParser().default.parseExpression(repeat, {
     currentDate
   });
-  let next = interval.next();
+  const next = interval.next();
   // NOTE: cache all workflows will be matched in current cycle
   if (next.getTime() - timestamp <= range) {
     return true;

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.9.2-alpha.2",
+  "version": "0.9.2-alpha.4",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.9.2-alpha.2",
-    "@nocobase/client": "0.9.2-alpha.2",
-    "@nocobase/database": "0.9.2-alpha.2",
-    "@nocobase/evaluators": "0.9.2-alpha.2",
-    "@nocobase/logger": "0.9.2-alpha.2",
-    "@nocobase/resourcer": "0.9.2-alpha.2",
-    "@nocobase/server": "0.9.2-alpha.2",
-    "@nocobase/utils": "0.9.2-alpha.2",
+    "@nocobase/actions": "0.9.2-alpha.4",
+    "@nocobase/client": "0.9.2-alpha.4",
+    "@nocobase/database": "0.9.2-alpha.4",
+    "@nocobase/evaluators": "0.9.2-alpha.4",
+    "@nocobase/logger": "0.9.2-alpha.4",
+    "@nocobase/resourcer": "0.9.2-alpha.4",
+    "@nocobase/server": "0.9.2-alpha.4",
+    "@nocobase/utils": "0.9.2-alpha.4",
     "antd": "4.22.8",
     "axios": "^0.27.2",
     "classnames": "^2.3.1",
@@ -24,9 +24,9 @@
     "react-js-cron": "^3.1.0"
   },
   "devDependencies": {
-    "@nocobase/plugin-formula-field": "0.9.2-alpha.2",
-    "@nocobase/test": "0.9.2-alpha.2",
+    "@nocobase/plugin-formula-field": "0.9.2-alpha.4",
+    "@nocobase/test": "0.9.2-alpha.4",
     "@types/ejs": "^3.1.1"
   },
-  "gitHead": "1a0de6908b2b1854bdf434fcafa8909cb65bb8a3"
+  "gitHead": "96cb023f353a4fb099dea074c575be65ebab813f"
 }