@salesforce/core 3.7.1 → 3.7.5

package/lib/org/user.js

@@ -84,18 +84,18 @@ async function retrieveUserFields(logger, username) {
     const result = await connection.query(requiredFieldsFromAdminQuery);
     logger.debug('Successfully retrieved the admin user for this org.');
     if (result.totalSize === 1) {
-        const results = kit_1.mapKeys(result.records[0], (value, key) => kit_1.lowerFirst(key));
+        const results = (0, kit_1.mapKeys)(result.records[0], (value, key) => (0, kit_1.lowerFirst)(key));
         const fields = {
-            id: ts_types_1.ensure(ts_types_1.getString(results, exports.REQUIRED_FIELDS.id)),
+            id: (0, ts_types_1.ensure)((0, ts_types_1.getString)(results, exports.REQUIRED_FIELDS.id)),
             username,
-            alias: ts_types_1.ensure(ts_types_1.getString(results, exports.REQUIRED_FIELDS.alias)),
-            email: ts_types_1.ensure(ts_types_1.getString(results, exports.REQUIRED_FIELDS.email)),
-            emailEncodingKey: ts_types_1.ensure(ts_types_1.getString(results, exports.REQUIRED_FIELDS.emailEncodingKey)),
-            languageLocaleKey: ts_types_1.ensure(ts_types_1.getString(results, exports.REQUIRED_FIELDS.languageLocaleKey)),
-            localeSidKey: ts_types_1.ensure(ts_types_1.getString(results, exports.REQUIRED_FIELDS.localeSidKey)),
-            profileId: ts_types_1.ensure(ts_types_1.getString(results, exports.REQUIRED_FIELDS.profileId)),
-            lastName: ts_types_1.ensure(ts_types_1.getString(results, exports.REQUIRED_FIELDS.lastName)),
-            timeZoneSidKey: ts_types_1.ensure(ts_types_1.getString(results, exports.REQUIRED_FIELDS.timeZoneSidKey)),
+            alias: (0, ts_types_1.ensure)((0, ts_types_1.getString)(results, exports.REQUIRED_FIELDS.alias)),
+            email: (0, ts_types_1.ensure)((0, ts_types_1.getString)(results, exports.REQUIRED_FIELDS.email)),
+            emailEncodingKey: (0, ts_types_1.ensure)((0, ts_types_1.getString)(results, exports.REQUIRED_FIELDS.emailEncodingKey)),
+            languageLocaleKey: (0, ts_types_1.ensure)((0, ts_types_1.getString)(results, exports.REQUIRED_FIELDS.languageLocaleKey)),
+            localeSidKey: (0, ts_types_1.ensure)((0, ts_types_1.getString)(results, exports.REQUIRED_FIELDS.localeSidKey)),
+            profileId: (0, ts_types_1.ensure)((0, ts_types_1.getString)(results, exports.REQUIRED_FIELDS.profileId)),
+            lastName: (0, ts_types_1.ensure)((0, ts_types_1.getString)(results, exports.REQUIRED_FIELDS.lastName)),
+            timeZoneSidKey: (0, ts_types_1.ensure)((0, ts_types_1.getString)(results, exports.REQUIRED_FIELDS.timeZoneSidKey)),
         };
         return fields;
     }
@@ -231,7 +231,7 @@ class User extends kit_1.AsyncCreatable {
                     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                     // @ts-ignore TODO: expose `soap` on Connection however appropriate
                     const soap = userConnection.soap;
-                    await soap.setPassword(ts_types_1.ensureString(info.getFields().userId), buffer.toString('utf8'));
+                    await soap.setPassword((0, ts_types_1.ensureString)(info.getFields().userId), buffer.toString('utf8'));
                     this.logger.debug(`Set password for userId: ${info.getFields().userId}`);
                     resolve();
                 }
@@ -389,17 +389,17 @@ class User extends kit_1.AsyncCreatable {
             body,
         };
         const response = await this.rawRequest(conn, info);
-        const responseBody = kit_1.parseJsonMap(ts_types_1.ensureString(response['body']));
-        const statusCode = ts_types_1.asNumber(response.statusCode);
+        const responseBody = (0, kit_1.parseJsonMap)((0, ts_types_1.ensureString)(response['body']));
+        const statusCode = (0, ts_types_1.asNumber)(response.statusCode);
         this.logger.debug(`user create response.statusCode: ${response.statusCode}`);
         if (!(statusCode === 201 || statusCode === 200)) {
             let message = messages.getMessage('invalidHttpResponseCreatingUser', [statusCode]);
             if (responseBody) {
-                const errors = ts_types_1.asJsonArray(responseBody.Errors);
+                const errors = (0, ts_types_1.asJsonArray)(responseBody.Errors);
                 if (errors && errors.length > 0) {
                     message = `${message} causes:${os_1.EOL}`;
                     errors.forEach((singleMessage) => {
-                        if (!ts_types_1.isJsonMap(singleMessage))
+                        if (!(0, ts_types_1.isJsonMap)(singleMessage))
                             return;
                         message = `${message}${os_1.EOL}${singleMessage.description}`;
                     });
@@ -408,11 +408,11 @@ class User extends kit_1.AsyncCreatable {
             this.logger.debug(message);
             throw new sfdxError_1.SfdxError(message, 'UserCreateHttpError');
         }
-        fields.id = ts_types_1.ensureString(responseBody.id);
+        fields.id = (0, ts_types_1.ensureString)(responseBody.id);
         await this.updateRequiredUserFields(fields);
         const buffer = new secureBuffer_1.SecureBuffer();
-        const headers = ts_types_1.ensureJsonMap(response.headers);
-        const autoApproveUser = ts_types_1.ensureString(headers['auto-approve-user']);
+        const headers = (0, ts_types_1.ensureJsonMap)(response.headers);
+        const autoApproveUser = (0, ts_types_1.ensureString)(headers['auto-approve-user']);
         buffer.consume(Buffer.from(autoApproveUser));
         return {
             buffer,
@@ -433,13 +433,13 @@ class User extends kit_1.AsyncCreatable {
      * @param fields The fields for the user.
      */
     async updateRequiredUserFields(fields) {
-        const leftOverRequiredFields = kit_1.omit(fields, [
+        const leftOverRequiredFields = (0, kit_1.omit)(fields, [
             exports.REQUIRED_FIELDS.username,
             exports.REQUIRED_FIELDS.email,
             exports.REQUIRED_FIELDS.lastName,
             exports.REQUIRED_FIELDS.profileId,
         ]);
-        const object = kit_1.mapKeys(leftOverRequiredFields, (value, key) => kit_1.upperFirst(key));
+        const object = (0, kit_1.mapKeys)(leftOverRequiredFields, (value, key) => (0, kit_1.upperFirst)(key));
         await this.org.getConnection().sobject('User').update(object);
         this.logger.debug(`Successfully Updated additional properties for user: ${fields.username}`);
     }

package/lib/schema/printer.js

@@ -90,11 +90,11 @@ class SchemaPrinter {
                 add('');
             }
             Object.keys(this.schema.properties).forEach((key) => {
-                const properties = ts_types_1.asJsonMap(this.schema.properties);
+                const properties = (0, ts_types_1.asJsonMap)(this.schema.properties);
                 if (!properties) {
                     return;
                 }
-                this.parseProperty(key, ts_types_1.asJsonMap(properties[key]), startLevel);
+                this.parseProperty(key, (0, ts_types_1.asJsonMap)(properties[key]), startLevel);
                 add('');
             });
         }
@@ -144,15 +144,15 @@ class SchemaPrinter {
             add(`    ${property.renderArrayHeader()}`);
             if (property.items && property.items.type === 'object' && property.items.properties) {
                 Object.keys(property.items.properties).forEach((key) => {
-                    const items = ts_types_1.asJsonMap(property.items);
+                    const items = (0, ts_types_1.asJsonMap)(property.items);
                     if (!items) {
                         return;
                     }
-                    const properties = ts_types_1.asJsonMap(items.properties);
+                    const properties = (0, ts_types_1.asJsonMap)(items.properties);
                     if (!properties) {
                         return;
                     }
-                    this.parseProperty(key, ts_types_1.asJsonMap(properties[key]), level + 2);
+                    this.parseProperty(key, (0, ts_types_1.asJsonMap)(properties[key]), level + 2);
                 });
             }
         }
@@ -176,16 +176,16 @@ class SchemaProperty {
             // if they are defined here, they take precedence over referenced definition properties.
             this.rawProperty = Object.assign({}, resolveRef(this.schema, this.rawProperty), rawProperty);
         }
-        const oneOfs = ts_types_1.asJsonArray(this.rawProperty.oneOf);
+        const oneOfs = (0, ts_types_1.asJsonArray)(this.rawProperty.oneOf);
         if (oneOfs && !this.rawProperty.type) {
             this.rawProperty.type = oneOfs
                 .map((value) => {
-                return ts_types_1.isJsonMap(value) ? value.type || value.$ref : value;
+                return (0, ts_types_1.isJsonMap)(value) ? value.type || value.$ref : value;
             })
                 .join('|');
         }
         // Handle items references
-        if (ts_types_1.isJsonMap(this.items) && this.items && this.items.$ref) {
+        if ((0, ts_types_1.isJsonMap)(this.items) && this.items && this.items.$ref) {
             Object.assign(this.items, resolveRef(this.schema, this.items));
         }
     }
@@ -213,32 +213,32 @@ class SchemaProperty {
         return `items(${prop.renderType()}${minItems}) - ${prop.renderTitle()}: ${prop.renderDescription()}`;
     }
     get title() {
-        return ts_types_1.asString(this.rawProperty.title);
+        return (0, ts_types_1.asString)(this.rawProperty.title);
     }
     get description() {
-        return ts_types_1.asString(this.rawProperty.description);
+        return (0, ts_types_1.asString)(this.rawProperty.description);
     }
     get type() {
-        return ts_types_1.asString(this.rawProperty.type);
+        return (0, ts_types_1.asString)(this.rawProperty.type);
     }
     get required() {
-        return ts_types_1.asJsonArray(this.rawProperty.required);
+        return (0, ts_types_1.asJsonArray)(this.rawProperty.required);
     }
     get properties() {
-        return ts_types_1.asJsonMap(this.rawProperty.properties);
+        return (0, ts_types_1.asJsonMap)(this.rawProperty.properties);
     }
     get items() {
-        return ts_types_1.asJsonMap(this.rawProperty.items);
+        return (0, ts_types_1.asJsonMap)(this.rawProperty.items);
     }
     get minItems() {
-        return ts_types_1.asNumber(this.rawProperty.minItems);
+        return (0, ts_types_1.asNumber)(this.rawProperty.minItems);
     }
     getProperty(key) {
         const properties = this.getProperties();
-        return ts_types_1.asJsonMap(properties && properties[key]);
+        return (0, ts_types_1.asJsonMap)(properties && properties[key]);
     }
     getProperties() {
-        return ts_types_1.asJsonMap(this.rawProperty.properties);
+        return (0, ts_types_1.asJsonMap)(this.rawProperty.properties);
     }
 }
 /**
@@ -254,7 +254,7 @@ function resolveRef(schema, property) {
     }
     return ref.split('/').reduce((prev, key) => {
         const next = prev[key];
-        return key === '#' ? schema : ts_types_1.isJsonMap(next) ? next : {};
+        return key === '#' ? schema : (0, ts_types_1.isJsonMap)(next) ? next : {};
     }, property);
 }
 //# sourceMappingURL=printer.js.map

package/lib/schema/validator.js

@@ -101,14 +101,14 @@ class SchemaValidator {
      */
     loadExternalSchemas(schema) {
         const externalSchemas = {};
-        const schemas = kit_1.getJsonValuesByName(schema, '$ref')
+        const schemas = (0, kit_1.getJsonValuesByName)(schema, '$ref')
             // eslint-disable-next-line no-useless-escape
             .map((ref) => ref && RegExp(/([\w\.]+)#/).exec(ref))
             .map((match) => match && match[1])
             .filter((uri) => !!uri)
             .map((uri) => this.loadExternalSchema(uri));
         schemas.forEach((externalSchema) => {
-            if (ts_types_1.isString(externalSchema.id)) {
+            if ((0, ts_types_1.isString)(externalSchema.id)) {
                 externalSchemas[externalSchema.id] = externalSchema;
             }
             else {
@@ -147,25 +147,25 @@ class SchemaValidator {
             const property = RegExp(/^([a-zA-Z0-9\.]+)\.([a-zA-Z0-9]+)$/).exec(error.path);
             const getPropValue = (prop) => {
                 const reducer = (obj, name) => {
-                    if (!ts_types_1.isJsonMap(obj))
+                    if (!(0, ts_types_1.isJsonMap)(obj))
                         return;
-                    if (ts_types_1.isJsonMap(obj.properties))
+                    if ((0, ts_types_1.isJsonMap)(obj.properties))
                         return obj.properties[name];
                     if (name === '0')
-                        return ts_types_1.asJsonArray(obj.items);
+                        return (0, ts_types_1.asJsonArray)(obj.items);
                     return obj[name] || obj[prop];
                 };
                 return error.path.split('.').reduce(reducer, schema);
             };
             const getEnumValues = () => {
-                const enumSchema = ts_types_1.asJsonMap(getPropValue('enum'));
-                return (enumSchema && ts_types_1.getJsonArray(enumSchema, 'enum', []).join(', ')) || '';
+                const enumSchema = (0, ts_types_1.asJsonMap)(getPropValue('enum'));
+                return (enumSchema && (0, ts_types_1.getJsonArray)(enumSchema, 'enum', []).join(', ')) || '';
             };
             switch (error.keyword) {
                 case 'additionalProperties':
                     // Missing Typing
                     // eslint-disable-next-line no-case-declarations
-                    const additionalProperties = ts_types_1.get(error, 'additionalProperties');
+                    const additionalProperties = (0, ts_types_1.get)(error, 'additionalProperties');
                     return `${error.path} should NOT have additional properties '${additionalProperties}'`;
                 case 'required':
                     if (property) {

package/lib/sfdxError.d.ts

@@ -50,7 +50,7 @@ export declare class SfdxError extends NamedError {
      * @param err The error to convert.
      */
     static wrap(err: Error | string): SfdxError;
-    get code(): string;
+    get code(): string | undefined | any;
     set code(code: string);
     /**
      * Sets the context of the error. For convenience `this` object is returned.

package/lib/sfdxError.js

@@ -52,7 +52,7 @@ class SfdxError extends kit_1.NamedError {
      * @param err The error to convert.
      */
     static wrap(err) {
-        if (ts_types_1.isString(err)) {
+        if ((0, ts_types_1.isString)(err)) {
             return new SfdxError(err);
         }
         if (err instanceof SfdxError) {
@@ -60,11 +60,12 @@ class SfdxError extends kit_1.NamedError {
         }
         const sfdxError = new SfdxError(err.message, err.name, undefined, err);
         // If the original error has a code, use that instead of name.
-        if (ts_types_1.hasString(err, 'code')) {
+        if ((0, ts_types_1.hasString)(err, 'code')) {
             sfdxError.code = err.code;
         }
         return sfdxError;
     }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     get code() {
         return this._code || this.name;
     }

package/lib/sfdxProject.js

@@ -110,12 +110,13 @@ class SfdxProjectJson extends configFile_1.ConfigFile {
                 await validator.validate(this.getContents());
             }
             catch (err) {
+                const error = err;
                 // Don't throw errors if the global isn't valid, but still warn the user.
                 if (kit_1.env.getBoolean('SFDX_PROJECT_JSON_VALIDATION', false) && !this.options.isGlobal) {
-                    throw messages.createError('schemaValidationError', [this.getPath(), err.message], [this.getPath()], err);
+                    throw messages.createError('schemaValidationError', [this.getPath(), error.message], [this.getPath()], error);
                 }
                 else {
-                    this.logger.warn(messages.getMessage('schemaValidationError', [this.getPath(), err.message]));
+                    this.logger.warn(messages.getMessage('schemaValidationError', [this.getPath(), error.message]));
                 }
             }
         }
@@ -149,12 +150,13 @@ class SfdxProjectJson extends configFile_1.ConfigFile {
                 validator.validateSync(this.getContents());
             }
             catch (err) {
+                const error = err;
                 // Don't throw errors if the global isn't valid, but still warn the user.
                 if (kit_1.env.getBoolean('SFDX_PROJECT_JSON_VALIDATION', false) && !this.options.isGlobal) {
-                    throw messages.createError('schemaValidationError', [this.getPath(), err.message], [this.getPath()], err);
+                    throw messages.createError('schemaValidationError', [this.getPath(), error.message], [this.getPath()], error);
                 }
                 else {
-                    this.logger.warn(messages.getMessage('schemaValidationError', [this.getPath(), err.message]));
+                    this.logger.warn(messages.getMessage('schemaValidationError', [this.getPath(), error.message]));
                 }
             }
         }
@@ -169,16 +171,16 @@ class SfdxProjectJson extends configFile_1.ConfigFile {
         // This has to be done on the fly so it won't be written back to the file
         // This is a fast operation so no need to cache it so it stays immutable.
         const packageDirs = (contents.packageDirectories || []).map((packageDir) => {
-            if (path_1.isAbsolute(packageDir.path)) {
+            if ((0, path_1.isAbsolute)(packageDir.path)) {
                 throw messages.createError('invalidPackageDirectory', [packageDir.path]);
             }
             const regex = path_1.sep === '/' ? /\\/g : /\//g;
             // Change packageDir paths to have path separators that match the OS
             const path = packageDir.path.replace(regex, path_1.sep);
             // Normalize and remove any ending path separators
-            const name = path_1.normalize(path).replace(new RegExp(`\\${path_1.sep}$`), '');
+            const name = (0, path_1.normalize)(path).replace(new RegExp(`\\${path_1.sep}$`), '');
             // Always end in a path sep for standardization on folder paths
-            const fullPath = `${path_1.dirname(this.getPath())}${path_1.sep}${name}${path_1.sep}`;
+            const fullPath = `${(0, path_1.dirname)(this.getPath())}${path_1.sep}${name}${path_1.sep}`;
             if (!this.doesPackageExist(fullPath)) {
                 throw messages.createError('missingPackageDirectory', [packageDir.path]);
             }
@@ -290,7 +292,7 @@ class SfdxProject {
             const project = new SfdxProject(path);
             SfdxProject.instances.set(path, project);
         }
-        return ts_types_1.ensure(SfdxProject.instances.get(path));
+        return (0, ts_types_1.ensure)(SfdxProject.instances.get(path));
     }
     /**
      * Get a Project from a given path or from the working directory.
@@ -306,7 +308,7 @@ class SfdxProject {
             const project = new SfdxProject(path);
             SfdxProject.instances.set(path, project);
         }
-        return ts_types_1.ensure(SfdxProject.instances.get(path));
+        return (0, ts_types_1.ensure)(SfdxProject.instances.get(path));
     }
     /**
      * Performs an upward directory search for an sfdx project file. Returns the absolute path to the project.
@@ -320,7 +322,7 @@ class SfdxProject {
      * **See** [process.cwd()](https://nodejs.org/api/process.html#process_process_cwd)
      */
     static async resolveProjectPath(dir) {
-        return internal_1.resolveProjectPath(dir);
+        return (0, internal_1.resolveProjectPath)(dir);
     }
     /**
      * Performs a synchronous upward directory search for an sfdx project file. Returns the absolute path to the project.
@@ -334,7 +336,7 @@ class SfdxProject {
      * **See** [process.cwd()](https://nodejs.org/api/process.html#process_process_cwd)
      */
     static resolveProjectPathSync(dir) {
-        return internal_1.resolveProjectPathSync(dir);
+        return (0, internal_1.resolveProjectPathSync)(dir);
     }
     /**
      * Returns the project path.
@@ -434,7 +436,7 @@ class SfdxProject {
      */
     getPackageFromPath(path) {
         const packageDirs = this.getPackageDirectories();
-        const match = packageDirs.find((packageDir) => path_1.basename(path) === packageDir.name || path.includes(packageDir.fullPath));
+        const match = packageDirs.find((packageDir) => (0, path_1.basename)(path) === packageDir.name || path.includes(packageDir.fullPath));
         return match;
     }
     /**
@@ -530,7 +532,7 @@ class SfdxProject {
                 configAggregator_1.ConfigAggregator.create(),
             ]);
             await Promise.all([global.read(), local.read()]);
-            this.projectConfig = kit_1.defaults(local.toObject(), global.toObject());
+            this.projectConfig = (0, kit_1.defaults)(local.toObject(), global.toObject());
             // Add fields in sfdx-config.json
             Object.assign(this.projectConfig, configAggregator.getConfig());
             // we don't have a login url yet, so use instanceUrl from config or default

package/lib/status/myDomainResolver.js

@@ -79,7 +79,7 @@ class MyDomainResolver extends kit_1.AsyncOptionalCreatable {
                             payload: '127.0.0.1',
                         };
                     }
-                    dnsResult = await util_1.promisify(dns_1.lookup)(host);
+                    dnsResult = await (0, util_1.promisify)(dns_1.lookup)(host);
                     self.logger.debug(`Successfully resolved host: ${host} result: ${JSON.stringify(dnsResult)}`);
                     return {
                         completed: true,
@@ -100,12 +100,12 @@ class MyDomainResolver extends kit_1.AsyncOptionalCreatable {
             timeoutErrorName: 'MyDomainResolverTimeoutError',
         };
         const client = await pollingClient_1.PollingClient.create(pollingOptions);
-        return ts_types_1.ensureString(await client.subscribe());
+        return (0, ts_types_1.ensureString)(await client.subscribe());
     }
     async getCnames() {
         try {
             await this.resolve();
-            return await util_1.promisify(dns_1.resolveCname)(this.options.url.host);
+            return await (0, util_1.promisify)(dns_1.resolveCname)(this.options.url.host);
         }
         catch (e) {
             this.logger.debug(`An error occurred trying to resolve: ${this.options.url.host}`);

package/lib/status/pollingClient.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="sfdx-faye" />
 import { AsyncOptionalCreatable, Duration } from '@salesforce/kit';
 import { AnyJson } from '@salesforce/ts-types';
 import { Logger } from '../logger';

package/lib/status/pollingClient.js

@@ -39,7 +39,7 @@ class PollingClient extends kit_1.AsyncOptionalCreatable {
      */
     constructor(options) {
         super(options);
-        this.options = ts_types_1.ensure(options);
+        this.options = (0, ts_types_1.ensure)(options);
     }
     /**
      * Asynchronous initializer.
@@ -69,7 +69,7 @@ class PollingClient extends kit_1.AsyncOptionalCreatable {
             }
             throw new Error('Operation did not complete.  Retrying...'); // triggers a retry
         };
-        const finalResult = ts_retry_promise_1.retryDecorator(doPoll, {
+        const finalResult = (0, ts_retry_promise_1.retryDecorator)(doPoll, {
             timeout: this.options.timeout.milliseconds,
             delay: this.options.frequency.milliseconds,
             retries: 'INFINITELY',

package/lib/status/streamingClient.d.ts

@@ -1,8 +1,8 @@
 import { AsyncOptionalCreatable, Duration, Env } from '@salesforce/kit/lib';
 import { AnyJson } from '@salesforce/ts-types/lib';
-import type { Client as CometClient, StreamProcessor } from 'sfdx-faye';
 import { Org } from '../org/org';
-export { Client as CometClient, Message, StreamProcessor, CometSubscription, StatusResult, StreamingExtension, } from 'sfdx-faye';
+import { CometClient, CometSubscription, Message, StatusResult, StreamingExtension, StreamProcessor } from './types';
+export { CometClient, CometSubscription, Message, StatusResult, StreamingExtension, StreamProcessor };
 /**
  * Inner streaming client interface. This implements the Cometd behavior.
  * Also allows for mocking the functional behavior.
@@ -187,7 +187,6 @@ export declare namespace StreamingClient {
         handshakeTimeout: Duration;
         channel: string;
         streamingImpl: StreamingClientIfc;
-        private envDep;
         /**
          * Constructor for DefaultStreamingOptions
          *

package/lib/status/streamingClient.js

@@ -11,12 +11,12 @@ exports.StreamingClient = exports.CometClient = void 0;
 const url_1 = require("url");
 const lib_1 = require("@salesforce/kit/lib");
 const lib_2 = require("@salesforce/ts-types/lib");
-const Faye = require("sfdx-faye");
+const Faye = require("faye");
 const logger_1 = require("../logger");
 const sfdxError_1 = require("../sfdxError");
 const messages_1 = require("../messages");
-var sfdx_faye_1 = require("sfdx-faye");
-Object.defineProperty(exports, "CometClient", { enumerable: true, get: function () { return sfdx_faye_1.Client; } });
+const types_1 = require("./types");
+Object.defineProperty(exports, "CometClient", { enumerable: true, get: function () { return types_1.CometClient; } });
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'streaming', [
     'waitParamValidValueError',
@@ -108,8 +108,8 @@ class StreamingClient extends lib_1.AsyncOptionalCreatable {
      */
     constructor(options) {
         super(options);
-        this.options = lib_2.ensure(options);
-        const instanceUrl = lib_2.ensure(this.options.org.getConnection().getAuthInfoFields().instanceUrl);
+        this.options = (0, lib_2.ensure)(options);
+        const instanceUrl = (0, lib_2.ensure)(this.options.org.getConnection().getAuthInfoFields().instanceUrl);
         /**
          * The salesforce network infrastructure issues a cookie called sfdx-stream if it sees /cometd in the url.
          * Without this cookie request response streams will experience intermittent client session failures.
@@ -126,7 +126,7 @@ class StreamingClient extends lib_1.AsyncOptionalCreatable {
          * Enable SFDX_ENABLE_FAYE_REQUEST_RESPONSE_LOGGING to debug potential session problems and to verify cookie
          * exchanges.
          */
-        this.targetUrl = url_1.resolve(instanceUrl, `cometd/${this.options.apiVersion}`);
+        this.targetUrl = (0, url_1.resolve)(instanceUrl, `cometd/${this.options.apiVersion}`);
         this.cometClient = this.options.streamingImpl.getCometClient(this.targetUrl);
         this.options.streamingImpl.setLogger(this.log.bind(this));
         this.cometClient.on('transport:up', () => this.log('Transport up event received'));
@@ -172,7 +172,7 @@ class StreamingClient extends lib_1.AsyncOptionalCreatable {
                     const replayFromMap = {};
                     replayFromMap[this.options.channel] = replayId;
                     // add "ext : { "replay" : { CHANNEL : REPLAY_VALUE }}" to subscribe message
-                    lib_1.set(message, 'ext.replay', replayFromMap);
+                    (0, lib_1.set)(message, 'ext.replay', replayFromMap);
                 }
                 callback(message);
             },
@@ -273,7 +273,7 @@ class StreamingClient extends lib_1.AsyncOptionalCreatable {
         if (message &&
             message.channel === '/meta/handshake' &&
             message.error &&
-            lib_2.ensureString(message.error).includes('400::API version in the URI is mandatory')) {
+            (0, lib_2.ensureString)(message.error).includes('400::API version in the URI is mandatory')) {
             throw messages.createError('handshakeApiVersionError', [this.options.apiVersion]);
         }
         cb(message);
@@ -337,6 +337,10 @@ exports.StreamingClient = StreamingClient;
          * @see {@link StatusResult}
          */
         constructor(org, channel, streamProcessor, envDep = lib_1.env) {
+            if (envDep) {
+                const logger = logger_1.Logger.childFromRoot('StreamingClient');
+                logger.warn('envDep is deprecated');
+            }
             if (!streamProcessor) {
                 throw new sfdxError_1.SfdxError('Missing stream processor', 'MissingArg');
             }
@@ -346,7 +350,6 @@ exports.StreamingClient = StreamingClient;
             if (!channel) {
                 throw new sfdxError_1.SfdxError('Missing streaming channel', 'MissingArg');
             }
-            this.envDep = envDep;
             this.org = org;
             this.apiVersion = org.getConnection().getApiVersion();
             if (channel.startsWith('/system')) {
@@ -361,24 +364,15 @@ exports.StreamingClient = StreamingClient;
             this.handshakeTimeout = StreamingClient.DefaultOptions.DEFAULT_HANDSHAKE_TIMEOUT;
             this.streamingImpl = {
                 getCometClient: (url) => {
-                    const x = this.envDep.getString(StreamingClient.DefaultOptions.SFDX_ENABLE_FAYE_COOKIES_ALLOW_ALL_PATHS);
-                    return new Faye.Client(url, {
-                        // This parameter ensures all cookies regardless of path are included in subsequent requests. Otherwise
-                        // only cookies with the path "/" and "/cometd" are known to be included.
-                        // if SFDX_ENABLE_FAYE_COOKIES_ALLOW_ALL_PATHS is *not* set the default to true.
-                        cookiesAllowAllPaths: x === undefined
-                            ? true
-                            : this.envDep.getBoolean(StreamingClient.DefaultOptions.SFDX_ENABLE_FAYE_COOKIES_ALLOW_ALL_PATHS),
-                        // WARNING - The allows request/response exchanges to be written to the log instance which includes
-                        // header and cookie information.
-                        enableRequestResponseLogging: this.envDep.getBoolean(StreamingClient.DefaultOptions.SFDX_ENABLE_FAYE_REQUEST_RESPONSE_LOGGING),
-                    });
+                    // @ts-ignore
+                    return new Faye.Client(url);
                 },
                 setLogger: (logLine) => {
                     // @ts-ignore
                     Faye.logger = {};
                     ['info', 'error', 'fatal', 'warn', 'debug'].forEach((element) => {
-                        lib_1.set(Faye.logger, element, logLine);
+                        // @ts-ignore
+                        (0, lib_1.set)(Faye.logger, element, logLine);
                     });
                 },
             };

package/lib/status/types.d.ts

@@ -0,0 +1,89 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+import { AnyFunction, AnyJson, JsonMap } from '@salesforce/ts-types';
+export declare type Message = JsonMap;
+export declare type Callback<T = unknown> = (...args: any[]) => T;
+export interface StatusResult {
+    /**
+     * If the result of the streaming or polling client is expected to return a result
+     */
+    payload?: AnyJson;
+    /**
+     * Indicates to the streaming or polling client that the subscriber has what its needs. If `true` the client will end
+     * the messaging exchanges with the endpoint.
+     */
+    completed: boolean;
+}
+/**
+ * The subscription object returned from the cometd subscribe object.
+ */
+export interface CometSubscription {
+    callback(callback: () => void): void;
+    errback(callback: (error: Error) => void): void;
+}
+/**
+ * Types for defining extensions.
+ */
+export interface StreamingExtension {
+    /**
+     * Extension for outgoing message.
+     *
+     * @param message The message.
+     * @param callback The callback to invoke after the message is processed.
+     */
+    outgoing?: (message: JsonMap, callback: AnyFunction) => void;
+    /**
+     * Extension for the incoming message.
+     *
+     * @param message The message.
+     * @param callback The callback to invoke after the message is processed.
+     */
+    incoming?: (message: JsonMap, callback: AnyFunction) => void;
+}
+/**
+ * Function type for processing messages
+ */
+export declare type StreamProcessor = (message: JsonMap) => StatusResult;
+/**
+ * Comet client interface. The is to allow for mocking the inner streaming Cometd implementation.
+ * The Faye implementation is used by default but it could be used to adapt another Cometd impl.
+ */
+export declare abstract class CometClient extends EventEmitter {
+    /**
+     * Disable polling features.
+     *
+     * @param label Polling feature label.
+     */
+    abstract disable(label: string): void;
+    /**
+     * Add a custom extension to the underlying client.
+     *
+     * @param extension The json function for the extension.
+     */
+    abstract addExtension(extension: StreamingExtension): void;
+    /**
+     * Sets an http header name/value.
+     *
+     * @param name The header name.
+     * @param value The header value.
+     */
+    abstract setHeader(name: string, value: string): void;
+    /**
+     * handshake with the streaming channel
+     *
+     * @param callback Callback for the handshake when it successfully completes. The handshake should throw
+     * errors when errors are encountered.
+     */
+    abstract handshake(callback: () => void): void;
+    /**
+     * Subscribes to Comet topics. Subscribe should perform a handshake if one hasn't been performed yet.
+     *
+     * @param channel The topic to subscribe to.
+     * @param callback The callback to execute once a message has been received.
+     */
+    abstract subscribe(channel: string, callback: (message: JsonMap) => void): CometSubscription;
+    /**
+     * Method to call to disconnect the client from the server.
+     */
+    abstract disconnect(): void;
+}