stepzen 0.29.0 → 0.30.0-beta.0

package/lib/shared/header-params-parser.js

@@ -7,24 +7,28 @@ const debug = require("debug");
 const header_1 = require("./header");
 const headerParamRegex = /^(?<prefix>([^$]|\$\$)*)(?<param>\$[_A-Za-z]\w*);?(?<suffix>.*)$/;
 const parseHeaderParam = (headers, headerParam) => {
-    const headerOrError = (0, header_1.parseHeader)(headerParam);
-    if (!headerOrError || 'error' in headerOrError) {
-        if (headerOrError) {
+    const { result: header, error: headerError } = (0, header_1.parseHeader)(headerParam);
+    if (headerError || !header) {
+        if (headerError) {
             debug('stepzen:curl2sdl')(`Failed to parse a header param ${headerParam}.` +
-                ` Error: ${headerOrError.error}`);
+                ` Error: ${headerError.message}`);
         }
         return {
-            error: `Could not find a header name in` +
-                ` ${chalk.bold(`--header-param '${headerParam}'`)}.`,
+            error: {
+                message: `Could not find a header name in` +
+                    ` ${chalk.bold(`--header-param '${headerParam}'`)}.`,
+            },
         };
     }
-    const { name, value } = headerOrError;
+    const { name, value } = header;
     const paramValueMatches = value.match(headerParamRegex);
     if (!paramValueMatches || !paramValueMatches.groups) {
         return {
-            error: `Could not find a $-prefixed parameter name in` +
-                ` ${chalk.bold(`--header-param '${headerParam}'`)}.` +
-                ` Did you use single quotes to prevent shell variable expansion?`,
+            error: {
+                message: `Could not find a $-prefixed parameter name in` +
+                    ` ${chalk.bold(`--header-param '${headerParam}'`)}.` +
+                    ` Did you use single quotes to prevent shell variable expansion?`,
+            },
         };
     }
     const prefix = paramValueMatches.groups.prefix.replace(/\$\$/g, '$');
@@ -32,27 +36,33 @@ const parseHeaderParam = (headers, headerParam) => {
     const suffix = paramValueMatches.groups.suffix.replace(/\$\$/g, '$');
     if (suffix.match(headerParamRegex)) {
         return {
-            error: `StepZen CLI currently supports at max 1 parameter per header` +
-                ` ${chalk.bold(`--header-param '${headerParam}'`)} has several.`,
+            error: {
+                message: `StepZen CLI currently supports at max 1 parameter per header` +
+                    ` ${chalk.bold(`--header-param '${headerParam}'`)} has several.`,
+            },
         };
     }
     const candidates = headers.filter(h => h.name.toLowerCase() === name.toLowerCase());
     if (candidates.length === 0) {
         return {
-            error: `Could not find a matching '-H, --header' curl flag for` +
-                ` ${chalk.bold(`--header-param '${headerParam}'`)}.` +
-                ` No header matches the name ${name}.`,
+            error: {
+                message: `Could not find a matching '-H, --header' curl flag for` +
+                    ` ${chalk.bold(`--header-param '${headerParam}'`)}.` +
+                    ` No header matches the name ${name}.`,
+            },
         };
     }
     const matches = candidates.filter(({ value }) => value.startsWith(prefix) &&
         value.substring(prefix.length).endsWith(suffix));
     if (matches.length === 0) {
         return {
-            error: `Could not find a matching '-H, --header' curl flag for` +
-                ` ${chalk.bold(`--header-param '${headerParam}'`)}.` +
-                (candidates.length > 1
-                    ? ` None of the ${name} headers matches the '${value}' pattern.`
-                    : ` The ${name} header does not match the '${value}' pattern.`),
+            error: {
+                message: `Could not find a matching '-H, --header' curl flag for` +
+                    ` ${chalk.bold(`--header-param '${headerParam}'`)}.` +
+                    (candidates.length > 1
+                        ? ` None of the ${name} headers matches the '${value}' pattern.`
+                        : ` The ${name} header does not match the '${value}' pattern.`),
+            },
         };
     }
     if (matches.length > 1) {
@@ -72,24 +82,26 @@ const parseHeaderParam = (headers, headerParam) => {
         name,
     });
     return {
-        header: {
-            name: matches[0].name,
-            parts: [
-                ...(prefix
-                    ? [asConstantHeaderValuePart(prefix)]
-                    : [
-                    /* spreading an empty array is a no-op */
-                    ]),
-                asVariableHeaderValuePart(matches[0].value.substring(prefix.length, matches[0].value.length - suffix.length), paramName),
-                ...(suffix
-                    ? [asConstantHeaderValuePart(suffix)]
-                    : [
-                    /* spreading an empty array is a no-op */
-                    ]),
-            ],
+        result: {
+            header: {
+                name: matches[0].name,
+                parts: [
+                    ...(prefix
+                        ? [asConstantHeaderValuePart(prefix)]
+                        : [
+                        /* spreading an empty array is a no-op */
+                        ]),
+                    asVariableHeaderValuePart(matches[0].value.substring(prefix.length, matches[0].value.length - suffix.length), paramName),
+                    ...(suffix
+                        ? [asConstantHeaderValuePart(suffix)]
+                        : [
+                        /* spreading an empty array is a no-op */
+                        ]),
+                ],
+            },
+            // assume each --header is referenced by at most one --header-param
+            remainingHeaders: headers.filter(h => h !== matches[0]),
         },
-        // assume each --header is referenced by at most one --header-param
-        remainingHeaders: headers.filter(h => h !== matches[0]),
     };
 };
 exports.parseHeaderParam = parseHeaderParam;
@@ -97,15 +109,15 @@ const makeHeaders = (curlHeaders, headerParams = []) => {
     const headers = [];
     let remainingCurlHeaders = curlHeaders;
     for (const headerParam of headerParams) {
-        const resultOrError = (0, exports.parseHeaderParam)(remainingCurlHeaders, headerParam);
-        if ('error' in resultOrError) {
-            return resultOrError;
+        const { result, error } = (0, exports.parseHeaderParam)(remainingCurlHeaders, headerParam);
+        if (error) {
+            return { error };
         }
-        headers.push(resultOrError.header);
-        remainingCurlHeaders = resultOrError.remainingHeaders;
+        headers.push(result.header);
+        remainingCurlHeaders = result.remainingHeaders;
     }
     headers.push(...remainingCurlHeaders);
-    return headers;
+    return { result: headers };
 };
 exports.makeHeaders = makeHeaders;
 //# sourceMappingURL=header-params-parser.js.map

package/lib/shared/header-params-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"header-params-parser.js","sourceRoot":"","sources":["../../src/shared/header-params-parser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"header-params-parser.js","sourceRoot":"","sources":["../../src/shared/header-params-parser.ts"],"names":[],"mappings":"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"}

package/lib/shared/header.d.ts

@@ -1,4 +1,4 @@
-import { ParseError } from './types';
+import type { ErrorOr } from './types';
 export interface Header {
     name: string;
     value: string;
@@ -29,5 +29,5 @@ export declare const HEADER_REGEX: RegExp;
  *    `null` for the `Header:` notation that means "remove this header" in
  *    the curl spec or a error object if cannot parse the string.
  */
-export declare const parseHeader: (header: string) => Header | null | ParseError;
+export declare const parseHeader: (header: string) => ErrorOr<Header | null>;
 //# sourceMappingURL=header.d.ts.map

package/lib/shared/header.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../src/shared/header.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAA;AAElC,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd;AAUD,oBAAY,oBAAoB,GAAG,MAAM,CAAA;AAGzC,oBAAY,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,oBAAoB,EAAE,CAAA;CAC9B,CAAA;AAED,oBAAY,WAAW,GAAG,oBAAoB,GAAG,oBAAoB,CAAA;AAErE,oBAAY,4BAA4B,GAAG;IACzC,IAAI,EAAE,UAAU,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,oBAAY,4BAA4B,GAAG;IACzC,IAAI,EAAE,UAAU,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,oBAAY,oBAAoB,GAC5B,4BAA4B,GAC5B,4BAA4B,CAAA;AAIhC,eAAO,MAAM,YAAY,QACkC,CAAA;AAE3D;;;;;;;;GAQG;AACH,eAAO,MAAM,WAAW,WAAY,MAAM,KAAG,MAAM,GAAG,IAAI,GAAG,UAgC5D,CAAA"}
+{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../src/shared/header.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAA;AAEpC,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd;AAUD,oBAAY,oBAAoB,GAAG,MAAM,CAAA;AAGzC,oBAAY,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,oBAAoB,EAAE,CAAA;CAC9B,CAAA;AAED,oBAAY,WAAW,GAAG,oBAAoB,GAAG,oBAAoB,CAAA;AAErE,oBAAY,4BAA4B,GAAG;IACzC,IAAI,EAAE,UAAU,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,oBAAY,4BAA4B,GAAG;IACzC,IAAI,EAAE,UAAU,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,oBAAY,oBAAoB,GAC5B,4BAA4B,GAC5B,4BAA4B,CAAA;AAIhC,eAAO,MAAM,YAAY,QACkC,CAAA;AAE3D;;;;;;;;GAQG;AACH,eAAO,MAAM,WAAW,WAAY,MAAM,KAAG,QAAQ,MAAM,GAAG,IAAI,CAsCjE,CAAA"}

package/lib/shared/header.js

@@ -19,26 +19,32 @@ const parseHeader = (header) => {
     // Check if it's a `Header:` case
     if (trimmed.indexOf(':') === trimmed.length - 1) {
         // the user intent was to _remove_ this header
-        return null;
+        return { result: null };
     }
     // Check if it's a `Header;` case
     if (trimmed.indexOf(':') === -1 &&
         trimmed.indexOf(';') === trimmed.length - 1) {
         return {
-            name: trimmed.substring(0, trimmed.length - 1).trim(),
-            value: '',
+            result: {
+                name: trimmed.substring(0, trimmed.length - 1).trim(),
+                value: '',
+            },
         };
     }
     const match = trimmed.match(exports.HEADER_REGEX);
     if (!match || !match.groups || !match.groups.name || !match.groups.value) {
         return {
-            error: `Unexpected header syntax in "${header}". ` +
-                `Expected "[name]: [value]", "[name];" or "[name]:"`,
+            error: {
+                message: `Unexpected header syntax in "${header}". ` +
+                    `Expected "[name]: [value]", "[name];" or "[name]:"`,
+            },
         };
     }
     return {
-        name: match.groups.name,
-        value: match.groups.value.trim(),
+        result: {
+            name: match.groups.name,
+            value: match.groups.value.trim(),
+        },
     };
 };
 exports.parseHeader = parseHeader;

package/lib/shared/header.js.map

@@ -1 +1 @@
-{"version":3,"file":"header.js","sourceRoot":"","sources":["../../src/shared/header.ts"],"names":[],"mappings":";AAAA,mDAAmD;;;AA0CnD,0CAA0C;AAC1C,wDAAwD;AAC3C,QAAA,YAAY,GACvB,yDAAyD,CAAA;AAE3D;;;;;;;;GAQG;AACI,MAAM,WAAW,GAAG,CAAC,MAAc,EAA8B,EAAE;IACxE,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;IAC7B,iCAAiC;IACjC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QAC/C,8CAA8C;QAC9C,OAAO,IAAI,CAAA;KACZ;IAED,iCAAiC;IACjC,IACE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3B,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,EAC3C;QACA,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE;YACrD,KAAK,EAAE,EAAE;SACV,CAAA;KACF;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,oBAAY,CAAC,CAAA;IACzC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE;QACxE,OAAO;YACL,KAAK,EACH,gCAAgC,MAAM,KAAK;gBAC3C,oDAAoD;SACvD,CAAA;KACF;IAED,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;QACvB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;KACjC,CAAA;AACH,CAAC,CAAA;AAhCY,QAAA,WAAW,eAgCvB"}
+{"version":3,"file":"header.js","sourceRoot":"","sources":["../../src/shared/header.ts"],"names":[],"mappings":";AAAA,mDAAmD;;;AA0CnD,0CAA0C;AAC1C,wDAAwD;AAC3C,QAAA,YAAY,GACvB,yDAAyD,CAAA;AAE3D;;;;;;;;GAQG;AACI,MAAM,WAAW,GAAG,CAAC,MAAc,EAA0B,EAAE;IACpE,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;IAC7B,iCAAiC;IACjC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QAC/C,8CAA8C;QAC9C,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,CAAA;KACtB;IAED,iCAAiC;IACjC,IACE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3B,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,EAC3C;QACA,OAAO;YACL,MAAM,EAAE;gBACN,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE;gBACrD,KAAK,EAAE,EAAE;aACV;SACF,CAAA;KACF;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,oBAAY,CAAC,CAAA;IACzC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE;QACxE,OAAO;YACL,KAAK,EAAE;gBACL,OAAO,EACL,gCAAgC,MAAM,KAAK;oBAC3C,oDAAoD;aACvD;SACF,CAAA;KACF;IAED,OAAO;QACL,MAAM,EAAE;YACN,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;YACvB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;SACjC;KACF,CAAA;AACH,CAAC,CAAA;AAtCY,QAAA,WAAW,eAsCvB"}

package/lib/shared/inquirer.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import * as inquirer from 'inquirer';
+import type { DistinctQuestion } from 'inquirer';
 interface HistoryKey {
     historyFile: string;
     key: Buffer;
@@ -9,5 +10,6 @@ export declare let historyKey: HistoryKey | undefined;
 export declare const clearHistoryKey: () => void;
 export declare const writeLastAnswers: (answers: any) => Promise<void>;
 export declare const prompt: <T extends inquirer.Answers>(namespace: string, questions: inquirer.QuestionCollection<T>, initialAnswers?: Partial<T> | undefined) => Promise<T>;
+export declare const overrideDefaults: <Options extends inquirer.Answers>(questions: inquirer.DistinctQuestion<Options>[], defaultAnswers: Partial<Options>) => inquirer.DistinctQuestion<Options>[];
 export {};
 //# sourceMappingURL=inquirer.d.ts.map

package/lib/shared/inquirer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inquirer.d.ts","sourceRoot":"","sources":["../../src/shared/inquirer.ts"],"names":[],"mappings":";AAMA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAA;AAQpC,UAAU,UAAU;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAA;CACnB;AAGD,eAAO,IAAI,UAAU,EAAE,UAAU,GAAG,SAAS,CAAA;AAwD7C,eAAO,MAAM,eAAe,YAE3B,CAAA;AAqCD,eAAO,MAAM,gBAAgB,YAAmB,GAAG,KAAG,QAAQ,IAAI,CAoBjE,CAAA;AAED,eAAO,MAAM,MAAM,0CACN,MAAM,mGAqBlB,CAAA"}
+{"version":3,"file":"inquirer.d.ts","sourceRoot":"","sources":["../../src/shared/inquirer.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAA;AAQpC,OAAO,KAAK,EAAU,gBAAgB,EAAC,MAAM,UAAU,CAAA;AAKvD,UAAU,UAAU;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,EAAE,MAAM,CAAA;CACnB;AAGD,eAAO,IAAI,UAAU,EAAE,UAAU,GAAG,SAAS,CAAA;AAwD7C,eAAO,MAAM,eAAe,YAE3B,CAAA;AAqCD,eAAO,MAAM,gBAAgB,YAAmB,GAAG,KAAG,QAAQ,IAAI,CAoBjE,CAAA;AAED,eAAO,MAAM,MAAM,0CACN,MAAM,mGAqBlB,CAAA;AAED,eAAO,MAAM,gBAAgB,+JAQ5B,CAAA"}

package/lib/shared/inquirer.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prompt = exports.writeLastAnswers = exports.clearHistoryKey = exports.historyKey = void 0;
+exports.overrideDefaults = exports.prompt = exports.writeLastAnswers = exports.clearHistoryKey = exports.historyKey = void 0;
 // Copyright (c) 2020,2021,2022,2023, StepZen, Inc.
+const crypto = require("crypto");
 const debug = require("debug");
 const fs = require("fs");
+const inquirer = require("inquirer");
+const lodash_1 = require("lodash");
 const path = require("path");
 const yaml = require("yaml");
-const crypto = require("crypto");
-const inquirer = require("inquirer");
-const constants_1 = require("./constants");
 const configuration_1 = require("./configuration");
+const constants_1 = require("./constants");
 const CIPHER_ALGORITHM = 'aes-256-cbc';
 const readHistoryKey = async () => {
     const config = await (0, configuration_1.readConfiguration)();
@@ -120,4 +121,11 @@ const prompt = async (namespace, questions, initialAnswers) => {
     return result;
 };
 exports.prompt = prompt;
+const overrideDefaults = (questions, defaultAnswers) => {
+    return questions.map(question => {
+        const def = (0, lodash_1.get)(defaultAnswers, question.name);
+        return def === undefined ? question : { ...question, default: def };
+    });
+};
+exports.overrideDefaults = overrideDefaults;
 //# sourceMappingURL=inquirer.js.map

package/lib/shared/inquirer.js.map

@@ -1 +1 @@
-{"version":3,"file":"inquirer.js","sourceRoot":"","sources":["../../src/shared/inquirer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inquirer.js","sourceRoot":"","sources":["../../src/shared/inquirer.ts"],"names":[],"mappings":";;;AAAA,mDAAmD;AACnD,iCAAgC;AAChC,+BAA8B;AAC9B,yBAAwB;AACxB,qCAAoC;AACpC,mCAA0B;AAC1B,6BAA4B;AAC5B,6BAA4B;AAE5B,mDAAiD;AACjD,2CAA2E;AAK3E,MAAM,gBAAgB,GAAG,aAAa,CAAA;AAWtC,MAAM,cAAc,GAAG,KAAK,IAAqC,EAAE;IACjE,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAiB,GAAE,CAAA;IACxC,IAAI,CAAC,CAAC,UAAU,IAAI,MAAM,CAAC,EAAE;QAC3B,KAAK,CAAC,kBAAkB,CAAC,CAAC,4CAA4C,CAAC,CAAA;QACvE,OAAO,SAAS,CAAA;KACjB;IACD,IAAI;QACF,MAAM,cAAc,GAAG,MAAsC,CAAA;QAE7D,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACjD,IACE,MAAM,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE;YACzB,aAAa,CAAC,MAAM,KAAK,CAAC;YAC1B,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,EAAE,EAC9B;YACA,KAAK,CAAC,kBAAkB,CAAC,CAAC,kCAAkC,CAAC,CAAA;YAC7D,OAAO,SAAS,CAAA;SACjB;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QACrD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;QAC5E,MAAM,IAAI,GAAG,UAAU,CAAA;QACvB,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QAEjD,kEAAkE;QAClE,oEAAoE;QACpE,sBAAsB;QACtB,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,GAAG,EAAE,UAAU,CAAC,CAAA;QACvE,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;YACzC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;YAC7B,MAAM,CAAC,KAAK,EAAE;SACf,CAAC,CAAA;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAC3B,qCAAyB,EACzB,gCAAoB,CAAC,OAAO,CAC1B,eAAe,EACf,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,CACrC,CACF,CAAA;QACD,kBAAU,GAAG,EAAC,WAAW,EAAE,GAAG,EAAE,UAAU,EAAC,CAAA;QAC3C,OAAO,kBAAU,CAAA;KAClB;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,CAAA;QAChC,OAAO,SAAS,CAAA;KACjB;AACH,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;IAC/B,IAAI,kBAAU,EAAE;QACd,OAAO,kBAAU,CAAA;KAClB;IACD,OAAO,cAAc,EAAE,CAAA;AACzB,CAAC,CAAA;AAED,iBAAiB;AACV,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,kBAAU,GAAG,SAAS,CAAA;AACxB,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAED,MAAM,eAAe,GAAG,KAAK,IAAkC,EAAE;IAC/D,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,CAAA;IACrC,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAO,EAAE,CAAA;KACV;IACD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QACvC,KAAK,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,OAAO,CAAC,WAAW,SAAS,CAAC,CAAA;QAC3E,OAAO,EAAE,CAAA;KACV;IAED,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CACtC,gBAAgB,EAChB,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,UAAU,CACnB,CAAA;QACD,MAAM,gBAAgB,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAC7D,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;YAC5B,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC;YACjC,QAAQ,CAAC,KAAK,EAAE;SACjB,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QACnD,IAAI,MAAM,KAAK,IAAI,EAAE;YACnB,KAAK,CAAC,kBAAkB,CAAC,CACvB,iCAAiC,OAAO,CAAC,WAAW,GAAG,CACxD,CAAA;YACD,OAAO,EAAE,CAAA;SACV;QACD,OAAO,MAAM,CAAA;KACd;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,CAAA;QAChC,OAAO,EAAE,CAAA;KACV;AACH,CAAC,CAAA;AAEM,MAAM,gBAAgB,GAAG,KAAK,EAAE,OAAY,EAAiB,EAAE;IACpE,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,CAAA;IACrC,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,OAAM;KACP;IAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,qCAAyB,CAAC,EAAE;QAC7C,EAAE,CAAC,SAAS,CAAC,qCAAyB,CAAC,CAAA;KACxC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IACvC,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAClC,gBAAgB,EAChB,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,UAAU,CACnB,CAAA;IACD,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;QACrC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;QACtB,MAAM,CAAC,KAAK,EAAE;KACf,CAAC,CAAA;IACF,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,EAAE,EAAC,IAAI,EAAE,KAAK,EAAC,CAAC,CAAA;AACxE,CAAC,CAAA;AApBY,QAAA,gBAAgB,oBAoB5B;AAEM,MAAM,MAAM,GAAG,KAAK,EACzB,SAAiB,EACjB,SAAyC,EACzC,cAAuC,EAC3B,EAAE;IACd,MAAM,IAAI,GAAG,MAAM,eAAe,EAAE,CAAA;IACpC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACvE,MAAM,UAAU,GAAG,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC3D,MAAM,cAAc,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QACjD,IACE,QAAQ,CAAC,IAAI,KAAK,SAAS;YAC3B,QAAQ,CAAC,IAAI,IAAI,UAAU;YAC3B,QAAQ,CAAC,OAAO,KAAK,SAAS,EAC9B;YACA,OAAO,EAAC,GAAG,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,CAAA;SACzD;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;IACpE,IAAA,wBAAgB,EAAC,EAAC,GAAG,IAAI,EAAE,GAAG,EAAC,CAAC,SAAS,CAAC,EAAE,EAAC,GAAG,UAAU,EAAE,GAAG,MAAM,EAAC,EAAC,EAAC,CAAC,CAAA;IACzE,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAtBY,QAAA,MAAM,UAsBlB;AAEM,MAAM,gBAAgB,GAAG,CAC9B,SAAsC,EACtC,cAAgC,EACH,EAAE;IAC/B,OAAO,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QAC9B,MAAM,GAAG,GAAG,IAAA,YAAG,EAAC,cAAc,EAAE,QAAQ,CAAC,IAAK,CAAC,CAAA;QAC/C,OAAO,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAC,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAC,CAAA;IACnE,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AARY,QAAA,gBAAgB,oBAQ5B"}

package/lib/shared/path-params-parser.d.ts

@@ -1,8 +1,8 @@
-import { ParseError } from './types';
+import type { ErrorOr } from './types';
 export declare type PathParam = {
     index: number;
     name: string;
 };
 export declare const formatPatternDiffWithPath: (patternSegments: readonly string[], pathSegments: readonly string[]) => string | null;
-export declare const parsePathParamsPattern: (url: string, pathParamsPattern?: string) => PathParam[] | ParseError;
+export declare const parsePathParamsPattern: (url: string, pathParamsPattern?: string) => ErrorOr<PathParam[]>;
 //# sourceMappingURL=path-params-parser.d.ts.map

package/lib/shared/path-params-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"path-params-parser.d.ts","sourceRoot":"","sources":["../../src/shared/path-params-parser.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAA;AAOlC,oBAAY,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,eAAO,MAAM,yBAAyB,oBACnB,SAAS,MAAM,EAAE,gBACpB,SAAS,MAAM,EAAE,KAC9B,MAAM,GAAG,IA+BX,CAAA;AAED,eAAO,MAAM,sBAAsB,QAC5B,MAAM,sBACS,MAAM,KACzB,SAAS,EAAE,GAAG,UA+ChB,CAAA"}
+{"version":3,"file":"path-params-parser.d.ts","sourceRoot":"","sources":["../../src/shared/path-params-parser.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAA;AAOpC,oBAAY,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,eAAO,MAAM,yBAAyB,oBACnB,SAAS,MAAM,EAAE,gBACpB,SAAS,MAAM,EAAE,KAC9B,MAAM,GAAG,IA+BX,CAAA;AAED,eAAO,MAAM,sBAAsB,QAC5B,MAAM,sBACS,MAAM,KACzB,QAAQ,SAAS,EAAE,CAmDrB,CAAA"}

package/lib/shared/path-params-parser.js

@@ -42,7 +42,7 @@ const formatPatternDiffWithPath = (patternSegments, pathSegments) => {
 exports.formatPatternDiffWithPath = formatPatternDiffWithPath;
 const parsePathParamsPattern = (url, pathParamsPattern) => {
     if (!pathParamsPattern) {
-        return [];
+        return { result: [] };
     }
     if (pathParamsPattern.charAt(0) === '/') {
         pathParamsPattern = pathParamsPattern.slice(1);
@@ -56,16 +56,20 @@ const parsePathParamsPattern = (url, pathParamsPattern) => {
     const maybeDiff = (0, exports.formatPatternDiffWithPath)(patternSegments, pathSegments);
     if (maybeDiff) {
         return {
-            error: `Path parameters do not align with the URL path: /${maybeDiff}`,
+            error: {
+                message: `Path parameters do not align with the URL path: /${maybeDiff}`,
+            },
         };
     }
     const invalidParameterSegments = patternSegments.filter(segment => !pathSegmentRegex.test(segment) && !pathParamRegex.test(segment));
     if (invalidParameterSegments.length > 0) {
         return {
-            error: `The path parameter name '${invalidParameterSegments[0]}' is not` +
-                ` allowed. Path parameter names should be valid GraphQL identifiers` +
-                ` prefixed with $ (dollar sign). $ in literal path segments must be` +
-                ` escaped as $$.`,
+            error: {
+                message: `The path parameter name '${invalidParameterSegments[0]}' is not` +
+                    ` allowed. Path parameter names should be valid GraphQL identifiers` +
+                    ` prefixed with $ (dollar sign). $ in literal path segments must be` +
+                    ` escaped as $$.`,
+            },
         };
     }
     const retval = patternSegments
@@ -78,7 +82,7 @@ const parsePathParamsPattern = (url, pathParamsPattern) => {
         index,
         name: name.slice(1),
     }));
-    return retval;
+    return { result: retval };
 };
 exports.parsePathParamsPattern = parsePathParamsPattern;
 //# sourceMappingURL=path-params-parser.js.map

package/lib/shared/path-params-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"path-params-parser.js","sourceRoot":"","sources":["../../src/shared/path-params-parser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"path-params-parser.js","sourceRoot":"","sources":["../../src/shared/path-params-parser.ts"],"names":[],"mappings":"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"}

package/lib/shared/request-variables-parser.d.ts

@@ -1,13 +1,6 @@
 import type { OperationDefinitionNode } from 'graphql';
-export declare const parseVariableValue: (value: string, typename: string) => {
-    value: any;
-    error?: undefined;
-} | {
-    error: {
-        message: string;
-    };
-    value?: undefined;
-};
+import type { ErrorOr } from './types';
+export declare const parseVariableValue: (value: string, typename: string) => ErrorOr<number | boolean | string | any>;
 export declare const parseRequestVariables: (variableFlags: string[], operation: OperationDefinitionNode, varFile?: Record<string, any>) => {
     variables: Record<string, any>;
     errors: string[];

package/lib/shared/request-variables-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-variables-parser.d.ts","sourceRoot":"","sources":["../../src/shared/request-variables-parser.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,uBAAuB,EAAW,MAAM,SAAS,CAAA;AAK9D,eAAO,MAAM,kBAAkB,UAAW,MAAM,YAAY,MAAM;;;;;;;;CA+CjE,CAAA;AAED,eAAO,MAAM,qBAAqB,kBACjB,MAAM,EAAE,aACZ,uBAAuB,YACzB,OAAO,MAAM,EAAE,GAAG,CAAC;;;CA2E7B,CAAA"}
+{"version":3,"file":"request-variables-parser.d.ts","sourceRoot":"","sources":["../../src/shared/request-variables-parser.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,uBAAuB,EAAW,MAAM,SAAS,CAAA;AAC9D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAA;AAKpC,eAAO,MAAM,kBAAkB,UACtB,MAAM,YACH,MAAM,KACf,QAAQ,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,GAAG,CA+CzC,CAAA;AAED,eAAO,MAAM,qBAAqB,kBACjB,MAAM,EAAE,aACZ,uBAAuB,YACzB,OAAO,MAAM,EAAE,GAAG,CAAC;eACf,OAAO,MAAM,EAAE,GAAG,CAAC;YAAU,MAAM,EAAE;CA0EnD,CAAA"}

package/lib/shared/request-variables-parser.js

@@ -10,23 +10,23 @@ const parseVariableValue = (value, typename) => {
         case 'Int': {
             const parsed = parseInt(value, 10);
             if (!Number.isNaN(parsed)) {
-                return { value: parsed };
+                return { result: parsed };
             }
             break;
         }
         case 'Float': {
             const parsed = parseFloat(value);
             if (!Number.isNaN(parsed) && Number.isFinite(parsed)) {
-                return { value: parsed };
+                return { result: parsed };
             }
             break;
         }
         case 'Boolean':
             if (value === 'true') {
-                return { value: true };
+                return { result: true };
             }
             if (value === 'false') {
-                return { value: false };
+                return { result: false };
             }
             break;
         case 'String':
@@ -34,12 +34,12 @@ const parseVariableValue = (value, typename) => {
         case 'Date':
         case 'DateTime':
         case 'Secret':
-            return { value };
+            return { result: value };
         case 'JSON':
         default:
             try {
                 const parsed = JSON.parse(value);
-                return { value: parsed };
+                return { result: parsed };
             }
             catch (error) {
                 debug('stepzen:request')(`JSON parsing error while parsing the value ${value}: `, error);
@@ -92,7 +92,7 @@ const parseRequestVariables = (variableFlags, operation, varFile = {}) => {
         else {
             const unNonNullType = unNonNull(varDef.type);
             const isList = unNonNullType.kind === 'ListType';
-            const { value, error } = (0, exports.parseVariableValue)(rawValue, isList
+            const { result, error } = (0, exports.parseVariableValue)(rawValue, isList
                 ? 'JSON' // parse any list as a JSON value
                 : unNonNullType.name.value);
             // errors for invalid values
@@ -101,7 +101,7 @@ const parseRequestVariables = (variableFlags, operation, varFile = {}) => {
                     error.message);
                 continue;
             }
-            variables[name] = value;
+            variables[name] = result;
         }
     }
     // errors for extra vars

package/lib/shared/request-variables-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-variables-parser.js","sourceRoot":"","sources":["../../src/shared/request-variables-parser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request-variables-parser.js","sourceRoot":"","sources":["../../src/shared/request-variables-parser.ts"],"names":[],"mappings":"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"}

package/lib/shared/types.d.ts

@@ -8,6 +8,39 @@ export declare type Expand<T> = T extends infer O ? {
 export declare type Defined<T> = {
     [P in keyof T]-?: NonNullable<T[P]>;
 };
+/**
+ * A utility type for cases when you prefer to explicitly return an error
+ * value from a function rather than throwing an exception.
+ *
+ * The optional `error?: never` property is a trick to make the TS compiler
+ * accept both `{ result: ... }` and `{ error: ... }` as valid return values.
+ *
+ * The default error type is `{message: string}` rather than a plain `string`
+ * to allow the TS compiler to infer the `result` type from `if (error)`
+ * checks. When `error` is an object it may be falsy only when undefined (which
+ * implies `result` is defined). When `error` is a string, it may be falsy
+ * even if it has a value (if it's an empty string). This means a simple
+ * `if (!error)` condition is not sufficient to assume `result` is defined.
+ *
+ * Intended usage (on the caller side):
+ * ```
+ * const {result, error} = foo()
+ * if (error) {
+ *   // error is defined here
+ * } else {
+ *   // result is defined here
+ * }
+ * ```
+ */
+export declare type ErrorOr<T, E = {
+    message: string;
+}> = {
+    result: T;
+    error?: never;
+} | {
+    error: E;
+    result?: never;
+};
 export interface ServiceInstanceV1 {
     zenctl?: string;
     introspection?: string;
@@ -48,10 +81,4 @@ export interface Workspace {
     directory: string;
     schema: string;
 }
-/**
- * Represents an error during parsing of a string.
- */
-export interface ParseError {
-    error: string;
-}
 //# sourceMappingURL=types.d.ts.map

package/lib/shared/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/shared/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAC,MAAM,mCAAmC,CAAA;AACvD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAA;AAE/D,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,cAAc,GACf,MAAM,yBAAyB,CAAA;AAGhC,oBAAY,MAAM,CAAC,OAAO,IAAI,OAAO,SAAS,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,GAC5E,CAAC,GACD,KAAK,CAAA;AAGT,oBAAY,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,GAAG;KAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAC,GAAG,KAAK,CAAA;AAG1E,oBAAY,OAAO,CAAC,CAAC,IAAI;KACtB,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACpC,CAAA;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,oBAAY,eAAe,GAAG,iBAAiB,GAAG,iBAAiB,CAAA;AAEnE,oBAAY,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAA;IACZ,eAAe,CAAC,EAAE,eAAe,CAAA;CAClC,CAAA;AAED,oBAAY,4BAA4B,GAAG,6BAA6B,GACtE,kBAAkB,CAAA;AAEpB;;;;;;GAMG;AACH,oBAAY,oBAAoB,GAC5B,4BAA4B,GAC5B,6BAA6B,CAAA;AAEjC;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAA;CACd"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/shared/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAC,MAAM,mCAAmC,CAAA;AACvD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAA;AAE/D,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,cAAc,GACf,MAAM,yBAAyB,CAAA;AAGhC,oBAAY,MAAM,CAAC,OAAO,IAAI,OAAO,SAAS,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,GAC5E,CAAC,GACD,KAAK,CAAA;AAGT,oBAAY,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,GAAG;KAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAC,GAAG,KAAK,CAAA;AAG1E,oBAAY,OAAO,CAAC,CAAC,IAAI;KACtB,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACpC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,oBAAY,OAAO,CAAC,CAAC,EAAE,CAAC,GAAG;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,IACxC;IAAC,MAAM,EAAE,CAAC,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAC,GAC1B;IAAC,KAAK,EAAE,CAAC,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,CAAA;CAAC,CAAA;AAE9B,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,oBAAY,eAAe,GAAG,iBAAiB,GAAG,iBAAiB,CAAA;AAEnE,oBAAY,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAA;IACZ,eAAe,CAAC,EAAE,eAAe,CAAA;CAClC,CAAA;AAED,oBAAY,4BAA4B,GAAG,6BAA6B,GACtE,kBAAkB,CAAA;AAEpB;;;;;;GAMG;AACH,oBAAY,oBAAoB,GAC5B,4BAA4B,GAC5B,6BAA6B,CAAA;AAEjC;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;CACf"}

package/lib/shared/utils.d.ts

@@ -1,4 +1,4 @@
-import { LoggedInMachineConfiguration, MachineConfiguration } from './types';
+import type { ErrorOr, LoggedInMachineConfiguration, MachineConfiguration } from './types';
 export declare const getDirectory: (d?: string | undefined) => string;
 /**
  * Replace the path prefix with `~` if it is inside the user's home directory.
@@ -37,18 +37,10 @@ export declare const parseHost: (host?: string) => {
     port?: string | undefined;
     isValid: boolean;
 };
-export declare const parseSnowflakeAccountId: (accountId?: string) => {
-    error: {
-        message: string;
-    };
-    result?: never;
-} | {
-    error?: never;
-    result: {
-        organization: string;
-        account: string;
-    };
-};
+export declare const parseSnowflakeAccountId: (accountId?: string) => ErrorOr<{
+    organization: string;
+    account: string;
+}>;
 export declare function maskPasswordInDsn(dsn: string): string;
 export declare function isLocalhost(hostname: string): boolean;
 export declare function rewriteLocalhostToHostGateway(config: MachineConfiguration, hostname: string): string;

package/lib/shared/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":"AAYA,OAAO,EAAC,4BAA4B,EAAE,oBAAoB,EAAC,MAAM,SAAS,CAAA;AAS1E,eAAO,MAAM,YAAY,OAAO,MAAM,GAAG,SAAS,KAAmB,MAkBpE,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,YAAY,YAAa,MAAM,KAAG,MAM9C,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,YACnB,MAAM,aACJ,MAAM,KAChB,MAMF,CAAA;AAED,eAAO,MAAM,oBAAoB,mBACf,oBAAoB,KACnC,QAAQ,MAAM,CAuBhB,CAAA;AAED,eAAO,MAAM,gBAAgB,aAAc,MAAM,KAAG,MAAM,GAAG,IAc5D,CAAA;AAED,eAAO,MAAM,cAAc,QAAS,MAAM,WASzC,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,MAAM,YAO1C,CAAA;AAED,oBAAY,qBAAqB,GAC7B;IAAC,IAAI,EAAE,KAAK,CAAA;CAAC,GACb;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,GAC7B;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAA;AAElB,eAAO,MAAM,kBAAkB;mBAOd,4BAA4B;cACjC,MAAM;;YAiFjB,CAAA;AAED,eAAO,MAAM,SAAS,UACb,MAAM;;;aAC4B,OAAO;CA6BjD,CAAA;AAED,eAAO,MAAM,uBAAuB,eACtB,MAAM,KAEhB;IAAC,KAAK,EAAE;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,CAAA;CAAC,GAC1C;IAAC,KAAK,CAAC,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAA;CA0BlE,CAAA;AAID,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,UAc5C;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,WAE3C;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,oBAAoB,EAC5B,QAAQ,EAAE,MAAM,GACf,MAAM,CAmBR;AAED,wBAAgB,kCAAkC,CAChD,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,MAAM,GACV,MAAM,CAUR;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAE3D;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,SAAS,CAAC,GAAG;IAAC,MAAM,EAAE,MAAM,IAAI,CAAA;CAAC,CAO3C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EACV,OAAO,EACP,4BAA4B,EAC5B,oBAAoB,EACrB,MAAM,SAAS,CAAA;AAIhB,eAAO,MAAM,YAAY,OAAO,MAAM,GAAG,SAAS,KAAmB,MAkBpE,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,YAAY,YAAa,MAAM,KAAG,MAM9C,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,YACnB,MAAM,aACJ,MAAM,KAChB,MAMF,CAAA;AAED,eAAO,MAAM,oBAAoB,mBACf,oBAAoB,KACnC,QAAQ,MAAM,CAuBhB,CAAA;AAED,eAAO,MAAM,gBAAgB,aAAc,MAAM,KAAG,MAAM,GAAG,IAc5D,CAAA;AAED,eAAO,MAAM,cAAc,QAAS,MAAM,WASzC,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,MAAM,YAO1C,CAAA;AAED,oBAAY,qBAAqB,GAC7B;IAAC,IAAI,EAAE,KAAK,CAAA;CAAC,GACb;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,GAC7B;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAA;AAElB,eAAO,MAAM,kBAAkB;mBAOd,4BAA4B;cACjC,MAAM;;YAiFjB,CAAA;AAED,eAAO,MAAM,SAAS,UACb,MAAM;;;aAC4B,OAAO;CA6BjD,CAAA;AAED,eAAO,MAAM,uBAAuB,eACtB,MAAM,KACjB,QAAQ;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CA0BjD,CAAA;AAID,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,UAc5C;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,WAE3C;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,oBAAoB,EAC5B,QAAQ,EAAE,MAAM,GACf,MAAM,CAmBR;AAED,wBAAgB,kCAAkC,CAChD,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,MAAM,GACV,MAAM,CAUR;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAE3D;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,SAAS,CAAC,GAAG;IAAC,MAAM,EAAE,MAAM,IAAI,CAAA;CAAC,CAO3C"}