@steedos/objectql 2.1.52 → 2.1.56

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steedos/objectql",
   "private": false,
-  "version": "2.1.52",
+  "version": "2.1.56",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -18,12 +18,12 @@
     "@salesforce/dev-config": "^1.4.4",
     "@salesforce/kit": "^1.0.4",
     "@salesforce/ts-types": "^1.1.1",
-    "@steedos/filters": "2.1.52",
-    "@steedos/formula": "2.1.52",
-    "@steedos/metadata-core": "2.1.52",
+    "@steedos/filters": "2.1.56",
+    "@steedos/formula": "2.1.56",
+    "@steedos/metadata-core": "2.1.56",
     "@steedos/odata-v4-typeorm": "^1.20.1",
-    "@steedos/schemas": "2.1.52",
-    "@steedos/standard-objects": "2.1.52",
+    "@steedos/schemas": "2.1.56",
+    "@steedos/standard-objects": "2.1.56",
     "@types/express": "^4.16.1",
     "@types/mongodb": "^3.1.22",
     "@types/node": "^11.10.4",
@@ -57,7 +57,7 @@
   },
   "devDependencies": {
     "@salesforce/dev-scripts": "0.3.12",
-    "@steedos/meteor-bundle-runner": "2.1.52",
+    "@steedos/meteor-bundle-runner": "2.1.56",
     "@types/chai": "^4.1.7",
     "@types/chai-as-promised": "7.1.0",
     "@types/mocha": "^5.2.6",
@@ -77,5 +77,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cc48f943b363921f18933d1e9d5d77dd5cb2185c"
+  "gitHead": "a8eed2e9927d67c38df80be1474cb6b7f5b0159c"
 }

package/src/dynamic-load/object_translations.ts

@@ -34,5 +34,7 @@ export const addObjectTranslationsFiles = async (filePath: string)=>{
 
 export const getObjectTranslations = async ()=>{
     const metadataObjectTranslations = await getSteedosSchema().metadataBroker.call('translations.getObjectTranslations')
-    return _.pluck(metadataObjectTranslations, 'metadata')
+    if(metadataObjectTranslations){
+        return _.pluck(metadataObjectTranslations, 'metadata')
+    }
 }   

package/src/dynamic-load/trigger.ts

@@ -35,8 +35,8 @@ export const addObjectListenerConfig = (json: SteedosListenerConfig) => {
         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')
     }
 
     let object_name = '';
@@ -46,22 +46,29 @@ export const addObjectListenerConfig = (json: SteedosListenerConfig) => {
     } else if (_.isFunction(json.listenTo)) {
         object_name = json.listenTo()
     }
-
-    let object = getObjectConfig(object_name);
-    if (object) {
-        if(!object.listeners){
-            object.listeners = {}
+    if(object_name){
+        let object = getObjectConfig(object_name);
+        if (object) {
+            if(!object.listeners){
+                object.listeners = {}
+            }
+            delete json.listenTo
+            const license = clone(json);
+            license.name = json._id || getMD5(JSONStringify(json));
+            object.listeners[license.name] = license
+            if(object.datasource === 'meteor'){
+                util.extend(object, {triggers: transformListenersToTriggers(object, license)})
+            }
         }
-        delete json.listenTo
-        const license = clone(json);
-        license.name = json._id || getMD5(JSONStringify(json));
-        object.listeners[license.name] = license
-        if(object.datasource === 'meteor'){
-            util.extend(object, {triggers: 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}); 
 }
 
 export const loadObjectTriggers = function (filePath: string){

package/src/formula/core.ts

@@ -11,6 +11,7 @@ import _ = require('lodash')
 // import _eval = require('eval')
 import { extract, parse } from '@steedos/formula';
 import { getFieldSubstitution, FormulonDataType } from './params'
+import { getSimpleParamSubstitution } from './simple_params'
 
 /**
  * 根据公式内容，取出其中{}中的变量
@@ -63,7 +64,7 @@ export const computeFormulaParams = async (doc: JsonMap, vars: Array<SteedosForm
     let params: Array<SteedosFormulaParamTypeConfig> = [];
     const spaceId = doc.space;
     if (vars && vars.length) {
-        for (let { key, paths, is_user_var: isUserVar } of vars) {
+        for (let { key, paths, is_user_var: isUserVar, is_simple_var: isSimpleVar } of vars) {
             key = key.trim();
             // 如果变量key以$user开头,则解析为userSession,此时paths为空
             let tempValue: any;
@@ -83,6 +84,16 @@ export const computeFormulaParams = async (doc: JsonMap, vars: Array<SteedosForm
                 // tempFormulaParams[FormulaUserKey] = currentUserId;
                 // tempValue = evalFieldFormula(tepmFormula, tempFormulaParams);
             }
+            if(isSimpleVar){
+                // 普通变量，取参数值时直接取值，而不用走变量上的paths属性。
+                // 注意未传入objectName时，公式中的user var的isSimpleVar为false，还是走下面的paths取值逻辑。
+                tempValue = <any>doc[key];
+                params.push({
+                    key: key,
+                    value: tempValue
+                });
+                continue;
+            }
             tempValue = _.reduce(paths, (reslut, next, index) => {
                 if (index === 0) {
                     if (isUserVar) {
@@ -176,7 +187,13 @@ export const runFormula = function (formula: string, params: Array<SteedosFormul
         // formulaParams[key] = value;
         // 把{}括起来的变量替换为计算得到的变量值
         // formula = formula.replace(`{${key}}`, `__params["${key}"]`);
-        formulaParams[key] = getFieldSubstitution(path.reference_from, path.field_name, value, blankValue);
+        if(path){
+            formulaParams[key] = getFieldSubstitution(path.reference_from, path.field_name, value, blankValue);
+        }
+        else{
+            // 变量中没有path属性说明是普通变量
+            formulaParams[key] = getSimpleParamSubstitution(value, blankValue);
+        }
     });
     
     // console.log("===runFormula===formula====", formula);

package/src/formula/index.ts

@@ -58,4 +58,24 @@ async function _computeFormula(formula: string, objectName:string, data: any, cu
     return runFormula(formula, params, options, {objectName});
 }
 
-export const computeFormula = _computeFormula 
+export const computeFormula = _computeFormula 
+
+async function _computeSimpleFormula(formula: string, data: any, currentUserId?: string, spaceId?: string, options?: SteedosFormulaOptions) {
+    // objectConfig参数值设置为null传入computeFormulaVarsAndQuotes表示计算不带objectConfig参数的普通公式变量
+    const varsAndQuotes = await computeFormulaVarsAndQuotes(formula, null);
+    const vars = varsAndQuotes.vars;
+    if (!currentUserId) {
+        const required = isCurrentUserIdRequiredForFormulaVars(vars);
+        if(required){
+            throw new Error(`The param 'currentUserId' is required for formula ${formula.replace("$", "\\$")}`);
+        }
+    }
+    if(spaceId){
+        data.space = spaceId;
+    }
+
+    let params = await computeFormulaParams(data, vars, currentUserId);
+    return runFormula(formula, params, options);
+}
+
+export const computeSimpleFormula = _computeSimpleFormula 

package/src/formula/simple_params.ts

@@ -0,0 +1,92 @@
+import { SteedosFormulaBlankValue } from './type';
+import { FormulonDataType } from './params';
+
+const VALUE_TYPES_NOT_SUPPORTED = ["function"];
+
+function getSubstitutionDataType(value: any){
+    const valueType = typeof value;
+    let dateType: FormulonDataType;
+    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 = FormulonDataType.Text;
+            break;
+        case 'number':
+            dateType = FormulonDataType.Number;
+            break;
+        case 'boolean':
+            dateType = FormulonDataType.Checkbox;
+            break;
+        case 'object':
+            if(value === null){
+                dateType = FormulonDataType.Null;
+            }
+            else if (value instanceof Date){
+                dateType = FormulonDataType.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 = FormulonDataType.Null;
+            break;
+        default:
+            break;
+    }
+    return dateType;
+}
+
+function getSubstitutionOptions(dataType: string, value: any){
+    switch (dataType) {
+        case FormulonDataType.Number:
+            let scale = 0;
+            let str = value.toString();
+            let dotStr = str.toString().split(".")[1];
+            let dotCount = dotStr && dotStr.length;
+            if(dotCount > 0){
+                scale = dotCount;
+            }
+            return { scale };
+        case FormulonDataType.Text:
+            return {length: Number.MAX_VALUE};
+        default:
+            return ;
+    }
+}
+
+function getSubstitutionValue(dataType: string, value: any, blankValue: SteedosFormulaBlankValue){
+    switch (dataType) {
+        case FormulonDataType.Text:
+            if(value === null || value === undefined){
+                return '';
+            }
+            break;
+        case FormulonDataType.Number:
+            if(value === null || value === undefined){
+                if(blankValue === SteedosFormulaBlankValue.blanks){
+                    return null;
+                }
+                else{
+                    return 0;
+                }
+            }
+            break;
+        default:
+            break;
+    }
+    return value;
+}
+
+export function getSimpleParamSubstitution(value: any, blankValue: SteedosFormulaBlankValue){
+    let fieldSubstitution: any = {
+        type: 'literal',
+        value: value
+    }
+    fieldSubstitution.dataType = getSubstitutionDataType(value);
+    fieldSubstitution.options = getSubstitutionOptions(fieldSubstitution.dataType, value);
+    fieldSubstitution.value  = getSubstitutionValue(fieldSubstitution.dataType, value, blankValue);
+    return fieldSubstitution;
+}

package/src/formula/type.ts

@@ -44,7 +44,7 @@ export type SteedosFormulaVarPathTypeConfig = {
  */
 export type SteedosFormulaParamTypeConfig = {
     key: string,
-    path: any,
+    path?: any,
     value: any
 }
 
@@ -62,8 +62,9 @@ export type SteedosFormulaParamTypeConfig = {
  */
 export type SteedosFormulaVarTypeConfig = {
     key: string,
-    paths: Array<SteedosFormulaVarPathTypeConfig>,
-    is_user_var?: boolean
+    paths?: Array<SteedosFormulaVarPathTypeConfig>,
+    is_user_var?: boolean,
+    is_simple_var?: boolean //当不传入objectApiName时变量上设置该属性表示一个普通的变量，此时paths为空
 }
 
 export type SteedosFieldFormulaTypeConfig = {

package/src/services/helpers/graphql.ts

@@ -28,6 +28,9 @@ const GRAPHQL_ACTION_PREFIX = 'graphql_';
 export function generateActionGraphqlProp(actionName: string, objectConfig: SteedosObjectTypeConfig) {
     let gplObj: any = {};
     let objectName = objectConfig.name;
+    if (objectName == 'users') {
+        return gplObj;
+    }
     switch (actionName) {
         case 'count':
             gplObj.query = gql`

package/src/services/objectService.ts

@@ -566,6 +566,7 @@ module.exports = {
                             ctx.broker.emit(`${getObjectServiceName(field.reference_to)}.refresh`, {});
                         }
                     })
+                    // console.log(`ctx.broker.destroyService`, this.object.name);
                     ctx.broker.destroyService(this);
                     if(onDestroyObjectService && _.isFunction(onDestroyObjectService)){
                         onDestroyObjectService(objectApiName);
@@ -650,7 +651,7 @@ module.exports = {
                             try {
                                 Creator.loadObjects(objectConfig, objectConfig.name);
                             } catch (error) {
-                                this.logger.error(error)
+                                this.logger.error('metadata.objects.inserted error', objectConfig.name, error)
                             }
                         }).promise();
                     }

package/src/ts-types/triggerActionParams.ts

@@ -2,6 +2,7 @@ import { JsonMap } from "@salesforce/ts-types";
 import { SteedosIDType } from "..";
 
 export type TriggerActionParams = {
+    objectName?: string
     isExecuting?: boolean,
     isInsert?: boolean,
     isUpdate?: boolean,

package/src/types/object.ts

@@ -366,11 +366,14 @@ export class SteedosObjectType extends SteedosObjectProperties {
 
         for (const trigger of triggers) {
             let params = generateActionParams(when, context); //参考sf
-            try {
-                await this._schema.metadataBroker.call(`${trigger.service.name}.${trigger.metadata.action}`, params)
-            } catch (error) {
-                console.error(error)
-            }
+            await this._schema.metadataBroker.call(`${trigger.service.name}.${trigger.metadata.action}`, params).catch((error)=>{
+                //如果action trigger 下线，则只打印error
+                if(error && _.isObject(error) && error.type === 'SERVICE_NOT_AVAILABLE'){
+                    console.error(`runTriggerActions error`, error)
+                }else{
+                    throw error
+                }
+            })
         }
 
     }
@@ -1257,7 +1260,7 @@ export class SteedosObjectType extends SteedosObjectProperties {
 
         let userSession = args[args.length - 1]
 
-        let context: SteedosTriggerContextConfig = { userId: userSession ? userSession.userId : undefined, spaceId: userSession ? userSession.spaceId : undefined }
+        let context: SteedosTriggerContextConfig = { objectName: this.name, userId: userSession ? userSession.userId : undefined, spaceId: userSession ? userSession.spaceId : undefined }
 
         if (method === 'find' || method === 'findOne' || method === 'count') {
             context.query = args[args.length - 2]

package/src/types/trigger.ts

@@ -12,6 +12,7 @@ export type SteedosTriggerContextConfig = {
     previousDoc?: JsonMap,  //仅afterUpdate, afterDelete时存在此属性
     query?: SteedosQueryOptions,
     data?: JsonMap //仅afterFind，afterCount时存在此属性
+    objectName?: string
 }
 
 export type SteedosTriggerTypeConfig = {

package/src/util/transform.ts

@@ -155,7 +155,7 @@ export function transformListenersToTriggers(object: SteedosObjectTypeConfig, js
 }
 
 export function generateActionParams(when: string, context: SteedosTriggerContextConfig): TriggerActionParams {
-    let params: TriggerActionParams = { isExecuting: true };
+    let params: TriggerActionParams = { objectName: context.objectName, isExecuting: true };
     switch (when) {
         case 'before.find':
             params.isBefore = true;