stentor-determiner 1.57.157 → 1.57.159
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/determine.d.ts +2 -1
- package/lib/determine.js +4 -3
- package/lib/determine.js.map +1 -1
- package/package.json +12 -12
package/lib/determine.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Context, Request } from "stentor-models";
|
|
2
|
+
import { MacroMap } from "stentor-utils";
|
|
2
3
|
/**
|
|
3
4
|
* Determine which of the provided objects is best based on provided request and context.
|
|
4
5
|
*
|
|
@@ -7,4 +8,4 @@ import { Context, Request } from "stentor-models";
|
|
|
7
8
|
* @param context
|
|
8
9
|
* @returns The best match from the provided potential matches, undefined if now match could be determined.
|
|
9
10
|
*/
|
|
10
|
-
export declare function determine<P extends object>(potentials: P[], request: Request, context: Context, additionalContext?: Record<string, unknown
|
|
11
|
+
export declare function determine<P extends object>(potentials: P[], request: Request, context: Context, additionalContext?: Record<string, unknown>, macros?: MacroMap): P | undefined;
|
package/lib/determine.js
CHANGED
|
@@ -20,7 +20,7 @@ const findJSONDependentMatch_1 = require("./findJSONDependentMatch");
|
|
|
20
20
|
* @param context
|
|
21
21
|
* @returns The best match from the provided potential matches, undefined if now match could be determined.
|
|
22
22
|
*/
|
|
23
|
-
function determine(potentials, request, context, additionalContext) {
|
|
23
|
+
function determine(potentials, request, context, additionalContext, macros) {
|
|
24
24
|
var _a, _b;
|
|
25
25
|
if (!Array.isArray(potentials) || potentials.length === 0) {
|
|
26
26
|
return undefined;
|
|
@@ -89,7 +89,7 @@ function determine(potentials, request, context, additionalContext) {
|
|
|
89
89
|
// Compile it
|
|
90
90
|
// replaceWhenUndefined is here so we can have logic like:
|
|
91
91
|
// !!${$.context.storage.user} <-- And it not throw an error when the user doesn't exist.
|
|
92
|
-
const compiled = new stentor_utils_1.Compiler({ additionalContext, replaceWhenUndefined: true }).compile(conditional.conditions, request, context);
|
|
92
|
+
const compiled = new stentor_utils_1.Compiler({ additionalContext, replaceWhenUndefined: true, macros }).compile(conditional.conditions, request, context);
|
|
93
93
|
// Keep hold of the original
|
|
94
94
|
originals[compiled] = conditional;
|
|
95
95
|
// Push a compiled version
|
|
@@ -111,7 +111,8 @@ function determine(potentials, request, context, additionalContext) {
|
|
|
111
111
|
const lastActiveTimestamp = typeof ((_a = context === null || context === void 0 ? void 0 : context.storage) === null || _a === void 0 ? void 0 : _a.lastActiveTimestamp) === "number" ? (_b = context === null || context === void 0 ? void 0 : context.storage) === null || _b === void 0 ? void 0 : _b.lastActiveTimestamp : undefined;
|
|
112
112
|
checks.push((0, stentor_time_1.TimeConditionalCheck)({ lastActiveTimestamp }));
|
|
113
113
|
// Big show, determine the matches
|
|
114
|
-
|
|
114
|
+
// need to pass the macros here
|
|
115
|
+
const matches = new stentor_conditional_1.ConditionalDeterminer(checks, macros).determine(compiledConditionals);
|
|
115
116
|
// Look through them and match them up to the original
|
|
116
117
|
const matchedOriginals = [];
|
|
117
118
|
matches.forEach((match) => {
|
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,mDAQwB;AACxB,yEAA2G;AAC3G,mDAAqC;AAcrC,qDAKyB;AACzB,qDAAwG;AACxG,+CAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"determine.js","sourceRoot":"","sources":["../src/determine.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.57.
|
|
7
|
+
"version": "1.57.159",
|
|
8
8
|
"description": "Determination for stentor",
|
|
9
9
|
"types": "lib/index",
|
|
10
10
|
"main": "lib/index",
|
|
@@ -23,21 +23,21 @@
|
|
|
23
23
|
"mocha": "9.2.2",
|
|
24
24
|
"sinon": "15.1.0",
|
|
25
25
|
"sinon-chai": "3.7.0",
|
|
26
|
-
"stentor-models": "1.57.
|
|
26
|
+
"stentor-models": "1.57.159",
|
|
27
27
|
"ts-node": "10.9.1",
|
|
28
28
|
"typescript": "5.0.4"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"jsonpath-plus": "7.2.0",
|
|
32
|
-
"stentor-conditional": "1.57.
|
|
33
|
-
"stentor-constants": "1.57.
|
|
34
|
-
"stentor-guards": "1.57.
|
|
35
|
-
"stentor-interaction-model": "1.57.
|
|
36
|
-
"stentor-logger": "1.57.
|
|
37
|
-
"stentor-request": "1.57.
|
|
38
|
-
"stentor-storage": "1.57.
|
|
39
|
-
"stentor-time": "1.57.
|
|
40
|
-
"stentor-utils": "1.57.
|
|
32
|
+
"stentor-conditional": "1.57.159",
|
|
33
|
+
"stentor-constants": "1.57.159",
|
|
34
|
+
"stentor-guards": "1.57.159",
|
|
35
|
+
"stentor-interaction-model": "1.57.159",
|
|
36
|
+
"stentor-logger": "1.57.159",
|
|
37
|
+
"stentor-request": "1.57.159",
|
|
38
|
+
"stentor-storage": "1.57.159",
|
|
39
|
+
"stentor-time": "1.57.159",
|
|
40
|
+
"stentor-utils": "1.57.159"
|
|
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": "1fa37eac581a822b37ff3f75efaebeb2ee014870"
|
|
51
51
|
}
|