@mablhq/mabl-cli 1.17.6 → 1.18.3

package/mablscript/steps/AssertStep.js

@@ -37,6 +37,7 @@ exports.fieldToAssertionStep = {};
 Object.entries(exports.assertionStepToField).forEach(([stepType, field]) => (exports.fieldToAssertionStep[field] = stepType));
 class AssertStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
+        var _a, _b;
         super(name, args, actions);
         const firstAction = actions[0];
         if (firstAction instanceof FindAction_1.FindAction ||
@@ -62,11 +63,12 @@ class AssertStep extends MablStep_1.MablStep {
         this.assertionType = this.conditionAction.conditionAttribute;
         this.assertionValue = this.conditionAction.conditionValueAttribute;
         this.isWaitUntilStep = this.determineIfWaitUntilStep();
-        const assertArguments = args[0] && typeof args[0] === 'object'
-            ? args[0]
-            : undefined;
-        this.continueOnFailure = (assertArguments === null || assertArguments === void 0 ? void 0 : assertArguments.onFailure) === 'continue';
-        this.observationScope = assertArguments === null || assertArguments === void 0 ? void 0 : assertArguments.observationScope;
+        this.assertArguments =
+            args[0] && typeof args[0] === 'object'
+                ? args[0]
+                : undefined;
+        this.continueOnFailure = ((_a = this.assertArguments) === null || _a === void 0 ? void 0 : _a.onFailure) === 'continue';
+        this.observationScope = (_b = this.assertArguments) === null || _b === void 0 ? void 0 : _b.observationScope;
     }
     validate() {
         if (!(this.actions.length === 2 || this.actions.length === 3) &&
@@ -161,8 +163,14 @@ class AssertStep extends MablStep_1.MablStep {
         const actions = [];
         const assertionType = exports.assertionStepToField[stepName];
         const assertionValue = stepArgs.assertionValue;
-        const findAction = FindAction_1.FindAction.findActionFromStepArgs(stepArgs);
-        actions.push(findAction);
+        let primaryAction;
+        if (stepArgs.kind === GetCurrentLocationDescriptor_1.GET_CURRENT_LOCATION_KIND) {
+            primaryAction = new GetUrlAction_1.GetUrlAction(GetUrlAction_1.GetUrlAction.mablScriptStepNames[0], []);
+        }
+        else {
+            primaryAction = FindAction_1.FindAction.findActionFromStepArgs(stepArgs);
+        }
+        actions.push(primaryAction);
         if (assertionType === 'present' || assertionType === 'not_present') {
             actions.push(new ConditionAction_1.ConditionAction('evaluate_presence', [assertionType]));
         }
@@ -181,7 +189,12 @@ class AssertStep extends MablStep_1.MablStep {
                 assertionValue,
             ]));
         }
-        return new AssertStep('assert', [], actions);
+        return new AssertStep('assert', [
+            {
+                onFailure: stepArgs.continueOnFailure ? 'continue' : undefined,
+                observationScope: stepArgs.observationScope,
+            },
+        ], actions);
     }
     produceSelIdeFormattedSteps(stepIndex) {
         const find = this.primaryAction.toDescriptor();
@@ -229,21 +242,22 @@ class AssertStep extends MablStep_1.MablStep {
         return seleniumStep;
     }
     toMablscript() {
-        if (this.assertionType === 'present' ||
-            this.assertionType === 'not_present' ||
-            this.isWaitUntilStep) {
-            const finalAssertionType = this.isWaitUntilStep
-                ? 'present'
-                : this.assertionType;
-            return `${this.primaryAction.generateMablscriptFindOne()}.evaluate_presence("${finalAssertionType}").assert()`;
-        }
+        var _a, _b;
+        const assertAction = `.assert(${!!(((_a = this.assertArguments) === null || _a === void 0 ? void 0 : _a.onFailure) ||
+            ((_b = this.assertArguments) === null || _b === void 0 ? void 0 : _b.observationScope))
+            ? this.convertObjectToMablscriptArgs(this.assertArguments)
+            : ''})`;
         if (this.countAction) {
-            return `${this.primaryAction.toMablscript()}.${this.countAction.toMablscript()}.${this.conditionAction.toMablscript()}.assert()`;
+            return `${this.primaryAction.toMablscript()}.${this.countAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
         }
         if (this.extractAction) {
-            return `${this.primaryAction.toMablscript()}.${this.extractAction.toMablscript()}.${this.conditionAction.toMablscript()}.assert()`;
+            return `${this.primaryAction.toMablscript()}.${this.extractAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
+        }
+        if (this.assertionType === 'present' ||
+            this.assertionType === 'not_present') {
+            return `${this.primaryAction.generateFindMablscript()}.evaluate_presence("${this.assertionType}")${assertAction}`;
         }
-        return `${this.primaryAction.toMablscript()}.${this.conditionAction.toMablscript()}.assert()`;
+        return `${this.primaryAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
     }
 }
 exports.AssertStep = AssertStep;

package/mablscript/steps/AssertStepOld.js

@@ -6,6 +6,8 @@ const MablStep_1 = require("../MablStep");
 const FindAction_1 = require("../actions/FindAction");
 const domUtil_1 = require("../../domUtil");
 const importer_1 = require("../importer");
+const GetCurrentLocationDescriptor_1 = require("../types/GetCurrentLocationDescriptor");
+const GetVariableDescriptor_1 = require("../types/GetVariableDescriptor");
 const oldToNewAssertionTypes = {
     assert_contains: 'AssertContains',
     assert_does_not_contain: 'AssertDoesNotContain',
@@ -31,8 +33,16 @@ class AssertStepOld extends MablStep_1.MablStep {
         this.validate();
         this.setAssertAttribute();
         this.assertionType = this.name;
-        this.findAction = actions[0];
+        this.primaryAction = actions[0];
         this.extractAction = actions[1];
+        if (args.length === 1) {
+            this.continueOnFailure = args[0].onFailure === 'continue';
+            this.observationScope = args[0].observationScope;
+        }
+        else if (args.length === 2) {
+            this.continueOnFailure = args[1].onFailure === 'continue';
+            this.observationScope = args[1].observationScope;
+        }
     }
     validate() {
         if (this.actions.length !== 2 &&
@@ -61,26 +71,34 @@ class AssertStepOld extends MablStep_1.MablStep {
                 ExtractAction_1.ExtractAction.mablscriptToYamlType[this.extractAction.extractionType];
             formatted.attribute = this.extractAction.extractionAttribute;
         }
-        const find = this.findAction.toDescriptor();
-        switch (find.findType) {
-            case domUtil_1.FindType.FIND_COOKIE:
-            case domUtil_1.FindType.FIND_EMAIL:
-                formatted.findType = FindAction_1.findTypesToFormattedType[find.findType];
-                formatted.selector = find.findTarget;
-                break;
-            case domUtil_1.FindType.FIND_FIRST:
-            case domUtil_1.FindType.FIND_LAST:
-            case domUtil_1.FindType.FIND_ANY:
-            case domUtil_1.FindType.FIND_ALL:
-                formatted.findType = FindAction_1.findTypesToFormattedType[find.findType];
-                formatted.selector = find.findTarget;
-                break;
-            case domUtil_1.FindType.FIND_ONE:
-                formatted.selector = find.findTarget.selector;
-                break;
-            default:
-                throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType}`);
+        const find = this.primaryAction.toDescriptor();
+        formatted.findOptions = find.selectorFindOption;
+        if ((0, GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor)(find) || (0, GetVariableDescriptor_1.isGetVariableDescriptor)(find)) {
+            formatted.kind = find.kind;
+        }
+        else {
+            switch (find.findType) {
+                case domUtil_1.FindType.FIND_COOKIE:
+                case domUtil_1.FindType.FIND_EMAIL:
+                    formatted.findType = FindAction_1.findTypesToFormattedType[find.findType];
+                    formatted.selector = find.findTarget;
+                    break;
+                case domUtil_1.FindType.FIND_FIRST:
+                case domUtil_1.FindType.FIND_LAST:
+                case domUtil_1.FindType.FIND_ANY:
+                case domUtil_1.FindType.FIND_ALL:
+                    formatted.findType = FindAction_1.findTypesToFormattedType[find.findType];
+                    formatted.selector = find.findTarget;
+                    break;
+                case domUtil_1.FindType.FIND_ONE:
+                    formatted.selector = find.findTarget.selector;
+                    break;
+                default:
+                    throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType}`);
+            }
         }
+        formatted.continueOnFailure = this.continueOnFailure;
+        formatted.observationScope = this.observationScope;
         return formatted;
     }
     getNewAssertionStep() {

package/mablscript/steps/AwaitTabStep.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AwaitTabStep = void 0;
+const domUtil_1 = require("../../domUtil");
 const MablStep_1 = require("../MablStep");
 class AwaitTabStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
@@ -20,14 +21,14 @@ class AwaitTabStep extends MablStep_1.MablStep {
     }
     toMablscript() {
         const mablscriptSelectorChunks = ['selector_type: "tab"'];
-        if (this.tab.title) {
-            mablscriptSelectorChunks.push(`title: "${this.tab.title}"`);
+        if (this.tab.title !== undefined) {
+            mablscriptSelectorChunks.push(`title: "${(0, domUtil_1.escapeMablscriptString)(this.tab.title)}"`);
         }
-        if (this.tab.url) {
-            mablscriptSelectorChunks.push(`url: "${this.tab.url}"`);
+        if (this.tab.url !== undefined) {
+            mablscriptSelectorChunks.push(`url: "${(0, domUtil_1.escapeMablscriptString)(this.tab.url)}"`);
         }
-        if (this.tab.uuid) {
-            mablscriptSelectorChunks.push(`uuid: "${this.tab.uuid}"`);
+        if (this.tab.uuid !== undefined) {
+            mablscriptSelectorChunks.push(`uuid: "${(0, domUtil_1.escapeMablscriptString)(this.tab.uuid)}"`);
         }
         return `await_tab({${mablscriptSelectorChunks.join(', ')}})`;
     }

package/mablscript/steps/ClickAndHoldStep.js

@@ -55,7 +55,7 @@ class ClickAndHoldStep extends MablStep_1.MablStep {
         return new ClickAndHoldStep('click_and_hold', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
     }
     toMablscript() {
-        return `${this.findAction.toMablscript()}.click_and_hold()`;
+        return `${this.findAction.toMablscript()}.click_and_hold({isHtml5:${this.clickArgs.isHtml5}})`;
     }
 }
 exports.ClickAndHoldStep = ClickAndHoldStep;

package/mablscript/steps/DownloadStep.js

@@ -4,6 +4,7 @@ exports.DownloadStep = void 0;
 const MablStep_1 = require("../MablStep");
 const AwaitDownloadAction_1 = require("../actions/AwaitDownloadAction");
 const AwaitPDFDownloadAction_1 = require("../actions/AwaitPDFDownloadAction");
+const domUtil_1 = require("../../domUtil");
 class DownloadStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         var _a;
@@ -77,8 +78,8 @@ class DownloadStep extends MablStep_1.MablStep {
         return new DownloadStep('assert_download', [fileAttributes], [awaitDownloadAction]);
     }
     toMablscript() {
-        const mablArgs = this.convertObjectToMablscriptArgs(this.fileAttributes);
-        return `${this.awaitDownloadAction.toMablscript()}.assert_download(${mablArgs})`;
+        const mablArgs = (0, domUtil_1.buildStepArgumentString)(this.fileAttributes);
+        return `${this.awaitDownloadAction.toMablscript()}.assert_download(${mablArgs ? mablArgs : ''})`;
     }
 }
 exports.DownloadStep = DownloadStep;

package/mablscript/steps/EchoStep.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EchoStep = void 0;
 const MablStep_1 = require("../MablStep");
+const domUtil_1 = require("../../domUtil");
 const SeleniumIdeStep_1 = require("./SeleniumIdeStep");
 const MablAction_1 = require("../MablAction");
 class EchoStep extends MablStep_1.MablStep {
@@ -24,7 +25,8 @@ class EchoStep extends MablStep_1.MablStep {
         return new EchoStep('echo', [stepArgs.value], []);
     }
     toMablscript() {
-        return `echo(${this.substituteMablscriptVariable(this.echoValue)})`;
+        const stringEchoValue = `${this.echoValue}`;
+        return `echo("${(0, domUtil_1.escapeMablscriptString)(stringEchoValue)}")`;
     }
 }
 exports.EchoStep = EchoStep;

package/mablscript/steps/ElseIfConditionStep.js

@@ -1,17 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElseIfConditionStep = void 0;
+const MablAction_1 = require("../MablAction");
 const IfConditionStep_1 = require("./IfConditionStep");
 class ElseIfConditionStep extends IfConditionStep_1.IfConditionStep {
     getStepName() {
         return 'ElseIf';
     }
     static fromYaml(_stepName, stepArgs) {
-        const actions = IfConditionStep_1.IfConditionStep.getActionsFromYamlForCondition(stepArgs);
+        const actions = [new MablAction_1.MablAction('conditional_else', [])];
+        actions.push(...IfConditionStep_1.IfConditionStep.getActionsFromYamlForCondition(stepArgs));
         return new ElseIfConditionStep('conditional_else_if', [], actions);
     }
     toMablscript() {
-        return `conditional_else().${this.actions.reduce((mablscript, action) => `${mablscript}${action.toMablscript()}.`, '')}conditional_else_if()`;
+        const actions = this.actions.reduce((mablscript, action) => `${mablscript}${action.toMablscript()}.`, '');
+        return `conditional_else()${actions}conditional_else_if()`;
     }
 }
 exports.ElseIfConditionStep = ElseIfConditionStep;

package/mablscript/steps/EnterTextStep.js

@@ -80,7 +80,10 @@ class EnterTextStep extends MablStep_1.MablStep {
         return new EnterTextStep('enter_text', [stepArgs.text], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
     }
     toMablscript() {
-        return `${this.findAction.toMablscript()}.enter_text(${this.substituteMablscriptVariable(this.text)})`;
+        const enterText = typeof this.text === 'string'
+            ? `"${(0, domUtil_1.escapeMablscriptString)(this.text)}"`
+            : this.substituteMablscriptVariable(this.text);
+        return `${this.findAction.toMablscript()}.enter_text(${enterText})`;
     }
 }
 exports.EnterTextStep = EnterTextStep;

package/mablscript/steps/EvaluateFlowStep.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EvaluateFlowStep = void 0;
+const MablStep_1 = require("../MablStep");
+const domUtil_1 = require("../../domUtil");
+class EvaluateFlowStep extends MablStep_1.MablStep {
+    constructor(name, args, actions) {
+        super(name, args, actions);
+        if (args.length < 1 || args.length > 2) {
+            throw new Error('EvaluateFlowStep expects 1 or 2 arguments');
+        }
+        this.flowDescriptor = this.getActionArgs()[0];
+        if (args.length === 2) {
+            this.config = this.getActionArgs()[1];
+        }
+    }
+    getStepName() {
+        return EvaluateFlowStep.yamlMablScriptNames[0];
+    }
+    toStepDescriptor() {
+        return {
+            descriptor: this.flowDescriptor,
+            config: this.config,
+        };
+    }
+    static fromYaml(_stepName, stepArgs) {
+        const { descriptor, config } = stepArgs;
+        return new EvaluateFlowStep(EvaluateFlowStep.mablScriptStepNames[0], [descriptor, config], []);
+    }
+    toMablscript() {
+        const flowReference = (0, domUtil_1.buildStepArgumentString)(this.flowDescriptor);
+        const flowConfig = this.config
+            ? ', ' + (0, domUtil_1.buildStepArgumentString)(this.config)
+            : '';
+        return `${EvaluateFlowStep.mablScriptStepNames[0]}(${flowReference}${flowConfig})`;
+    }
+}
+exports.EvaluateFlowStep = EvaluateFlowStep;
+EvaluateFlowStep.mablScriptStepNames = ['evaluate_flow'];
+EvaluateFlowStep.yamlMablScriptNames = ['EvaluateFlow'];

package/mablscript/steps/ReleaseStep.js

@@ -55,7 +55,8 @@ class ReleaseStep extends MablStep_1.MablStep {
         return new ReleaseStep('release', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
     }
     toMablscript() {
-        return `${this.findAction.toMablscript()}.release()`;
+        const args = this.convertObjectToMablscriptArgs(this.releaseArgs);
+        return `${this.findAction.toMablscript()}.release(${args})`;
     }
 }
 exports.ReleaseStep = ReleaseStep;

package/mablscript/steps/RemoveCookieStep.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RemoveCookieStep = void 0;
 const MablStep_1 = require("../MablStep");
 const CookieUtils_1 = require("./CookieUtils");
+const domUtil_1 = require("../../domUtil");
 class RemoveCookieStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
@@ -20,9 +21,7 @@ class RemoveCookieStep extends MablStep_1.MablStep {
         return new RemoveCookieStep('remove_cookie', [stepArgs], []);
     }
     toMablscript() {
-        return `remove_cookie(${this.convertObjectToMablscriptArgs({
-            name: this.cookieName,
-        })})`;
+        return `remove_cookie({ name : "${(0, domUtil_1.escapeMablscriptString)(this.cookieName)}" })`;
     }
 }
 exports.RemoveCookieStep = RemoveCookieStep;

package/mablscript/steps/SendHttpRequestStep.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VariableSource = exports.HttpResponseAssertion = exports.SendHttpRequestStep = void 0;
 const MablStep_1 = require("../MablStep");
-const AssertStep_1 = require("./AssertStep");
 const ConditionDescriptor_1 = require("../types/ConditionDescriptor");
+const AssertStep_1 = require("./AssertStep");
+const domUtil_1 = require("../../domUtil");
 const evalAssertionType = {};
 Object.entries(AssertStep_1.assertionStepToField).forEach(([stepType, field]) => (evalAssertionType[field] = `${stepType.split('Assert')[1]}`));
 class SendHttpRequestStep extends MablStep_1.MablStep {
@@ -36,8 +37,7 @@ class SendHttpRequestStep extends MablStep_1.MablStep {
         return new SendHttpRequestStep('send_http_request', [formatted], []);
     }
     toMablscript() {
-        const stepAsSource = (0, MablStep_1.buildSourceRepresentationOfObject)(this.sendRequest);
-        return `send_http_request(${stepAsSource})`;
+        return `send_http_request(${(0, domUtil_1.buildStepArgumentString)(this.sendRequest)})`;
     }
 }
 exports.SendHttpRequestStep = SendHttpRequestStep;

package/mablscript/steps/SendKeyStep.js

@@ -100,8 +100,8 @@ class SendKeyStep extends MablStep_1.MablStep {
     }
     toMablscript() {
         const keysToSend = this.keys
-            .map((key) => this.convertObjectToMablscriptArgs(key))
-            .join(', ');
+            .map((key) => (0, domUtil_1.buildStepArgumentString)(key))
+            .join();
         return `${this.findAction.toMablscript()}.send_keys(${keysToSend})`;
     }
 }

package/mablscript/steps/SetCookieStep.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SetCookieStep = void 0;
 const MablStep_1 = require("../MablStep");
 const CookieUtils_1 = require("./CookieUtils");
+const domUtil_1 = require("../../domUtil");
 const validValueCharacters = /^(!|[\x23-\x2B]|[\x2D-\x3A]|[\x3C-\x5B]|[\x5D-\x7E])*$/;
 class SetCookieStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
@@ -20,10 +21,7 @@ class SetCookieStep extends MablStep_1.MablStep {
         return new SetCookieStep('set_cookie', [stepArgs], []);
     }
     toMablscript() {
-        return `set_cookie(${this.convertObjectToMablscriptArgs({
-            name: this.cookieName,
-            value: this.cookieValue,
-        })})`;
+        return `set_cookie({ name : "${(0, domUtil_1.escapeMablscriptString)(this.cookieName)}", value : "${(0, domUtil_1.escapeMablscriptString)(this.cookieValue)}" })`;
     }
     static normalizeValue(value) {
         const trimmed = value.trim();

package/mablscript/steps/SetViewportStep.js

@@ -28,7 +28,7 @@ class SetViewportStep extends MablStep_1.MablStep {
     toMablscript() {
         let sizeArg;
         if (this.size.height && this.size.width) {
-            sizeArg = `{ size : { width : ${this.size.width}, height: ${this.size.height} } }`;
+            sizeArg = `{ size : { width : ${this.size.width}, height : ${this.size.height} } }`;
         }
         else if (this.size.width) {
             sizeArg = `{ size : { width : ${this.size.width} } }`;

package/mablscript/steps/VisitUrlStep.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VisitUrlStep = void 0;
 const MablStep_1 = require("../MablStep");
 const SeleniumIdeStep_1 = require("./SeleniumIdeStep");
+const domUtil_1 = require("../../domUtil");
 class VisitUrlStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
@@ -28,7 +29,7 @@ class VisitUrlStep extends MablStep_1.MablStep {
         return new VisitUrlStep('visit_url', [stepArgs.url], []);
     }
     toMablscript() {
-        const resolvedUrl = this.substituteMablscriptVariable(this.url.toString());
+        const resolvedUrl = this.substituteMablscriptVariable((0, domUtil_1.escapeMablscriptString)(this.url.toString()));
         if (VisitUrlStep.isInProduction() && VisitUrlStep.isFileUrl(resolvedUrl)) {
             throw new Error('Access to local files is not permitted');
         }

package/mablscript/steps/WaitStep.js

@@ -25,15 +25,12 @@ class WaitStep extends MablStep_1.MablStep {
         return new WaitStep('wait', [stepArgs.milliseconds], []);
     }
     toMablscript() {
-        return `wait("${this.milliseconds}")`;
+        return `wait(${this.milliseconds})`;
     }
     static validateWait(wait) {
         if (typeof wait !== 'number') {
             throw new Error(`Invalid wait argument [${wait}]`);
         }
-        if (wait < 1000 || wait > 900000) {
-            throw new Error('Wait must be between 1 and 900 seconds');
-        }
         return wait;
     }
 }

package/mablscript/types/GetCurrentLocationDescriptor.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.newGetCurrentLocationDescriptor = exports.isGetCurrentLocationDescriptor = void 0;
+exports.newGetCurrentLocationDescriptor = exports.isGetCurrentLocationDescriptor = exports.GET_CURRENT_LOCATION_KIND = void 0;
+exports.GET_CURRENT_LOCATION_KIND = 'Location';
 function isGetCurrentLocationDescriptor(value) {
-    return value.kind === 'Location';
+    return (value.kind === exports.GET_CURRENT_LOCATION_KIND);
 }
 exports.isGetCurrentLocationDescriptor = isGetCurrentLocationDescriptor;
 function newGetCurrentLocationDescriptor() {
-    return { kind: 'Location' };
+    return { kind: exports.GET_CURRENT_LOCATION_KIND };
 }
 exports.newGetCurrentLocationDescriptor = newGetCurrentLocationDescriptor;