@steedos/objectql 2.7.10 → 2.7.11-beta.2
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.
- package/lib/formula/util.js +6 -0
- package/lib/formula/util.js.map +1 -1
- package/package.json +14 -14
package/lib/formula/util.js
CHANGED
|
@@ -22,6 +22,9 @@ var isFieldFormulaConfigQuoted = function (configA, configB) {
|
|
|
22
22
|
return !!configAQuoteds.length;
|
|
23
23
|
};
|
|
24
24
|
exports.isFieldFormulaConfigQuoted = isFieldFormulaConfigQuoted;
|
|
25
|
+
function includesAny(mainString, stringArray) {
|
|
26
|
+
return _.some(stringArray, function (substr) { return mainString.includes(substr); });
|
|
27
|
+
}
|
|
25
28
|
var isFieldFormulaConfigQuotingObjectAndFields = function (config, objectName, fieldNames) {
|
|
26
29
|
var quotes = config.quotes;
|
|
27
30
|
if (quotes && quotes.length) {
|
|
@@ -34,6 +37,9 @@ var isFieldFormulaConfigQuotingObjectAndFields = function (config, objectName, f
|
|
|
34
37
|
}
|
|
35
38
|
});
|
|
36
39
|
}
|
|
40
|
+
else if (config.formula) {
|
|
41
|
+
return includesAny(config.formula, fieldNames);
|
|
42
|
+
}
|
|
37
43
|
else {
|
|
38
44
|
return false;
|
|
39
45
|
}
|
package/lib/formula/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/formula/util.ts"],"names":[],"mappings":";;;;AACA,0BAA4B;AAOrB,IAAM,4BAA4B,GAAG,UAAC,MAAqC,EAAE,aAAmD;IAC3H,IAAA,MAAM,GAAK,MAAM,OAAX,CAAY;IAC1B,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;QACzB,OAAO,aAAa,CAAC,MAAM,CAAC,UAAC,YAA2C;YACpE,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAC,KAAK;gBACvB,OAAO,KAAK,CAAC,WAAW,KAAK,YAAY,CAAC,WAAW,IAAI,KAAK,CAAC,UAAU,KAAK,YAAY,CAAC,UAAU,CAAC;YAC1G,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;KACN;SACI;QACD,OAAO,EAAE,CAAC;KACb;AACL,CAAC,CAAA;AAZY,QAAA,4BAA4B,gCAYxC;AAOM,IAAM,0BAA0B,GAAG,UAAC,OAAsC,EAAE,OAAsC;IACrH,IAAI,cAAc,GAAG,IAAA,oCAA4B,EAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACtE,OAAO,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC;AACnC,CAAC,CAAA;AAHY,QAAA,0BAA0B,8BAGtC;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/formula/util.ts"],"names":[],"mappings":";;;;AACA,0BAA4B;AAOrB,IAAM,4BAA4B,GAAG,UAAC,MAAqC,EAAE,aAAmD;IAC3H,IAAA,MAAM,GAAK,MAAM,OAAX,CAAY;IAC1B,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;QACzB,OAAO,aAAa,CAAC,MAAM,CAAC,UAAC,YAA2C;YACpE,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAC,KAAK;gBACvB,OAAO,KAAK,CAAC,WAAW,KAAK,YAAY,CAAC,WAAW,IAAI,KAAK,CAAC,UAAU,KAAK,YAAY,CAAC,UAAU,CAAC;YAC1G,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;KACN;SACI;QACD,OAAO,EAAE,CAAC;KACb;AACL,CAAC,CAAA;AAZY,QAAA,4BAA4B,gCAYxC;AAOM,IAAM,0BAA0B,GAAG,UAAC,OAAsC,EAAE,OAAsC;IACrH,IAAI,cAAc,GAAG,IAAA,oCAA4B,EAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACtE,OAAO,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC;AACnC,CAAC,CAAA;AAHY,QAAA,0BAA0B,8BAGtC;AAED,SAAS,WAAW,CAAC,UAAU,EAAE,WAAW;IACxC,OAAO,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,UAAC,MAAM,IAAK,OAAA,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAA3B,CAA2B,CAAC,CAAC;AACtE,CAAC;AAQI,IAAM,0CAA0C,GAAE,UAAC,MAAqC,EAAE,UAAkB,EAAE,UAA0B;IACnI,IAAA,MAAM,GAAK,MAAM,OAAX,CAAY;IAC1B,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;QACzB,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAC,KAAK;YACvB,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,EAAE;gBACjC,OAAO,KAAK,CAAC,WAAW,KAAK,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;aACxF;iBACI;gBACD,OAAO,KAAK,CAAC,WAAW,KAAK,UAAU,CAAC;aAC3C;QACL,CAAC,CAAC,CAAC;KACN;SAAK,IAAG,MAAM,CAAC,OAAO,EAAC;QACpB,OAAO,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;KAClD;SACI;QACD,OAAO,KAAK,CAAC;KAChB;AACL,CAAC,CAAA;AAjBY,QAAA,0CAA0C,8CAiBtD;AAQM,IAAM,iCAAiC,GAAG,UAAC,MAAqC,EAAE,aAAmD;;IACxI,IAAI,aAAa,GAAG,IAAA,oCAA4B,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACxE,IAAG,CAAC,aAAa,CAAC,MAAM,EAAC;QACrB,OAAO,KAAK,CAAC;KAChB;;QACD,KAAwB,IAAA,kBAAA,iBAAA,aAAa,CAAA,4CAAA,uEAAC;YAAlC,IAAI,YAAY,0BAAA;YAChB,IAAI,oBAAoB,GAAG,IAAA,kCAA0B,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAC5E,IAAG,oBAAoB,EAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,sEAA+D,MAAM,CAAC,GAAG,oBAAU,YAAY,CAAC,GAAG,4BAAyB,CAAC,CAAC;gBAC9I,OAAO,IAAI,CAAC;aACf;SACJ;;;;;;;;;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAA;AAbY,QAAA,iCAAiC,qCAa7C;AAOM,IAAM,gCAAgC,GAAG,UAAC,OAAsC,EAAE,OAAsC;IAC3H,OAAO,IAAA,yCAAiC,EAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;AACjE,CAAC,CAAA;AAFY,QAAA,gCAAgC,oCAE5C;AAOM,IAAO,wBAAwB,GAAG,UAAC,MAAqC,EAAE,OAA6C;IAC1H,IAAI,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,UAAC,IAAI;QAClC,OAAO,IAAI,CAAC,GAAG,KAAK,MAAM,CAAC,GAAG,CAAA;IAClC,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,aAAa,EAAE;QAChB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACxB;AACL,CAAC,CAAA;AAPa,QAAA,wBAAwB,4BAOrC;AAED,IAAM,2BAA2B,GAAG,UAAC,MAAqC,EAAE,aAAmD,EAAE,aAAmD;IAChL,IAAM,aAAa,GAAG,IAAA,oCAA4B,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC1E,aAAa,CAAC,OAAO,CAAC,UAAC,YAAY;QAC/B,2BAA2B,CAAC,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IACH,IAAA,gCAAwB,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AACpD,CAAC,CAAA;AAQM,IAAM,uBAAuB,GAAG,UAAC,OAA6C;IACjF,IAAG,OAAO,CAAC,MAAM,IAAI,CAAC,EAAC;QAEnB,OAAO,OAAO,CAAC;KAClB;IACD,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,OAAO,CAAC,OAAO,CAAC,UAAC,MAAM;QACnB,2BAA2B,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IACH,OAAO,aAAa,CAAC;AACzB,CAAC,CAAA;AAVY,QAAA,uBAAuB,2BAUnC;AAMM,IAAM,2CAA2C,GAAG,UAAC,OAAmF;;IAC3I,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACrB,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC;KACvB;IACD,IAAG,CAAC,OAAO,CAAC,MAAM,EAAC;QACf,OAAO;KACV;;QACD,KAAkB,IAAA,YAAA,iBAAA,OAAO,CAAA,gCAAA,qDAAC;YAAtB,IAAI,MAAM,oBAAA;YACJ,IAAA,IAAI,GAA8D,MAAM,KAApE,EAAe,UAAU,GAAqC,MAAM,YAA3C,EAAc,SAAS,GAAc,MAAM,WAApB,EAAE,OAAO,GAAK,MAAM,QAAX,CAAY;YAC/E,IAAI,QAAQ,GAAG,IAAA,2CAAmC,EAAC,IAAI,CAAC,CAAC;YACzD,IAAG,QAAQ,EAAC;gBACR,MAAM,IAAI,KAAK,CAAC,yEAAkE,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,yBAAe,SAAS,8BAAoB,UAAU,MAAG,CAAC,CAAC;aAC3K;SACJ;;;;;;;;;AACL,CAAC,CAAA;AAdY,QAAA,2CAA2C,+CAcvD;AAMM,IAAM,mCAAmC,GAAG,UAAC,IAAwC;IACxF,IAAI,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAC,EAAiE;YAAlD,SAAS,iBAAA,EAAuB,gBAAgB,yBAAA;QACvF,OAAO,SAAS,IAAI,gBAAgB,CAAC;IACzC,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAA;AALY,QAAA,mCAAmC,uCAK/C;AAyBM,IAAM,kCAAkC,GAAG,UAAC,KAA6C;IAC5F,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;QACf,OAAO,EAAE,CAAC;KACb;IACD,IAAI,OAAO,GAAG,EAAE,EAAE,WAA4C,EAAE,QAAyC,CAAC;IAC1G,IAAI,YAAY,GAAW,EAAE,EAAE,oBAAoB,GAAW,EAAE,CAAC;IACjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QACvC,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,QAAQ,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACxB,oBAAoB,GAAG,WAAW,CAAC,UAAU,CAAC;QAC9C,IAAG,YAAY,EAAC;YACZ,oBAAoB,GAAG,UAAG,YAAY,cAAI,oBAAoB,CAAE,CAAC;YACjE,YAAY,GAAG,oBAAoB,CAAC;SACvC;aACG;YACA,YAAY,GAAG,oBAAa,WAAW,CAAC,UAAU,CAAE,CAAC;SACxD;QACD,IAAI,YAAY,GAAG,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC;QAC3F,OAAO,CAAC,IAAI,CAAC;YACT,OAAO,EAAE;gBACL,IAAI,EAAE,QAAQ,CAAC,cAAc;gBAC7B,UAAU,EAAE,oBAAoB;gBAChC,YAAY,cAAA;gBACZ,EAAE,EAAE,YAAY;aACnB;SACJ,CAAC,CAAC;KACN;IACD,OAAO,OAAO,CAAC;AACnB,CAAC,CAAA;AA5BY,QAAA,kCAAkC,sCA4B9C"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/objectql",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "2.7.
|
|
4
|
+
"version": "2.7.11-beta.2",
|
|
5
5
|
"description": "",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"scripts": {
|
|
@@ -16,17 +16,17 @@
|
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"@salesforce/kit": "1.0.4",
|
|
18
18
|
"@salesforce/ts-types": "1.1.1",
|
|
19
|
-
"@steedos/cachers": "2.7.
|
|
20
|
-
"@steedos/filters": "2.7.
|
|
21
|
-
"@steedos/formula": "2.7.
|
|
22
|
-
"@steedos/i18n": "2.7.
|
|
23
|
-
"@steedos/metadata-core": "2.7.
|
|
24
|
-
"@steedos/metadata-registrar": "2.7.
|
|
25
|
-
"@steedos/odata-v4-mongodb": "2.7.
|
|
26
|
-
"@steedos/odata-v4-sql": "2.7.
|
|
27
|
-
"@steedos/odata-v4-typeorm": "2.7.
|
|
28
|
-
"@steedos/schemas": "2.7.
|
|
29
|
-
"@steedos/standard-objects": "2.7.
|
|
19
|
+
"@steedos/cachers": "2.7.11-beta.2",
|
|
20
|
+
"@steedos/filters": "2.7.11-beta.2",
|
|
21
|
+
"@steedos/formula": "2.7.11-beta.2",
|
|
22
|
+
"@steedos/i18n": "2.7.11-beta.2",
|
|
23
|
+
"@steedos/metadata-core": "2.7.11-beta.2",
|
|
24
|
+
"@steedos/metadata-registrar": "2.7.11-beta.2",
|
|
25
|
+
"@steedos/odata-v4-mongodb": "2.7.11-beta.2",
|
|
26
|
+
"@steedos/odata-v4-sql": "2.7.11-beta.2",
|
|
27
|
+
"@steedos/odata-v4-typeorm": "2.7.11-beta.2",
|
|
28
|
+
"@steedos/schemas": "2.7.11-beta.2",
|
|
29
|
+
"@steedos/standard-objects": "2.7.11-beta.2",
|
|
30
30
|
"amis-formula": "~6.3.0",
|
|
31
31
|
"app-root-path": "^2.2.1",
|
|
32
32
|
"body-parser": "^1.18.1",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"vm2": "^3.9.17"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@steedos/meteor-bundle-runner": "2.7.
|
|
59
|
+
"@steedos/meteor-bundle-runner": "2.7.11-beta.2",
|
|
60
60
|
"@types/express": "^4.16.1",
|
|
61
61
|
"@types/node": "^11.10.4",
|
|
62
62
|
"@types/underscore": "^1.8.13",
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "2e6f72c0e3b573e2992dd7bcc444438119157f3a"
|
|
70
70
|
}
|