@api-client/core 0.9.20 → 0.9.21

package/data/models/tracked-to-linked.json

@@ -362,6 +362,11 @@
 "@type": [
 "sourcemaps:SourceMap"
 ],
+"sourcemaps:lexical": [
+{
+"@id": "#26/source-map/lexical/element_0"
+}
+],
 "sourcemaps:virtual-element": [
 {
 "@id": "#26/source-map/virtual-element/element_0"
@@ -395,6 +400,11 @@
 "@type": [
 "sourcemaps:SourceMap"
 ],
+"sourcemaps:lexical": [
+{
+"@id": "#38/source-map/lexical/element_0"
+}
+],
 "sourcemaps:virtual-element": [
 {
 "@id": "#38/source-map/virtual-element/element_0"
@@ -428,6 +438,11 @@
 "@type": [
 "sourcemaps:SourceMap"
 ],
+"sourcemaps:lexical": [
+{
+"@id": "#40/source-map/lexical/element_0"
+}
+],
 "sourcemaps:virtual-element": [
 {
 "@id": "#40/source-map/virtual-element/element_0"
@@ -461,6 +476,11 @@
 "@type": [
 "sourcemaps:SourceMap"
 ],
+"sourcemaps:lexical": [
+{
+"@id": "#42/source-map/lexical/element_0"
+}
+],
 "sourcemaps:virtual-element": [
 {
 "@id": "#42/source-map/virtual-element/element_0"
@@ -508,6 +528,11 @@
 ]
 },
 {
+"@id": "#26/source-map/lexical/element_0",
+"sourcemaps:element": "amf://id#26",
+"sourcemaps:value": "[(11,9)-(15,0)]"
+},
+{
 "@id": "#26/source-map/virtual-element/element_0",
 "sourcemaps:element": "amf://id#26",
 "sourcemaps:value": "true"
@@ -554,6 +579,11 @@
 ]
 },
 {
+"@id": "#38/source-map/lexical/element_0",
+"sourcemaps:element": "amf://id#38",
+"sourcemaps:value": "[(16,9)-(20,0)]"
+},
+{
 "@id": "#38/source-map/virtual-element/element_0",
 "sourcemaps:element": "amf://id#38",
 "sourcemaps:value": "true"
@@ -570,6 +600,11 @@
 ]
 },
 {
+"@id": "#40/source-map/lexical/element_0",
+"sourcemaps:element": "amf://id#40",
+"sourcemaps:value": "[(21,9)-(25,0)]"
+},
+{
 "@id": "#40/source-map/virtual-element/element_0",
 "sourcemaps:element": "amf://id#40",
 "sourcemaps:value": "true"
@@ -586,6 +621,11 @@
 ]
 },
 {
+"@id": "#42/source-map/lexical/element_0",
+"sourcemaps:element": "amf://id#42",
+"sourcemaps:value": "[(26,9)-(28,47)]"
+},
+{
 "@id": "#42/source-map/virtual-element/element_0",
 "sourcemaps:element": "amf://id#42",
 "sourcemaps:value": "true"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@api-client/core",
   "description": "The API Client's core client library. Works in NodeJS and in a ES enabled browser.",
-  "version": "0.9.20",
+  "version": "0.9.21",
   "license": "Apache-2.0",
   "main": "build/index.js",
   "module": "build/index.js",

package/src/models/http-actions/HttpFlows.ts

@@ -51,6 +51,10 @@ export interface IHttpFlow {
    * The ordered list of actions to execute.
    */
   actions: IHttpAction[];
+  /**
+   * A condition to check before running the flow.
+   */
+  condition?: IHttpCondition;
 }
 
 /**
@@ -66,10 +70,6 @@ export interface IHttpAction {
    * The description of the action
    */
   description?: string;
-  /**
-   * A condition to check before performing the action.
-   */
-  condition?: IHttpCondition;
   /**
    * The list of steps to perform. This is an ordered list of action tasks.
    * Each step is described by the `kind` property which tells the runner what action to perform.

package/src/models/http-actions/LegacyTranslator.ts

@@ -24,45 +24,44 @@ export class LegacyTranslator {
     const result: IHttpFlow[] = [];
 
     if (Array.isArray(request) && request.length) {
-      const flow: IHttpFlow = {
-        trigger: 'request',
-        actions: this._translateRunnables(request),
-      };
-      result.push(flow);
+      request.forEach((runnable, index) => {
+        const flow = this._runnableIntoFlow(runnable, 'request');
+        flow.description = `Translated flow ${index + 1}`;
+        result.push(flow);
+      });
     }
 
     if (Array.isArray(response) && response.length) {
-      const flow: IHttpFlow = {
-        trigger: 'response',
-        actions: this._translateRunnables(response),
-      };
-      result.push(flow);
+      response.forEach((runnable, index) => {
+        const flow = this._runnableIntoFlow(runnable, 'response');
+        flow.description = `Translated flow ${index + 1}`;
+        result.push(flow);
+      });
     }
     return result;
   }
 
-  protected static _translateRunnables(runnables: LegacyRunnable[]): IHttpAction[] {
-    const result: IHttpAction[] = [];
-    runnables.forEach((runnable) => {
-      const actions = this._translateRunnable(runnable);
-      actions.forEach(item => result.push(item));
-    });
-    return result;
-  }
-
-  protected static _translateRunnable(runnable: LegacyRunnable): IHttpAction[] {
-    const result: IHttpAction[] = [];
+  protected static _runnableIntoFlow(runnable: LegacyRunnable, trigger: 'request' | 'response'): IHttpFlow {
+    const flow: IHttpFlow = {
+      trigger,
+      actions: [],
+    };
     const { actions, condition } = runnable;
-    actions.forEach((action) => {
+    if (condition) {
+      flow.condition = this._translateCondition(condition);
+    }
+    actions.forEach((action, index) => {
       const current: IHttpAction = {
         steps: this._translateAction(action),
       };
-      if (condition) {
-        current.condition = this._translateCondition(condition);
+      if (action.name) {
+        current.description = action.name;
+      } else {
+        current.description = `Translated action ${index + 1}`;
       }
-      result.push(current);
+      flow.actions.push(current);
     });
-    return result;
+    return flow;
   }
 
   protected static _translateCondition(runnable: LegacyCondition): IHttpCondition | undefined {

package/src/runtime/http-runner/HttpFlowRunner.ts

@@ -41,7 +41,18 @@ export class HttpFlowRunner {
       return;
     }
     for (const flow of flows) {
-      for (const action of flow.actions) {
+      const { condition, actions } = flow;
+      if (condition) {
+        try {
+          const meet = await this._satisfied(condition, request);
+          if (!meet) {
+            continue;
+          }
+        } catch (_) {
+          continue;
+        }
+      }
+      for (const action of actions) {
         await this._runAction(action, request);
       }
     }
@@ -59,17 +70,10 @@ export class HttpFlowRunner {
   }
 
   async _runAction(action: IHttpAction, request: IHttpRequest | ISentRequest, response?: IResponse | IErrorResponse): Promise<void> {
-    const { steps, condition } = action;
+    const { steps } = action;
     if (!Array.isArray(steps) || !steps.length) {
       return;
     }
-    if (condition) {
-      const meet = await this._satisfied(condition, request, response);
-      if (!meet) {
-        return;
-      }
-    }
-
     // this keeps a value from the last step to be passed to the next step.
     let lastResult: FlowValue;
     for (const step of steps) {
@@ -231,7 +235,7 @@ export class HttpFlowRunner {
   async _runDeleteCookieStep(step: IDeleteCookieStep, request: IHttpRequest | ISentRequest): Promise<FlowValue> {
     const instance = new DeleteCookieStep(step);
     const { cookies } = this;
-    if (instance.enabled === false || !instance.checkValidity() || !cookies ) {
+    if (instance.enabled === false || !instance.checkValidity() || !cookies) {
       return undefined;
     }
     let url: string;

package/src/runtime/http-runner/HttpRequestRunner.ts

@@ -234,11 +234,11 @@ export class HttpRequestRunner {
         continue;
       }
       const copy = { ...flow } as IHttpFlow;
+      if (copy.condition) {
+        copy.condition = await variablesProcessor.evaluateVariablesWithContext(copy.condition, variables);
+      }
       const actions = copy.actions.map(async (action) => {
         const actionCopy = { ...action };
-        if (actionCopy.condition) {
-          actionCopy.condition = await variablesProcessor.evaluateVariablesWithContext(actionCopy.condition, variables);
-        }
         if (Array.isArray(actionCopy.steps) && actionCopy.steps.length) {
           const stepsPromises = actionCopy.steps.map((step) => variablesProcessor.evaluateVariablesWithContext(step, variables));
           actionCopy.steps = await Promise.all(stepsPromises);