stentor-response 1.48.7 → 1.48.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.
- package/lib/compileResponse.d.ts +6 -0
- package/lib/compileResponse.js +20 -9
- package/lib/compileResponse.js.map +1 -1
- package/package.json +7 -7
- package/CHANGELOG.md +0 -5493
package/lib/compileResponse.d.ts
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import { Context, Request, Response } from "stentor-models";
|
|
2
2
|
import { MacroMap } from "stentor-utils";
|
|
3
|
+
/**
|
|
4
|
+
* Necessary to JSON.parse strings with newlines that need escaping. Otherwise JSON.parse fails.
|
|
5
|
+
* @param json
|
|
6
|
+
* @returns
|
|
7
|
+
*/
|
|
8
|
+
export declare function jsonEscape(json: string): string;
|
|
3
9
|
/**
|
|
4
10
|
* Compiles a templated response with provided request and context.
|
|
5
11
|
*
|
package/lib/compileResponse.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.compileResponse = void 0;
|
|
3
|
+
exports.compileResponse = exports.jsonEscape = void 0;
|
|
4
4
|
/*! Copyright (c) 2019, XAPPmedia */
|
|
5
5
|
const stentor_constants_1 = require("stentor-constants");
|
|
6
6
|
const stentor_guards_1 = require("stentor-guards");
|
|
@@ -8,6 +8,15 @@ const stentor_locales_1 = require("stentor-locales");
|
|
|
8
8
|
const stentor_logger_1 = require("stentor-logger");
|
|
9
9
|
const stentor_utils_1 = require("stentor-utils");
|
|
10
10
|
const compileSegments_1 = require("./compileSegments");
|
|
11
|
+
/**
|
|
12
|
+
* Necessary to JSON.parse strings with newlines that need escaping. Otherwise JSON.parse fails.
|
|
13
|
+
* @param json
|
|
14
|
+
* @returns
|
|
15
|
+
*/
|
|
16
|
+
function jsonEscape(json) {
|
|
17
|
+
return json.replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t");
|
|
18
|
+
}
|
|
19
|
+
exports.jsonEscape = jsonEscape;
|
|
11
20
|
/**
|
|
12
21
|
* Compiles a templated response with provided request and context.
|
|
13
22
|
*
|
|
@@ -58,7 +67,7 @@ function compileResponse(response, request, context, additionalContext, macros)
|
|
|
58
67
|
if (Array.isArray(compiledResponse.displays) && compiledResponse.displays.length > 0) {
|
|
59
68
|
// We want to first check to see if they have the itemObject feature
|
|
60
69
|
// Note, just care about the first one here.
|
|
61
|
-
const firstDisplay = compiledResponse.displays[0];
|
|
70
|
+
const firstDisplay = Object.assign({}, compiledResponse.displays[0]);
|
|
62
71
|
if ((0, stentor_guards_1.isTemplatedList)(firstDisplay)) {
|
|
63
72
|
// This is what we will replace the items on firstDisplay with
|
|
64
73
|
const compiledItems = [];
|
|
@@ -103,7 +112,7 @@ function compileResponse(response, request, context, additionalContext, macros)
|
|
|
103
112
|
// Time to iterate and do replacements
|
|
104
113
|
itemsObjectArray.forEach((item, index) => {
|
|
105
114
|
// Stringify
|
|
106
|
-
const itemString = JSON.stringify(itemTemplate
|
|
115
|
+
const itemString = JSON.stringify(itemTemplate);
|
|
107
116
|
let compiledItemString = (0, compileSegments_1.compileSegments)(itemString, compiledResponse.segments, request, context);
|
|
108
117
|
// New compiler
|
|
109
118
|
const itemCompiler = new stentor_utils_1.Compiler({
|
|
@@ -113,25 +122,27 @@ function compileResponse(response, request, context, additionalContext, macros)
|
|
|
113
122
|
});
|
|
114
123
|
compiledItemString = itemCompiler.compile(compiledItemString, request, context);
|
|
115
124
|
try {
|
|
116
|
-
const compiledItem = JSON.parse(compiledItemString);
|
|
125
|
+
const compiledItem = JSON.parse(jsonEscape(compiledItemString));
|
|
117
126
|
// Only update if it doesn't explode
|
|
118
127
|
compiledItems.push(compiledItem);
|
|
119
128
|
}
|
|
120
129
|
catch (e) {
|
|
121
|
-
(0, stentor_logger_1.log)().error(`Could not compile display:`, e);
|
|
130
|
+
(0, stentor_logger_1.log)().error(`Could not compile display item:`, e);
|
|
122
131
|
}
|
|
123
|
-
// ok, time to update the items.
|
|
124
|
-
firstDisplay.items = compiledItems;
|
|
125
132
|
});
|
|
133
|
+
// ok, time to update the items.
|
|
134
|
+
firstDisplay.items = compiledItems;
|
|
135
|
+
// update on the compiled response
|
|
136
|
+
compiledResponse.displays[0] = firstDisplay;
|
|
126
137
|
}
|
|
127
138
|
// Then pass it through as a string convert it to a string
|
|
128
|
-
const displaysString = JSON.stringify(compiledResponse.displays
|
|
139
|
+
const displaysString = JSON.stringify(compiledResponse.displays);
|
|
129
140
|
// Compile the segments
|
|
130
141
|
let compiledDisplayString = (0, compileSegments_1.compileSegments)(displaysString, compiledResponse.segments, request, context);
|
|
131
142
|
compiledDisplayString = compiler.compile(compiledDisplayString, request, context);
|
|
132
143
|
// Set it back
|
|
133
144
|
try {
|
|
134
|
-
const compiledDisplays = JSON.parse(compiledDisplayString);
|
|
145
|
+
const compiledDisplays = JSON.parse(jsonEscape(compiledDisplayString));
|
|
135
146
|
// Only update if it doesn't explode
|
|
136
147
|
compiledResponse.displays = compiledDisplays;
|
|
137
148
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileResponse.js","sourceRoot":"","sources":["../src/compileResponse.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,yDAAmD;AACnD,mDAAiD;AACjD,qDAA2C;AAC3C,mDAAqC;AAErC,iDAAmG;AAEnG,uDAAoD;AAEpD;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,eAAe,CAC3B,QAAkB,EAClB,OAAgB,EAChB,OAAgB,EAChB,iBAA2C,EAC3C,MAAiB;;IAEjB,YAAY;IACZ,IAAI,CAAC,QAAQ,EAAE;QACX,OAAO,QAAQ,CAAC;KACnB;IAED,MAAM,QAAQ,GAAG,IAAI,wBAAQ,CACzB;QACI,MAAM,kCAAO,8BAAc,GAAK,MAAM,CAAE;QACxC,iBAAiB;QACjB,oBAAoB,EAAE,IAAI;KAC7B,CACJ,CAAC;IAEF,+BAA+B;IAC/B,MAAM,gBAAgB,qBAAkB,QAAQ,CAAE,CAAC;IAGnD,MAAM,IAAI,GAA4B,CAAC,cAAc,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;IACpF,mBAAmB;IACnB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACf,MAAM,cAAc,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,cAAc,EAAE;YAChB,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;gBACpC,MAAM,aAAa,GAAG,IAAA,iCAAe,EACjC,cAAc,EACd,gBAAgB,CAAC,QAAQ,EACzB,OAAO,EACP,OAAO,CACV,CAAC;gBACF,gBAAgB,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;aAC7E;iBAAM;gBACH,sBAAsB;gBACtB,MAAM,uBAAuB,GAAG,IAAA,0BAAQ,EAAC,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;gBACzE,MAAM,aAAa,GAAG,IAAA,iCAAe,EACjC,uBAAuB,EACvB,gBAAgB,CAAC,QAAQ,EACzB,OAAO,EACP,OAAO,CACV,CAAC;gBACF,gBAAgB,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;aAC7E;SACJ;IACL,CAAC,CAAC,CAAC;IAEH,YAAY;IACZ,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QAClF,oEAAoE;QACpE,4CAA4C;QAC5C,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"compileResponse.js","sourceRoot":"","sources":["../src/compileResponse.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,yDAAmD;AACnD,mDAAiD;AACjD,qDAA2C;AAC3C,mDAAqC;AAErC,iDAAmG;AAEnG,uDAAoD;AAEpD;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAAY;IACnC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAClF,CAAC;AAFD,gCAEC;AAED;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,eAAe,CAC3B,QAAkB,EAClB,OAAgB,EAChB,OAAgB,EAChB,iBAA2C,EAC3C,MAAiB;;IAEjB,YAAY;IACZ,IAAI,CAAC,QAAQ,EAAE;QACX,OAAO,QAAQ,CAAC;KACnB;IAED,MAAM,QAAQ,GAAG,IAAI,wBAAQ,CACzB;QACI,MAAM,kCAAO,8BAAc,GAAK,MAAM,CAAE;QACxC,iBAAiB;QACjB,oBAAoB,EAAE,IAAI;KAC7B,CACJ,CAAC;IAEF,+BAA+B;IAC/B,MAAM,gBAAgB,qBAAkB,QAAQ,CAAE,CAAC;IAGnD,MAAM,IAAI,GAA4B,CAAC,cAAc,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;IACpF,mBAAmB;IACnB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACf,MAAM,cAAc,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,cAAc,EAAE;YAChB,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;gBACpC,MAAM,aAAa,GAAG,IAAA,iCAAe,EACjC,cAAc,EACd,gBAAgB,CAAC,QAAQ,EACzB,OAAO,EACP,OAAO,CACV,CAAC;gBACF,gBAAgB,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;aAC7E;iBAAM;gBACH,sBAAsB;gBACtB,MAAM,uBAAuB,GAAG,IAAA,0BAAQ,EAAC,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;gBACzE,MAAM,aAAa,GAAG,IAAA,iCAAe,EACjC,uBAAuB,EACvB,gBAAgB,CAAC,QAAQ,EACzB,OAAO,EACP,OAAO,CACV,CAAC;gBACF,gBAAgB,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;aAC7E;SACJ;IACL,CAAC,CAAC,CAAC;IAEH,YAAY;IACZ,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QAClF,oEAAoE;QACpE,4CAA4C;QAC5C,MAAM,YAAY,qBAAQ,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,CAAC;QAEzD,IAAI,IAAA,gCAAe,EAAC,YAAY,CAAC,EAAE;YAC/B,8DAA8D;YAC9D,MAAM,aAAa,GAAU,EAAE,CAAC;YAChC,sBAAsB;YACtB,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,IAAI,OAAO,CAAC;YACpD,4GAA4G;YAC5G,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;YAC7C,uEAAuE;YACvE,OAAO,YAAY,CAAC,WAAW,CAAC;YAChC,OAAO,YAAY,CAAC,SAAS,CAAC;YAE9B,oCAAoC;YACpC,IAAI,YAAY,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACjC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;aAC5D;YAED,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAE3C,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAAC,kCAAc,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAEvE,IAAI,CAAC,iBAAiB,EAAE;gBACpB,MAAM,IAAI,KAAK,CAAC,qCAAqC,WAAW,sCAAsC,CAAC,CAAC;aAC3G;YAED,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAE1D,wBAAwB;YACxB,uCAAuC;YACvC,IAAI,YAAmB,CAAC;YACxB,MAAM,iBAAiB,GAAG,IAAA,2BAAW,EAAC,qBAAqB,EAAE,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,YAAY,0CAAE,IAAI,CAAC,CAAC;YACnG,IAAI,IAAA,iCAAiB,EAAC,iBAAiB,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,EAAE;gBAC9D,YAAY,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;aACvC;YAED,gCAAgC;YAChC,IAAI,SAAgB,CAAC;YACrB,MAAM,UAAU,GAAG,IAAA,2BAAW,EAAC,qBAAqB,kCAC7C,iBAAiB,KACpB,OAAO;gBACP,OAAO,EACP,OAAO,EAAE,OAAO,CAAC,OAAO,EACxB,OAAO,EAAE,OAAO,CAAC,OAAO,IAC1B,CAAC;YACH,IAAI,IAAA,iCAAiB,EAAC,UAAU,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE;gBAChD,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;aAC7B;YAED,uCAAuC;YACvC,IAAI,gBAAgB,GAAU,YAAY,IAAI,SAAS,CAAC;YAExD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;aAC/E;YACD,uCAAuC;YACvC,gBAAgB,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;YACtI,sCAAsC;YACtC,gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gBACrC,YAAY;gBACZ,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBAChD,IAAI,kBAAkB,GAAG,IAAA,iCAAe,EAAC,UAAU,EAAE,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAElG,eAAe;gBACf,MAAM,YAAY,GAAG,IAAI,wBAAQ,CAC7B;oBACI,MAAM,kCAAO,8BAAc,GAAK,MAAM,CAAE;oBACxC,iBAAiB,kCACV,iBAAiB,KACpB,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,IAAI,EACtB,KAAK,GACR;oBACD,oBAAoB,EAAE,IAAI;iBAC7B,CACJ,CAAC;gBACF,kBAAkB,GAAG,YAAY,CAAC,OAAO,CAAC,kBAAkB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAEhF,IAAI;oBACA,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC;oBAChE,oCAAoC;oBACpC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;iBACpC;gBAAC,OAAO,CAAC,EAAE;oBACR,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,iCAAiC,EAAE,CAAC,CAAC,CAAC;iBACrD;YACL,CAAC,CAAC,CAAC;YAEH,gCAAgC;YAChC,YAAY,CAAC,KAAK,GAAG,aAAa,CAAC;YACnC,kCAAkC;YAClC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC;SAC/C;QAED,0DAA0D;QAC1D,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACjE,uBAAuB;QACvB,IAAI,qBAAqB,GAAG,IAAA,iCAAe,EAAC,cAAc,EAAE,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEzG,qBAAqB,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAElF,cAAc;QACd,IAAI;YACA,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,CAAC;YACvE,oCAAoC;YACpC,gBAAgB,CAAC,QAAQ,GAAG,gBAAgB,CAAC;SAChD;QAAC,OAAO,CAAC,EAAE;YACR,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,4BAA4B,EAAE,CAAC,CAAC,CAAC;SAChD;KACJ;IAED,oBAAoB;IACpB,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AAtKD,0CAsKC"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
7
|
-
"version": "1.48.
|
|
7
|
+
"version": "1.48.8",
|
|
8
8
|
"description": "Response for stentor",
|
|
9
9
|
"types": "lib/index",
|
|
10
10
|
"main": "lib/index",
|
|
@@ -31,11 +31,11 @@
|
|
|
31
31
|
"dependencies": {
|
|
32
32
|
"@xapp/patterns": "1.37.29",
|
|
33
33
|
"lodash.template": "4.5.0",
|
|
34
|
-
"stentor-determiner": "1.48.
|
|
35
|
-
"stentor-locales": "1.48.
|
|
36
|
-
"stentor-media": "1.48.
|
|
37
|
-
"stentor-request": "1.48.
|
|
38
|
-
"stentor-utils": "1.48.
|
|
34
|
+
"stentor-determiner": "1.48.8",
|
|
35
|
+
"stentor-locales": "1.48.8",
|
|
36
|
+
"stentor-media": "1.48.8",
|
|
37
|
+
"stentor-request": "1.48.8",
|
|
38
|
+
"stentor-utils": "1.48.8"
|
|
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": "5e1da4b0160904e6f13bfb971f534e2f0be8d275"
|
|
49
49
|
}
|