@steedos/service-metadata-objects 2.3.0-beta.4 → 2.3.0-beta.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/lib/formula/formulaActionHandler.js +7 -4
  2. package/lib/formula/formulaActionHandler.js.map +1 -1
  3. package/lib/formula/type.d.ts +2 -0
  4. package/lib/formula/type.js +2 -1
  5. package/lib/formula/type.js.map +1 -1
  6. package/lib/objects/fields/index.js +1 -1
  7. package/lib/objects/fields/index.js.map +1 -1
  8. package/package.json +5 -5
  9. package/src/formula/formulaActionHandler.ts +16 -9
  10. package/src/formula/type.ts +3 -1
  11. package/src/objects/fields/index.ts +1 -1
package/lib/formula/formulaActionHandler.js CHANGED
@@ -56,13 +56,14 @@ class FormulaActionHandler {
56
56
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
57
57
  let isSimpleVar = objectConfig === null;
58
58
  let isUserVar = new RegExp(`^${type_1.FormulaUserKey.replace("$", "\\$")}\\b`).test(formulaVar);
59
+ let isUserSessionVar = new RegExp(`^${type_1.FormulaUserSessionKey.replace("$", "\\$")}\\b`).test(formulaVar);
59
60
  let varItems = formulaVar.split(".");
60
61
  let paths = [];
61
62
  let formulaVarItem = {
62
63
  key: formulaVar,
63
64
  paths: paths
64
65
  };
65
- if (isUserVar) {
66
+ if (isUserVar || isUserSessionVar) {
66
67
  isSimpleVar = false;
67
68
  objectConfig = "space_users";
68
69
  }
@@ -71,6 +72,11 @@ class FormulaActionHandler {
71
72
  vars.push(formulaVarItem);
72
73
  return;
73
74
  }
75
+ if (isUserSessionVar) {
76
+ formulaVarItem.is_user_session_var = true;
77
+ vars.push(formulaVarItem);
78
+ return;
79
+ }
74
80
  if (isUserVar) {
75
81
  formulaVarItem.is_user_var = true;
76
82
  }
@@ -231,9 +237,6 @@ class FormulaActionHandler {
231
237
  for (var _b = tslib_1.__asyncValues(_.values(config.fields)), _c; _c = yield _b.next(), !_c.done;) {
232
238
  const field = _c.value;
233
239
  if (field.type === "formula") {
234
- if (datasource !== "meteor" && datasource !== "default") {
235
- throw new Error(`The type of the field '${field.name}' on the object '${config.name}' can't be 'formula', because it is not in the default datasource.`);
236
- }
237
240
  try {
238
241
  const fieldFormulaConfig = yield this.getObjectFieldFormulaConfig(clone(field), config);
239
242
  objectFieldsFormulaConfig.push(fieldFormulaConfig);
package/lib/formula/formulaActionHandler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"formulaActionHandler.js","sourceRoot":"","sources":["../../src/formula/formulaActionHandler.ts"],"names":[],"mappings":";;;;AAAA,iCAAmM;AACnM,iCAAyC;AAEzC,oEAAuD;AAEvD,4BAA4B;AAC5B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;AAG9B,MAAM,YAAY,GAAG,CAAC,aAAa,EAAC,EAAE;IAClC,OAAO,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,mBAAmB,CAAC;AAGvC,SAAS,0BAA0B,CAAC,aAAqB,EAAE,iBAAyB;IAChF,OAAO,qBAAqB,aAAa,IAAI,iBAAiB,EAAE,CAAA;AACpE,CAAC;AAED,MAAa,oBAAoB;IAE7B,YAAY,MAAM;QADlB,WAAM,GAAQ,IAAI,CAAC;QAEf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAEK,SAAS,CAAC,YAAY;;YACxB,IAAI;gBACA,IAAI,CAAC,YAAY,EAAE;oBACf,OAAO;iBACV;gBAGD,MAAM,6BAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACjF,OAAO,IAAI,CAAA;aACd;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACnC;YACD,OAAO,KAAK,CAAA;QAChB,CAAC;KAAA;IAEK,eAAe,CAAC,aAAqB;;YACvC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,EAAC,aAAa,EAAE,aAAa,EAAC,CAAC,CAAA;YAClF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QACvC,CAAC;KAAA;IAED,2BAA2B,CAAC,KAAyC,EAAE,MAAiD;QACpH,IAAG,KAAK,CAAC,UAAU,KAAK,KAAK,EAAC;YAE1B,OAAO;SACV;QACD,IAAI,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAClC,OAAO,IAAI,CAAC,UAAU,KAAK,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,WAAW,CAAA;QACzF,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtB;IACL,CAAC;IAUK,0BAA0B,CAAC,UAAkB,EAAE,YAAiB,EAAG,MAAiD,EAAE,IAAwC;;;YAChK,IAAI,WAAW,GAAG,YAAY,KAAK,IAAI,CAAC;YAExC,IAAI,SAAS,GAAG,IAAI,MAAM,CAAC,IAAI,qBAAc,CAAC,OAAO,CAAC,GAAG,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACxF,IAAI,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,KAAK,GAA2C,EAAE,CAAC;YACvD,IAAI,cAAc,GAAgC;gBAC9C,GAAG,EAAE,UAAU;gBACf,KAAK,EAAE,KAAK;aACf,CAAC;YACF,IAAI,SAAS,EAAE;gBAEX,WAAW,GAAG,KAAK,CAAC;gBACpB,YAAY,GAAG,aAAa,CAAC;aAChC;YACD,IAAG,WAAW,EAAC;gBAIX,cAAc,CAAC,aAAa,GAAG,IAAI,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAC1B,OAAO;aACV;YACD,IAAI,SAAS,EAAE;gBAEX,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC;aAGrC;iBACG;gBACA,IAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAAC;oBAC1B,MAAM,IAAI,KAAK,CAAC,+CAA+C,UAAU,yEAAyE,CAAC,CAAC;iBACvJ;gBACD,IAAG,CAAC,YAAY,EAAC;oBAEb,MAAM,IAAI,KAAK,CAAC,kFAAkF,UAAU,GAAG,CAAC,CAAC;iBACpH;aACJ;YACD,IAAI,gBAAgB,GAAG,YAAY,CAAC;YACpC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;;gBACX,KAA0B,IAAA,aAAA,sBAAA,QAAQ,CAAA,cAAA;oBAAvB,IAAI,OAAO,qBAAA,CAAA;oBAClB,CAAC,EAAE,CAAC;oBAGJ,IAAI,eAAoB,CAAC;oBACzB,MAAM,SAAS,GAAG,OAAO,KAAK,qBAAc,CAAC;oBAC7C,IAAG,OAAO,KAAK,KAAK,EAAC;wBAEjB,eAAe,GAAG;4BACd,IAAI,EAAE,OAAO;4BACb,IAAI,EAAE,MAAM;yBACf,CAAA;qBACJ;yBACI,IAAG,SAAS,EAAC;wBAEd,eAAe,GAAG;4BACd,IAAI,EAAE,OAAO;4BACb,IAAI,EAAE,QAAQ;4BACd,YAAY,EAAE,aAAa;yBAC9B,CAAA;qBACJ;yBACG;wBACA,eAAe,GAAG,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;qBACtD;oBACD,IAAI,CAAC,eAAe,EAAE;wBAGlB,OAAQ;qBACX;oBACD,IAAI,aAAa,GAAG,eAAe,CAAC,IAAI,KAAK,SAAS,CAAC;oBACvD,IAAG,CAAC,SAAS,EAAC;wBACV,IAAI,uBAAuB,GAAoC;4BAC3D,UAAU,EAAE,OAAO;4BACnB,cAAc,EAAE,gBAAgB,CAAC,IAAI;yBACxC,CAAC;wBACF,IAAI,aAAa,EAAE;4BACf,uBAAuB,CAAC,UAAU,GAAG,IAAI,CAAC;yBAC7C;wBAED,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;qBACvC;oBACD,IAAI,CAAC,SAAS,EAAE;wBAGZ,IAAI,qBAAqB,GAAuC;4BAC5D,WAAW,EAAE,gBAAgB,CAAC,IAAI;4BAClC,UAAU,EAAE,eAAe,CAAC,IAAI;yBACnC,CAAC;wBACF,IAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAC;4BAEpC,qBAAqB,CAAC,MAAM,GAAG,IAAI,CAAC;yBACvC;wBACD,IAAI,aAAa,EAAE;4BACf,qBAAqB,CAAC,UAAU,GAAG,IAAI,CAAC;yBAC3C;wBACD,IAAI,CAAC,2BAA2B,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;qBACnE;oBACD,IAAI,eAAe,CAAC,IAAI,KAAK,QAAQ,IAAI,eAAe,CAAC,IAAI,KAAK,eAAe,EAAE;wBAE/E,IAAI,eAAe,CAAC,QAAQ,EAAE;4BAE1B,MAAM,IAAI,KAAK,CAAC,yCAAyC,eAAe,CAAC,IAAI,0BAA0B,UAAU,mBAAmB,eAAe,CAAC,IAAI,iCAAiC,CAAC,CAAC;yBAC9L;wBACD,IAAI,CAAC,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;4BAE3B,MAAM,IAAI,KAAK,CAAC,yCAAyC,eAAe,CAAC,IAAI,0BAA0B,UAAU,UAAU,eAAe,CAAC,IAAI,gDAAgD,CAAC,CAAC;yBACpM;wBACD,IAAG,eAAe,CAAC,kBAAkB,IAAI,KAAK,CAAC,MAAM,EAAC;4BAClD,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,kBAAkB,GAAG,eAAe,CAAC,kBAAkB,CAAC;yBACnF;qBACJ;yBACI;wBAED,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;4BAEzB,MAAM,IAAI,KAAK,CAAC,yCAAyC,eAAe,CAAC,IAAI,0BAA0B,UAAU,8EAA8E,CAAC,CAAC;yBACpM;wBACD,MAAM;qBACT;oBACD,IAAI,OAAO,eAAe,CAAC,YAAY,KAAK,QAAQ,EAAE;wBAElD,MAAM,IAAI,KAAK,CAAC,SAAS,eAAe,CAAC,IAAI,eAAe,UAAU,oGAAoG,CAAC,CAAC;qBAC/K;oBACD,gBAAgB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;oBAC5E,IAAI,CAAC,gBAAgB,EAAE;wBAGnB,IAAG,YAAY,CAAC,eAAe,CAAC,YAAY,CAAC,EAAC;4BAC1C,MAAM,IAAI,KAAK,CAAC,kEAAkE,eAAe,CAAC,YAAY,mBAAmB,eAAe,CAAC,IAAI,0BAA0B,UAAU,GAAG,CAAC,CAAC;yBACjM;6BACG;4BAEA,MAAM,6BAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,eAAe,CAAC,YAAY,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAC,aAAa,EAAE,YAAY,CAAC,IAAI,EAAC,EAAC,EAAE,EAAE,CAAC,CAAC;4BAClL,OAAO;yBACV;qBACJ;iBACJ;;;;;;;;;YACD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;;KAC7B;IAOK,2BAA2B,CAAC,OAAe,EAAE,YAAiB;;;YAChE,IAAI,MAAM,GAA8C,EAAE,CAAC;YAC3D,IAAI,IAAI,GAAuC,EAAE,CAAC;YAClD,IAAI,WAAW,GAAQ,EAAE,CAAC;YAC1B,IAAG;gBACC,WAAW,GAAG,IAAA,sBAAe,EAAC,OAAO,CAAC,CAAC;aAC1C;YACD,OAAM,EAAE,EAAC;gBACL,MAAM,IAAI,KAAK,CAAC,mCAAmC,EAAE,uCAAuC,OAAO,UAAU,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;aACjJ;;gBACD,KAA8B,IAAA,gBAAA,sBAAA,WAAW,CAAA,iBAAA;oBAA/B,MAAM,UAAU,wBAAA,CAAA;oBACtB,MAAM,IAAI,CAAC,0BAA0B,CAAC,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;iBACjF;;;;;;;;;YACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;;KAC3B;IAED,SAAS,CAAC,OAAe;QACrB,OAAO,qBAAqB,OAAO,EAAE,CAAA;IACzC,CAAC;IAEK,2BAA2B,CAAC,WAAgB,EAAE,YAAiB;;YACjE,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;YACpC,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC3E,IAAI,aAAa,GAAkC;gBAC/C,GAAG,EAAE,GAAG,YAAY,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,EAAE;gBAC/C,WAAW,EAAE,YAAY,CAAC,IAAI;gBAC9B,UAAU,EAAE,WAAW,CAAC,IAAI;gBAC5B,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,WAAW,CAAC,SAAS;gBAChC,mBAAmB,EAA4B,WAAW,CAAC,mBAAmB;gBAC9E,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,IAAI,EAAE,MAAM,CAAC,IAAI;aACpB,CAAC;YAEF,OAAO,aAAa,CAAC;QACzB,CAAC;KAAA;IAEK,4BAA4B,CAAC,MAAW,EAAE,UAAkB;;;YAC9D,MAAM,yBAAyB,GAAG,EAAE,CAAC;;gBACrC,KAA0B,IAAA,KAAA,sBAAA,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA,IAAA;oBAAtC,MAAM,KAAK,WAAA,CAAA;oBAGlB,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;wBAC1B,IAAG,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,SAAS,EAAC;4BACnD,MAAM,IAAI,KAAK,CAAC,0BAA0B,KAAK,CAAC,IAAI,oBAAoB,MAAM,CAAC,IAAI,oEAAoE,CAAC,CAAC;yBAC5J;wBACD,IAAI;4BAEA,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAA;4BACvF,yBAAyB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;yBACtD;wBAAC,OAAO,KAAK,EAAE;4BACZ,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;yBACxB;qBACJ;iBACJ;;;;;;;;;YACD,OAAO,yBAAyB,CAAC;;KACpC;IAED,eAAe,CAAC,IAAI,EAAE,IAAI;QACtB,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,SAAS,iBAAiB,CAAC,KAAK;YAC5B,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,UAAS,IAAI;gBACtB,IAAG,IAAI,CAAC,KAAK,KAAK,KAAK,EAAC;oBACpB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACpB,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;iBAC9B;YACL,CAAC,CAAC,CAAA;QACN,CAAC;QACD,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC3B,IAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,UAAS,GAAG,IAAE,OAAO,GAAG,KAAK,IAAI,CAAC,KAAK,CAAA,CAAA,CAAC,CAAC,EAAC;YACtD,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC7D;IACL,CAAC;IAEK,uBAAuB,CAAC,MAAW;;;YACrC,MAAM,IAAI,GAAG,EAAE,CAAC;YAEhB,IAAI,OAAO,GAAQ,CAAC,MAAM,6BAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,UAAU,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;;gBACjG,KAAyB,IAAA,YAAA,sBAAA,OAAO,CAAA,aAAA;oBAArB,MAAM,IAAI,oBAAA,CAAA;oBACjB,MAAM,QAAQ,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC;oBAChC,IAAG,QAAQ,EAAC;wBACR,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBACnB;iBACJ;;;;;;;;;YACD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;KAC7B;IACK,uBAAuB,CAAC,MAAW,EAAE,GAAW,EAAE,KAAa;;YACjE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YACtE,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,IAAG,QAAQ,EAAC;gBACR,IAAI,GAAG,QAAQ,CAAC;aACnB;YAED,IAAI,IAAI,GAAG;gBACP,GAAG,EAAE,GAAG;gBACR,KAAK,EAAE,KAAK;aACf,CAAA;YAGD,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAEjC,MAAM,6BAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,UAAU,IAAI,GAAG,IAAI,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC;QAE5G,CAAC;KAAA;IAEK,kBAAkB,CAAC,MAAW,EAAE,UAAkB;;;YACpD,MAAM,yBAAyB,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;;gBAC9F,KAAiC,IAAA,8BAAA,sBAAA,yBAAyB,CAAA,+BAAA;oBAA/C,MAAM,YAAY,sCAAA,CAAA;;wBACzB,KAA0B,IAAA,oBAAA,sBAAA,YAAY,CAAC,MAAM,CAAA,CAAA,IAAA;4BAAlC,MAAM,KAAK,WAAA,CAAA;4BAClB,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,YAAY,CAAC,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;yBACtH;;;;;;;;;oBACD,MAAM,6BAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,YAAY,EAAC,EAAE,EAAE,CAAC,CAAC;iBAEpG;;;;;;;;;YACD,OAAO,IAAI,CAAC;;KACf;IAEK,8BAA8B,CAAC,aAAa;;YAC9C,OAAO,MAAM,6BAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,CAAC,CAAA;QAE7G,CAAC;KAAA;IAEK,uBAAuB,CAAC,YAAY;;;;YACtC,MAAM,aAAa,GAAG,EAAE,CAAC;YACzB,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;;gBAC3F,KAAyB,IAAA,0BAAA,sBAAA,qBAAqB,CAAA,2BAAA;oBAAnC,MAAM,IAAI,kCAAA,CAAA;oBACjB,MAAM,mBAAmB,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,0CAAE,aAAa,CAAC;oBAC1D,IAAG,mBAAmB,EAAC;wBACnB,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;wBAC3E,IAAG,kBAAkB,EAAC;4BAClB,aAAa,CAAC,mBAAmB,CAAC,GAAG,kBAAkB,CAAA;yBAC1D;qBACJ;iBACJ;;;;;;;;;YAED,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE;gBACpC,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,EAAE;oBACjE,MAAM,kBAAkB,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;oBACrD,MAAM,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;oBACjF,MAAM,6BAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;iBAEhH;aACJ;;KACJ;IAEK,GAAG,CAAC,YAAY;;YAClB,IAAI;gBACA,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;gBACrE,OAAO,IAAI,CAAC;aACf;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACnC;YACD,OAAO,KAAK,CAAA;QAChB,CAAC;KAAA;IAEK,MAAM,CAAC,GAAG;;YACZ,IAAI,EAAC,aAAa,EAAE,YAAY,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;YAC/C,IAAG,CAAC,aAAa,EAAC;gBACd,aAAa,GAAG,GAAG,CAAC;aACvB;YACD,IAAG,CAAC,YAAY,EAAC;gBACb,YAAY,GAAG,GAAG,CAAC;aACtB;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,aAAa,IAAI,YAAY,EAAE,CAAC,CAAA;YAC9D,MAAM,OAAO,GAAG,EAAE,CAAC;YAEnB,MAAM,GAAG,GAAG,MAAM,6BAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACpD,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,EAAC,EAAE;gBACnB,OAAO,CAAC,IAAI,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC,CAAA;YAChC,CAAC,CAAC,CAAA;YACF,OAAO,OAAO,CAAC;QACnB,CAAC;KAAA;IAEK,GAAG,CAAC,GAAG;;YACT,IAAI,EAAC,gBAAgB,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;YACpC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;YAE5C,MAAM,GAAG,GAAG,MAAM,6BAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;YAChD,OAAO,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,CAAC;QACzB,CAAC;KAAA;IAEK,8BAA8B,CAAC,GAAG;;;YACpC,IAAI,EAAC,WAAW,EAAE,YAAY,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;YAE7C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YACvF,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1E,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,IAAG,QAAQ,EAAC;gBACR,IAAI,GAAG,QAAQ,CAAC;aACnB;;gBAED,KAA0B,IAAA,KAAA,sBAAA,YAAY,CAAC,MAAM,CAAA,IAAA;oBAAlC,MAAM,KAAK,WAAA,CAAA;oBAClB,IAAI,IAAI,GAAG;wBACP,GAAG,EAAE,YAAY,CAAC,GAAG;wBACrB,KAAK,EAAE,GAAG,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,UAAU,EAAE;qBACpD,CAAA;oBACD,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBACpC;;;;;;;;;YAED,OAAO,MAAM,IAAI,CAAC,2BAA2B,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;;KAC5E;IAEK,uBAAuB,CAAC,GAAG;;YAC7B,IAAI,EAAC,OAAO,EAAE,YAAY,EAAC,GAAG,GAAG,CAAC,MAAM,CAAC;YACzC,OAAO,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACzE,CAAC;KAAA;CACJ;AA9YD,oDA8YC"}
1
+ {"version":3,"file":"formulaActionHandler.js","sourceRoot":"","sources":["../../src/formula/formulaActionHandler.ts"],"names":[],"mappings":"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"}
package/lib/formula/type.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  export declare const FormulaUserKey = "$user";
2
+ export declare const FormulaUserSessionKey = "$userSession";
2
3
  export declare type SteedosFieldFormulaQuoteTypeConfig = {
3
4
  object_name: string;
4
5
  field_name: string;
@@ -20,6 +21,7 @@ export declare type SteedosFormulaVarTypeConfig = {
20
21
  key: string;
21
22
  paths: Array<SteedosFormulaVarPathTypeConfig>;
22
23
  is_user_var?: boolean;
24
+ is_user_session_var?: boolean;
23
25
  is_simple_var?: boolean;
24
26
  };
25
27
  export declare type SteedosFieldFormulaTypeConfig = {
package/lib/formula/type.js CHANGED
@@ -1,7 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.SteedosFormulaBlankValue = exports.FormulaUserKey = void 0;
3
+ exports.SteedosFormulaBlankValue = exports.FormulaUserSessionKey = exports.FormulaUserKey = void 0;
4
4
  exports.FormulaUserKey = "$user";
5
+ exports.FormulaUserSessionKey = "$userSession";
5
6
  var SteedosFormulaBlankValue;
6
7
  (function (SteedosFormulaBlankValue) {
7
8
  SteedosFormulaBlankValue["zeroes"] = "zeroes";
package/lib/formula/type.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/formula/type.ts"],"names":[],"mappings":";;;AACa,QAAA,cAAc,GAAG,OAAO,CAAC;AA+FtC,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAChC,6CAAiB,CAAA;IACjB,6CAAiB,CAAA;AACrB,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC"}
1
+ {"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/formula/type.ts"],"names":[],"mappings":";;;AACa,QAAA,cAAc,GAAG,OAAO,CAAC;AACzB,QAAA,qBAAqB,GAAG,cAAc,CAAC;AAgGpD,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAChC,6CAAiB,CAAA;IACjB,6CAAiB,CAAA;AACrB,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC"}
package/lib/objects/fields/index.js CHANGED
@@ -106,7 +106,7 @@ function getDBType(objectName, field) {
106
106
  case "markdown":
107
107
  return SteedosFieldDBType.varchar;
108
108
  case "formula":
109
- return getDBType(objectName, Object.assign(Object.assign({}, field), { type: "datetime" }));
109
+ return getDBType(objectName, Object.assign(Object.assign({}, field), { type: field.data_type }));
110
110
  case "summary":
111
111
  return SteedosFieldDBType.varchar;
112
112
  default:
package/lib/objects/fields/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/objects/fields/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/objects/fields/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-metadata-objects",
3
- "version": "2.3.0-beta.4",
3
+ "version": "2.3.0-beta.8",
4
4
  "description": "",
5
5
  "main": "lib/objects.service.js",
6
6
  "scripts": {
@@ -20,9 +20,9 @@
20
20
  "license": "MIT",
21
21
  "dependencies": {
22
22
  "@salesforce/ts-types": "^1.1.1",
23
- "@steedos/formula": "2.3.0-beta.4",
24
- "@steedos/i18n": "2.3.0-beta.4",
25
- "@steedos/metadata-registrar": "2.3.0-beta.4",
23
+ "@steedos/formula": "2.3.0-beta.8",
24
+ "@steedos/i18n": "2.3.0-beta.8",
25
+ "@steedos/metadata-registrar": "2.3.0-beta.8",
26
26
  "dotenv-flow": "^3.1.0",
27
27
  "ioredis": "^4.22.0",
28
28
  "lodash": "^4.17.21",
@@ -36,5 +36,5 @@
36
36
  "publishConfig": {
37
37
  "access": "public"
38
38
  },
39
- "gitHead": "04dec60fc62988742fcf63181d26f584f5995196"
39
+ "gitHead": "d0bfd52568ee68e3af0f251c06bd8169e823851f"
40
40
  }
package/src/formula/formulaActionHandler.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { SteedosFieldFormulaTypeConfig, SteedosFieldFormulaQuoteTypeConfig, SteedosFormulaVarTypeConfig, SteedosFormulaVarPathTypeConfig, FormulaUserKey, SteedosFormulaBlankValue } from './type';
1
+ import { SteedosFieldFormulaTypeConfig, SteedosFieldFormulaQuoteTypeConfig, SteedosFormulaVarTypeConfig, SteedosFormulaVarPathTypeConfig, FormulaUserKey, FormulaUserSessionKey, SteedosFormulaBlankValue } from './type';
2
2
  import { pickFormulaVars } from './core';
3
3
  // import { isCodeObject } from '../util'; TODO
4
4
  import { Register } from '@steedos/metadata-registrar';
@@ -67,29 +67,36 @@ export class FormulaActionHandler{
67
67
  */
68
68
  async computeFormulaVarAndQuotes(formulaVar: string, objectConfig: any, quotes: Array<SteedosFieldFormulaQuoteTypeConfig>, vars: Array<SteedosFormulaVarTypeConfig>){
69
69
  let isSimpleVar = objectConfig === null;//明确传入null时表示要计算的是普通变量。
70
- // 公式变量以FormulaUserSessionKey（即$user）值开头，说明是userSession变量
70
+ // 公式变量以FormulaUserSessionKey（即$user）值开头，说明是user变量
71
71
  let isUserVar = new RegExp(`^${FormulaUserKey.replace("$","\\$")}\\b`).test(formulaVar);
72
+ let isUserSessionVar = new RegExp(`^${FormulaUserSessionKey.replace("$","\\$")}\\b`).test(formulaVar);
72
73
  let varItems = formulaVar.split(".");
73
74
  let paths: Array<SteedosFormulaVarPathTypeConfig> = [];
74
75
  let formulaVarItem: SteedosFormulaVarTypeConfig = {
75
76
  key: formulaVar,
76
77
  paths: paths
77
78
  };
78
- if (isUserVar) {
79
+ if (isUserVar || isUserSessionVar) {
79
80
  // user var不可以按普通变量处理，因为其变量值依赖paths属性
80
81
  isSimpleVar = false;
81
82
  objectConfig = "space_users";
82
83
  }
83
84
  if(isSimpleVar){
84
85
  // 只要不是user var则标记为普通变量，后续取参数值时直接通过key取值，而不用走变量上的paths属性。
85
- // 普通变量直接跳后后面所有代码即可，因为不需要处理paths和公式关系链等逻辑。
86
- // 注意普通公式也是支持$user全局变量的，但是isSimpleVar是false，所以下面所有逻辑
86
+ // 普通变量直接跳过后面所有代码即可，因为不需要处理paths和公式关系链等逻辑。
87
+ // 注意普通公式也是支持$user全局变量的，但是isSimpleVar是false，所以走的是后面的逻辑
87
88
  formulaVarItem.is_simple_var = true;
88
89
  vars.push(formulaVarItem);
89
90
  return;
90
91
  }
92
+ if(isUserSessionVar){
93
+ // $userSession变量直接跳后后面所有代码即可，因为不需要处理paths和公式关系链等逻辑。
94
+ formulaVarItem.is_user_session_var = true;
95
+ vars.push(formulaVarItem);
96
+ return;
97
+ }
91
98
  if (isUserVar) {
92
- // 如果是userSession变量，则不需要计算quotes引用，但是其paths值需要正常记录下来
99
+ // 如果是user变量，则不需要计算quotes引用，但是其paths值需要正常记录下来
93
100
  formulaVarItem.is_user_var = true;
94
101
  // vars.push(formulaVarItem);
95
102
  // return;
@@ -253,9 +260,9 @@ export class FormulaActionHandler{
253
260
  // console.log('key', key);
254
261
  // const field = config.fields[key]
255
262
  if (field.type === "formula") {
256
- if(datasource !== "meteor" && datasource !== "default"){
257
- throw new Error(`The type of the field '${field.name}' on the object '${config.name}' can't be 'formula', because it is not in the default datasource.`);
258
- }
263
+ // if(datasource !== "meteor" && datasource !== "default"){
264
+ // throw new Error(`The type of the field '${field.name}' on the object '${config.name}' can't be 'formula', because it is not in the default datasource.`);
265
+ // }
259
266
  try {
260
267
  // 这里一定要加try catch，否则某个字段报错后，后续其他字段及其他对象就再也没有正常加载了
261
268
  const fieldFormulaConfig = await this.getObjectFieldFormulaConfig(clone(field), config)
package/src/formula/type.ts CHANGED
@@ -1,5 +1,6 @@
1
- // 公式内容中表示userSession变量的占位符
1
+ // 公式内容中表示user变量的占位符
2
2
  export const FormulaUserKey = "$user";
3
+ export const FormulaUserSessionKey = "$userSession";
3
4
 
4
5
  /**
5
6
  * 记录公式字段中引用的本对象或其他对象上的字段
@@ -65,6 +66,7 @@ export type SteedosFormulaVarTypeConfig = {
65
66
  key: string,
66
67
  paths: Array<SteedosFormulaVarPathTypeConfig>,
67
68
  is_user_var?: boolean,
69
+ is_user_session_var?: boolean,
68
70
  is_simple_var?: boolean //当不传入objectApiName时变量上设置该属性表示一个普通的变量
69
71
  }
70
72
 
package/src/objects/fields/index.ts CHANGED
@@ -133,7 +133,7 @@ export function getDBType(objectName, field) {
133
133
  case "markdown":
134
134
  return SteedosFieldDBType.varchar;
135
135
  case "formula":
136
- return getDBType(objectName, { ...field, type: "datetime" });
136
+ return getDBType(objectName, { ...field, type: field.data_type });
137
137
  case "summary":
138
138
  //汇总不需要check类型
139
139
  return SteedosFieldDBType.varchar;