@salesforce/core 3.7.6 → 3.7.9

package/lib/{sfdxError.d.ts → sfError.d.ts}

@@ -13,10 +13,10 @@ import { JsonMap } from '@salesforce/ts-types';
  * const messages = Messages.load('myPackageName', 'myBundleName');
  *
  * // To throw a non-bundle based error:
- * throw new SfdxError(message.getMessage('myError'), 'MyErrorName');
+ * throw new SfError(message.getMessage('myError'), 'MyErrorName');
  * ```
  */
-export declare class SfdxError extends NamedError {
+export declare class SfError extends NamedError {
     /**
      * Action messages. Hints to the users regarding what can be done to fix related issues.
      */
@@ -35,21 +35,21 @@ export declare class SfdxError extends NamedError {
      */
     private _code?;
     /**
-     * Create an SfdxError.
+     * Create an SfError.
      *
      * @param message The error message.
-     * @param name The error name. Defaults to 'SfdxError'.
+     * @param name The error name. Defaults to 'SfError'.
      * @param actions The action message(s).
      * @param exitCodeOrCause The exit code which will be used by SfdxCommand or he underlying error that caused this error to be raised.
      * @param cause The underlying error that caused this error to be raised.
      */
     constructor(message: string, name?: string, actions?: string[], exitCodeOrCause?: number | Error, cause?: Error);
     /**
-     * Convert an Error to an SfdxError.
+     * Convert an Error to an SfError.
      *
      * @param err The error to convert.
      */
-    static wrap(err: Error | string): SfdxError;
+    static wrap(err: Error | string): SfError;
     get code(): string | undefined | any;
     set code(code: string);
     /**
@@ -57,20 +57,20 @@ export declare class SfdxError extends NamedError {
      *
      * @param context The command name.
      */
-    setContext(context: string): SfdxError;
+    setContext(context: string): SfError;
     /**
      * An additional payload for the error. For convenience `this` object is returned.
      *
      * @param data The payload data.
      */
-    setData(data: unknown): SfdxError;
+    setData(data: unknown): SfError;
     /**
-     * Convert an {@link SfdxError} state to an object. Returns a plain object representing the state of this error.
+     * Convert an {@link SfError} state to an object. Returns a plain object representing the state of this error.
      */
     toObject(): JsonMap;
-    /**
-     * @deprecated Does nothing. Do not use. This is kept around to support older versions of SfdxCommand.
-     * @param commandName
-     */
-    setCommandName(): void;
+}
+/**
+ * @deprecated use SfError instead
+ */
+export declare class SfdxError extends SfError {
 }

package/lib/{sfdxError.js → sfError.js}

@@ -6,7 +6,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SfdxError = void 0;
+exports.SfdxError = exports.SfError = void 0;
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 /**
@@ -22,22 +22,22 @@ const ts_types_1 = require("@salesforce/ts-types");
  * const messages = Messages.load('myPackageName', 'myBundleName');
  *
  * // To throw a non-bundle based error:
- * throw new SfdxError(message.getMessage('myError'), 'MyErrorName');
+ * throw new SfError(message.getMessage('myError'), 'MyErrorName');
  * ```
  */
-class SfdxError extends kit_1.NamedError {
+class SfError extends kit_1.NamedError {
     /**
-     * Create an SfdxError.
+     * Create an SfError.
      *
      * @param message The error message.
-     * @param name The error name. Defaults to 'SfdxError'.
+     * @param name The error name. Defaults to 'SfError'.
      * @param actions The action message(s).
      * @param exitCodeOrCause The exit code which will be used by SfdxCommand or he underlying error that caused this error to be raised.
      * @param cause The underlying error that caused this error to be raised.
      */
     constructor(message, name, actions, exitCodeOrCause, cause) {
         cause = exitCodeOrCause instanceof Error ? exitCodeOrCause : cause;
-        super(name || 'SfdxError', message || name, cause);
+        super(name || 'SfError', message || name, cause);
         this.actions = actions;
         if (typeof exitCodeOrCause === 'number') {
             this.exitCode = exitCodeOrCause;
@@ -47,23 +47,23 @@ class SfdxError extends kit_1.NamedError {
         }
     }
     /**
-     * Convert an Error to an SfdxError.
+     * Convert an Error to an SfError.
      *
      * @param err The error to convert.
      */
     static wrap(err) {
         if ((0, ts_types_1.isString)(err)) {
-            return new SfdxError(err);
+            return new SfError(err);
         }
-        if (err instanceof SfdxError) {
+        if (err instanceof SfError) {
             return err;
         }
-        const sfdxError = new SfdxError(err.message, err.name, undefined, err);
+        const sfError = new SfError(err.message, err.name, undefined, err);
         // If the original error has a code, use that instead of name.
         if ((0, ts_types_1.hasString)(err, 'code')) {
-            sfdxError.code = err.code;
+            sfError.code = err.code;
         }
-        return sfdxError;
+        return sfError;
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     get code() {
@@ -91,7 +91,7 @@ class SfdxError extends kit_1.NamedError {
         return this;
     }
     /**
-     * Convert an {@link SfdxError} state to an object. Returns a plain object representing the state of this error.
+     * Convert an {@link SfError} state to an object. Returns a plain object representing the state of this error.
      */
     toObject() {
         const obj = {
@@ -109,13 +109,12 @@ class SfdxError extends kit_1.NamedError {
         }
         return obj;
     }
-    /**
-     * @deprecated Does nothing. Do not use. This is kept around to support older versions of SfdxCommand.
-     * @param commandName
-     */
-    setCommandName() {
-        /** Do nothing. */
-    }
+}
+exports.SfError = SfError;
+/**
+ * @deprecated use SfError instead
+ */
+class SfdxError extends SfError {
 }
 exports.SfdxError = SfdxError;
-//# sourceMappingURL=sfdxError.js.map
+//# sourceMappingURL=sfError.js.map

package/lib/{sfdxProject.d.ts → sfProject.d.ts}

@@ -54,7 +54,7 @@ export declare type ProjectJson = ConfigContents & {
  * be in a top level property that represents your project or plugin.
  *
  * ```
- * const project = await SfdxProject.resolve();
+ * const project = await SfProject.resolve();
  * const projectJson = await project.resolveProjectConfig();
  * const myPluginProperties = projectJson.get('myplugin') || {};
  * myPluginProperties.myprop = 'someValue';
@@ -64,7 +64,7 @@ export declare type ProjectJson = ConfigContents & {
  *
  * **See** [force:project:create](https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_ws_create_new.htm)
  */
-export declare class SfdxProjectJson extends ConfigFile {
+export declare class SfProjectJson extends ConfigFile {
     static BLOCKLIST: string[];
     static getFileName(): string;
     static getDefaultOptions(isGlobal?: boolean): ConfigFile.Options;
@@ -115,7 +115,7 @@ export declare class SfdxProjectJson extends ConfigFile {
      */
     getUniquePackageDirectories(): NamedPackageDir[];
     /**
-     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfdxProject.getUniquePackageDirectories}
+     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfProject.getUniquePackageDirectories}
      * for data other than the names.
      */
     getUniquePackageNames(): string[];
@@ -131,51 +131,51 @@ export declare class SfdxProjectJson extends ConfigFile {
     private validateKeys;
 }
 /**
- * Represents an SFDX project directory. This directory contains a {@link SfdxProjectJson} config file as well as
+ * Represents an SFDX project directory. This directory contains a {@link SfProjectJson} config file as well as
  * a hidden .sfdx folder that contains all the other local project config files.
  *
  * ```
- * const project = await SfdxProject.resolve();
+ * const project = await SfProject.resolve();
  * const projectJson = await project.resolveProjectConfig();
  * console.log(projectJson.sfdcLoginUrl);
  * ```
  */
-export declare class SfdxProject {
+export declare class SfProject {
     private path;
     private static instances;
     private projectConfig;
-    private sfdxProjectJson;
-    private sfdxProjectJsonGlobal;
+    private sfProjectJson;
+    private sfProjectJsonGlobal;
     private packageDirectories?;
     private activePackage;
     /**
-     * Do not directly construct instances of this class -- use {@link SfdxProject.resolve} instead.
+     * Do not directly construct instances of this class -- use {@link SfProject.resolve} instead.
      *
      * @ignore
      */
-    private constructor();
+    protected constructor(path: string);
     /**
      * Get a Project from a given path or from the working directory.
      *
      * @param path The path of the project.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      */
-    static resolve(path?: string): Promise<SfdxProject>;
+    static resolve(path?: string): Promise<SfProject>;
     /**
      * Get a Project from a given path or from the working directory.
      *
      * @param path The path of the project.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      */
-    static getInstance(path?: string): SfdxProject;
+    static getInstance(path?: string): SfProject;
     /**
      * Performs an upward directory search for an sfdx project file. Returns the absolute path to the project.
      *
      * @param dir The directory path to start traversing from.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      *
      * **See** {@link traverseForFile}
      *
@@ -187,7 +187,7 @@ export declare class SfdxProject {
      *
      * @param dir The directory path to start traversing from.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      *
      * **See** {@link traverseForFileSync}
      *
@@ -202,24 +202,24 @@ export declare class SfdxProject {
      * Get the sfdx-project.json config. The global sfdx-project.json is used for user defaults
      * that are not checked in to the project specific file.
      *
-     * *Note:* When reading values from {@link SfdxProjectJson}, it is recommended to use
-     * {@link SfdxProject.resolveProjectConfig} instead.
+     * *Note:* When reading values from {@link SfProjectJson}, it is recommended to use
+     * {@link SfProject.resolveProjectConfig} instead.
      *
      * @param isGlobal True to get the global project file, otherwise the local project config.
      */
-    retrieveSfdxProjectJson(isGlobal?: boolean): Promise<SfdxProjectJson>;
+    retrieveSfProjectJson(isGlobal?: boolean): Promise<SfProjectJson>;
     /**
      * Get the sfdx-project.json config. The global sfdx-project.json is used for user defaults
      * that are not checked in to the project specific file.
      *
-     * *Note:* When reading values from {@link SfdxProjectJson}, it is recommended to use
-     * {@link SfdxProject.resolveProjectConfig} instead.
+     * *Note:* When reading values from {@link SfProjectJson}, it is recommended to use
+     * {@link SfProject.resolveProjectConfig} instead.
      *
-     * This is the sync method of {@link SfdxProject.resolveSfdxProjectJson}
+     * This is the sync method of {@link SfProject.resolveSfProjectJson}
      *
      * @param isGlobal True to get the global project file, otherwise the local project config.
      */
-    getSfdxProjectJson(isGlobal?: boolean): SfdxProjectJson;
+    getSfProjectJson(isGlobal?: boolean): SfProjectJson;
     /**
      * Returns a read-only list of `packageDirectories` within sfdx-project.json, first reading
      * and validating the file if necessary. i.e. modifying this array will not affect the
@@ -238,7 +238,7 @@ export declare class SfdxProject {
      */
     getUniquePackageDirectories(): NamedPackageDir[];
     /**
-     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfdxProject.getUniquePackageDirectories}
+     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfProject.getUniquePackageDirectories}
      * for data other than the names.
      */
     getUniquePackageNames(): string[];
@@ -293,11 +293,11 @@ export declare class SfdxProject {
      */
     getDefaultPackage(): NamedPackageDir;
     /**
-     * The project config is resolved from local and global {@link SfdxProjectJson},
+     * The project config is resolved from local and global {@link SfProjectJson},
      * {@link ConfigAggregator}, and a set of defaults. It is recommended to use
-     * this when reading values from SfdxProjectJson.
+     * this when reading values from SfProjectJson.
      *
-     * The global {@link SfdxProjectJson} is used to allow the user to provide default values they
+     * The global {@link SfProjectJson} is used to allow the user to provide default values they
      * may not want checked into their project's source.
      *
      * @returns A resolved config object that contains a bunch of different
@@ -305,3 +305,13 @@ export declare class SfdxProject {
      */
     resolveProjectConfig(): Promise<JsonMap>;
 }
+/**
+ * @deprecated use SfProject instead
+ */
+export declare class SfdxProject extends SfProject {
+}
+/**
+ * @deprecated use SfProjectJson instead
+ */
+export declare class SfdxProjectJson extends SfProjectJson {
+}

package/lib/{sfdxProject.js → sfProject.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SfdxProject = exports.SfdxProjectJson = void 0;
+exports.SfdxProjectJson = exports.SfdxProject = exports.SfProject = exports.SfProjectJson = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -8,15 +8,15 @@ exports.SfdxProject = exports.SfdxProjectJson = void 0;
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 const path_1 = require("path");
+const fs = require("fs");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const sfdcUrl_1 = require("./util/sfdcUrl");
 const configAggregator_1 = require("./config/configAggregator");
 const configFile_1 = require("./config/configFile");
 const validator_1 = require("./schema/validator");
-const fs_1 = require("./util/fs");
 const internal_1 = require("./util/internal");
-const sfdxError_1 = require("./sfdxError");
+const sfError_1 = require("./sfError");
 const sfdc_1 = require("./util/sfdc");
 const messages_1 = require("./messages");
 messages_1.Messages.importMessagesDirectory(__dirname);
@@ -36,7 +36,7 @@ const coreMessages = messages_1.Messages.load('@salesforce/core', 'core', ['inva
  * be in a top level property that represents your project or plugin.
  *
  * ```
- * const project = await SfdxProject.resolve();
+ * const project = await SfProject.resolve();
  * const projectJson = await project.resolveProjectConfig();
  * const myPluginProperties = projectJson.get('myplugin') || {};
  * myPluginProperties.myprop = 'someValue';
@@ -46,12 +46,12 @@ const coreMessages = messages_1.Messages.load('@salesforce/core', 'core', ['inva
  *
  * **See** [force:project:create](https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_ws_create_new.htm)
  */
-class SfdxProjectJson extends configFile_1.ConfigFile {
+class SfProjectJson extends configFile_1.ConfigFile {
     static getFileName() {
         return internal_1.SFDX_PROJECT_JSON;
     }
     static getDefaultOptions(isGlobal = false) {
-        const options = configFile_1.ConfigFile.getDefaultOptions(isGlobal, SfdxProjectJson.getFileName());
+        const options = configFile_1.ConfigFile.getDefaultOptions(isGlobal, SfProjectJson.getFileName());
         options.isState = false;
         return options;
     }
@@ -229,7 +229,7 @@ class SfdxProjectJson extends configFile_1.ConfigFile {
         return uniqueValues;
     }
     /**
-     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfdxProject.getUniquePackageDirectories}
+     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfProject.getUniquePackageDirectories}
      * for data other than the names.
      */
     getUniquePackageNames() {
@@ -248,31 +248,31 @@ class SfdxProjectJson extends configFile_1.ConfigFile {
         return this.getContents().packageDirectories && this.getContents().packageDirectories.length > 1;
     }
     doesPackageExist(packagePath) {
-        return fs_1.fs.existsSync(packagePath);
+        return fs.existsSync(packagePath);
     }
     validateKeys() {
         // Verify that the configObject does not have upper case keys; throw if it does.  Must be heads down camel case.
-        const upperCaseKey = sfdc_1.sfdc.findUpperCaseKeys(this.toObject(), SfdxProjectJson.BLOCKLIST);
+        const upperCaseKey = sfdc_1.sfdc.findUpperCaseKeys(this.toObject(), SfProjectJson.BLOCKLIST);
         if (upperCaseKey) {
             throw coreMessages.createError('invalidJsonCasing', [upperCaseKey, this.getPath()]);
         }
     }
 }
-exports.SfdxProjectJson = SfdxProjectJson;
-SfdxProjectJson.BLOCKLIST = ['packageAliases'];
+exports.SfProjectJson = SfProjectJson;
+SfProjectJson.BLOCKLIST = ['packageAliases'];
 /**
- * Represents an SFDX project directory. This directory contains a {@link SfdxProjectJson} config file as well as
+ * Represents an SFDX project directory. This directory contains a {@link SfProjectJson} config file as well as
  * a hidden .sfdx folder that contains all the other local project config files.
  *
  * ```
- * const project = await SfdxProject.resolve();
+ * const project = await SfProject.resolve();
  * const projectJson = await project.resolveProjectConfig();
  * console.log(projectJson.sfdcLoginUrl);
  * ```
  */
-class SfdxProject {
+class SfProject {
     /**
-     * Do not directly construct instances of this class -- use {@link SfdxProject.resolve} instead.
+     * Do not directly construct instances of this class -- use {@link SfProject.resolve} instead.
      *
      * @ignore
      */
@@ -284,38 +284,38 @@ class SfdxProject {
      *
      * @param path The path of the project.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      */
     static async resolve(path) {
         path = await this.resolveProjectPath(path || process.cwd());
-        if (!SfdxProject.instances.has(path)) {
-            const project = new SfdxProject(path);
-            SfdxProject.instances.set(path, project);
+        if (!SfProject.instances.has(path)) {
+            const project = new SfProject(path);
+            SfProject.instances.set(path, project);
         }
-        return (0, ts_types_1.ensure)(SfdxProject.instances.get(path));
+        return (0, ts_types_1.ensure)(SfProject.instances.get(path));
     }
     /**
      * Get a Project from a given path or from the working directory.
      *
      * @param path The path of the project.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      */
     static getInstance(path) {
         // Store instance based on the path of the actual project.
         path = this.resolveProjectPathSync(path || process.cwd());
-        if (!SfdxProject.instances.has(path)) {
-            const project = new SfdxProject(path);
-            SfdxProject.instances.set(path, project);
+        if (!SfProject.instances.has(path)) {
+            const project = new SfProject(path);
+            SfProject.instances.set(path, project);
         }
-        return (0, ts_types_1.ensure)(SfdxProject.instances.get(path));
+        return (0, ts_types_1.ensure)(SfProject.instances.get(path));
     }
     /**
      * Performs an upward directory search for an sfdx project file. Returns the absolute path to the project.
      *
      * @param dir The directory path to start traversing from.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      *
      * **See** {@link traverseForFile}
      *
@@ -329,7 +329,7 @@ class SfdxProject {
      *
      * @param dir The directory path to start traversing from.
      *
-     * **Throws** *{@link SfdxError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
+     * **Throws** *{@link SfError}{ name: 'InvalidProjectWorkspaceError' }* If the current folder is not located in a workspace.
      *
      * **See** {@link traverseForFileSync}
      *
@@ -348,54 +348,54 @@ class SfdxProject {
      * Get the sfdx-project.json config. The global sfdx-project.json is used for user defaults
      * that are not checked in to the project specific file.
      *
-     * *Note:* When reading values from {@link SfdxProjectJson}, it is recommended to use
-     * {@link SfdxProject.resolveProjectConfig} instead.
+     * *Note:* When reading values from {@link SfProjectJson}, it is recommended to use
+     * {@link SfProject.resolveProjectConfig} instead.
      *
      * @param isGlobal True to get the global project file, otherwise the local project config.
      */
-    async retrieveSfdxProjectJson(isGlobal = false) {
-        const options = SfdxProjectJson.getDefaultOptions(isGlobal);
+    async retrieveSfProjectJson(isGlobal = false) {
+        const options = SfProjectJson.getDefaultOptions(isGlobal);
         if (isGlobal) {
-            if (!this.sfdxProjectJsonGlobal) {
-                this.sfdxProjectJsonGlobal = await SfdxProjectJson.create(options);
+            if (!this.sfProjectJsonGlobal) {
+                this.sfProjectJsonGlobal = await SfProjectJson.create(options);
             }
-            return this.sfdxProjectJsonGlobal;
+            return this.sfProjectJsonGlobal;
         }
         else {
             options.rootFolder = this.getPath();
-            if (!this.sfdxProjectJson) {
-                this.sfdxProjectJson = await SfdxProjectJson.create(options);
+            if (!this.sfProjectJson) {
+                this.sfProjectJson = await SfProjectJson.create(options);
             }
-            return this.sfdxProjectJson;
+            return this.sfProjectJson;
         }
     }
     /**
      * Get the sfdx-project.json config. The global sfdx-project.json is used for user defaults
      * that are not checked in to the project specific file.
      *
-     * *Note:* When reading values from {@link SfdxProjectJson}, it is recommended to use
-     * {@link SfdxProject.resolveProjectConfig} instead.
+     * *Note:* When reading values from {@link SfProjectJson}, it is recommended to use
+     * {@link SfProject.resolveProjectConfig} instead.
      *
-     * This is the sync method of {@link SfdxProject.resolveSfdxProjectJson}
+     * This is the sync method of {@link SfProject.resolveSfProjectJson}
      *
      * @param isGlobal True to get the global project file, otherwise the local project config.
      */
-    getSfdxProjectJson(isGlobal = false) {
-        const options = SfdxProjectJson.getDefaultOptions(isGlobal);
+    getSfProjectJson(isGlobal = false) {
+        const options = SfProjectJson.getDefaultOptions(isGlobal);
         if (isGlobal) {
-            if (!this.sfdxProjectJsonGlobal) {
-                this.sfdxProjectJsonGlobal = new SfdxProjectJson(options);
-                this.sfdxProjectJsonGlobal.readSync();
+            if (!this.sfProjectJsonGlobal) {
+                this.sfProjectJsonGlobal = new SfProjectJson(options);
+                this.sfProjectJsonGlobal.readSync();
             }
-            return this.sfdxProjectJsonGlobal;
+            return this.sfProjectJsonGlobal;
         }
         else {
             options.rootFolder = this.getPath();
-            if (!this.sfdxProjectJson) {
-                this.sfdxProjectJson = new SfdxProjectJson(options);
-                this.sfdxProjectJson.readSync();
+            if (!this.sfProjectJson) {
+                this.sfProjectJson = new SfProjectJson(options);
+                this.sfProjectJson.readSync();
             }
-            return this.sfdxProjectJson;
+            return this.sfProjectJson;
         }
     }
     /**
@@ -405,7 +405,7 @@ class SfdxProject {
      */
     getPackageDirectories() {
         if (!this.packageDirectories) {
-            this.packageDirectories = this.getSfdxProjectJson().getPackageDirectoriesSync();
+            this.packageDirectories = this.getSfProjectJson().getPackageDirectoriesSync();
         }
         return this.packageDirectories;
     }
@@ -420,14 +420,14 @@ class SfdxProject {
      * for packaging operations that want to do something for each package entry.
      */
     getUniquePackageDirectories() {
-        return this.getSfdxProjectJson().getUniquePackageDirectories();
+        return this.getSfProjectJson().getUniquePackageDirectories();
     }
     /**
-     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfdxProject.getUniquePackageDirectories}
+     * Get a list of the unique package names from within sfdx-project.json. Use {@link SfProject.getUniquePackageDirectories}
      * for data other than the names.
      */
     getUniquePackageNames() {
-        return this.getSfdxProjectJson().getUniquePackageNames();
+        return this.getSfProjectJson().getUniquePackageNames();
     }
     /**
      * Returns the package from a file path.
@@ -471,13 +471,13 @@ class SfdxProject {
      * Has package directories defined in the project.
      */
     hasPackages() {
-        return this.getSfdxProjectJson().hasPackages();
+        return this.getSfProjectJson().hasPackages();
     }
     /**
      * Has multiple package directories (MPD) defined in the project.
      */
     hasMultiplePackages() {
-        return this.getSfdxProjectJson().hasMultiplePackages();
+        return this.getSfProjectJson().hasMultiplePackages();
     }
     /**
      * Get the currently activated package on the project. This has no implication on sfdx-project.json
@@ -506,17 +506,17 @@ class SfdxProject {
      */
     getDefaultPackage() {
         if (!this.hasPackages()) {
-            throw new sfdxError_1.SfdxError('The sfdx-project.json does not have any packageDirectories defined.');
+            throw new sfError_1.SfError('The sfdx-project.json does not have any packageDirectories defined.');
         }
         const defaultPackage = this.getPackageDirectories().find((packageDir) => packageDir.default === true);
         return defaultPackage || this.getPackageDirectories()[0];
     }
     /**
-     * The project config is resolved from local and global {@link SfdxProjectJson},
+     * The project config is resolved from local and global {@link SfProjectJson},
      * {@link ConfigAggregator}, and a set of defaults. It is recommended to use
-     * this when reading values from SfdxProjectJson.
+     * this when reading values from SfProjectJson.
      *
-     * The global {@link SfdxProjectJson} is used to allow the user to provide default values they
+     * The global {@link SfProjectJson} is used to allow the user to provide default values they
      * may not want checked into their project's source.
      *
      * @returns A resolved config object that contains a bunch of different
@@ -527,8 +527,8 @@ class SfdxProject {
         if (!this.projectConfig) {
             // Do fs operations in parallel
             const [global, local, configAggregator] = await Promise.all([
-                this.retrieveSfdxProjectJson(true),
-                this.retrieveSfdxProjectJson(),
+                this.retrieveSfProjectJson(true),
+                this.retrieveSfProjectJson(),
                 configAggregator_1.ConfigAggregator.create(),
             ]);
             await Promise.all([global.read(), local.read()]);
@@ -551,7 +551,19 @@ class SfdxProject {
         return this.projectConfig;
     }
 }
+exports.SfProject = SfProject;
+// Cache of SfProject instances per path.
+SfProject.instances = new Map();
+/**
+ * @deprecated use SfProject instead
+ */
+class SfdxProject extends SfProject {
+}
 exports.SfdxProject = SfdxProject;
-// Cache of SfdxProject instances per path.
-SfdxProject.instances = new Map();
-//# sourceMappingURL=sfdxProject.js.map
+/**
+ * @deprecated use SfProjectJson instead
+ */
+class SfdxProjectJson extends SfProjectJson {
+}
+exports.SfdxProjectJson = SfdxProjectJson;
+//# sourceMappingURL=sfProject.js.map