@salesforce/core 3.31.17 → 3.31.19

package/lib/org/connection.js

@@ -148,7 +148,14 @@ class Connection extends jsforce_1.Connection {
      */
     request(request, options) {
         const httpRequest = (0, ts_types_1.isString)(request) ? { method: 'GET', url: request } : request;
-        httpRequest.headers = Object.assign({}, exports.SFDX_HTTP_HEADERS, httpRequest.headers);
+        // prevent duplicate headers by lowercasing the keys on the incoming request
+        const lowercasedHeaders = httpRequest.headers
+            ? Object.fromEntries(Object.entries(httpRequest.headers).map(([key, value]) => [key.toLowerCase(), value]))
+            : {};
+        httpRequest.headers = {
+            ...exports.SFDX_HTTP_HEADERS,
+            ...lowercasedHeaders,
+        };
         this.logger.debug(`request: ${JSON.stringify(httpRequest)}`);
         return super.request(httpRequest, options);
     }

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.17",
+  "version": "3.31.19",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -61,15 +61,15 @@
     "@types/chai-string": "^1.4.2",
     "@types/debug": "0.0.31",
     "@types/jsen": "0.0.21",
-    "@types/jsonwebtoken": "8.5.7",
-    "@types/lodash": "^4.14.182",
+    "@types/jsonwebtoken": "8.5.9",
+    "@types/lodash": "^4.14.186",
     "@types/shelljs": "0.8.11",
-    "@typescript-eslint/eslint-plugin": "^5.33.0",
-    "@typescript-eslint/parser": "^5.33.0",
+    "@typescript-eslint/eslint-plugin": "^5.41.0",
+    "@typescript-eslint/parser": "^5.41.0",
     "chai": "^4.3.4",
     "chai-string": "^1.5.0",
     "commitizen": "^3.1.2",
-    "eslint": "^8.21.0",
+    "eslint": "^8.26.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-salesforce": "^1.1.0",
     "eslint-config-salesforce-license": "^0.1.6",