stepzen 0.29.0 → 0.30.0-beta.0

package/lib/shared/constants.js.map

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

package/lib/shared/curl-parser.d.ts

@@ -1,5 +1,5 @@
-import { Header } from './header';
-import { ParseError } from './types';
+import type { Header } from './header';
+import type { ErrorOr } from './types';
 export interface CurlArguments {
     url: string;
     method: 'Get' | 'Post';
@@ -21,5 +21,5 @@ export interface CurlArguments {
  *    ]`
  * @returns {*} a structured object with the curl arguments
  */
-export declare const parseCurlArgv: (argv: readonly string[]) => CurlArguments | ParseError;
+export declare const parseCurlArgv: (argv: readonly string[]) => ErrorOr<CurlArguments>;
 //# sourceMappingURL=curl-parser.d.ts.map

package/lib/shared/curl-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"curl-parser.d.ts","sourceRoot":"","sources":["../../src/shared/curl-parser.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,MAAM,EAAc,MAAM,UAAU,CAAA;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAA;AAElC,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,KAAK,GAAG,MAAM,CAAA;IACtB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAkJD;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,aAAa,SAClB,SAAS,MAAM,EAAE,KACtB,aAAa,GAAG,UAoFlB,CAAA"}
+{"version":3,"file":"curl-parser.d.ts","sourceRoot":"","sources":["../../src/shared/curl-parser.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,UAAU,CAAA;AACpC,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAA;AAEpC,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,KAAK,GAAG,MAAM,CAAA;IACtB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AA6JD;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,aAAa,SAClB,SAAS,MAAM,EAAE,KACtB,QAAQ,aAAa,CA4FvB,CAAA"}

package/lib/shared/curl-parser.js

@@ -10,16 +10,16 @@ const httpURLRegex = /^https?:\/\//i;
 const isAFlagArg = (arg) => curlFlagRegex.test(arg);
 const isAURL = (arg) => httpURLRegex.test(arg);
 const parseHeaderFlag = (value, partialCurlArgs) => {
-    const headerOrError = (0, header_1.parseHeader)(value);
-    if (headerOrError && 'error' in headerOrError) {
-        return headerOrError; // error
+    const { result: header, error } = (0, header_1.parseHeader)(value);
+    if (error) {
+        return { error };
     }
     const headers = partialCurlArgs.headers || [];
     // A `null` from parseCurlHeaderString() means a header should NOT be
     // sent. This is not supported by zenserv / the introspection service
     // so the CLI simply omits such headers
-    if (headerOrError) {
-        headers.push(headerOrError); // header
+    if (header) {
+        headers.push(header);
     }
     return {
         result: {
@@ -31,9 +31,11 @@ const parseHeaderFlag = (value, partialCurlArgs) => {
 const parseDataFlag = (value, partialCurlArgs, match) => {
     if (match !== '--data-raw' && value.charAt(0) === '@') {
         return {
-            error: `Reading request data from local files in not currently supported ` +
-                `by StepZen CLI (${match} ${value}). If this is a blocker ` +
-                `for you, please let us know on Discord (${constants_1.STEPZEN_DISCORD_URL})`,
+            error: {
+                message: `Reading request data from local files in not currently supported ` +
+                    `by StepZen CLI (${match} ${value}). If this is a blocker ` +
+                    `for you, please let us know on Discord (${constants_1.STEPZEN_DISCORD_URL})`,
+            },
         };
     }
     const data = (partialCurlArgs.data ? partialCurlArgs.data + '&' : '') + value;
@@ -48,7 +50,7 @@ const parseMethodFlag = (value, partialCurlArgs) => {
     const lowercaseMethod = value.toLowerCase();
     if (lowercaseMethod !== 'post' && lowercaseMethod !== 'get') {
         return {
-            error: `The method ${value} is currently not supported.`,
+            error: { message: `The method ${value} is currently not supported.` },
         };
     }
     const method = lowercaseMethod === 'post' ? 'Post' : 'Get';
@@ -62,8 +64,10 @@ const parseMethodFlag = (value, partialCurlArgs) => {
 const parseURLFlag = (value, partialCurlArgs) => {
     if (partialCurlArgs.url) {
         return {
-            error: `Multiple URLs are not currently supported by StepZen CLI (${value}).` +
-                ` If this is a blocker for you, please let us know on Discord (${constants_1.STEPZEN_DISCORD_URL})`,
+            error: {
+                message: `Multiple URLs are not currently supported by StepZen CLI (${value}).` +
+                    ` If this is a blocker for you, please let us know on Discord (${constants_1.STEPZEN_DISCORD_URL})`,
+            },
         };
     }
     return {
@@ -96,23 +100,28 @@ const tryMatchCurlFlag = (matches, argv, i) => {
         const isShortFlag = match.length === 2;
         if (isShortFlag && argv[i].startsWith(match) && argv[i].length > 2) {
             return {
-                value: argv[i].substring(2),
-                match,
+                result: {
+                    value: argv[i].substring(2),
+                    match,
+                },
             };
         }
         if (argv[i] === match) {
             if (i + 1 >= argv.length) {
                 return {
-                    error: `The '${argv[i]}' curl flag requires a value`,
+                    error: { message: `The '${argv[i]}' curl flag requires a value` },
                 };
             }
             return {
-                value: argv[i + 1],
-                match,
-                skip: 1,
+                result: {
+                    value: argv[i + 1],
+                    match,
+                    skip: 1,
+                },
             };
         }
     }
+    return { result: undefined };
 };
 /**
  * Parse a curl command line arguments array to a JSON structure consumable by
@@ -138,50 +147,54 @@ const parseCurlArgv = (argv) => {
         if (isAFlagArg(argv[i])) {
             let isKnownFlag = false;
             for (const flag of flags) {
-                const matcherResult = tryMatchCurlFlag(flag.matches, argv, i);
-                if (!matcherResult) {
+                const { result: match, error: matchError } = tryMatchCurlFlag(flag.matches, argv, i);
+                if (matchError) {
+                    // flag matched but it requires a value which is missing
+                    return { error: matchError };
+                }
+                if (!match) {
                     // no match => try matching the next flag
                     continue;
                 }
-                if ('error' in matcherResult) {
-                    // flag matched but it requires a value which is missing
-                    return matcherResult;
-                }
-                const parserResult = flag.parse(matcherResult.value, result, matcherResult.match);
-                if ('error' in parserResult) {
-                    return parserResult;
+                const { result: parseResult, error: parseError } = flag.parse(match.value, result, match.match);
+                if (parseError) {
+                    return { error: parseError };
                 }
-                result = parserResult.result;
-                i += matcherResult.skip || 0;
+                result = parseResult;
+                i += match.skip || 0;
                 isKnownFlag = true;
                 break;
             }
             if (!isKnownFlag) {
                 return {
-                    error: `The '${argv[i]}' curl flag is not currently supported by StepZen CLI.` +
-                        ` If this is a blocker for you, please let us know on Discord (${constants_1.STEPZEN_DISCORD_URL})`,
+                    error: {
+                        message: `The '${argv[i]}' curl flag is not currently supported by StepZen CLI.` +
+                            ` If this is a blocker for you, please let us know on Discord (${constants_1.STEPZEN_DISCORD_URL})`,
+                    },
                 };
             }
         }
         else {
             // The only curl argument that's not a flag is the URL
-            const resultOrError = parseURLFlag(argv[i], result, '');
-            if ('error' in resultOrError) {
-                return resultOrError;
+            const parseResult = parseURLFlag(argv[i], result, '');
+            if (parseResult.error) {
+                return parseResult;
             }
-            result = resultOrError.result;
+            result = parseResult.result;
         }
     }
     if (!result.url) {
         return {
-            error: 'curl: a URL is required',
+            error: { message: 'curl: a URL is required' },
         };
     }
     if (!isAURL(result.url)) {
         return {
-            error: `Unsupported URL schema in '${result.url}'.` +
-                ` StepZen CLI currently supports 'https' and 'http'.` +
-                ` If this is a blocker for you, please let us know on Discord (${constants_1.STEPZEN_DISCORD_URL})`,
+            error: {
+                message: `Unsupported URL schema in '${result.url}'.` +
+                    ` StepZen CLI currently supports 'https' and 'http'.` +
+                    ` If this is a blocker for you, please let us know on Discord (${constants_1.STEPZEN_DISCORD_URL})`,
+            },
         };
     }
     result.headers = result.headers || [];
@@ -195,7 +208,7 @@ const parseCurlArgv = (argv) => {
             value: 'application/x-www-form-urlencoded',
         });
     }
-    return result;
+    return { result: result };
 };
 exports.parseCurlArgv = parseCurlArgv;
 //# sourceMappingURL=curl-parser.js.map

package/lib/shared/curl-parser.js.map

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

package/lib/shared/docker.d.ts

@@ -1,4 +1,5 @@
 import * as shell from 'shelljs';
+import type { ErrorOr } from './types';
 /**
  * Execute a command in a new shell process (sync) and return the result
  * object. Log both the command and the result into the `stepzen:docker` log.
@@ -13,54 +14,25 @@ export declare const exec: (command: string) => shell.ShellString;
  * @param {*} nameOrId name or ID of a Docker image
  * @returns {*} digest or error
  */
-export declare const getLocalDockerImageDigest: (nameOrId: string) => {
-    error: {
-        message: string;
-    };
-    digest: undefined;
-} | {
-    error: undefined;
-    digest: string;
-};
-export declare const getGarManifestUrl: (nameAndTag: string) => {
-    error: {
-        message: string;
-    };
-    url: undefined;
-} | {
-    error: undefined;
-    url: string;
-};
+export declare const getLocalDockerImageDigest: (nameOrId: string) => ErrorOr<string>;
+export declare const getGarManifestUrl: (nameAndTag: string) => ErrorOr<string>;
 /**
  * Fetch the most up-to-date image digest from a GCR by image name and tag
  *
  * @param {*} nameAndTag name or ID of a Docker image
  * @returns {*} digest or error
  */
-export declare const getGarDockerImageDigest: (nameAndTag: string) => Promise<{
-    error: {
-        message: string;
-    };
-    digest: undefined;
-} | {
-    error: undefined;
-    digest: string;
-}>;
+export declare const getGarDockerImageDigest: (nameAndTag: string) => Promise<ErrorOr<string>>;
 /**
  * Get the Docker image digests for the local and the latest remote
  * StepZen docker images.
  *
  * @returns {*} local and latest Docker image digests, or an error
  */
-export declare const getDockerImageVersions: () => Promise<{
-    error: {
-        message: string;
-    };
-    local: undefined;
-    latest: undefined;
-} | {
-    error: undefined;
+export declare const getDockerImageVersions: () => Promise<ErrorOr<{
     local: string;
     latest: string;
-}>;
+}, {
+    message: string;
+}>>;
 //# sourceMappingURL=docker.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../../src/shared/docker.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAMhC;;;;;;GAMG;AACH,eACA,MAAM,IAAI,YAAa,MAAM,sBAY5B,CAAA;AAED;;;;;GAKG;AACH,eACA,MAAM,yBAAyB,aAAc,MAAM;;;;;;;;CA0BlD,CAAA;AAED,eACA,MAAM,iBAAiB,eAAgB,MAAM;;;;;;;;CAmC5C,CAAA;AAED;;;;;GAKG;AACH,eACA,MAAM,uBAAuB,eAAsB,MAAM;;;;;;;;EAkDxD,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;EA8ClC,CAAA"}
+{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../../src/shared/docker.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAKhC,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAA;AAEpC;;;;;;GAMG;AACH,eACA,MAAM,IAAI,YAAa,MAAM,sBAY5B,CAAA;AAED;;;;;GAKG;AACH,eACA,MAAM,yBAAyB,aAAc,MAAM,KAAG,QAAQ,MAAM,CAuBnE,CAAA;AAED,eACA,MAAM,iBAAiB,eAAgB,MAAM,KAAG,QAAQ,MAAM,CAiC7D,CAAA;AAED;;;;;GAKG;AACH,eACA,MAAM,uBAAuB,eACf,MAAM,KACjB,QAAQ,QAAQ,MAAM,CAAC,CAuDzB,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB;WACjB,MAAM;YAAU,MAAM;;;GA6CvC,CAAA"}

package/lib/shared/docker.js

@@ -33,25 +33,23 @@ exports.exec = exec;
  * @returns {*} digest or error
  */
 const getLocalDockerImageDigest = (nameOrId) => {
-    const error = (message) => ({ error: { message }, digest: undefined });
-    const digest = (digest) => ({ error: undefined, digest });
     const command = `docker image inspect -f "{{index .RepoDigests 0}}" ${nameOrId}`;
     const result = (0, exports.exec)(command);
     if (result.code !== 0) {
-        return error(`Could not inspect the docker image ${nameOrId}`);
+        return { error: { message: `Could not inspect the docker image ${nameOrId}` } };
     }
     const maybeDigest = result.stdout.trim();
     if (!maybeDigest) {
         (0, debug_1.default)('stepzen:docker')(`The image ${nameOrId} has no digest`);
-        return error(`Could not inspect the docker image ${nameOrId}`);
+        return { error: { message: `Could not inspect the docker image ${nameOrId}` } };
     }
     const match = maybeDigest.match(/sha256:[0-9a-f]+$/i);
     if (!match) {
         (0, debug_1.default)('stepzen:docker')(`Unexpected image digest format: ${maybeDigest}.` +
             ` Expected /sha256:[0-9a-f]+$/i`);
-        return error(`Could not inspect the docker image ${nameOrId}`);
+        return { error: { message: `Could not inspect the docker image ${nameOrId}` } };
     }
-    return digest(match[0]);
+    return { result: match[0] };
 };
 exports.getLocalDockerImageDigest = getLocalDockerImageDigest;
 const getGarManifestUrl = (nameAndTag) => {
@@ -73,14 +71,12 @@ const getGarManifestUrl = (nameAndTag) => {
                     ` [subdomain.]gcr.io/[project]/[image]:[tag]` +
                     ` or [subdomain]-docker.pkg.dev/[project]/[repository]/[image]:[tag]`,
             },
-            url: undefined,
         };
     }
     const { domain, project, repository, image, tag } = match.groups;
     const path = repository ? repository + '/' : '';
     return {
-        error: undefined,
-        url: `https://${domain}/v2/${project}/${path}${image}/manifests/${tag}`,
+        result: `https://${domain}/v2/${project}/${path}${image}/manifests/${tag}`,
     };
 };
 exports.getGarManifestUrl = getGarManifestUrl;
@@ -91,17 +87,19 @@ exports.getGarManifestUrl = getGarManifestUrl;
  * @returns {*} digest or error
  */
 const getGarDockerImageDigest = async (nameAndTag) => {
-    const error = (message) => ({ error: { message }, digest: undefined });
-    const digest = (digest) => ({ error: undefined, digest });
-    const url = (0, exports.getGarManifestUrl)(nameAndTag);
-    if (url.error) {
-        (0, debug_1.default)('stepzen:docker')(`Failed to get a GCR API URL for the '${nameAndTag}' image. ${url.error}`);
-        return error(`Could not get the image digest for ${nameAndTag} because this version` +
-            ` of StepZen CLI only supports Docker images hosted in GCR.`);
+    const { result: url, error } = (0, exports.getGarManifestUrl)(nameAndTag);
+    if (error) {
+        (0, debug_1.default)('stepzen:docker')(`Failed to get a GCR API URL for the '${nameAndTag}' image. ${error}`);
+        return {
+            error: {
+                message: `Could not get the image digest for ${nameAndTag} because this version` +
+                    ` of StepZen CLI only supports Docker images hosted in GCR.`,
+            },
+        };
     }
     try {
-        (0, debug_1.default)('stepzen:docker')(`GCR API URL for the '${nameAndTag}' image: '${url.url}'`);
-        const response = await (0, fetch_1.default)(url.url, {
+        (0, debug_1.default)('stepzen:docker')(`GCR API URL for the '${nameAndTag}' image: '${url}'`);
+        const response = await (0, fetch_1.default)(url, {
             headers: {
                 Accept: 'application/vnd.docker.distribution.manifest.list.v2+json',
             },
@@ -115,13 +113,21 @@ const getGarDockerImageDigest = async (nameAndTag) => {
         const maybeDigest = response.headers.get('docker-content-digest');
         if (!maybeDigest) {
             (0, debug_1.default)('stepzen:docker')(`failed to find the 'docker-content-digest' header in the response`);
-            return error(`Could not get the image digest for ${nameAndTag} from the remote registry.`);
+            return {
+                error: {
+                    message: `Could not get the image digest for ${nameAndTag} from the remote registry.`,
+                },
+            };
         }
-        return digest(maybeDigest);
+        return { result: maybeDigest };
     }
     catch (error2) {
         (0, debug_1.default)('stepzen:docker')(`Failed to fetch the image manifest from GCR. ${error2}`);
-        return error(`Could not get the image digest for ${nameAndTag} from the remote registry.`);
+        return {
+            error: {
+                message: `Could not get the image digest for ${nameAndTag} from the remote registry.`,
+            },
+        };
     }
 };
 exports.getGarDockerImageDigest = getGarDockerImageDigest;
@@ -132,41 +138,37 @@ exports.getGarDockerImageDigest = getGarDockerImageDigest;
  * @returns {*} local and latest Docker image digests, or an error
  */
 const getDockerImageVersions = async () => {
-    const error = (message) => ({
-        error: { message },
-        local: undefined,
-        latest: undefined,
-    });
-    const versions = (local, latest) => ({
-        error: undefined,
-        local,
-        latest,
-    });
     const dockerCliPath = shell.which('docker');
     if (!dockerCliPath) {
         (0, debug_1.default)('stepzen:docker')('Failed to find the docker CLI binary in PATH');
-        return error('Could not find Docker CLI');
+        return { error: { message: 'Could not find Docker CLI' } };
     }
     (0, debug_1.default)('stepzen:docker')(`found Docker CLI at ${dockerCliPath}`);
     const command = `docker container inspect -f "{{println .Image}}{{.Config.Image}}" ${constants_1.STEPZEN_CONTAINER_NAME}`;
     const result = (0, exports.exec)(command);
     if (result.code !== 0) {
         // container does not exist => nothing to do
-        return error('Could not find the local StepZen container');
+        return { error: { message: 'Could not find the local StepZen container' } };
     }
     const [localImageId, localImageName] = result.stdout.trim().split('\n');
-    const local = (0, exports.getLocalDockerImageDigest)(localImageId);
-    if (local.error) {
-        return error('Could not get the local StepZen container version');
+    const { result: local, error: localError } = (0, exports.getLocalDockerImageDigest)(localImageId);
+    if (localError) {
+        return {
+            error: { message: 'Could not get the local StepZen container version' },
+        };
     }
-    const latest = await (0, exports.getGarDockerImageDigest)(localImageName);
-    if (latest.error) {
-        return error('Could not get the latest StepZen container version from Google Artifact Registry');
+    const { result: latest, error: latestError } = await (0, exports.getGarDockerImageDigest)(localImageName);
+    if (latestError) {
+        return {
+            error: {
+                message: 'Could not get the latest StepZen container version from Google Artifact Registry',
+            },
+        };
     }
     (0, debug_1.default)('stepzen:docker')(`detected Docker image versions:` +
-        `\n\tlocal: ${local.digest}` +
-        `\n\tlatest: ${latest.digest}`);
-    return versions(local.digest, latest.digest);
+        `\n\tlocal: ${local}` +
+        `\n\tlatest: ${latest}`);
+    return { result: { local, latest } };
 };
 exports.getDockerImageVersions = getDockerImageVersions;
 //# sourceMappingURL=docker.js.map

package/lib/shared/docker.js.map

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

package/lib/shared/dsn-parser.d.ts

@@ -0,0 +1,3 @@
+import { parseDsn as orig } from '@soluble/dsn-parser';
+export declare const parseDsn: typeof orig;
+//# sourceMappingURL=dsn-parser.d.ts.map

package/lib/shared/dsn-parser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dsn-parser.d.ts","sourceRoot":"","sources":["../../src/shared/dsn-parser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,QAAQ,IAAI,IAAI,EAAC,MAAM,qBAAqB,CAAA;AAEpD,eAAO,MAAM,QAAQ,EAAE,OAAO,IAqB7B,CAAA"}

package/lib/shared/dsn-parser.js

@@ -0,0 +1,28 @@
+"use strict";
+// Copyright (c) 2020,2021,2022,2023, StepZen, Inc.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseDsn = void 0;
+const dsn_parser_1 = require("@soluble/dsn-parser");
+const parseDsn = (dsn, options) => {
+    try {
+        const url = new URL(dsn);
+        if (url.username && !url.password) {
+            // the DSN has a username but not the password
+            // issue: https://github.com/soluble-io/cache-interop/issues/800
+            url.password = 'DUMMY';
+            const result = (0, dsn_parser_1.parseDsn)(url.href, options);
+            if (result.success) {
+                result.value.pass = '';
+            }
+            return result;
+        }
+        // no issues to work-around => default implementation
+        return (0, dsn_parser_1.parseDsn)(dsn, options);
+    }
+    catch {
+        // the DSN string is not a valid URL => let the original impl handle that
+        return (0, dsn_parser_1.parseDsn)(dsn, options);
+    }
+};
+exports.parseDsn = parseDsn;
+//# sourceMappingURL=dsn-parser.js.map

package/lib/shared/dsn-parser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dsn-parser.js","sourceRoot":"","sources":["../../src/shared/dsn-parser.ts"],"names":[],"mappings":";AAAA,mDAAmD;;;AAEnD,oDAAoD;AAE7C,MAAM,QAAQ,GAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;IACpD,IAAI;QACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;QACxB,IAAI,GAAG,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;YACjC,8CAA8C;YAC9C,gEAAgE;YAChE,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAA;YAEtB,MAAM,MAAM,GAAG,IAAA,qBAAI,EAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;YACtC,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,EAAE,CAAA;aACvB;YACD,OAAO,MAAM,CAAA;SACd;QAED,qDAAqD;QACrD,OAAO,IAAA,qBAAI,EAAC,GAAG,EAAE,OAAO,CAAC,CAAA;KAC1B;IAAC,MAAM;QACN,yEAAyE;QACzE,OAAO,IAAA,qBAAI,EAAC,GAAG,EAAE,OAAO,CAAC,CAAA;KAC1B;AACH,CAAC,CAAA;AArBY,QAAA,QAAQ,YAqBpB"}

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

@@ -1,8 +1,10 @@
-import { Header, HeaderInput } from './header';
-import { ParseError } from './types';
-export declare const parseHeaderParam: (headers: readonly Header[], headerParam: string) => {
+import type { Header, HeaderInput } from './header';
+import type { ErrorOr } from './types';
+export declare const parseHeaderParam: (headers: readonly Header[], headerParam: string) => ErrorOr<{
     header: HeaderInput;
     remainingHeaders: Header[];
-} | ParseError;
-export declare const makeHeaders: (curlHeaders: readonly Header[], headerParams?: readonly string[]) => ParseError | HeaderInput[];
+}, {
+    message: string;
+}>;
+export declare const makeHeaders: (curlHeaders: readonly Header[], headerParams?: readonly string[]) => ErrorOr<HeaderInput[]>;
 //# sourceMappingURL=header-params-parser.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"header-params-parser.d.ts","sourceRoot":"","sources":["../../src/shared/header-params-parser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAc,MAAM,UAAU,CAAA;AACzD,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAA;AAKlC,eAAO,MAAM,gBAAgB,YAClB,SAAS,MAAM,EAAE,eACb,MAAM,KAEjB;IACE,MAAM,EAAE,WAAW,CAAA;IACnB,gBAAgB,EAAE,MAAM,EAAE,CAAA;CAC3B,GACD,UAgHH,CAAA;AAED,eAAO,MAAM,WAAW,gBACT,SAAS,MAAM,EAAE,iEAiB/B,CAAA"}
+{"version":3,"file":"header-params-parser.d.ts","sourceRoot":"","sources":["../../src/shared/header-params-parser.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,UAAU,CAAA;AACjD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAA;AAKpC,eAAO,MAAM,gBAAgB,YAClB,SAAS,MAAM,EAAE,eACb,MAAM;YAEX,WAAW;sBACD,MAAM,EAAE;;;EA6H3B,CAAA;AAED,eAAO,MAAM,WAAW,gBACT,SAAS,MAAM,EAAE,uCAE7B,QAAQ,WAAW,EAAE,CAevB,CAAA"}