stentor-response 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 +38 -0
- package/lib/compileResponse.d.ts +1 -1
- package/lib/compileResponse.js +70 -2
- package/lib/compileResponse.js.map +1 -1
- package/lib/compileSegments.js +6 -7
- package/lib/compileSegments.js.map +1 -1
- package/lib/determineResponse.d.ts +1 -1
- package/lib/determineResponse.js +2 -2
- package/lib/determineResponse.js.map +1 -1
- package/lib/getResponse.d.ts +1 -1
- package/lib/getResponse.js +1 -1
- package/lib/getResponse.js.map +1 -1
- package/package.json +9 -9
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,44 @@
|
|
|
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-response
|
|
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-response
|
|
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
|
+
|
|
25
|
+
### Features
|
|
26
|
+
|
|
27
|
+
* List Template ([#1200](https://github.com/stentorium/stentor/issues/1200)) ([6dc854a](https://github.com/stentorium/stentor/commit/6dc854ae810be1f752eea31160759427e768715e))
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
# [1.47.0](https://github.com/stentorium/stentor/compare/v1.46.8...v1.47.0) (2021-10-26)
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
### Features
|
|
37
|
+
|
|
38
|
+
* Compilation on the Suggestion Chips ([#1195](https://github.com/stentorium/stentor/issues/1195)) ([8469365](https://github.com/stentorium/stentor/commit/8469365c03b7cf5f7b5439cc851aafba68eddffb))
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
|
|
6
44
|
## [1.46.8](https://github.com/stentorium/stentor/compare/v1.46.7...v1.46.8) (2021-10-26)
|
|
7
45
|
|
|
8
46
|
**Note:** Version bump only for package stentor-response
|
package/lib/compileResponse.d.ts
CHANGED
|
@@ -16,4 +16,4 @@ import { MacroMap } from "stentor-utils";
|
|
|
16
16
|
* @param context - Context to pull information from for compilation
|
|
17
17
|
* @param additionalContext - Additional, optional, context to pull information from for compilation
|
|
18
18
|
*/
|
|
19
|
-
export declare function compileResponse(response: Response, request: Request, context: Context, additionalContext?:
|
|
19
|
+
export declare function compileResponse(response: Response, request: Request, context: Context, additionalContext?: Record<string, unknown>, macros?: MacroMap): Response;
|
package/lib/compileResponse.js
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.compileResponse = void 0;
|
|
4
4
|
/*! Copyright (c) 2019, XAPPmedia */
|
|
5
|
+
const stentor_constants_1 = require("stentor-constants");
|
|
6
|
+
const stentor_guards_1 = require("stentor-guards");
|
|
5
7
|
const stentor_locales_1 = require("stentor-locales");
|
|
6
8
|
const stentor_utils_1 = require("stentor-utils");
|
|
7
9
|
const compileSegments_1 = require("./compileSegments");
|
|
@@ -22,13 +24,14 @@ const compileSegments_1 = require("./compileSegments");
|
|
|
22
24
|
* @param additionalContext - Additional, optional, context to pull information from for compilation
|
|
23
25
|
*/
|
|
24
26
|
function compileResponse(response, request, context, additionalContext, macros) {
|
|
27
|
+
var _a, _b;
|
|
25
28
|
// fast fail
|
|
26
29
|
if (!response) {
|
|
27
30
|
return response;
|
|
28
31
|
}
|
|
29
32
|
const compiler = new stentor_utils_1.Compiler({
|
|
30
33
|
macros: Object.assign(Object.assign({}, stentor_utils_1.DEFAULT_MARCOS), macros),
|
|
31
|
-
additionalContext
|
|
34
|
+
additionalContext,
|
|
32
35
|
replaceWhenUndefined: true
|
|
33
36
|
});
|
|
34
37
|
// Make a copy for manipulation
|
|
@@ -52,7 +55,72 @@ function compileResponse(response, request, context, additionalContext, macros)
|
|
|
52
55
|
});
|
|
53
56
|
// Displays!
|
|
54
57
|
if (Array.isArray(compiledResponse.displays) && compiledResponse.displays.length > 0) {
|
|
55
|
-
//
|
|
58
|
+
// We want to first check to see if they have the itemObject feature
|
|
59
|
+
// Note, just care about the first one here.
|
|
60
|
+
const firstDisplay = compiledResponse.displays[0];
|
|
61
|
+
if ((0, stentor_guards_1.isTemplatedList)(firstDisplay)) {
|
|
62
|
+
// This is what we will replace the items on firstDisplay with
|
|
63
|
+
const compiledItems = [];
|
|
64
|
+
// Defaults to "items"
|
|
65
|
+
const itemsName = firstDisplay.itemsName || "items";
|
|
66
|
+
// The collection variable. The regex is just for the syntactical similarity. ex "${ $.session.storeList }"
|
|
67
|
+
const itemsObject = firstDisplay.itemsObject;
|
|
68
|
+
// If dynamic no reason to give more
|
|
69
|
+
if (firstDisplay.items.length !== 1) {
|
|
70
|
+
throw new Error("Templated Lists must only have 1 item");
|
|
71
|
+
}
|
|
72
|
+
const itemTemplate = firstDisplay.items[0];
|
|
73
|
+
const itemsObjectResult = new RegExp(stentor_constants_1.TEMPLATE_REGEX).exec(itemsObject);
|
|
74
|
+
if (!itemsObjectResult) {
|
|
75
|
+
throw new Error(`Unable to determine JSON path for ${itemsObject}, which is required for compilation.`);
|
|
76
|
+
}
|
|
77
|
+
const itemsObjectResultPath = itemsObjectResult[1].trim();
|
|
78
|
+
// Now, find the object.
|
|
79
|
+
// try just the session variables first
|
|
80
|
+
let sessionValue;
|
|
81
|
+
const sessionPathResult = (0, stentor_utils_1.getJSONPath)(itemsObjectResultPath, (_b = (_a = context === null || context === void 0 ? void 0 : context.storage) === null || _a === void 0 ? void 0 : _a.sessionStore) === null || _b === void 0 ? void 0 : _b.data);
|
|
82
|
+
if ((0, stentor_utils_1.existsAndNotEmpty)(sessionPathResult) && sessionPathResult[0]) {
|
|
83
|
+
sessionValue = sessionPathResult[0];
|
|
84
|
+
}
|
|
85
|
+
// Last, we just try a JSON path
|
|
86
|
+
let pathValue;
|
|
87
|
+
const pathResult = (0, stentor_utils_1.getJSONPath)(itemsObjectResultPath, Object.assign(Object.assign({}, additionalContext), { request,
|
|
88
|
+
context, storage: context.storage, session: context.session }));
|
|
89
|
+
if ((0, stentor_utils_1.existsAndNotEmpty)(pathResult) && pathResult[0]) {
|
|
90
|
+
pathValue = pathResult[0];
|
|
91
|
+
}
|
|
92
|
+
// Prefer the session over the path one
|
|
93
|
+
let itemsObjectArray = sessionValue || pathValue;
|
|
94
|
+
if (!Array.isArray(itemsObjectArray)) {
|
|
95
|
+
throw new Error(`Item found at JSONPath for itemsObject was not an array.`);
|
|
96
|
+
}
|
|
97
|
+
// if a range exists, trim to the range
|
|
98
|
+
itemsObjectArray = firstDisplay.range ? itemsObjectArray.slice(firstDisplay.range.from, firstDisplay.range.length) : itemsObjectArray;
|
|
99
|
+
// Time to iterate and do replacements
|
|
100
|
+
itemsObjectArray.forEach((item, index) => {
|
|
101
|
+
// Stringify
|
|
102
|
+
const itemString = JSON.stringify(itemTemplate, undefined, 2);
|
|
103
|
+
let compiledItemString = (0, compileSegments_1.compileSegments)(itemString, compiledResponse.segments, request, context);
|
|
104
|
+
// New compiler
|
|
105
|
+
const itemCompiler = new stentor_utils_1.Compiler({
|
|
106
|
+
macros: Object.assign(Object.assign({}, stentor_utils_1.DEFAULT_MARCOS), macros),
|
|
107
|
+
additionalContext: Object.assign(Object.assign({}, additionalContext), { [`${itemsName}`]: item, index }),
|
|
108
|
+
replaceWhenUndefined: true
|
|
109
|
+
});
|
|
110
|
+
compiledItemString = itemCompiler.compile(compiledItemString, request, context);
|
|
111
|
+
try {
|
|
112
|
+
const compiledItem = JSON.parse(compiledItemString);
|
|
113
|
+
// Only update if it doesn't explode
|
|
114
|
+
compiledItems.push(compiledItem);
|
|
115
|
+
}
|
|
116
|
+
catch (e) {
|
|
117
|
+
console.info("Could not parse compiled displays");
|
|
118
|
+
}
|
|
119
|
+
// ok, time to update the items.
|
|
120
|
+
firstDisplay.items = compiledItems;
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
// Then pass it through as a string convert it to a string
|
|
56
124
|
const displaysString = JSON.stringify(compiledResponse.displays, undefined, 2);
|
|
57
125
|
// Compile the segments
|
|
58
126
|
let compiledDisplayString = (0, compileSegments_1.compileSegments)(displaysString, compiledResponse.segments, request, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileResponse.js","sourceRoot":"","sources":["../src/compileResponse.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,qDAA2C;AAE3C,
|
|
1
|
+
{"version":3,"file":"compileResponse.js","sourceRoot":"","sources":["../src/compileResponse.ts"],"names":[],"mappings":"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"}
|
package/lib/compileSegments.js
CHANGED
|
@@ -9,8 +9,9 @@ const determineSegment_1 = require("./determineSegment");
|
|
|
9
9
|
/* private */
|
|
10
10
|
function compileString(value, segmentsMap, request, context, responseKey) {
|
|
11
11
|
let compiledValue = value;
|
|
12
|
-
let result
|
|
13
|
-
|
|
12
|
+
let result;
|
|
13
|
+
const reg = new RegExp(stentor_constants_1.TEMPLATE_REGEX);
|
|
14
|
+
while ((result = reg.exec(value)) !== null) {
|
|
14
15
|
// Pull the first key out
|
|
15
16
|
const key = result[1] ? result[1].trim() : undefined;
|
|
16
17
|
const foundSegment = segmentsMap[key];
|
|
@@ -32,21 +33,19 @@ function compileString(value, segmentsMap, request, context, responseKey) {
|
|
|
32
33
|
compiledValue = compiledValue.replace(result[0], cleanSegment);
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
|
-
// Run the value back through until we have replaced all the templates
|
|
36
|
-
result = stentor_constants_1.TEMPLATE_REGEX.exec(compiledValue);
|
|
37
36
|
}
|
|
38
37
|
return compiledValue;
|
|
39
38
|
}
|
|
40
39
|
/* private */
|
|
41
40
|
function findSegments(value, segmentsMap, request, context) {
|
|
42
41
|
const foundSegments = {};
|
|
43
|
-
let result
|
|
44
|
-
|
|
42
|
+
let result;
|
|
43
|
+
const reg = new RegExp(stentor_constants_1.TEMPLATE_REGEX);
|
|
44
|
+
while ((result = reg.exec(value)) !== null) {
|
|
45
45
|
const key = result[1] ? result[1].trim() : undefined;
|
|
46
46
|
const segments = segmentsMap[key] || [];
|
|
47
47
|
const matchedSegment = (0, determineSegment_1.determineSegment)(segments, request, context);
|
|
48
48
|
foundSegments[key] = matchedSegment;
|
|
49
|
-
result = stentor_constants_1.TEMPLATE_REGEX.exec(value);
|
|
50
49
|
}
|
|
51
50
|
return foundSegments;
|
|
52
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileSegments.js","sourceRoot":"","sources":["../src/compileSegments.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,yDAAmD;AACnD,qDAA2C;AAE3C,iDAA0C;AAC1C,yDAAsD;AAQtD,aAAa;AACb,SAAS,aAAa,CAClB,KAAa,EACb,WAA0B,EAC1B,OAAgB,EAChB,OAAgB,EAChB,WAA0C;IAE1C,IAAI,aAAa,GAAW,KAAK,CAAC;IAElC,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"compileSegments.js","sourceRoot":"","sources":["../src/compileSegments.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,4 +6,4 @@ import { Context, Request, Response } from "stentor-models";
|
|
|
6
6
|
* @param responses
|
|
7
7
|
* @returns {(Response | undefined)}
|
|
8
8
|
*/
|
|
9
|
-
export declare function determineResponse(responses: Response[], request: Request, context: Context): Response | undefined;
|
|
9
|
+
export declare function determineResponse(responses: Response[], request: Request, context: Context, additionalContext?: Record<string, unknown>): Response | undefined;
|
package/lib/determineResponse.js
CHANGED
|
@@ -8,8 +8,8 @@ const stentor_determiner_1 = require("stentor-determiner");
|
|
|
8
8
|
* @param responses
|
|
9
9
|
* @returns {(Response | undefined)}
|
|
10
10
|
*/
|
|
11
|
-
function determineResponse(responses, request, context) {
|
|
12
|
-
return (0, stentor_determiner_1.determine)(responses, request, context);
|
|
11
|
+
function determineResponse(responses, request, context, additionalContext) {
|
|
12
|
+
return (0, stentor_determiner_1.determine)(responses, request, context, additionalContext);
|
|
13
13
|
}
|
|
14
14
|
exports.determineResponse = determineResponse;
|
|
15
15
|
//# sourceMappingURL=determineResponse.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"determineResponse.js","sourceRoot":"","sources":["../src/determineResponse.ts"],"names":[],"mappings":";;;AAEA,2DAA+C;AAC/C;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,SAAqB,EAAE,OAAgB,EAAE,OAAgB;
|
|
1
|
+
{"version":3,"file":"determineResponse.js","sourceRoot":"","sources":["../src/determineResponse.ts"],"names":[],"mappings":";;;AAEA,2DAA+C;AAC/C;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,SAAqB,EAAE,OAAgB,EAAE,OAAgB,EAAE,iBAA2C;IACpI,OAAO,IAAA,8BAAS,EAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;AACrE,CAAC;AAFD,8CAEC"}
|
package/lib/getResponse.d.ts
CHANGED
|
@@ -13,4 +13,4 @@ import { MacroMap } from "stentor-utils";
|
|
|
13
13
|
* @param macros
|
|
14
14
|
* @returns
|
|
15
15
|
*/
|
|
16
|
-
export declare function getResponse(content: Handler | Content | Response[], request: Request, context: Context, additionalContext?:
|
|
16
|
+
export declare function getResponse(content: Handler | Content | Response[], request: Request, context: Context, additionalContext?: Record<string, unknown>, macros?: MacroMap): Response;
|
package/lib/getResponse.js
CHANGED
|
@@ -82,7 +82,7 @@ function getResponse(content, request, context, additionalContext, macros) {
|
|
|
82
82
|
responses = (0, stentor_utils_1.findValueForKey)(key, content);
|
|
83
83
|
}
|
|
84
84
|
// Determine the best one
|
|
85
|
-
let response = (0, determineResponse_1.determineResponse)(responses, request, context);
|
|
85
|
+
let response = (0, determineResponse_1.determineResponse)(responses, request, context, additionalContext);
|
|
86
86
|
// And compile
|
|
87
87
|
response = (0, compileResponse_1.compileResponse)(response, request, context, additionalContext, macros);
|
|
88
88
|
// Check for actions and apply them?
|
package/lib/getResponse.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getResponse.js","sourceRoot":"","sources":["../src/getResponse.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,yDAA8D;AAC9D,mDAA2C;AAE3C,qDAAkE;AAClE,iDAA0G;AAC1G,uDAAoD;AACpD,2DAAwD;AAExD;;;;;;;;;;;;GAYG;AACH,SAAgB,WAAW,CACvB,OAAuC,EACvC,OAAgB,EAChB,OAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"getResponse.js","sourceRoot":"","sources":["../src/getResponse.ts"],"names":[],"mappings":"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"}
|
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": "Response for stentor",
|
|
9
9
|
"types": "lib/index",
|
|
10
10
|
"main": "lib/index",
|
|
@@ -17,25 +17,25 @@
|
|
|
17
17
|
"devDependencies": {
|
|
18
18
|
"@types/chai": "4.2.22",
|
|
19
19
|
"@types/lodash.template": "4.5.0",
|
|
20
|
-
"@types/sinon": "10.0.
|
|
20
|
+
"@types/sinon": "10.0.6",
|
|
21
21
|
"@types/sinon-chai": "3.2.5",
|
|
22
22
|
"@xapp/config": "0.2.3",
|
|
23
23
|
"chai": "4.3.4",
|
|
24
24
|
"mocha": "9.1.3",
|
|
25
25
|
"sinon": "10.0.0",
|
|
26
26
|
"sinon-chai": "3.7.0",
|
|
27
|
-
"stentor-models": "1.
|
|
27
|
+
"stentor-models": "1.48.1",
|
|
28
28
|
"ts-node": "9.1.1",
|
|
29
29
|
"typescript": "4.4.4"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
32
|
"@xapp/patterns": "1.37.29",
|
|
33
33
|
"lodash.template": "4.5.0",
|
|
34
|
-
"stentor-determiner": "1.
|
|
35
|
-
"stentor-locales": "1.
|
|
36
|
-
"stentor-media": "1.
|
|
37
|
-
"stentor-request": "1.
|
|
38
|
-
"stentor-utils": "1.
|
|
34
|
+
"stentor-determiner": "1.48.2",
|
|
35
|
+
"stentor-locales": "1.48.2",
|
|
36
|
+
"stentor-media": "1.48.2",
|
|
37
|
+
"stentor-request": "1.48.2",
|
|
38
|
+
"stentor-utils": "1.48.2"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
41
|
"stentor-models": "1.x"
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"clean": "rm -rf ./lib/* ",
|
|
46
46
|
"test": "mocha --recursive -r ts-node/register \"./src/**/*.test.ts\""
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "34274fc82ce9b007a2f8d8c741b545251ebb1f6b"
|
|
49
49
|
}
|