@mablhq/mabl-cli 1.10.10 → 1.11.15

package/mablscript/actions/JavaScriptAction.js

@@ -1,15 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isJavaScriptActionDescriptor = exports.JavaScriptAction = void 0;
+const domUtil_1 = require("../../domUtil");
 const MablAction_1 = require("../MablAction");
 const JavaScriptDescriptor_1 = require("../types/JavaScriptDescriptor");
 const MABLSCRIPT_NAME = 'evaluate_js';
 function isLegacySnippetReference(value) {
     return typeof value === 'object' && !!value.id && !('invariant_id' in value);
 }
-function isSnippetReference(value) {
+function isReusableSnippetReference(value) {
     return typeof value === 'object' && !!value.id && !!value.invariant_id;
 }
+function isInlineSnippetReference(value) {
+    return (typeof value === 'object' &&
+        typeof value.body === 'string' &&
+        Array.isArray(value.parameters) &&
+        !('id' in value) &&
+        !('invariant_id' in value));
+}
 function isSnippetOptions(value) {
     return value && 'parameter_overrides' in value;
 }
@@ -36,11 +44,22 @@ class JavaScriptAction extends MablAction_1.MablAction {
                 snippetInvariantId: id,
             };
         }
-        else if (isSnippetReference(scriptOrSnippetReference)) {
+        else if (isReusableSnippetReference(scriptOrSnippetReference)) {
             const { id, invariant_id } = scriptOrSnippetReference;
             this.javaScript = {
                 snippetId: id,
                 snippetInvariantId: invariant_id,
+                parameterOverrides: [],
+            };
+            const snippetOptions = args[1];
+            if (isSnippetOptions(snippetOptions)) {
+                this.javaScript.parameterOverrides = snippetOptions.parameter_overrides;
+            }
+        }
+        else if (isInlineSnippetReference(scriptOrSnippetReference)) {
+            this.javaScript = {
+                inlineSnippet: scriptOrSnippetReference,
+                parameterOverrides: [],
             };
             const snippetOptions = args[1];
             if (isSnippetOptions(snippetOptions)) {
@@ -54,22 +73,53 @@ class JavaScriptAction extends MablAction_1.MablAction {
     toDescriptor() {
         return { javaScript: this.javaScript };
     }
+    static fromDescriptor(descriptor) {
+        const { javaScript } = descriptor;
+        if (JavaScriptDescriptor_1.isReusableSnippetDescriptor(javaScript)) {
+            return new JavaScriptAction(JavaScriptAction.mablscriptName, [
+                {
+                    id: javaScript.snippetId,
+                    invariant_id: javaScript.snippetInvariantId,
+                },
+                { parameter_overrides: javaScript.parameterOverrides },
+            ]);
+        }
+        else if (JavaScriptDescriptor_1.isInlineSnippetDescriptor(javaScript)) {
+            return new JavaScriptAction(JavaScriptAction.mablscriptName, [
+                javaScript.inlineSnippet,
+                { parameter_overrides: javaScript.parameterOverrides },
+            ]);
+        }
+        else if (JavaScriptDescriptor_1.isLegacyReusableSnippetDescriptor(javaScript)) {
+            return new JavaScriptAction(JavaScriptAction.mablscriptName, [
+                {
+                    id: javaScript.snippetInvariantId,
+                },
+            ]);
+        }
+        else if (JavaScriptDescriptor_1.isLegacyInlineJavaScriptDescriptor(javaScript)) {
+            return new JavaScriptAction(JavaScriptAction.mablscriptName, [
+                javaScript.encodedJS,
+            ]);
+        }
+        throw new Error(`Invalid javascript action descriptor: ${JSON.stringify(descriptor)}`);
+    }
     toYaml() {
         const actionYaml = {};
-        if (JavaScriptDescriptor_1.isInlineJavaScriptDescriptor(this.javaScript)) {
-            actionYaml.code = this.javaScript.encodedJS;
+        if (JavaScriptDescriptor_1.isReusableSnippetDescriptor(this.javaScript)) {
+            actionYaml.snippetId = this.javaScript.snippetId;
+            actionYaml.snippetInvariantId = this.javaScript.snippetInvariantId;
+            actionYaml.parameterOverrides = this.javaScript.parameterOverrides;
         }
-        else if (JavaScriptDescriptor_1.isSnippetJavaScriptDescriptor(this.javaScript)) {
-            if (this.javaScript.snippetId) {
-                actionYaml.snippetId = this.javaScript.snippetId;
-                actionYaml.snippetInvariantId = this.javaScript.snippetInvariantId;
-            }
-            else {
-                actionYaml.snippetId = this.javaScript.snippetInvariantId;
-            }
-            if (this.javaScript.parameterOverrides) {
-                actionYaml.parameterOverrides = this.javaScript.parameterOverrides;
-            }
+        else if (JavaScriptDescriptor_1.isInlineSnippetDescriptor(this.javaScript)) {
+            actionYaml.snippet = this.javaScript.inlineSnippet;
+            actionYaml.parameterOverrides = this.javaScript.parameterOverrides;
+        }
+        else if (JavaScriptDescriptor_1.isLegacyReusableSnippetDescriptor(this.javaScript)) {
+            actionYaml.snippetId = this.javaScript.snippetInvariantId;
+        }
+        else if (JavaScriptDescriptor_1.isLegacyInlineJavaScriptDescriptor(this.javaScript)) {
+            actionYaml.code = this.javaScript.encodedJS;
         }
         else {
             throw new Error(`Cannot export action to yaml: ${JSON.stringify(this.javaScript)}`);
@@ -87,38 +137,51 @@ class JavaScriptAction extends MablAction_1.MablAction {
         if (formatted.code) {
             args.push(formatted.code);
         }
+        else if (formatted.snippet) {
+            args.push(formatted.snippet);
+        }
+        else if (formatted.snippetInvariantId && formatted.snippetId) {
+            args.push({
+                id: formatted.snippetId,
+                invariant_id: formatted.snippetInvariantId,
+            });
+        }
         else if (formatted.snippetId) {
-            args.push(formatted.snippetInvariantId
-                ? {
-                    id: formatted.snippetId,
-                    invariant_id: formatted.snippetInvariantId,
-                }
-                : {
-                    id: formatted.snippetId,
-                });
-            if (snippetOptions) {
-                args.push(snippetOptions);
-            }
+            args.push({
+                id: formatted.snippetId,
+            });
         }
         else {
             throw new Error(`Cannot import action from yaml: ${JSON.stringify(formatted)}`);
         }
+        if (snippetOptions) {
+            args.push(snippetOptions);
+        }
         return new JavaScriptAction(MABLSCRIPT_NAME, args);
     }
     toMablscript() {
-        if (JavaScriptDescriptor_1.isInlineJavaScriptDescriptor(this.javaScript)) {
-            return `evaluate_js("${this.javaScript.encodedJS}")`;
+        if (JavaScriptDescriptor_1.isReusableSnippetDescriptor(this.javaScript)) {
+            const snippetReference = domUtil_1.buildStepArgumentString({
+                id: this.javaScript.snippetId,
+                invariant_id: this.javaScript.snippetInvariantId,
+                snippet_type: 'javascript',
+            });
+            const snippetOptions = `, {parameter_overrides: ${domUtil_1.buildStepArgumentString(this.javaScript.parameterOverrides)}}`;
+            return `evaluate_js(${snippetReference}${snippetOptions})`;
         }
-        if (JavaScriptDescriptor_1.isSnippetJavaScriptDescriptor(this.javaScript)) {
-            const maybeInvariantIdString = this.javaScript.snippetId
-                ? `id: "${this.javaScript.snippetId}", invariant_id: "${this.javaScript.snippetInvariantId}"`
-                : `id: "${this.javaScript.snippetInvariantId}"`;
-            const maybeSnippetOptionsString = this.javaScript.parameterOverrides
-                ? `, {parameter_overrides: [${this.javaScript.parameterOverrides
-                    .map(override => `{id: "${override.id}", value: "${override.value}"}`)
-                    .join(', ')}]}`
-                : '';
-            return `evaluate_js({${maybeInvariantIdString}, snippet_type: "javascript"}${maybeSnippetOptionsString})`;
+        if (JavaScriptDescriptor_1.isInlineSnippetDescriptor(this.javaScript)) {
+            const snippetReference = domUtil_1.buildStepArgumentString({
+                ...this.javaScript.inlineSnippet,
+                snippet_type: 'javascript',
+            });
+            const snippetOptions = `, {parameter_overrides: ${domUtil_1.buildStepArgumentString(this.javaScript.parameterOverrides)}}`;
+            return `evaluate_js(${snippetReference}${snippetOptions})`;
+        }
+        if (JavaScriptDescriptor_1.isLegacyReusableSnippetDescriptor(this.javaScript)) {
+            return `evaluate_js({id: "${this.javaScript.snippetInvariantId}", snippet_type: "javascript"})`;
+        }
+        if (JavaScriptDescriptor_1.isLegacyInlineJavaScriptDescriptor(this.javaScript)) {
+            return `evaluate_js("${this.javaScript.encodedJS}")`;
         }
         throw new Error(`Cannot export action to mablscript: ${JSON.stringify(this.javaScript)}`);
     }

package/mablscript/types/ConditionDescriptor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PresenceEvaluationType = exports.isPresenceCondition = exports.ComparisonType = exports.ConditionType = void 0;
+exports.PresenceEvaluationType = exports.isAbsenceExpected = exports.isPresenceCondition = exports.ComparisonType = exports.ConditionType = void 0;
 var ConditionType;
 (function (ConditionType) {
     ConditionType["Comparison"] = "comparison";
@@ -36,6 +36,11 @@ function isPresenceCondition(value) {
     return value.conditionType === ConditionType.Presence;
 }
 exports.isPresenceCondition = isPresenceCondition;
+function isAbsenceExpected(value) {
+    return (isPresenceCondition(value) &&
+        value.presenceType === PresenceEvaluationType.NOT_PRESENT);
+}
+exports.isAbsenceExpected = isAbsenceExpected;
 var PresenceEvaluationType;
 (function (PresenceEvaluationType) {
     PresenceEvaluationType["NOT_PRESENT"] = "not_present";

package/mablscript/types/JavaScriptDescriptor.js

@@ -1,20 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSnippetJavaScriptDescriptor = exports.isInlineJavaScriptDescriptor = exports.isJavaScriptDescriptor = void 0;
+exports.isReusableSnippetDescriptor = exports.isInlineSnippetDescriptor = exports.isLegacyReusableSnippetDescriptor = exports.isLegacyInlineJavaScriptDescriptor = exports.isJavaScriptDescriptor = void 0;
 function isJavaScriptDescriptor(value) {
-    return (isInlineJavaScriptDescriptor(value) || isSnippetJavaScriptDescriptor(value));
+    return (isLegacyInlineJavaScriptDescriptor(value) ||
+        isLegacyReusableSnippetDescriptor(value) ||
+        isInlineSnippetDescriptor(value) ||
+        isReusableSnippetDescriptor(value));
 }
 exports.isJavaScriptDescriptor = isJavaScriptDescriptor;
-function isInlineJavaScriptDescriptor(value) {
+function isLegacyInlineJavaScriptDescriptor(value) {
+    return (value && typeof value === 'object' && typeof value.encodedJS === 'string');
+}
+exports.isLegacyInlineJavaScriptDescriptor = isLegacyInlineJavaScriptDescriptor;
+function isLegacyReusableSnippetDescriptor(value) {
+    return (value &&
+        typeof value === 'object' &&
+        typeof value.snippetInvariantId === 'string' &&
+        !('snippetId' in value));
+}
+exports.isLegacyReusableSnippetDescriptor = isLegacyReusableSnippetDescriptor;
+function isInlineSnippetDescriptor(value) {
     return (value &&
         typeof value === 'object' &&
-        typeof value.encodedJS === 'string' &&
-        !('snippetInvariantId' in value));
+        typeof value.inlineSnippet === 'object' &&
+        Array.isArray(value.parameterOverrides));
 }
-exports.isInlineJavaScriptDescriptor = isInlineJavaScriptDescriptor;
-function isSnippetJavaScriptDescriptor(value) {
+exports.isInlineSnippetDescriptor = isInlineSnippetDescriptor;
+function isReusableSnippetDescriptor(value) {
     return (value &&
         typeof value === 'object' &&
-        typeof value.snippetInvariantId === 'string');
+        typeof value.snippetInvariantId === 'string' &&
+        typeof value.snippetId === 'string' &&
+        Array.isArray(value.parameterOverrides));
 }
-exports.isSnippetJavaScriptDescriptor = isSnippetJavaScriptDescriptor;
+exports.isReusableSnippetDescriptor = isReusableSnippetDescriptor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "1.10.10",
+  "version": "1.11.15",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",
@@ -25,7 +25,7 @@
     "postinstall": "node ./util/postInstallMessage.js"
   },
   "dependencies": {
-    "@playwright/test": "^1.13.1",
+    "@playwright/test": "^1.15.2",
     "@types/fs-extra": "^8.1.0",
     "@types/serve-handler": "^6.1.0",
     "@types/tmp": "^0.2.0",

package/providers/exportRequestProvider.js

@@ -66,8 +66,10 @@ class ExportRequestProvider {
         const notTimedOut = Date.now() - this.exportStartEpochMilliseconds <
             this.pollingTimeoutMilliseconds;
         if (notTimedOut && this.isExportIncomplete()) {
-            return new Promise(resolve => {
-                setTimeout(() => this.awaitCompletion().then(() => resolve()), this.pollingIntervalMilliseconds);
+            return new Promise((resolve, reject) => {
+                setTimeout(() => this.awaitCompletion()
+                    .then(() => resolve())
+                    .catch(error => reject(error)), this.pollingIntervalMilliseconds);
             });
         }
     }