stentor-determiner 1.46.8 → 1.48.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/CHANGELOG.md +35 -0
- package/lib/determine.d.ts +1 -1
- package/lib/determine.js +3 -2
- package/lib/determine.js.map +1 -1
- package/package.json +13 -13
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,41 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [1.48.2](https://github.com/stentorium/stentor/compare/v1.48.1...v1.48.2) (2021-10-28)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package stentor-determiner
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [1.48.1](https://github.com/stentorium/stentor/compare/v1.48.0...v1.48.1) (2021-10-28)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package stentor-determiner
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
# [1.48.0](https://github.com/stentorium/stentor/compare/v1.47.0...v1.48.0) (2021-10-28)
|
|
23
|
+
|
|
24
|
+
**Note:** Version bump only for package stentor-determiner
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
# [1.47.0](https://github.com/stentorium/stentor/compare/v1.46.8...v1.47.0) (2021-10-26)
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
### Features
|
|
34
|
+
|
|
35
|
+
* Compilation on the Suggestion Chips ([#1195](https://github.com/stentorium/stentor/issues/1195)) ([8469365](https://github.com/stentorium/stentor/commit/8469365c03b7cf5f7b5439cc851aafba68eddffb))
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
|
|
6
41
|
## [1.46.8](https://github.com/stentorium/stentor/compare/v1.46.7...v1.46.8) (2021-10-26)
|
|
7
42
|
|
|
8
43
|
**Note:** Version bump only for package stentor-determiner
|
package/lib/determine.d.ts
CHANGED
|
@@ -7,4 +7,4 @@ import { Context, Request } from "stentor-models";
|
|
|
7
7
|
* @param context
|
|
8
8
|
* @returns The best match from the provided potential matches, undefined if now match could be determined.
|
|
9
9
|
*/
|
|
10
|
-
export declare function determine<P extends object>(potentials: P[], request: Request, context: Context): P | undefined;
|
|
10
|
+
export declare function determine<P extends object>(potentials: P[], request: Request, context: Context, additionalContext?: Record<string, unknown>): P | undefined;
|
package/lib/determine.js
CHANGED
|
@@ -21,7 +21,7 @@ const Guards_1 = require("./Guards");
|
|
|
21
21
|
* @param context
|
|
22
22
|
* @returns The best match from the provided potential matches, undefined if now match could be determined.
|
|
23
23
|
*/
|
|
24
|
-
function determine(potentials, request, context) {
|
|
24
|
+
function determine(potentials, request, context, additionalContext) {
|
|
25
25
|
if (!Array.isArray(potentials) || potentials.length === 0) {
|
|
26
26
|
return undefined;
|
|
27
27
|
}
|
|
@@ -69,10 +69,11 @@ function determine(potentials, request, context) {
|
|
|
69
69
|
const originals = {};
|
|
70
70
|
const compiledConditionals = [];
|
|
71
71
|
const requestSlots = (0, stentor_request_1.isIntentRequest)(request) && context.session ? (0, stentor_utils_1.combineRequestSlots)(context.session.get(stentor_constants_1.SESSION_STORAGE_SLOTS_KEY), request.slots) : context.session ? context.session.get(stentor_constants_1.SESSION_STORAGE_SLOTS_KEY) : {};
|
|
72
|
+
// We want to compile the conditions first
|
|
72
73
|
conditionals.forEach((conditional) => {
|
|
73
74
|
if (typeof conditional.conditions === "string") {
|
|
74
75
|
// Compile it
|
|
75
|
-
const compiled = new stentor_utils_1.Compiler().compile(conditional.conditions, request, context);
|
|
76
|
+
const compiled = new stentor_utils_1.Compiler({ additionalContext }).compile(conditional.conditions, request, context);
|
|
76
77
|
// Keep hold of the original
|
|
77
78
|
originals[compiled] = conditional;
|
|
78
79
|
// Push a compiled version
|
package/lib/determine.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"determine.js","sourceRoot":"","sources":["../src/determine.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,6DAA4D;AAC5D,yDAA8D;AAC9D,mDAAkD;AAClD,yEAA2G;AAC3G,mDAAqC;AAcrC,qDAQyB;AACzB,qDAAwG;AACxG,+CAA6E;AAC7E,iDAAyF;AACzF,qEAAwF;AACxF,qCAA2D;AAE3D;;;;;;;GAOG;AACH,SAAgB,SAAS,CAAmB,UAAe,EAAE,OAAgB,EAAE,OAAgB;
|
|
1
|
+
{"version":3,"file":"determine.js","sourceRoot":"","sources":["../src/determine.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,6DAA4D;AAC5D,yDAA8D;AAC9D,mDAAkD;AAClD,yEAA2G;AAC3G,mDAAqC;AAcrC,qDAQyB;AACzB,qDAAwG;AACxG,+CAA6E;AAC7E,iDAAyF;AACzF,qEAAwF;AACxF,qCAA2D;AAE3D;;;;;;;GAOG;AACH,SAAgB,SAAS,CAAmB,UAAe,EAAE,OAAgB,EAAE,OAAgB,EAAE,iBAA2C;IACxI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QACvD,OAAO,SAAS,CAAC;KACpB;IAED,MAAM,aAAa,GAAQ,EAAE,CAAC;IAC9B,MAAM,uBAAuB,GAA0B,EAAE,CAAC;IAC1D,MAAM,qBAAqB,GAAwB,EAAE,CAAC;IACtD,MAAM,uBAAuB,GAA2B,EAAE,CAAC;IAC3D,MAAM,oBAAoB,GAAwB,EAAE,CAAC;IACrD,MAAM,uBAAuB,GAA2B,EAAE,CAAC;IAC3D,MAAM,oBAAoB,GAAwB,EAAE,CAAC;IACrD,6BAA6B;IAC7B,MAAM,YAAY,GAAqB,EAAE,CAAC;IAE1C,4BAA4B;IAC5B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAChC,qCAAqC;QACrC,IAAI,IAAA,sBAAa,EAAC,SAAS,CAAC,EAAE;YAC1B,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAChC;aAAM,IAAI,IAAA,qCAAmB,EAAC,SAAS,CAAC,EAAE;YACvC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC3C;aAAM,IAAI,IAAA,4CAAgB,EAAC,SAAS,CAAC,EAAE;YACpC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACxC;aAAM,IAAI,IAAA,qCAAmB,EAAC,SAAS,CAAC,EAAE;YACvC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC3C;aAAM,IAAI,IAAA,iCAAgB,EAAC,SAAS,CAAC,EAAE;YACpC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACzC;aAAM,IAAI,IAAA,yBAAgB,EAAC,SAAS,CAAC,EAAE;YACpC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACxC;aAAM,IAAI,IAAA,oCAAkB,EAAC,SAAS,CAAC,EAAE;YACtC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC3C;aAAM;YACH,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACjC;KACJ;IAED,oCAAoC;IACpC,IAAI,gBAAgC,CAAC;IACrC,IAAI,IAAA,iCAAiB,EAAC,YAAY,CAAC,EAAE;QACjC,qFAAqF;QACrF,MAAM,SAAS,GAA2C,EAAE,CAAC;QAC7D,MAAM,oBAAoB,GAAqB,EAAE,CAAC;QAElD,MAAM,YAAY,GAAmB,IAAA,iCAAe,EAAC,OAAO,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,mCAAmB,EAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,6CAAyB,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,6CAAyB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAE9O,2CAA2C;QAC3C,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YACjC,IAAI,OAAO,WAAW,CAAC,UAAU,KAAK,QAAQ,EAAE;gBAC5C,aAAa;gBACb,MAAM,QAAQ,GAAW,IAAI,wBAAQ,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAE/G,4BAA4B;gBAC5B,SAAS,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC;gBAClC,0BAA0B;gBAC1B,oBAAoB,CAAC,IAAI,iCAClB,WAAW,KACd,UAAU,EAAE,QAAQ,IACtB,CAAC;aACN;iBAAM;gBACH,qBAAqB;gBACrB,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC1C;QACL,CAAC,CAAC,CAAC;QAEH,0CAA0C;QAC1C,MAAM,MAAM,GAAuB;YAC/B,IAAA,6CAAoB,EAAC,OAAO,EAAE,OAAO,CAAC;YACtC,IAAA,wCAAsB,EAAC,OAAO,EAAE,OAAO,CAAC;YACxC,IAAA,yCAAuB,EAAC,OAAO,CAAC;YAChC,IAAA,gDAAoB,EAAC,YAAY,CAAC;YAClC,IAAA,uCAAqB,EAAC,OAAO,EAAE,OAAO,CAAC;SAC1C,CAAC;QACF,6DAA6D;QAC7D,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,OAAO,CAAC,OAAO,CAAC,mBAAmB,KAAK,QAAQ,EAAE;YACvF,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC;YAChE,MAAM,CAAC,IAAI,CAAC,IAAA,mCAAoB,EAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;SAC9D;QAED,kCAAkC;QAClC,MAAM,OAAO,GAAG,IAAI,2CAAqB,CAAC,MAAM,CAAC,CAAC,SAAS,CAAI,oBAAoB,CAAC,CAAC;QACrF,sDAAsD;QACtD,MAAM,gBAAgB,GAAqB,EAAE,CAAC;QAC9C,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACtB,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ,EAAE;gBACtC,4BAA4B;gBAC5B,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;aACtD;iBAAM;gBACH,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAChC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,SAAS,gBAAgB,CAAC,MAAM,6CAA6C,CAAC,CAAC;SAC9F;QACD,oBAAoB;QACpB,gBAAgB,GAAG,IAAA,sBAAM,EAAC,gBAAgB,CAAC,CAAC;KAC/C;IAED,IAAI,mBAAsC,CAAC;IAC3C,IAAI,qBAA2C,CAAC;IAChD,uCAAuC;IACvC,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE;QAC5B,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9F,mBAAmB,GAAG,IAAA,sCAAuB,EAAC,qBAAqB,EAAE,EAAE,mBAAmB,EAAE,CAAC,CAAC;QAC9F,qBAAqB,GAAG,IAAA,2CAAyB,EAAC,uBAAuB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;KAC/F;IACD,MAAM,oBAAoB,GAAG,IAAA,0CAAwB,EAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IACxF,MAAM,qBAAqB,GAAG,IAAA,2CAAyB,EAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAC1F,IAAI,kBAAqC,CAAC;IAC1C,IAAI,IAAA,iCAAe,EAAC,OAAO,CAAC,EAAE;QAC1B,kBAAkB,GAAG,IAAA,kDAAsB,EAAC,oBAAoB,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;KACpF;IACD,MAAM,kBAAkB,GAAG,IAAA,+CAAsB,EAAC,oBAAoB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1F,eAAe;IACf,MAAM,WAAW,GAAG,IAAA,sBAAM,EAAC,aAAa,CAAC,CAAC;IAE1C,0BAA0B;IAC1B,OAAO,CACH,gBAAgB,IAAI,+EAA+E;QACnG,oBAAoB;QACpB,kBAAkB;QAClB,qBAAqB;QACrB,qBAAqB;QACrB,kBAAkB;QAClB,mBAAmB;QACnB,WAAW,CACd,CAAC;AACN,CAAC;AAhID,8BAgIC"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
7
|
-
"version": "1.
|
|
7
|
+
"version": "1.48.2",
|
|
8
8
|
"description": "Determination for stentor",
|
|
9
9
|
"types": "lib/index",
|
|
10
10
|
"main": "lib/index",
|
|
@@ -16,28 +16,28 @@
|
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
18
|
"@types/chai": "4.2.22",
|
|
19
|
-
"@types/sinon": "10.0.
|
|
19
|
+
"@types/sinon": "10.0.6",
|
|
20
20
|
"@types/sinon-chai": "3.2.5",
|
|
21
21
|
"@xapp/config": "0.2.3",
|
|
22
22
|
"chai": "4.3.4",
|
|
23
23
|
"mocha": "9.1.3",
|
|
24
24
|
"sinon": "10.0.0",
|
|
25
25
|
"sinon-chai": "3.7.0",
|
|
26
|
-
"stentor-models": "1.
|
|
26
|
+
"stentor-models": "1.48.1",
|
|
27
27
|
"ts-node": "9.1.1",
|
|
28
28
|
"typescript": "4.4.4"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"jsonpath-plus": "6.0.1",
|
|
32
|
-
"stentor-conditional": "1.
|
|
33
|
-
"stentor-constants": "1.
|
|
34
|
-
"stentor-guards": "1.
|
|
35
|
-
"stentor-interaction-model": "1.
|
|
36
|
-
"stentor-logger": "1.
|
|
37
|
-
"stentor-request": "1.
|
|
38
|
-
"stentor-storage": "1.
|
|
39
|
-
"stentor-time": "1.
|
|
40
|
-
"stentor-utils": "1.
|
|
32
|
+
"stentor-conditional": "1.48.2",
|
|
33
|
+
"stentor-constants": "1.48.1",
|
|
34
|
+
"stentor-guards": "1.48.2",
|
|
35
|
+
"stentor-interaction-model": "1.48.2",
|
|
36
|
+
"stentor-logger": "1.48.2",
|
|
37
|
+
"stentor-request": "1.48.2",
|
|
38
|
+
"stentor-storage": "1.48.2",
|
|
39
|
+
"stentor-time": "1.48.2",
|
|
40
|
+
"stentor-utils": "1.48.2"
|
|
41
41
|
},
|
|
42
42
|
"peerDependencies": {
|
|
43
43
|
"stentor-models": "1.x"
|
|
@@ -47,5 +47,5 @@
|
|
|
47
47
|
"clean": "rm -rf ./lib/*",
|
|
48
48
|
"test": "mocha --recursive -r ts-node/register \"./src/**/*.test.ts\""
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "34274fc82ce9b007a2f8d8c741b545251ebb1f6b"
|
|
51
51
|
}
|