@salesforce/core 3.24.3 → 3.25.0

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.25.0](https://github.com/forcedotcom/sfdx-core/compare/v3.24.5...v3.25.0) (2022-07-29)
+
+### Features
+
+- orgAccessor.get has throwOnNotFound option ([a2ee821](https://github.com/forcedotcom/sfdx-core/commit/a2ee8219adf692de7de17ba254e05f501ef5814c))
+
+### [3.24.5](https://github.com/forcedotcom/sfdx-core/compare/v3.24.4...v3.24.5) (2022-07-28)
+
+### Bug Fixes
+
+- set correct file mode for log file ([30aa3fc](https://github.com/forcedotcom/sfdx-core/commit/30aa3fc09ba2bf0db600ee6528fde5b0ff97b217))
+
+### [3.24.4](https://github.com/forcedotcom/sfdx-core/compare/v3.24.3...v3.24.4) (2022-07-28)
+
 ### [3.24.3](https://github.com/forcedotcom/sfdx-core/compare/v3.24.2...v3.24.3) (2022-07-28)
 
 ### Bug Fixes

package/lib/config/config.js

@@ -11,7 +11,6 @@ const path_1 = require("path");
 const fs = require("fs");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
-const mkdirp = require("mkdirp");
 const global_1 = require("../global");
 const logger_1 = require("../logger");
 const messages_1 = require("../messages");
@@ -510,7 +509,7 @@ class SfdxConfig {
         try {
             const translated = this.translate(config, 'toOld');
             const sfdxPath = this.getSfdxPath();
-            await mkdirp((0, path_1.dirname)(sfdxPath));
+            await fs.promises.mkdir((0, path_1.dirname)(sfdxPath), { recursive: true });
             await fs.promises.writeFile(sfdxPath, JSON.stringify(translated, null, 2));
         }
         catch (error) {

package/lib/config/configFile.js

@@ -13,7 +13,6 @@ const os_1 = require("os");
 const path_1 = require("path");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
-const mkdirp = require("mkdirp");
 const global_1 = require("../global");
 const logger_1 = require("../logger");
 const sfError_1 = require("../sfError");
@@ -213,7 +212,12 @@ class ConfigFile extends configStore_1.BaseConfigStore {
         if (newContents) {
             this.setContents(newContents);
         }
-        await mkdirp((0, path_1.dirname)(this.getPath()));
+        try {
+            await fs.promises.mkdir((0, path_1.dirname)(this.getPath()), { recursive: true });
+        }
+        catch (err) {
+            throw sfError_1.SfError.wrap(err);
+        }
         this.logger.info(`Writing to config file: ${this.getPath()}`);
         await fs.promises.writeFile(this.getPath(), JSON.stringify(this.toObject(), null, 2));
         return this.getContents();
@@ -228,7 +232,12 @@ class ConfigFile extends configStore_1.BaseConfigStore {
         if ((0, ts_types_1.isPlainObject)(newContents)) {
             this.setContents(newContents);
         }
-        mkdirp.sync((0, path_1.dirname)(this.getPath()));
+        try {
+            fs.mkdirSync((0, path_1.dirname)(this.getPath()), { recursive: true });
+        }
+        catch (err) {
+            throw sfError_1.SfError.wrap(err);
+        }
         this.logger.info(`Writing to config file: ${this.getPath()}`);
         fs.writeFileSync(this.getPath(), JSON.stringify(this.toObject(), null, 2));
         return this.getContents();

package/lib/crypto/keyChainImpl.js

@@ -15,7 +15,6 @@ const os_1 = require("os");
 const path = require("path");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
-const mkdirp = require("mkdirp");
 const global_1 = require("../global");
 const messages_1 = require("../messages");
 messages_1.Messages.importMessagesDirectory(__dirname);
@@ -332,7 +331,7 @@ async function _writeFile(opts, fn) {
             [SecretField.SERVICE]: opts.service,
         };
         const secretFile = getSecretFile();
-        await mkdirp(path.dirname(secretFile));
+        await fs.promises.mkdir(path.dirname(secretFile), { recursive: true });
         await fs.promises.writeFile(secretFile, JSON.stringify(contents, null, 4), { mode: '600' });
         fn(null, contents);
     }

package/lib/global.js

@@ -7,10 +7,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Global = exports.Mode = void 0;
+const fs = require("fs");
 const os = require("os");
 const path = require("path");
 const kit_1 = require("@salesforce/kit");
-const mkdirp = require("mkdirp");
+const sfError_1 = require("./sfError");
 /**
  * Represents an environment mode.  Supports `production`, `development`, `demo`, and `test`
  * with the default mode being `production`.
@@ -68,7 +69,17 @@ class Global {
      */
     static async createDir(dirPath) {
         dirPath = dirPath ? path.join(Global.SFDX_DIR, dirPath) : Global.SFDX_DIR;
-        await mkdirp(dirPath, '700');
+        try {
+            if (process.platform === 'win32') {
+                await fs.promises.mkdir(dirPath, { recursive: true });
+            }
+            else {
+                await fs.promises.mkdir(dirPath, { recursive: true, mode: 0o700 });
+            }
+        }
+        catch (error) {
+            throw new sfError_1.SfError(`Failed to create directory or set permissions for: ${dirPath}`);
+        }
     }
 }
 exports.Global = Global;

package/lib/logger.js

@@ -18,7 +18,6 @@ const Bunyan = require("@salesforce/bunyan");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const Debug = require("debug");
-const mkdirp = require("mkdirp");
 const global_1 = require("./global");
 const sfError_1 = require("./sfError");
 /**
@@ -245,12 +244,15 @@ class Logger {
         }
         catch (err1) {
             try {
-                await mkdirp(path.dirname(logFile), {
-                    mode: '700',
-                });
+                if (process.platform === 'win32') {
+                    await fs.promises.mkdir(path.dirname(logFile), { recursive: true });
+                }
+                else {
+                    await fs.promises.mkdir(path.dirname(logFile), { recursive: true, mode: 0o700 });
+                }
             }
             catch (err2) {
-                // noop; directory exists already
+                throw sfError_1.SfError.wrap(err2);
             }
             try {
                 await fs.promises.writeFile(logFile, '', { mode: '600' });
@@ -285,12 +287,15 @@ class Logger {
         }
         catch (err1) {
             try {
-                mkdirp.sync(path.dirname(logFile), {
-                    mode: '700',
-                });
+                if (process.platform === 'win32') {
+                    fs.mkdirSync(path.dirname(logFile));
+                }
+                else {
+                    fs.mkdirSync(path.dirname(logFile), { mode: 0o700 });
+                }
             }
             catch (err2) {
-                // noop; directory exists already
+                throw sfError_1.SfError.wrap(err2);
             }
             try {
                 fs.writeFileSync(logFile, '', { mode: '600' });

package/lib/org/authRemover.js

@@ -14,7 +14,6 @@ const messages_1 = require("../messages");
 const stateAggregator_1 = require("../stateAggregator");
 const orgConfigProperties_1 = require("./orgConfigProperties");
 messages_1.Messages.importMessagesDirectory(__dirname);
-const coreMessages = messages_1.Messages.load('@salesforce/core', 'core', ['namedOrgNotFound']);
 const messages = messages_1.Messages.load('@salesforce/core', 'auth', ['targetOrgNotSet']);
 /**
  * Handles  the removing of authorizations, which includes deleting the auth file
@@ -72,12 +71,8 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
      * @returns {Promise<SfOrg>}
      */
     async findAuth(usernameOrAlias) {
-        const username = await this.resolveUsername(usernameOrAlias || this.getTargetOrg());
-        const auth = this.stateAggregator.orgs.get(username);
-        if (!auth) {
-            throw coreMessages.createError('namedOrgNotFound');
-        }
-        return auth;
+        const username = await this.resolveUsername(usernameOrAlias ?? this.getTargetOrg());
+        return this.stateAggregator.orgs.get(username, false, true);
     }
     /**
      * Finds all org authorizations in the global info file (.sf/sf.json)

package/lib/stateAggregator/accessors/orgAccessor.d.ts

@@ -26,7 +26,7 @@ export declare abstract class BaseOrgAccessor<T extends ConfigFile, P extends Co
     private contents;
     private logger;
     /**
-     * Read the auth file for the given useranme. Once the file has been read, it can be reaccessed with the `get` method.
+     * Read the auth file for the given username. Once the file has been read, it can be re-accessed with the `get` method.
      *
      * @param username username to read
      * @param decrypt if true, decrypt encrypted values
@@ -39,13 +39,7 @@ export declare abstract class BaseOrgAccessor<T extends ConfigFile, P extends Co
      * @param decrypt if true, decrypt encrypted values
      */
     readAll(decrypt?: boolean): Promise<P[]>;
-    /**
-     * Return the contents of the username's auth file from cache. The `read` or `readAll` methods must be called first in order to populate the cache.
-     *
-     * @param username username to get
-     * @param decrypt if true, decrypt encrypted values
-     */
-    get(username: string, decrypt?: boolean): Nullable<P>;
+    get(username: string, decrypt?: boolean, throwOnNotFound?: true): P;
     /**
      * Return the contents of all the auth files from cache. The `read` or `readAll` methods must be called first in order to populate the cache.
      *

package/lib/stateAggregator/accessors/orgAccessor.js

@@ -14,6 +14,7 @@ const authInfoConfig_1 = require("../../config/authInfoConfig");
 const global_1 = require("../../global");
 const types_1 = require("../types");
 const logger_1 = require("../../logger");
+const messages_1 = require("../../messages");
 /**
  * @deprecated
  */
@@ -62,7 +63,7 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
         this.contents = new Map();
     }
     /**
-     * Read the auth file for the given useranme. Once the file has been read, it can be reaccessed with the `get` method.
+     * Read the auth file for the given username. Once the file has been read, it can be re-accessed with the `get` method.
      *
      * @param username username to read
      * @param decrypt if true, decrypt encrypted values
@@ -96,13 +97,21 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
         return this.getAll(decrypt);
     }
     /**
-     * Return the contents of the username's auth file from cache. The `read` or `readAll` methods must be called first in order to populate the cache.
+     * Return the contents of the username's auth file from cache.
+     * The `read` or `readAll` methods must be called first in order to populate the cache.
+     * If throwOnNotFound is not true, an empty object {} is returned if the org is not found.
      *
      * @param username username to get
      * @param decrypt if true, decrypt encrypted values
+     * @param throwOnNotFound if true, throw if the auth file does not already exist in the cache
      */
-    get(username, decrypt = false) {
+    get(username, decrypt = false, throwOnNotFound = false) {
         const config = this.configs.get(username);
+        if (throwOnNotFound && config?.keys().length === 0) {
+            messages_1.Messages.importMessagesDirectory(__dirname);
+            const messages = messages_1.Messages.load('@salesforce/core', 'core', ['namedOrgNotFound']);
+            throw messages.createError('namedOrgNotFound', [username]);
+        }
         if (config) {
             this.contents.set(username, config.getContents(decrypt));
         }
@@ -115,10 +124,7 @@ class BaseOrgAccessor extends kit_1.AsyncOptionalCreatable {
      * @returns
      */
     getAll(decrypt = false) {
-        return [...this.configs.keys()].reduce((orgs, username) => {
-            const org = this.get(username, decrypt);
-            return org && !(0, kit_1.isEmpty)(org) ? orgs.concat([org]) : orgs;
-        }, []);
+        return [...this.configs.keys()].map((username) => this.get(username, decrypt)).filter((org) => !(0, kit_1.isEmpty)(org));
     }
     /**
      * Returns true if the username has been cached.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.24.3",
+  "version": "3.25.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -39,7 +39,6 @@
     "@salesforce/schemas": "^1.1.0",
     "@salesforce/ts-types": "^1.5.20",
     "@types/graceful-fs": "^4.1.5",
-    "@types/mkdirp": "^1.0.2",
     "@types/semver": "^7.3.9",
     "ajv": "^8.11.0",
     "archiver": "^5.3.0",
@@ -51,7 +50,6 @@
     "js2xmlparser": "^4.0.1",
     "jsforce": "^2.0.0-beta.16",
     "jsonwebtoken": "8.5.1",
-    "mkdirp": "1.0.4",
     "ts-retry-promise": "^0.6.0"
   },
   "devDependencies": {