@salesforce/core 3.31.18 → 3.32.0

package/lib/org/connection.js

@@ -177,7 +177,7 @@ class Connection extends jsforce_1.Connection {
      */
     async deployRecentValidation(options) {
         // REST returns an object with an id property, SOAP returns the id as a string directly. That is now handled
-        // in jsforce, so we have to cast a string as unkown as JsonCollection to support backwards compatibility.
+        // in jsforce, so we have to cast a string as unknown as JsonCollection to support backwards compatibility.
         return (await this.metadata.deployRecentValidation(options));
     }
     /**

package/lib/org/org.d.ts

@@ -357,8 +357,12 @@ export declare class Org extends AsyncOptionalCreatable<Org.Options> {
     getFields(keys: Org.Fields[]): JsonMap;
     /**
      * Returns the JSForce connection for the org.
+     * side effect: If you pass it an apiVersion, it will set it on the Org
+     * so that future calls to getConnection() will also use that version.
+     *
+     * @param apiVersion The API version to use for the connection.
      */
-    getConnection(): Connection;
+    getConnection(apiVersion?: string): Connection;
     supportsSourceTracking(): Promise<boolean>;
     /**
      * query SandboxProcess via sandbox name

package/lib/org/org.js

@@ -686,8 +686,20 @@ class Org extends kit_1.AsyncOptionalCreatable {
     }
     /**
      * Returns the JSForce connection for the org.
+     * side effect: If you pass it an apiVersion, it will set it on the Org
+     * so that future calls to getConnection() will also use that version.
+     *
+     * @param apiVersion The API version to use for the connection.
      */
-    getConnection() {
+    getConnection(apiVersion) {
+        if (apiVersion) {
+            if (this.connection.getApiVersion() === apiVersion) {
+                this.logger.warn(`Default API version is already ${apiVersion}`);
+            }
+            else {
+                this.connection.setApiVersion(apiVersion);
+            }
+        }
         return this.connection;
     }
     async supportsSourceTracking() {

package/lib/schema/validator.js

@@ -76,6 +76,7 @@ class SchemaValidator {
         const externalSchemas = this.loadExternalSchemas(schema);
         const ajv = new ajv_1.default({
             allErrors: true,
+            allowUnionTypes: true,
             schemas: externalSchemas,
             useDefaults: true,
             // TODO: We may someday want to enable strictSchema. This is disabled for now

package/lib/sfProject.js

@@ -59,13 +59,11 @@ class SfProjectJson extends configFile_1.ConfigFile {
     async read() {
         const contents = await super.read();
         this.validateKeys();
-        await this.schemaValidate();
         return contents;
     }
     readSync() {
         const contents = super.readSync();
         this.validateKeys();
-        this.schemaValidateSync();
         return contents;
     }
     async write(newContents) {
@@ -73,7 +71,6 @@ class SfProjectJson extends configFile_1.ConfigFile {
             this.setContents(newContents);
         }
         this.validateKeys();
-        await this.schemaValidate();
         return super.write();
     }
     writeSync(newContents) {
@@ -81,7 +78,6 @@ class SfProjectJson extends configFile_1.ConfigFile {
             this.setContents(newContents);
         }
         this.validateKeys();
-        this.schemaValidateSync();
         return super.writeSync();
     }
     getContents() {
@@ -108,21 +104,19 @@ class SfProjectJson extends configFile_1.ConfigFile {
             // read calls back into this method after necessarily setting this.hasRead=true
             await this.read();
         }
-        else {
-            try {
-                const projectJsonSchemaPath = require.resolve('@salesforce/schemas/sfdx-project.schema.json');
-                const validator = new validator_1.SchemaValidator(this.logger, projectJsonSchemaPath);
-                await validator.validate(this.getContents());
+        try {
+            const projectJsonSchemaPath = require.resolve('@salesforce/schemas/sfdx-project.schema.json');
+            const validator = new validator_1.SchemaValidator(this.logger, projectJsonSchemaPath);
+            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(), error.message], [this.getPath()], error);
             }
-            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(), error.message], [this.getPath()], error);
-                }
-                else {
-                    this.logger.warn(messages.getMessage('schemaValidationError', [this.getPath(), error.message]));
-                }
+            else {
+                this.logger.warn(messages.getMessage('schemaValidationError', [this.getPath(), error.message]));
             }
         }
     }
@@ -147,21 +141,19 @@ class SfProjectJson extends configFile_1.ConfigFile {
             // read calls back into this method after necessarily setting this.hasRead=true
             this.readSync();
         }
-        else {
-            try {
-                const projectJsonSchemaPath = require.resolve('@salesforce/schemas/sfdx-project.schema.json');
-                const validator = new validator_1.SchemaValidator(this.logger, projectJsonSchemaPath);
-                validator.validateSync(this.getContents());
+        try {
+            const projectJsonSchemaPath = require.resolve('@salesforce/schemas/sfdx-project.schema.json');
+            const validator = new validator_1.SchemaValidator(this.logger, projectJsonSchemaPath);
+            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(), error.message], [this.getPath()], error);
             }
-            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(), error.message], [this.getPath()], error);
-                }
-                else {
-                    this.logger.warn(messages.getMessage('schemaValidationError', [this.getPath(), error.message]));
-                }
+            else {
+                this.logger.warn(messages.getMessage('schemaValidationError', [this.getPath(), error.message]));
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.31.18",
+  "version": "3.32.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",