@salesforce/core 8.26.0 → 8.26.1

package/lib/org/scratchOrgInfoGenerator.js

@@ -181,12 +181,14 @@ exports.generateScratchOrgInfo = generateScratchOrgInfo;
  */
 const getScratchOrgInfoPayload = async (options) => {
     let warnings = [];
-    // orgConfig input overrides definitionjson (-j option; hidden/deprecated) overrides definitionfile (-f option)
+    // Merge after all validations complete
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const scratchOrgInfoPayload = {
         ...(options.definitionfile ? await parseDefinitionFile(options.definitionfile) : {}),
-        ...(options.definitionjson ? JSON.parse(options.definitionjson) : {}),
-        ...(options.orgConfig ?? {}),
+        ...(options.definitionjson
+            ? await validateInputDef(JSON.parse(options.definitionjson), 'definitionjson')
+            : {}),
+        ...(options.orgConfig ? await validateInputDef(options.orgConfig, 'orgConfig') : {}),
     };
     // scratchOrgInfoPayload must be heads down camelcase.
     Object.keys(scratchOrgInfoPayload).forEach((key) => {
@@ -223,6 +225,19 @@ const getScratchOrgInfoPayload = async (options) => {
     };
 };
 exports.getScratchOrgInfoPayload = getScratchOrgInfoPayload;
+/**
+ * Validates input definition objects (definitionjson or orgConfig) against schema
+ * Emits warnings if validation issues are found
+ */
+const validateInputDef = async (input, source) => {
+    const result = scratchOrgDef_1.ScratchOrgDefSchema.safeParse(input);
+    if (!result.success) {
+        const errorMessages = result.error.issues.map((err) => `${err.path.join('.')}: ${err.message}`).join('\n');
+        await lifecycleEvents_1.Lifecycle.getInstance().emitWarning(`Scratch org definition validation issues in ${source}:\n${errorMessages}`);
+        return input;
+    }
+    return result.data;
+};
 const parseDefinitionFile = async (definitionFile) => {
     try {
         const fileData = await fs_1.fs.promises.readFile(definitionFile, 'utf8');

package/lib/schema/project-scratch-def/scratchOrgDef.d.ts

@@ -6,14 +6,14 @@ import { z } from 'zod';
 export declare const ScratchOrgDefSchema: z.ZodObject<{
     orgName: z.ZodOptional<z.ZodString>;
     edition: z.ZodEnum<{
-        Group: "Group";
-        Developer: "Developer";
-        Enterprise: "Enterprise";
-        "Partner Developer": "Partner Developer";
-        "Partner Enterprise": "Partner Enterprise";
-        "Partner Group": "Partner Group";
-        "Partner Professional": "Partner Professional";
-        Professional: "Professional";
+        group: "group";
+        developer: "developer";
+        enterprise: "enterprise";
+        "partner-developer": "partner-developer";
+        "partner-enterprise": "partner-enterprise";
+        "partner-group": "partner-group";
+        "partner-professional": "partner-professional";
+        professional: "professional";
     }>;
     country: z.ZodOptional<z.ZodString>;
     username: z.ZodOptional<z.ZodString>;

package/lib/schema/project-scratch-def/scratchOrgDef.js

@@ -19,14 +19,14 @@ exports.ScratchOrgDefSchema = zod_1.z
     orgName: zod_1.z.string().optional().describe('The name of the scratch org.').meta({ title: 'Organization Name' }),
     edition: zod_1.z
         .enum([
-        'Developer',
-        'Enterprise',
-        'Group',
-        'Partner Developer',
-        'Partner Enterprise',
-        'Partner Group',
-        'Partner Professional',
-        'Professional',
+        'developer',
+        'enterprise',
+        'group',
+        'partner-developer',
+        'partner-enterprise',
+        'partner-group',
+        'partner-professional',
+        'professional',
     ])
         .describe('The Salesforce edition of the scratch org.'),
     country: zod_1.z

package/lib/schema/project-scratch-def/simpleFeaturesList.js

@@ -112,6 +112,7 @@ exports.simpleFeaturesList = [
     'EinsteinGPTForDevelopers',
     'EinsteinRecommendationBuilder',
     'EinsteinRecommendationBuilderMetadata',
+    'EinsteinSalesRepFdbk',
     'EinsteinSearch',
     'EinsteinVisits',
     'EinsteinVisitsED',

package/package.json

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

package/schemas/project-scratch-def.schema.json

@@ -11,14 +11,14 @@
       "description": "The Salesforce edition of the scratch org.",
       "type": "string",
       "enum": [
-        "Developer",
-        "Enterprise",
-        "Group",
-        "Partner Developer",
-        "Partner Enterprise",
-        "Partner Group",
-        "Partner Professional",
-        "Professional"
+        "developer",
+        "enterprise",
+        "group",
+        "partner-developer",
+        "partner-enterprise",
+        "partner-group",
+        "partner-professional",
+        "professional"
       ]
     },
     "country": {
@@ -452,6 +452,7 @@
               "EinsteinGPTForDevelopers",
               "EinsteinRecommendationBuilder",
               "EinsteinRecommendationBuilderMetadata",
+              "EinsteinSalesRepFdbk",
               "EinsteinSearch",
               "EinsteinVisits",
               "EinsteinVisitsED",