callman-core 1.28.0 → 1.28.1
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/ai-packs/scenario-nodes.md +451 -0
- package/dist/ai/index.d.ts +1 -0
- package/dist/ai/index.d.ts.map +1 -1
- package/dist/ai/index.js +1 -0
- package/dist/ai/index.js.map +1 -1
- package/dist/ai/prompts/scenario.d.ts.map +1 -1
- package/dist/ai/prompts/scenario.js +9 -8
- package/dist/ai/prompts/scenario.js.map +1 -1
- package/dist/ai/prompts/scenarioNodeReference.d.ts +16 -0
- package/dist/ai/prompts/scenarioNodeReference.d.ts.map +1 -0
- package/dist/ai/prompts/scenarioNodeReference.js +882 -0
- package/dist/ai/prompts/scenarioNodeReference.js.map +1 -0
- package/dist/http-file/flatImport.d.ts +1 -0
- package/dist/http-file/flatImport.d.ts.map +1 -1
- package/dist/http-file/flatImport.js.map +1 -1
- package/dist/http-file/index.d.ts +1 -1
- package/dist/http-file/index.d.ts.map +1 -1
- package/dist/http-file/index.js +1 -1
- package/dist/http-file/index.js.map +1 -1
- package/dist/http-file/parseHttpFile.d.ts +1 -0
- package/dist/http-file/parseHttpFile.d.ts.map +1 -1
- package/dist/http-file/parseHttpFile.js +40 -8
- package/dist/http-file/parseHttpFile.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/request/requestBody.d.ts +55 -0
- package/dist/request/requestBody.d.ts.map +1 -0
- package/dist/request/requestBody.js +198 -0
- package/dist/request/requestBody.js.map +1 -0
- package/dist/runner/requestRunner.d.ts.map +1 -1
- package/dist/runner/requestRunner.js +127 -43
- package/dist/runner/requestRunner.js.map +1 -1
- package/dist/runner/runCollection.d.ts +1 -1
- package/dist/runner/runCollection.d.ts.map +1 -1
- package/dist/runner/runCollection.js +9 -2
- package/dist/runner/runCollection.js.map +1 -1
- package/dist/scenario-runner/adapters/helpers/request-helpers.d.ts +2 -1
- package/dist/scenario-runner/adapters/helpers/request-helpers.d.ts.map +1 -1
- package/dist/scenario-runner/adapters/helpers/request-helpers.js +8 -40
- package/dist/scenario-runner/adapters/helpers/request-helpers.js.map +1 -1
- package/dist/scenario-runner/adapters/request-executor.d.ts.map +1 -1
- package/dist/scenario-runner/adapters/request-executor.js +2 -29
- package/dist/scenario-runner/adapters/request-executor.js.map +1 -1
- package/dist/scenario-runner/index.d.ts +1 -0
- package/dist/scenario-runner/index.d.ts.map +1 -1
- package/dist/scenario-runner/index.js +1 -0
- package/dist/scenario-runner/index.js.map +1 -1
- package/dist/scenario-runner/labels.d.ts +3 -0
- package/dist/scenario-runner/labels.d.ts.map +1 -0
- package/dist/scenario-runner/labels.js +20 -0
- package/dist/scenario-runner/labels.js.map +1 -0
- package/dist/scenario-runner/runScenario.d.ts.map +1 -1
- package/dist/scenario-runner/runScenario.js +4 -11
- package/dist/scenario-runner/runScenario.js.map +1 -1
- package/dist/script/legacy.d.ts.map +1 -1
- package/dist/script/legacy.js +24 -9
- package/dist/script/legacy.js.map +1 -1
- package/dist/types/index.d.ts +18 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/variables/resolver.d.ts.map +1 -1
- package/dist/variables/resolver.js +27 -5
- package/dist/variables/resolver.js.map +1 -1
- package/dist-cjs/ai/index.js +4 -1
- package/dist-cjs/ai/index.js.map +1 -1
- package/dist-cjs/ai/prompts/scenario.js +9 -8
- package/dist-cjs/ai/prompts/scenario.js.map +1 -1
- package/dist-cjs/ai/prompts/scenarioNodeReference.js +886 -0
- package/dist-cjs/ai/prompts/scenarioNodeReference.js.map +1 -0
- package/dist-cjs/http-file/flatImport.js.map +1 -1
- package/dist-cjs/http-file/index.js +2 -1
- package/dist-cjs/http-file/index.js.map +1 -1
- package/dist-cjs/http-file/parseHttpFile.js +42 -9
- package/dist-cjs/http-file/parseHttpFile.js.map +1 -1
- package/dist-cjs/index.js +9 -1
- package/dist-cjs/index.js.map +1 -1
- package/dist-cjs/request/requestBody.js +206 -0
- package/dist-cjs/request/requestBody.js.map +1 -0
- package/dist-cjs/runner/requestRunner.js +127 -43
- package/dist-cjs/runner/requestRunner.js.map +1 -1
- package/dist-cjs/runner/runCollection.js +9 -2
- package/dist-cjs/runner/runCollection.js.map +1 -1
- package/dist-cjs/scenario-runner/adapters/helpers/request-helpers.js +7 -42
- package/dist-cjs/scenario-runner/adapters/helpers/request-helpers.js.map +1 -1
- package/dist-cjs/scenario-runner/adapters/request-executor.js +3 -30
- package/dist-cjs/scenario-runner/adapters/request-executor.js.map +1 -1
- package/dist-cjs/scenario-runner/index.js +4 -1
- package/dist-cjs/scenario-runner/index.js.map +1 -1
- package/dist-cjs/scenario-runner/labels.js +24 -0
- package/dist-cjs/scenario-runner/labels.js.map +1 -0
- package/dist-cjs/scenario-runner/runScenario.js +4 -11
- package/dist-cjs/scenario-runner/runScenario.js.map +1 -1
- package/dist-cjs/script/legacy.js +24 -9
- package/dist-cjs/script/legacy.js.map +1 -1
- package/dist-cjs/variables/resolver.js +27 -5
- package/dist-cjs/variables/resolver.js.map +1 -1
- package/package.json +1 -1
|
@@ -95,37 +95,52 @@ const runScript = async (script, context) => {
|
|
|
95
95
|
if (!script?.trim()) {
|
|
96
96
|
return [];
|
|
97
97
|
}
|
|
98
|
-
const
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
98
|
+
const toStringRecord = (values) => {
|
|
99
|
+
const out = {};
|
|
100
|
+
for (const [key, value] of Object.entries(values)) {
|
|
101
|
+
out[key] = value === undefined || value === null ? "" : String(value);
|
|
102
|
+
}
|
|
103
|
+
return out;
|
|
104
|
+
};
|
|
105
|
+
const initialEnv = toStringRecord(context.env.all());
|
|
106
|
+
const extensions = context.db || context.redis || context.logs
|
|
103
107
|
? {
|
|
104
108
|
...(context.db ? { db: context.db } : {}),
|
|
105
109
|
...(context.redis ? { redis: context.redis } : {}),
|
|
110
|
+
...(context.logs ? { log: true } : {}),
|
|
106
111
|
}
|
|
107
112
|
: undefined;
|
|
108
113
|
const result = await (0, executor_js_1.executeScript)({
|
|
109
114
|
script,
|
|
110
115
|
capabilities: {
|
|
111
116
|
environment: { values: initialEnv, emitMutations: true },
|
|
117
|
+
...(context.globals
|
|
118
|
+
? { globals: { values: toStringRecord(context.globals.all()), emitMutations: true } }
|
|
119
|
+
: {}),
|
|
112
120
|
request: toRequestState(context.request),
|
|
113
121
|
response: toResponseState(context.response),
|
|
114
122
|
...(context.featurePolicy ? { featurePolicy: context.featurePolicy } : {}),
|
|
115
123
|
...(extensions ? { extensions } : {}),
|
|
116
124
|
},
|
|
117
125
|
});
|
|
118
|
-
// Apply mutations to the caller's EnvStore
|
|
119
|
-
// after `runScript` returns see the changes (sandbox A
|
|
126
|
+
// Apply mutations to the caller's EnvStore (and globals store) so callers
|
|
127
|
+
// that read it after `runScript` returns see the changes (sandbox A
|
|
128
|
+
// semantics).
|
|
120
129
|
for (const mutation of result.variableMutations) {
|
|
121
|
-
|
|
130
|
+
const target = mutation.scope === "environment"
|
|
131
|
+
? context.env
|
|
132
|
+
: mutation.scope === "global"
|
|
133
|
+
? context.globals
|
|
134
|
+
: undefined;
|
|
135
|
+
if (!target) {
|
|
122
136
|
continue;
|
|
123
137
|
}
|
|
124
138
|
if (mutation.type === "set") {
|
|
125
|
-
|
|
139
|
+
target.set(mutation.key, mutation.value ?? "");
|
|
126
140
|
}
|
|
127
141
|
// Legacy EnvStore has no `unset` — nothing to do for that branch.
|
|
128
142
|
}
|
|
143
|
+
context.logs?.push(...result.logs);
|
|
129
144
|
const testResults = result.testResults.map(toLegacyTestResult);
|
|
130
145
|
if (result.error) {
|
|
131
146
|
testResults.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../src/script/legacy.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../src/script/legacy.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,2EAA2E;AAC3E,EAAE;AACF,kDAAkD;AAClD,2DAA2D;AAC3D,8DAA8D;AAC9D,sEAAsE;AACtE,yEAAyE;AACzE,qEAAqE;AACrE,mCAAmC;AACnC,sEAAsE;AACtE,EAAE;AACF,qEAAqE;AACrE,uEAAuE;;;AASvE,+CAA8C;AAS9C,MAAM,SAAS,GAAG,CAAC,MAA0C,EAAE,EAAE,CAC/D,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IAClD,GAAG;IACH,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;IAC1B,OAAO,EAAE,IAAI;CACd,CAAC,CAAC,CAAC;AAEN,MAAM,cAAc,GAAG,CACrB,OAAwC,EACR,EAAE;IAClC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAC/B,MAAM,QAAQ,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC;IAC/C,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,WAAW,EAAE;QACrD,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC;QAC9B,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,OAA6C,CAAC;QACzE,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,KAA2C,CAAC;QACrE,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;YACnD,GAAG,EAAE,QAAQ;gBACX,CAAC,CAAE,SAAoB;gBACvB,CAAC,CAAC,SAAS;oBACT,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC;oBAC9B,CAAC,CAAC,EAAE;YACR,WAAW,EAAE,EAAE;SAChB;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,KAAc,EAAU,EAAE;IACnD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CACtB,QAAiD,EAChB,EAAE;IACnC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;IACvC,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC3B,MAAM,YAAY,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC;IAC9C,MAAM,OAAO,GAAG,YAAY,CAAC,CAAC,CAAE,IAAe,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC1E,MAAM,WAAW,GACf,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAC1B,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,cAAc,CAChD,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACf,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;SACpC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC;SACrD,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAErC,OAAO;QACL,EAAE,EAAE,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG;QACnD,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,UAAU,EAAE,EAAE;QACd,OAAO,EAAE,OAAiC;QAC1C,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;QAChD,OAAO;QACP,WAAW;QACX,UAAU,EAAE,QAAQ,CAAC,QAAQ,IAAI,CAAC;QAClC,SAAS,EAAE,OAAO,CAAC,MAAM;QACzB,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,MAAwB,EAAc,EAAE;IAClE,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QAC7B,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,MAAM,CAAC,KAAK,IAAI,SAAS;SACnC,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnD,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,SAAS,GAAG,KAAK,EAC5B,MAA0B,EAC1B,OAAyB,EACF,EAAE;IACzB,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;QACpB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,cAAc,GAAG,CAAC,MAA+B,EAA0B,EAAE;QACjF,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IACF,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IAErD,MAAM,UAAU,GACd,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI;QACzC,CAAC,CAAC;YACE,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACvC;QACH,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAa,EAAC;QACjC,MAAM;QACN,YAAY,EAAE;YACZ,WAAW,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE;YACxD,GAAG,CAAC,OAAO,CAAC,OAAO;gBACjB,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,EAAE;gBACrF,CAAC,CAAC,EAAE,CAAC;YACP,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC;YACxC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC;YAC3C,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1E,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtC;KACF,CAAC,CAAC;IAEH,0EAA0E;IAC1E,oEAAoE;IACpE,cAAc;IACd,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAChD,MAAM,MAAM,GACV,QAAQ,CAAC,KAAK,KAAK,aAAa;YAC9B,CAAC,CAAC,OAAO,CAAC,GAAG;YACb,CAAC,CAAC,QAAQ,CAAC,KAAK,KAAK,QAAQ;gBAC3B,CAAC,CAAC,OAAO,CAAC,OAAO;gBACjB,CAAC,CAAC,SAAS,CAAC;QAClB,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,SAAS;QACX,CAAC;QACD,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC5B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACjD,CAAC;QACD,kEAAkE;IACpE,CAAC;IAED,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAE/D,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,WAAW,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,kBAAkB;YACxB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO;SAC9B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAxEW,QAAA,SAAS,aAwEpB"}
|
|
@@ -7,6 +7,8 @@ const postman_generators_js_1 = require("../templating/postman-generators.js");
|
|
|
7
7
|
const envStore_js_1 = require("./envStore.js");
|
|
8
8
|
const TEMPLATE_PATTERN = /\{\{\s*([^{}]+?)\s*\}\}/g;
|
|
9
9
|
const POSTMAN_DOLLAR_PATTERN = /^\$([A-Za-z][A-Za-z0-9]*)$/;
|
|
10
|
+
// Forced-globals prefixes. `globals.` first so the longer prefix wins.
|
|
11
|
+
const GLOBAL_SCOPE_PREFIXES = ["globals.", "global."];
|
|
10
12
|
const MAX_TEMPLATE_PASSES = 4;
|
|
11
13
|
const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
|
|
12
14
|
const readEnvValue = (env, key) => {
|
|
@@ -60,21 +62,41 @@ const resolveExpression = (expression, context) => {
|
|
|
60
62
|
// Unknown token → fall through to scope / env lookup so an env
|
|
61
63
|
// value literally named "$something" still resolves.
|
|
62
64
|
}
|
|
65
|
+
// A lookup that found nothing still renders "" (as it always has) and is
|
|
66
|
+
// reported to `onUnresolved` for diagnostics.
|
|
67
|
+
const found = (lookup) => {
|
|
68
|
+
if (!lookup.exists) {
|
|
69
|
+
context.onUnresolved?.(normalizedExpression);
|
|
70
|
+
}
|
|
71
|
+
return stringifyTemplateValue(lookup.value);
|
|
72
|
+
};
|
|
63
73
|
if (normalizedExpression.startsWith("env.")) {
|
|
64
|
-
return
|
|
74
|
+
return found(readEnvValue(context.env, normalizedExpression.slice("env.".length)));
|
|
75
|
+
}
|
|
76
|
+
// `{{global.x}}` / `{{globals.x}}` read the globals only. Without a
|
|
77
|
+
// globals scope the token falls through to the historical lookup below.
|
|
78
|
+
const globalPrefix = context.globals
|
|
79
|
+
? GLOBAL_SCOPE_PREFIXES.find((prefix) => normalizedExpression.startsWith(prefix))
|
|
80
|
+
: undefined;
|
|
81
|
+
if (globalPrefix) {
|
|
82
|
+
return found(readEnvValue(context.globals, normalizedExpression.slice(globalPrefix.length)));
|
|
65
83
|
}
|
|
66
84
|
if (normalizedExpression.startsWith("response.")) {
|
|
67
|
-
return
|
|
85
|
+
return found((0, get_js_1.safeGet)(context.response, normalizedExpression.slice("response.".length)));
|
|
68
86
|
}
|
|
69
87
|
if (normalizedExpression.startsWith("request.")) {
|
|
70
|
-
return
|
|
88
|
+
return found((0, get_js_1.safeGet)(context.request, normalizedExpression.slice("request.".length)));
|
|
71
89
|
}
|
|
72
90
|
const scopedValue = (0, get_js_1.safeGet)(context, normalizedExpression);
|
|
73
|
-
if (scopedValue.exists) {
|
|
91
|
+
if (scopedValue.exists && typeof scopedValue.value !== "function") {
|
|
74
92
|
return stringifyTemplateValue(scopedValue.value);
|
|
75
93
|
}
|
|
94
|
+
// Bare `{{name}}`: environment first, then globals (the documented order).
|
|
76
95
|
const envValue = readEnvValue(context.env, normalizedExpression);
|
|
77
|
-
|
|
96
|
+
if (!envValue.exists && context.globals) {
|
|
97
|
+
return found(readEnvValue(context.globals, normalizedExpression));
|
|
98
|
+
}
|
|
99
|
+
return found(envValue);
|
|
78
100
|
};
|
|
79
101
|
const resolveTemplate = (template, context) => {
|
|
80
102
|
if (!template.includes("{{")) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/variables/resolver.ts"],"names":[],"mappings":";;;AACA,4CAA0C;AAC1C,kDAAmD;AACnD,+EAAgF;AAChF,+CAAyC;AAEzC,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;AACpD,MAAM,sBAAsB,GAAG,4BAA4B,CAAC;AAC5D,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAE9B,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAgC,EAAE,CAChE,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAEvE,MAAM,YAAY,GAAG,CACnB,GAA+C,EAC/C,GAAW,EAC0B,EAAE;IACvC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO;YACL,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,SAAS;SACjB,CAAC;IACJ,CAAC;IAED,IAAI,GAAG,YAAY,sBAAQ,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC;QACzB,OAAO,IAAA,gBAAO,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,IAAA,gBAAO,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,KAAc,EAAU,EAAE;IACxD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAC1C,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;QAC5D,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CACxB,UAAkB,EAClB,OAA+B,EACvB,EAAE;IACV,MAAM,oBAAoB,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;IAE/C,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,oBAAoB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC/C,OAAO,sBAAsB,CAAC,IAAA,yBAAa,EAAC,oBAAoB,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,qEAAqE;IACrE,sEAAsE;IACtE,sEAAsE;IACtE,wDAAwD;IACxD,MAAM,WAAW,GAAG,oBAAoB,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACvE,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,WAAW,GAAG,IAAA,iDAAyB,EAAC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO,WAAW,CAAC;QACrB,CAAC;QACD,+DAA+D;QAC/D,qDAAqD;IACvD,CAAC;IAED,IAAI,oBAAoB,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/variables/resolver.ts"],"names":[],"mappings":"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"}
|