@steedos/objectql 2.1.52 → 2.1.56

package/lib/dynamic-load/object_translations.js

@@ -90,7 +90,10 @@ exports.getObjectTranslations = function () { return tslib_1.__awaiter(void 0, v
             case 0: return [4 /*yield*/, schema_1.getSteedosSchema().metadataBroker.call('translations.getObjectTranslations')];
             case 1:
                 metadataObjectTranslations = _a.sent();
-                return [2 /*return*/, _.pluck(metadataObjectTranslations, 'metadata')];
+                if (metadataObjectTranslations) {
+                    return [2 /*return*/, _.pluck(metadataObjectTranslations, 'metadata')];
+                }
+                return [2 /*return*/];
         }
     });
 }); };

package/lib/dynamic-load/object_translations.js.map

@@ -1 +1 @@
-{"version":3,"file":"object_translations.js","sourceRoot":"","sources":["../../src/dynamic-load/object_translations.ts"],"names":[],"mappings":";;;;AAAA,0CAAmD;AACnD,2BAA8B;AAC9B,8BAAgC;AAChC,IAAI,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAE9B,IAAM,eAAe,GAAG,UAAM,QAAQ;;;;;;gBAC9B,MAAM,GAAG,yBAAgB,EAAE,CAAC;gBAChC,4BAAM,MAAM,CAAC,MAAM,0CAAE,IAAI,CAAC,4BAA4B,EAAE;wBACpD,QAAQ,UAAA;qBACX,IAAC;;gBAFF,SAEE,CAAC;;;;KACN,CAAA;AAED,IAAM,qBAAqB,GAAG,UAAO,aAAa,EAAE,IAAI;;;;oBAC7C,4BAAM,yBAAgB,EAAE,CAAC,cAAc,0CAAE,IAAI,CAAC,mCAAmC,EAAE;oBACtF,aAAa,eAAA,EAAE,IAAI,MAAA;iBACtB,IAAC;oBAFF,sBAAO,SAEL,EAAA;;;KACL,CAAA;AAEY,QAAA,0BAA0B,GAAG,UAAO,QAAgB;;;;;;gBAC7D,IAAG,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC;oBAC1B,MAAM,IAAI,KAAK,CAAI,QAAQ,8BAA2B,CAAC,CAAC;iBAC3D;gBAEG,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAA;;;;gBACxC,uBAAA,iBAAA,kBAAkB,CAAA;;;;gBAA7B,OAAO;;;;gBAEV,qBAAM,qBAAqB,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,EAAA;;gBAA3D,SAA2D,CAAA;;;;gBAE3D,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,OAAK,CAAC,OAAO,CAAC,CAAA;;;;;;;;;;;;;;;;qBAGnE,qBAAM,eAAe,CAAC,QAAQ,CAAC,EAAA;;gBAA/B,SAA+B,CAAA;;;;KAClC,CAAA;AAEY,QAAA,qBAAqB,GAAG;;;;oBACE,qBAAM,yBAAgB,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,oCAAoC,CAAC,EAAA;;gBAA/G,0BAA0B,GAAG,SAAkF;gBACrH,sBAAO,CAAC,CAAC,KAAK,CAAC,0BAA0B,EAAE,UAAU,CAAC,EAAA;;;KACzD,CAAA"}
+{"version":3,"file":"object_translations.js","sourceRoot":"","sources":["../../src/dynamic-load/object_translations.ts"],"names":[],"mappings":";;;;AAAA,0CAAmD;AACnD,2BAA8B;AAC9B,8BAAgC;AAChC,IAAI,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAE9B,IAAM,eAAe,GAAG,UAAM,QAAQ;;;;;;gBAC9B,MAAM,GAAG,yBAAgB,EAAE,CAAC;gBAChC,4BAAM,MAAM,CAAC,MAAM,0CAAE,IAAI,CAAC,4BAA4B,EAAE;wBACpD,QAAQ,UAAA;qBACX,IAAC;;gBAFF,SAEE,CAAC;;;;KACN,CAAA;AAED,IAAM,qBAAqB,GAAG,UAAO,aAAa,EAAE,IAAI;;;;oBAC7C,4BAAM,yBAAgB,EAAE,CAAC,cAAc,0CAAE,IAAI,CAAC,mCAAmC,EAAE;oBACtF,aAAa,eAAA,EAAE,IAAI,MAAA;iBACtB,IAAC;oBAFF,sBAAO,SAEL,EAAA;;;KACL,CAAA;AAEY,QAAA,0BAA0B,GAAG,UAAO,QAAgB;;;;;;gBAC7D,IAAG,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC;oBAC1B,MAAM,IAAI,KAAK,CAAI,QAAQ,8BAA2B,CAAC,CAAC;iBAC3D;gBAEG,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAA;;;;gBACxC,uBAAA,iBAAA,kBAAkB,CAAA;;;;gBAA7B,OAAO;;;;gBAEV,qBAAM,qBAAqB,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,EAAA;;gBAA3D,SAA2D,CAAA;;;;gBAE3D,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,OAAK,CAAC,OAAO,CAAC,CAAA;;;;;;;;;;;;;;;;qBAGnE,qBAAM,eAAe,CAAC,QAAQ,CAAC,EAAA;;gBAA/B,SAA+B,CAAA;;;;KAClC,CAAA;AAEY,QAAA,qBAAqB,GAAG;;;;oBACE,qBAAM,yBAAgB,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,oCAAoC,CAAC,EAAA;;gBAA/G,0BAA0B,GAAG,SAAkF;gBACrH,IAAG,0BAA0B,EAAC;oBAC1B,sBAAO,CAAC,CAAC,KAAK,CAAC,0BAA0B,EAAE,UAAU,CAAC,EAAA;iBACzD;;;;KACJ,CAAA"}

package/lib/dynamic-load/trigger.d.ts

@@ -1,7 +1,5 @@
 import { SteedosListenerConfig } from '../types';
 export declare const getLazyLoadListeners: (objectName?: string) => any;
 export declare const loadObjectLazyListenners: (objectName: string) => void;
-export declare const addObjectListenerConfig: (json: SteedosListenerConfig) => SteedosListenerConfig & {
-    listenTo: string;
-};
+export declare const addObjectListenerConfig: (json: SteedosListenerConfig) => SteedosListenerConfig;
 export declare const loadObjectTriggers: (filePath: string) => any[];

package/lib/dynamic-load/trigger.js

@@ -31,8 +31,8 @@ exports.addObjectListenerConfig = function (json) {
     if (!json.listenTo) {
         throw new Error('missing attribute listenTo');
     }
-    if (!_.isString(json.listenTo) && !_.isFunction(json.listenTo)) {
-        throw new Error('listenTo must be a function or string');
+    if (!_.isString(json.listenTo) && !_.isFunction(json.listenTo) && !_.isArray(json.listenTo) && !_.isRegExp(json.listenTo)) {
+        throw new Error('listenTo must be a function or string or array or regExp');
     }
     var object_name = '';
     if (_.isString(json.listenTo)) {
@@ -41,21 +41,31 @@ exports.addObjectListenerConfig = function (json) {
     else if (_.isFunction(json.listenTo)) {
         object_name = json.listenTo();
     }
-    var object = types_1.getObjectConfig(object_name);
-    if (object) {
-        if (!object.listeners) {
-            object.listeners = {};
+    if (object_name) {
+        var object = types_1.getObjectConfig(object_name);
+        if (object) {
+            if (!object.listeners) {
+                object.listeners = {};
+            }
+            delete json.listenTo;
+            var license = clone(json);
+            license.name = json._id || util_1.getMD5(util_1.JSONStringify(json));
+            object.listeners[license.name] = license;
+            if (object.datasource === 'meteor') {
+                util.extend(object, { triggers: util_1.transformListenersToTriggers(object, license) });
+            }
         }
-        delete json.listenTo;
-        var license = clone(json);
-        license.name = json._id || util_1.getMD5(util_1.JSONStringify(json));
-        object.listeners[license.name] = license;
-        if (object.datasource === 'meteor') {
-            util.extend(object, { triggers: util_1.transformListenersToTriggers(object, license) });
+        addLazyLoadListeners(object_name, Object.assign({}, json, { listenTo: object_name }));
+        return Object.assign({}, json, { listenTo: object_name });
+    }
+    else {
+        if (_.isRegExp(json.listenTo)) {
+            return Object.assign({}, json, { listenTo: json.listenTo.toString() });
+        }
+        else {
+            return json;
         }
     }
-    addLazyLoadListeners(object_name, Object.assign({}, json, { listenTo: object_name }));
-    return Object.assign({}, json, { listenTo: object_name });
 };
 exports.loadObjectTriggers = function (filePath) {
     var triggerJsons = util.loadTriggers(filePath);

package/lib/dynamic-load/trigger.js.map

@@ -1 +1 @@
-{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../src/dynamic-load/trigger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../src/dynamic-load/trigger.ts"],"names":[],"mappings":"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"}

package/lib/formula/core.js

@@ -12,6 +12,7 @@ var _ = require("lodash");
 // import _eval = require('eval')
 var formula_1 = require("@steedos/formula");
 var params_1 = require("./params");
+var simple_params_1 = require("./simple_params");
 /**
  * 根据公式内容，取出其中{}中的变量
  * @param formula
@@ -57,13 +58,13 @@ exports.pickFormulaVarFields = function (vars) {
  * return Array<SteedosFormulaParamTypeConfig>
  */
 exports.computeFormulaParams = function (doc, vars, currentUserId) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var params, spaceId, _loop_1, vars_1, vars_1_1, _a, key, paths, isUserVar;
+    var params, spaceId, _loop_1, vars_1, vars_1_1, _a, key, paths, isUserVar, isSimpleVar;
     var e_1, _b;
     return tslib_1.__generator(this, function (_c) {
         params = [];
         spaceId = doc.space;
         if (vars && vars.length) {
-            _loop_1 = function (key, paths, isUserVar) {
+            _loop_1 = function (key, paths, isUserVar, isSimpleVar) {
                 key = key.trim();
                 // 如果变量key以$user开头,则解析为userSession,此时paths为空
                 var tempValue = void 0;
@@ -83,6 +84,16 @@ exports.computeFormulaParams = function (doc, vars, currentUserId) { return tsli
                     // tempFormulaParams[FormulaUserKey] = currentUserId;
                     // tempValue = evalFieldFormula(tepmFormula, tempFormulaParams);
                 }
+                if (isSimpleVar) {
+                    // 普通变量，取参数值时直接取值，而不用走变量上的paths属性。
+                    // 注意未传入objectName时，公式中的user var的isSimpleVar为false，还是走下面的paths取值逻辑。
+                    tempValue = doc[key];
+                    params.push({
+                        key: key,
+                        value: tempValue
+                    });
+                    return "continue";
+                }
                 tempValue = _.reduce(paths, function (reslut, next, index) {
                     if (index === 0) {
                         if (isUserVar) {
@@ -129,8 +140,8 @@ exports.computeFormulaParams = function (doc, vars, currentUserId) { return tsli
             };
             try {
                 for (vars_1 = tslib_1.__values(vars), vars_1_1 = vars_1.next(); !vars_1_1.done; vars_1_1 = vars_1.next()) {
-                    _a = vars_1_1.value, key = _a.key, paths = _a.paths, isUserVar = _a.is_user_var;
-                    _loop_1(key, paths, isUserVar);
+                    _a = vars_1_1.value, key = _a.key, paths = _a.paths, isUserVar = _a.is_user_var, isSimpleVar = _a.is_simple_var;
+                    _loop_1(key, paths, isUserVar, isSimpleVar);
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -196,7 +207,13 @@ exports.runFormula = function (formula, params, options, messageTag) {
         // formulaParams[key] = value;
         // 把{}括起来的变量替换为计算得到的变量值
         // formula = formula.replace(`{${key}}`, `__params["${key}"]`);
-        formulaParams[key] = params_1.getFieldSubstitution(path.reference_from, path.field_name, value, blankValue);
+        if (path) {
+            formulaParams[key] = params_1.getFieldSubstitution(path.reference_from, path.field_name, value, blankValue);
+        }
+        else {
+            // 变量中没有path属性说明是普通变量
+            formulaParams[key] = simple_params_1.getSimpleParamSubstitution(value, blankValue);
+        }
     });
     // console.log("===runFormula===formula====", formula);
     // console.log("===runFormula===formulaParams====", formulaParams);

package/lib/formula/core.js.map

@@ -1 +1 @@
-{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/formula/core.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/formula/core.ts"],"names":[],"mappings":";;;;AAAA,kCAA4C;AAC5C,+BACkG;AAClG,iDAAqG;AACrG,sCAAmG;AACnG,+BAAuJ;AACvJ,gCAAoC;AAGpC,0BAA4B;AAC5B,iCAAiC;AACjC,4CAAkD;AAClD,mCAAiE;AACjE,iDAA4D;AAE5D;;;GAGG;AACU,QAAA,eAAe,GAAG,UAAC,OAAe;IAC3C,OAAO,iBAAO,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC,CAAA;AAED;;;GAGG;AACU,QAAA,yBAAyB,GAAG,UAAC,mBAAyF;IAC/H,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE;QACjC,mBAAmB,GAAG,CAAC,mBAAmB,CAAC,CAAC;KAC/C;IACD,IAAI,MAAM,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB;IAC1C,mBAAmB,CAAC,OAAO,CAAC,UAAC,kBAAiD;QACpE,IAAA,IAAI,GAAK,kBAAkB,KAAvB,CAAwB;QAClC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,4BAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC1B,CAAC,CAAA;AAED;;;GAGG;AACU,QAAA,oBAAoB,GAAG,UAAC,IAAwC;IACzE,IAAI,MAAM,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB;IAC1C,IAAI,CAAC,OAAO,CAAC,UAAC,OAAoC;QAC9C,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE;YACtB,mDAAmD;YACnD,IAAI,SAAS,GAAoC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAClE,IAAI,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACzB;IACL,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC1B,CAAC,CAAA;AAED;;;;;GAKG;AACU,QAAA,oBAAoB,GAAG,UAAO,GAAY,EAAE,IAAwC,EAAE,aAAqB;;;;QAChH,MAAM,GAAyC,EAAE,CAAC;QAChD,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC;QAC1B,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE;gCACV,GAAG,EAAE,KAAK,EAAe,SAAS,EAAiB,WAAW;gBACrE,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;gBACjB,4CAA4C;gBAC5C,IAAI,SAAS,SAAK,CAAC;gBACnB,IAAI,SAAS,EAAE;oBACX,IAAI,CAAC,aAAa,EAAE;wBAChB,MAAM,IAAI,KAAK,CAAC,wFAAsF,GAAG,mBAAgB,CAAC,CAAC;qBAC9H;oBACD,IAAI,CAAC,OAAO,EAAE;wBACV,MAAM,IAAI,KAAK,CAAC,8FAA4F,GAAG,mBAAgB,CAAC,CAAC;qBACpI;oBACD,wBAAwB;oBACxB,oHAAoH;oBACpH,IAAI;oBACJ,8BAA8B;oBAC9B,kFAAkF;oBAClF,wCAAwC;oBACxC,qDAAqD;oBACrD,gEAAgE;iBACnE;gBACD,IAAG,WAAW,EAAC;oBACX,kCAAkC;oBAClC,mEAAmE;oBACnE,SAAS,GAAQ,GAAG,CAAC,GAAG,CAAC,CAAC;oBAC1B,MAAM,CAAC,IAAI,CAAC;wBACR,GAAG,EAAE,GAAG;wBACR,KAAK,EAAE,SAAS;qBACnB,CAAC,CAAC;;iBAEN;gBACD,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,UAAC,MAAM,EAAE,IAAI,EAAE,KAAK;oBAC5C,IAAI,KAAK,KAAK,CAAC,EAAE;wBACb,IAAI,SAAS,EAAE;4BACX,uDAAuD;4BACvD,IAAM,GAAG,GAAG,gBAAS,CAAC;gCAClB,OAAO,wBAAgB,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC;oCACpD,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;oCAChE,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC;iCAC5B,CAAC,CAAC;4BACP,CAAC,EAAE,EAAE,CAAC,CAAC;4BACP,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;4BACrC,IAAI,MAAM,EAAE;gCACR,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;6BACjC;iCACI;gCACD,OAAO,IAAI,CAAA;6BACd;yBACJ;6BACI;4BACD,OAAY,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;yBACpC;qBACJ;yBACI;wBACD,IAAI,CAAC,MAAM,EAAE;4BACT,mBAAmB;4BACnB,OAAO,MAAM,CAAC;yBACjB;wBACD,MAAM,GAAG,gBAAS,CAAC;4BACf,OAAO,wBAAgB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAM,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;wBAChH,CAAC,EAAE,EAAE,CAAC,CAAC;wBACP,IAAI,MAAM,EAAE;4BACR,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;yBACjC;6BACI;4BACD,OAAO,IAAI,CAAA;yBACd;qBACJ;gBACL,CAAC,EAAE,IAAI,CAAC,CAAC;gBACT,MAAM,CAAC,IAAI,CAAC;oBACR,GAAG,EAAE,GAAG;oBACR,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;oBACnB,KAAK,EAAE,SAAS;iBACnB,CAAC,CAAC;;;gBAxEP,KAA+E,SAAA,iBAAA,IAAI,CAAA;oBAA1E,mBAAkE,EAAhE,GAAG,SAAA,EAAE,KAAK,WAAA,EAAe,SAAS,iBAAA,EAAiB,WAAW,mBAAA;4BAA9D,GAAG,EAAE,KAAK,EAAe,SAAS,EAAiB,WAAW;iBAyExE;;;;;;;;;SACJ;QACD,sBAAO,MAAM,EAAC;;KACjB,CAAA;AAEY,QAAA,wBAAwB,GAAG,UAAO,GAAY,EAAE,kBAAiD,EAAE,aAAqB;;;;;gBACjI,IAAI,CAAC,aAAa,EAAE;oBAChB,oDAA6C,CAAC,kBAAkB,CAAC,CAAC;iBACrE;gBACO,OAAO,GAA2C,kBAAkB,QAA7D,EAAE,IAAI,GAAqC,kBAAkB,KAAvD,EAAE,SAAS,GAA0B,kBAAkB,UAA5C,EAAE,mBAAmB,GAAK,kBAAkB,oBAAvB,CAAwB;gBAChE,qBAAM,4BAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,EAAA;;gBAA7D,MAAM,GAAG,SAAoD;gBACjE,sBAAO,kBAAU,CAAC,OAAO,EAAE,MAAM,EAAE;wBAC/B,UAAU,EAAE,SAAS;wBACrB,UAAU,EAAE,mBAAmB;qBAClC,EAAE,kBAAkB,CAAC,EAAC;;;KAC1B,CAAA;AAEY,QAAA,gBAAgB,GAAG,UAAU,OAAe,EAAE,aAAqB;IAC5E,IAAI;QACA,0EAA0E;QAC1E,gEAAgE;QAChE,sEAAsE;QACtE,2CAA2C;QAC3C,OAAO,eAAK,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;KACvC;IACD,OAAO,EAAE,EAAE;QACP,aAAa,CAAC,qBAAc,CAAC,GAAG,OAAO,CAAA,CAAC,oBAAoB;QAC5D,MAAM,IAAI,KAAK,CAAC,uCAAoC,EAAE,gCAAyB,OAAO,yBAAkB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,OAAG,CAAC,CAAC;KAC7I;AACL,CAAC,CAAA;AAED;;;;;;GAMG;AACU,QAAA,UAAU,GAAG,UAAU,OAAe,EAAE,MAA4C,EAAE,OAA+B,EAAE,UAAgB;IAChJ,IAAI,CAAC,OAAO,EAAE;QACV,OAAO,GAAG,EAAE,CAAC;KAChB;IACD,uDAAuD;IACvD,qDAAqD;IAC/C,IAAA,UAAU,GAAiB,OAAO,WAAxB,EAAE,UAAU,GAAK,OAAO,WAAZ,CAAa;IACzC,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,MAAM,CAAC,OAAO,CAAC,UAAC,EAAoB;YAAlB,GAAG,SAAA,EAAE,IAAI,UAAA,EAAE,KAAK,WAAA;QAC9B,8BAA8B;QAC9B,uBAAuB;QACvB,+DAA+D;QAC/D,IAAG,IAAI,EAAC;YACJ,aAAa,CAAC,GAAG,CAAC,GAAG,6BAAoB,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;SACtG;aACG;YACA,qBAAqB;YACrB,aAAa,CAAC,GAAG,CAAC,GAAG,0CAA0B,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;SACtE;IACL,CAAC,CAAC,CAAC;IAEH,uDAAuD;IACvD,mEAAmE;IACnE,IAAI,MAAM,GAAG,wBAAgB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACtD,qDAAqD;IACrD,IAAI,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC;IAChC,IAAI,gBAAgB,GAAG,MAAM,CAAC,QAAQ,CAAC;IACvC,IAAG,MAAM,CAAC,IAAI,KAAK,OAAO,EAAC;QACvB,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;QACrC,MAAM,IAAI,KAAK,CAAC,iCAA8B,MAAM,CAAC,OAAO,gCAAyB,OAAO,0BAAmB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,iBAAU,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAG,CAAC,CAAC;QACrL,8FAA8F;QAC9F,kDAAkD;QAClD,4EAA4E;QAC5E,2BAA2B;QAC3B,OAAO;QACP,QAAQ;QACR,uCAAuC;QACvC,IAAI;KACP;IACD,IAAI,gBAAgB,0BAA4B,IAAI,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,EAAC;QACtE,sBAAsB;QACtB,YAAY,GAAG,IAAI,CAAC;KACvB;IAED,IAAI,UAAU,IAAI,gBAAgB,IAAI,gBAAgB,IAAI,MAAM,EAAE;QAC9D,QAAQ,UAAU,EAAE;YAChB,KAAK,SAAS;gBACV,IAAI,gBAAgB,8BAA8B,EAAE;oBAChD,MAAM,IAAI,KAAK,CAAC,oCAAiC,OAAO,yBAAkB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,yDAAmD,gBAAgB,qBAAgB,YAAY,OAAI,CAAC,CAAC;iBAC/M;gBACD,MAAM;YACV,KAAK,QAAQ;gBACT,IAAI,gBAAgB,0BAA4B,EAAE;oBAC9C,MAAM,IAAI,KAAK,CAAC,oCAAiC,OAAO,yBAAkB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,wDAAkD,gBAAgB,qBAAgB,YAAY,OAAI,CAAC,CAAC;iBAC9M;gBACD,MAAM;YACV,KAAK,UAAU;gBACX,IAAI,gBAAgB,0BAA4B,EAAE;oBAC9C,MAAM,IAAI,KAAK,CAAC,oCAAiC,OAAO,yBAAkB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,wDAAkD,gBAAgB,qBAAgB,YAAY,OAAI,CAAC,CAAC;iBAC9M;gBACD,MAAM;YACV,KAAK,SAAS;gBACV,IAAI,gBAAgB,0BAA4B,EAAE;oBAC9C,MAAM,IAAI,KAAK,CAAC,oCAAiC,OAAO,yBAAkB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,wDAAkD,gBAAgB,qBAAgB,YAAY,OAAI,CAAC,CAAC;iBAC9M;gBACD,MAAM;YACV,KAAK,MAAM;gBACP,IAAI,gBAAgB,sBAA0B,EAAE;oBAC5C,MAAM,IAAI,KAAK,CAAC,oCAAiC,OAAO,yBAAkB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,wDAAkD,gBAAgB,qBAAgB,YAAY,OAAI,CAAC,CAAC;iBAC9M;gBACD,MAAM;YACV,KAAK,MAAM;gBACP,IAAI,gBAAgB,sBAA0B,EAAE;oBAC5C,yFAAyF;oBACzF,MAAM,IAAI,KAAK,CAAC,oCAAiC,OAAO,yBAAkB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,sDAAgD,gBAAgB,qBAAgB,YAAY,OAAI,CAAC,CAAC;iBAC5M;gBACD,MAAM;YACV,KAAK,UAAU;gBACX,IAAI,gBAAgB,8BAA8B,EAAE;oBAChD,yFAAyF;oBACzF,MAAM,IAAI,KAAK,CAAC,oCAAiC,OAAO,yBAAkB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,sDAAgD,gBAAgB,qBAAgB,YAAY,OAAI,CAAC,CAAC;iBAC5M;gBACD,MAAM;SACb;KACJ;IACD,iEAAiE;IACjE,OAAO,YAAY,CAAC;AACxB,CAAC,CAAA;AAED,IAAM,mBAAmB,GAAG,UAAC,uBAA+D,EAAE,gBAA+D;IACzJ,wFAAwF;IACxF,kJAAkJ;IAClJ,4IAA4I;IAC5I,IAAM,UAAU,GAAG,uBAAuB,CAAC,MAAM,CAAC;IAClD,IAAI,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,UAAC,IAAI;QACvC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAA;IACrH,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,SAAS,EAAE;QACZ,gBAAgB,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;KAClD;AACL,CAAC,CAAA;AAED;;;;;;;;;GASG;AACU,QAAA,8BAA8B,GAAG,UAAgB,UAAkB,EAAE,QAAgB,EAAE,WAAgB,EAAE,OAIhH;IAJgH,wBAAA,EAAA,YAIhH;;;;;;;oBACE,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;oBAC3D,UAAU,GAAqC,OAAO,WAA5C,EAAE,aAAa,GAAsB,OAAO,cAA7B,EAAE,eAAe,GAAK,OAAO,gBAAZ,CAAa;yBACzD,CAAC,eAAe,EAAhB,wBAAgB;oBACE,qBAAM,oDAAoC,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC,EAAA;;oBAAnG,eAAe,GAAG,SAAiF,CAAC;;;oBAIxG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,MAAM,EAAE;wBACpC,sBAAO;qBACV;oBACD,IAAI,CAAC,aAAa,EAAE;wBAChB,oDAA6C,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;qBAC7E;;;;oBAEoB,KAAA,iBAAA,eAAe,CAAC,UAAU,CAAA;;;;oBAApC,MAAM;oBACb,qBAAM,6CAAqC,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,CAAC,UAAU,CAAC,EAAA;;oBAAlH,SAAkH,CAAC;;;;;;;;;;;;;;;;;;;;CAE1H,CAAA;AAED;;;;;;;;GAQG;AACU,QAAA,6BAA6B,GAAG,UAAgB,UAAkB,EAAE,QAAgB,EAAE,GAAY,EAAE,aAAqB,EAAE,cAAwB,EAAE,OAA8C;;;;;;;yBACxM,CAAC,OAAO,EAAR,wBAAQ;oBACE,qBAAM,4CAA4B,CAAC,UAAU,CAAC,EAAA;;oBAAxD,OAAO,GAAG,SAA8C,CAAC;;;oBAE7D,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;wBACjB,sBAAO;qBACV;oBACD,IAAI,CAAC,aAAa,EAAE;wBAChB,oDAA6C,CAAC,OAAO,CAAC,CAAC;qBAC1D;yBAEG,CAAA,cAAc,KAAK,KAAK,CAAA,EAAxB,wBAAwB;oBAClB,gBAAgB,GAAG,iCAAyB,CAAC,OAAO,CAAC,CAAC;oBACtD,qBAAM,wBAAgB,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,EAAA;;oBAApG,GAAG,GAAG,SAA8F,CAAC;;;oBAErG,MAAM,GAAG,EAAE,CAAC;;;;oBACK,YAAA,iBAAA,OAAO,CAAA;;;;oBAAjB,MAAM;oBACb,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA,8BAA8B;oBACnE,KAAA,MAAM,CAAA;oBAAC,KAAA,MAAM,CAAC,UAAU,CAAA;oBAAI,qBAAM,gCAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,EAAA;;oBAAtF,MAAyB,GAAG,SAA0D,CAAC;;;;;;;;;;;;;;;;yBAE3F,qBAAM,wBAAgB,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAA;;oBAA7E,SAA6E,CAAC;;;;;CACjF,CAAA;AAED;;;;;GAKG;AACU,QAAA,iCAAiC,GAAG,UAAgB,UAAkB,EAAE,OAA4B,EAAE,aAAqB;;;;;;wBACpH,qBAAM,4CAA4B,CAAC,UAAU,CAAC,EAAA;;oBAAxD,OAAO,GAAG,SAA8C;oBAC9D,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;wBACjB,sBAAO;qBACV;oBACD,IAAI,CAAC,aAAa,EAAE;wBAChB,oDAA6C,CAAC,OAAO,CAAC,CAAC;qBAC1D;oBACK,gBAAgB,GAAG,iCAAyB,CAAC,OAAO,CAAC,CAAC;oBACjD,qBAAM,wBAAgB,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,EAAA;;oBAA1G,IAAI,GAAG,SAAmG;;;;oBAC5F,SAAA,iBAAA,IAAI,CAAA;;;;oBAAX,GAAG;oBACV,qBAAM,qCAA6B,CAAC,UAAU,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,EAAA;;oBAA5F,SAA4F,CAAC;;;;;;;;;;;;;;;;;;;;CAEpG,CAAA;AAED;;;;;GAKG;AACU,QAAA,qCAAqC,GAAG,UAAO,UAAkB,EAAE,QAAgB,EAAE,kBAAiD,EAAE,WAAgB,EAAE,aAAoE;;;;;;gBAE/N,IAAI,GAA0C,kBAAkB,KAA5D,EAAe,sBAAsB,GAAK,kBAAkB,YAAvB,CAAwB;gBACrE,gBAAgB,GAAkD,EAAE,CAAC;;oBACzE,KAAoB,SAAA,iBAAA,IAAI,CAAA,sEAAE;wBAAjB,OAAO;wBAEJ,KAAK,GAAK,OAAO,MAAZ,CAAa;wBACtB,SAAS,GAAG,KAAK,CAAC;wBAClB,uBAAuB,GAAG,EAAE,CAAC;;4BACjC,KAAqB,yBAAA,iBAAA,KAAK,CAAA,CAAA,2EAAE;gCAAnB,QAAQ;gCACb,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gCACvC,IAAI,QAAQ,CAAC,cAAc,KAAK,UAAU,EAAE;oCACxC,SAAS,GAAG,IAAI,CAAC;oCACjB,MAAM;iCACT;6BACJ;;;;;;;;;wBACD,IAAI,SAAS,EAAE;4BACX,WAAW;4BACX,mBAAmB,CAAC,uBAAuB,EAAE,gBAAgB,CAAC,CAAC;yBAClE;qBACJ;;;;;;;;;gBASK,gBAAgB,GAAG,iCAAyB,CAAC,kBAAkB,CAAC,CAAC;;;;gBACtC,qBAAA,iBAAA,gBAAgB,CAAA;;;;gBAAxC,oBAAoB;qBACrB,CAAA,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAA,EAA/B,wBAA+B;gBAE3B,QAAQ,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;qBAEnC,CAAA,sBAAsB,KAAK,UAAU,IAAI,QAAQ,CAAC,cAAc,KAAK,UAAU,CAAA,EAA/E,wBAA+E;gBAErE,qBAAM,wBAAgB,EAAE,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,EAAA;;gBAAhH,GAAG,GAAG,SAA0G;gBACpH,qBAAM,mCAA2B,CAAC,GAAG,EAAE,kBAAkB,EAAE,WAAW,EAAE,aAAa,CAAC,EAAA;;gBAAtF,SAAsF,CAAC;;oBAI5E,qBAAM,wBAAgB,EAAE,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,EAAA;;gBAArJ,IAAI,GAAG,SAA8I;gBACzJ,qBAAM,mCAA2B,CAAC,IAAI,EAAE,kBAAkB,EAAE,WAAW,EAAE,aAAa,CAAC,EAAA;;gBAAvF,SAAuF,CAAC;;;;gBAKxF,gBAAgB,GAAG,yCAAkC,CAAC,oBAAoB,CAAC,CAAC;gBAC5E,YAAY,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;gBAC3E,gBAAgB,GAAG,CAAC,CAAI,YAAY,SAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;gBACnD,qBAAM,wBAAgB,EAAE,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC,+BAA+B,CAAC;wBACpG,OAAO,EAAE,gBAAgB;wBACzB,MAAM,EAAE,gBAAgB;qBAC3B,EAAE,gBAAgB,CAAC,EAAA;;gBAHd,IAAI,GAAG,SAGO;gBACpB,qBAAM,mCAA2B,CAAC,IAAI,EAAE,kBAAkB,EAAE,WAAW,EAAE,aAAa,CAAC,EAAA;;gBAAvF,SAAuF,CAAC;;;;;;;;;;;;;;;;;;;KAGnG,CAAA;AAEY,QAAA,2BAA2B,GAAG,UAAO,IAAS,EAAE,kBAAiD,EAAE,WAAgB,EAAE,aAAoE;;;;;;gBAC7K,sBAAsB,GAAK,kBAAkB,YAAvB,CAAwB;gBACnE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBAClB,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;iBACjB;gBACG,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;;;;gBACjD,SAAA,iBAAA,IAAI,CAAA;;;;gBAAX,GAAG;gBACI,qBAAM,gCAAwB,CAAC,GAAG,EAAE,kBAAkB,EAAE,aAAa,CAAC,EAAA;;gBAA9E,KAAK,GAAG,SAAsE;gBAC9E,MAAM,GAAG,EAAE,CAAC;gBAChB,MAAM,CAAC,kBAAkB,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;gBAC9C,qBAAM,wBAAgB,EAAE,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,EAAA;;gBAAxF,SAAwF,CAAC;;;;;;;;;;;;;;;;;YAE7F,uFAAuF;YACvF,qBAAM,wCAAgC,CAAC,IAAI,EAAE,kBAAkB,EAAE,WAAW,EAAE,aAAa,CAAC,EAAA;;gBAD5F,uFAAuF;gBACvF,SAA4F,CAAC;;;;KAChG,CAAA;AAEY,QAAA,gCAAgC,GAAG,UAAO,IAAS,EAAE,kBAAiD,EAAE,WAAgB,EAAE,aAAoE;;;;;;gBAClL,sBAAsB,GAAK,kBAAkB,YAAvB,CAAwB;gBACnE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBAClB,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;iBACjB;gBACK,UAAU,GAAG,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;gBACpB,qBAAM,oDAAoC,CAAC,sBAAsB,EAAE,UAAU,EAAE,aAAa,CAAC,EAAA;;gBAAtH,sBAAsB,GAAG,SAA6F;gBAC7F,qBAAM,8CAAoC,CAAC,sBAAsB,EAAE,UAAU,CAAC,EAAA;;gBAAvG,sBAAsB,GAAG,SAA8E;;;;gBAC7F,SAAA,iBAAA,IAAI,CAAA;;;;gBAAX,GAAG;gBACR,mCAAmC;gBACnC,qBAAM,sCAA8B,CAAC,sBAAsB,EAAE,GAAG,CAAC,GAAG,EAAE,WAAW,EAAE;wBAC/E,UAAU,YAAA;wBACV,eAAe,EAAE,sBAAsB;wBACvC,aAAa,eAAA;qBAChB,CAAC;oBACF,mCAAmC;kBADjC;;gBALF,mCAAmC;gBACnC,SAIE,CAAA;gBACF,mCAAmC;gBACnC,qBAAM,yCAA+B,CAAC,sBAAsB,EAAE,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE;wBACtF,UAAU,YAAA;wBACV,eAAe,EAAE,sBAAsB;qBAC1C,CAAC,EAAA;;gBAJF,mCAAmC;gBACnC,SAGE,CAAC;;;;;;;;;;;;;;;;;;;KAEV,CAAA;AAED;;;;;;GAMG;AACU,QAAA,oCAAoC,GAAG,UAAO,iBAAyB,EAAE,gBAAwB,EAAE,UAAkB,EAAE,UAA0B;;;;oBACpG,qBAAM,4CAA4B,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,EAAA;;gBAAvH,OAAO,GAAyC,SAAuE;gBAC7H,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE;oBAC3B,sBAAO,iDAA0C,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,EAAC;iBACzF;qBACI;oBACD,yBAAyB;oBACzB,sBAAO,KAAK,EAAC;iBAChB;;;;KACJ,CAAA"}

package/lib/formula/index.d.ts

@@ -9,3 +9,5 @@ export declare function checkFormula(formula: string, mainObjectName: string): P
 declare function _computeFormula(formula: string, objectName: string, record: JsonMap, currentUserId: string, spaceId: string, options?: SteedosFormulaOptions): any;
 declare function _computeFormula(formula: string, objectName: string, recordId: string, currentUserId: string, spaceId: string, options?: SteedosFormulaOptions): any;
 export declare const computeFormula: typeof _computeFormula;
+declare function _computeSimpleFormula(formula: string, data: any, currentUserId?: string, spaceId?: string, options?: SteedosFormulaOptions): Promise<any>;
+export declare const computeSimpleFormula: typeof _computeSimpleFormula;

package/lib/formula/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.computeFormula = exports.checkFormula = void 0;
+exports.computeSimpleFormula = exports.computeFormula = exports.checkFormula = void 0;
 var tslib_1 = require("tslib");
 var types_1 = require("../types");
 var core_1 = require("./core");
@@ -83,4 +83,31 @@ function _computeFormula(formula, objectName, data, currentUserId, spaceId, opti
     });
 }
 exports.computeFormula = _computeFormula;
+function _computeSimpleFormula(formula, data, currentUserId, spaceId, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var varsAndQuotes, vars, required, params;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, computeFormulaVarsAndQuotes(formula, null)];
+                case 1:
+                    varsAndQuotes = _a.sent();
+                    vars = varsAndQuotes.vars;
+                    if (!currentUserId) {
+                        required = util_1.isCurrentUserIdRequiredForFormulaVars(vars);
+                        if (required) {
+                            throw new Error("The param 'currentUserId' is required for formula " + formula.replace("$", "\\$"));
+                        }
+                    }
+                    if (spaceId) {
+                        data.space = spaceId;
+                    }
+                    return [4 /*yield*/, core_1.computeFormulaParams(data, vars, currentUserId)];
+                case 2:
+                    params = _a.sent();
+                    return [2 /*return*/, core_1.runFormula(formula, params, options)];
+            }
+        });
+    });
+}
+exports.computeSimpleFormula = _computeSimpleFormula;
 //# sourceMappingURL=index.js.map

package/lib/formula/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/formula/index.ts"],"names":[],"mappings":";;;;AAAA,kCAAsF;AAEtF,+BAAgF;AAChF,+BAA+D;AAG/D,iDAAsB;AACtB,iDAAsB;AACtB,0DAA+B;AAC/B,iDAAsB;AACtB,6BAA6B;AAC7B,sDAA2B;AAC3B;;;;;GAKG;AACH,IAAM,2BAA2B,GAAG,UAAO,OAAe,EAAE,YAAqC;;;oBACtF,qBAAM,wBAAgB,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,iCAAiC,EAAE,EAAC,OAAO,SAAA,EAAE,YAAY,cAAA,EAAC,CAAC,EAAA;oBAA/G,sBAAO,SAAwG,EAAA;;;KAClH,CAAA;AAED,SAAsB,YAAY,CAAC,OAAe,EAAE,cAAsB;;;;;;oBAEhE,gBAAgB,GAAG,uBAAe,CAAC,cAAc,CAAC,CAAC;oBAEzD,qBAAM,2BAA2B,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAAA;;oBAA5D,SAA4D,CAAC;;;;;CAChE;AALD,oCAKC;AAID,SAAe,eAAe,CAAC,OAAe,EAAE,UAAiB,EAAE,IAAS,EAAE,aAAqB,EAAE,OAAe,EAAE,OAA+B;;;;;;oBAE3I,YAAY,GAAG,UAAU,CAAC,CAAC,CAAC,uBAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;oBAC/C,qBAAM,2BAA2B,CAAC,OAAO,EAAE,YAAY,CAAC,EAAA;;oBAAxE,aAAa,GAAG,SAAwD;oBACxE,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;oBAChC,IAAI,CAAC,aAAa,EAAE;wBACV,QAAQ,GAAG,4CAAqC,CAAC,IAAI,CAAC,CAAC;wBAC7D,IAAG,QAAQ,EAAC;4BACR,MAAM,IAAI,KAAK,CAAC,uDAAqD,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAG,CAAC,CAAC;yBACvG;qBACJ;oBACG,GAAG,GAAQ,EAAE,CAAC;yBAEf,CAAA,OAAO,IAAI,IAAI,QAAQ,IAAI,IAAI,CAAA,EAA/B,wBAA+B;oBAC9B,GAAG,GAAG,IAAI,CAAC;;;yBACN,CAAA,OAAO,IAAI,IAAI,QAAQ,CAAA,EAAvB,wBAAuB;yBACzB,CAAA,UAAU,IAAI,IAAI,CAAA,EAAlB,wBAAkB;oBACX,gBAAgB,GAAG,2BAAoB,CAAC,IAAI,CAAC,CAAC;oBAC9C,qBAAM,wBAAgB,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,EAAA;;oBAAhG,GAAG,GAAG,SAA0F,CAAC;;;oBAIzG,IAAG,OAAO,EAAC;wBACP,GAAG,CAAC,KAAK,GAAG,OAAO,CAAC;qBACvB;oBACY,qBAAM,2BAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,EAAA;;oBAA7D,MAAM,GAAG,SAAoD;oBACjE,sBAAO,iBAAU,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,EAAC,UAAU,YAAA,EAAC,CAAC,EAAC;;;;CAC7D;AAEY,QAAA,cAAc,GAAG,eAAe,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/formula/index.ts"],"names":[],"mappings":"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"}

package/lib/formula/simple_params.d.ts

@@ -0,0 +1,2 @@
+import { SteedosFormulaBlankValue } from './type';
+export declare function getSimpleParamSubstitution(value: any, blankValue: SteedosFormulaBlankValue): any;

package/lib/formula/simple_params.js

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSimpleParamSubstitution = void 0;
+var type_1 = require("./type");
+var VALUE_TYPES_NOT_SUPPORTED = ["function"];
+function getSubstitutionDataType(value) {
+    var valueType = typeof value;
+    var dateType;
+    if (VALUE_TYPES_NOT_SUPPORTED.indexOf(dateType) > -1) {
+        throw new Error("runFormula:Catch an error the param type \"" + valueType + "\" is not supported while eval formula with the params value: \"" + value + "\"");
+    }
+    switch (valueType) {
+        case 'string':
+            dateType = "text" /* Text */;
+            break;
+        case 'number':
+            dateType = "number" /* Number */;
+            break;
+        case 'boolean':
+            dateType = "checkbox" /* Checkbox */;
+            break;
+        case 'object':
+            if (value === null) {
+                dateType = "null" /* Null */;
+            }
+            else if (value instanceof Date) {
+                dateType = "datetime" /* Datetime */;
+            }
+            else {
+                throw new Error("runFormula:Catch an error the param type \"" + valueType + "\" is not supported while eval formula with the params value: \"" + value + "\"");
+            }
+            break;
+        case 'undefined':
+            dateType = "null" /* Null */;
+            break;
+        default:
+            break;
+    }
+    return dateType;
+}
+function getSubstitutionOptions(dataType, value) {
+    switch (dataType) {
+        case "number" /* Number */:
+            var scale = 0;
+            var str = value.toString();
+            var dotStr = str.toString().split(".")[1];
+            var dotCount = dotStr && dotStr.length;
+            if (dotCount > 0) {
+                scale = dotCount;
+            }
+            return { scale: scale };
+        case "text" /* Text */:
+            return { length: Number.MAX_VALUE };
+        default:
+            return;
+    }
+}
+function getSubstitutionValue(dataType, value, blankValue) {
+    switch (dataType) {
+        case "text" /* Text */:
+            if (value === null || value === undefined) {
+                return '';
+            }
+            break;
+        case "number" /* Number */:
+            if (value === null || value === undefined) {
+                if (blankValue === type_1.SteedosFormulaBlankValue.blanks) {
+                    return null;
+                }
+                else {
+                    return 0;
+                }
+            }
+            break;
+        default:
+            break;
+    }
+    return value;
+}
+function getSimpleParamSubstitution(value, blankValue) {
+    var fieldSubstitution = {
+        type: 'literal',
+        value: value
+    };
+    fieldSubstitution.dataType = getSubstitutionDataType(value);
+    fieldSubstitution.options = getSubstitutionOptions(fieldSubstitution.dataType, value);
+    fieldSubstitution.value = getSubstitutionValue(fieldSubstitution.dataType, value, blankValue);
+    return fieldSubstitution;
+}
+exports.getSimpleParamSubstitution = getSimpleParamSubstitution;
+//# sourceMappingURL=simple_params.js.map

package/lib/formula/simple_params.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"simple_params.js","sourceRoot":"","sources":["../../src/formula/simple_params.ts"],"names":[],"mappings":";;;AAAA,+BAAkD;AAGlD,IAAM,yBAAyB,GAAG,CAAC,UAAU,CAAC,CAAC;AAE/C,SAAS,uBAAuB,CAAC,KAAU;IACvC,IAAM,SAAS,GAAG,OAAO,KAAK,CAAC;IAC/B,IAAI,QAA0B,CAAC;IAC/B,IAAG,yBAAyB,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAC;QAChD,MAAM,IAAI,KAAK,CAAC,gDAA6C,SAAS,wEAAiE,KAAK,OAAG,CAAC,CAAC;KACpJ;IACD,QAAQ,SAAS,EAAE;QACf,KAAK,QAAQ;YACT,QAAQ,oBAAwB,CAAC;YACjC,MAAM;QACV,KAAK,QAAQ;YACT,QAAQ,wBAA0B,CAAC;YACnC,MAAM;QACV,KAAK,SAAS;YACV,QAAQ,4BAA4B,CAAC;YACrC,MAAM;QACV,KAAK,QAAQ;YACT,IAAG,KAAK,KAAK,IAAI,EAAC;gBACd,QAAQ,oBAAwB,CAAC;aACpC;iBACI,IAAI,KAAK,YAAY,IAAI,EAAC;gBAC3B,QAAQ,4BAA4B,CAAC;aACxC;iBACG;gBACA,MAAM,IAAI,KAAK,CAAC,gDAA6C,SAAS,wEAAiE,KAAK,OAAG,CAAC,CAAC;aACpJ;YACD,MAAM;QACV,KAAK,WAAW;YACZ,QAAQ,oBAAwB,CAAC;YACjC,MAAM;QACV;YACI,MAAM;KACb;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,sBAAsB,CAAC,QAAgB,EAAE,KAAU;IACxD,QAAQ,QAAQ,EAAE;QACd;YACI,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,IAAI,GAAG,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC3B,IAAI,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,IAAI,QAAQ,GAAG,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC;YACvC,IAAG,QAAQ,GAAG,CAAC,EAAC;gBACZ,KAAK,GAAG,QAAQ,CAAC;aACpB;YACD,OAAO,EAAE,KAAK,OAAA,EAAE,CAAC;QACrB;YACI,OAAO,EAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAC,CAAC;QACtC;YACI,OAAQ;KACf;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAgB,EAAE,KAAU,EAAE,UAAoC;IAC5F,QAAQ,QAAQ,EAAE;QACd;YACI,IAAG,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAC;gBACrC,OAAO,EAAE,CAAC;aACb;YACD,MAAM;QACV;YACI,IAAG,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAC;gBACrC,IAAG,UAAU,KAAK,+BAAwB,CAAC,MAAM,EAAC;oBAC9C,OAAO,IAAI,CAAC;iBACf;qBACG;oBACA,OAAO,CAAC,CAAC;iBACZ;aACJ;YACD,MAAM;QACV;YACI,MAAM;KACb;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAgB,0BAA0B,CAAC,KAAU,EAAE,UAAoC;IACvF,IAAI,iBAAiB,GAAQ;QACzB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,KAAK;KACf,CAAA;IACD,iBAAiB,CAAC,QAAQ,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAC5D,iBAAiB,CAAC,OAAO,GAAG,sBAAsB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACtF,iBAAiB,CAAC,KAAK,GAAI,oBAAoB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAC/F,OAAO,iBAAiB,CAAC;AAC7B,CAAC;AATD,gEASC"}

package/lib/formula/type.d.ts

@@ -40,7 +40,7 @@ export declare type SteedosFormulaVarPathTypeConfig = {
  */
 export declare type SteedosFormulaParamTypeConfig = {
     key: string;
-    path: any;
+    path?: any;
     value: any;
 };
 /**
@@ -57,8 +57,9 @@ export declare type SteedosFormulaParamTypeConfig = {
  */
 export declare type SteedosFormulaVarTypeConfig = {
     key: string;
-    paths: Array<SteedosFormulaVarPathTypeConfig>;
+    paths?: Array<SteedosFormulaVarPathTypeConfig>;
     is_user_var?: boolean;
+    is_simple_var?: boolean;
 };
 export declare type SteedosFieldFormulaTypeConfig = {
     _id: string;

package/lib/formula/type.js.map

@@ -1 +1 @@
-{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/formula/type.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AACd,QAAA,cAAc,GAAG,OAAO,CAAC;AA0FtC;;GAEG;AACH,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAChC,6CAAiB,CAAA;IACjB,6CAAiB,CAAA;AACrB,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC"}
+{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/formula/type.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AACd,QAAA,cAAc,GAAG,OAAO,CAAC;AA2FtC;;GAEG;AACH,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAChC,6CAAiB,CAAA;IACjB,6CAAiB,CAAA;AACrB,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC"}

package/lib/services/helpers/graphql.js

@@ -29,6 +29,9 @@ var GRAPHQL_ACTION_PREFIX = 'graphql_';
 function generateActionGraphqlProp(actionName, objectConfig) {
     var gplObj = {};
     var objectName = objectConfig.name;
+    if (objectName == 'users') {
+        return gplObj;
+    }
     switch (actionName) {
         case 'count':
             gplObj.query = gql(templateObject_1 || (templateObject_1 = tslib_1.__makeTemplateObject(["\n                type Query {\n                    ", "__", "(fields: JSON, filters: JSON, top: Int, skip: Int, sort: String): Int\n                }\n            "], ["\n                type Query {\n                    ", "__", "(fields: JSON, filters: JSON, top: Int, skip: Int, sort: String): Int\n                }\n            "])), objectName, actionName);

package/lib/services/helpers/graphql.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../../src/services/helpers/graphql.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graphql.js","sourceRoot":"","sources":["../../../src/services/helpers/graphql.ts"],"names":[],"mappings":"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"}

package/lib/services/objectService.js

@@ -908,6 +908,7 @@ module.exports = {
                                     ctx.broker.emit(_1.getObjectServiceName(field.reference_to) + ".refresh", {});
                                 }
                             });
+                            // console.log(`ctx.broker.destroyService`, this.object.name);
                             ctx.broker.destroyService(this);
                             if (onDestroyObjectService && _.isFunction(onDestroyObjectService)) {
                                 onDestroyObjectService(objectApiName);
@@ -1005,7 +1006,7 @@ module.exports = {
                                             Creator.loadObjects(objectConfig, objectConfig.name);
                                         }
                                         catch (error) {
-                                            _this.logger.error(error);
+                                            _this.logger.error('metadata.objects.inserted error', objectConfig.name, error);
                                         }
                                     }).promise()];
                             case 3: