chore: merge main, resolve conflicts

Author: WillieRuemmele

CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/source-deploy-retrieve",
-  "version": "12.36.7",
+  "version": "12.37.2",
   "description": "JavaScript library to run Salesforce metadata deploys and retrieves",
   "main": "lib/src/index.js",
   "author": "Salesforce",
@@ -25,7 +25,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@salesforce/core": "^8.31.4",
+    "@salesforce/core": "^8.32.3",
     "@salesforce/kit": "^3.2.4",
     "@salesforce/ts-types": "^2.0.12",
     "@salesforce/types": "^1.6.0",
@@ -41,7 +41,7 @@
     "yaml": "^2.9.0"
   },
   "devDependencies": {
-    "@jsforce/jsforce-node": "^3.10.17",
+    "@jsforce/jsforce-node": "^3.10.19",
     "@salesforce/cli-plugins-testkit": "^5.3.58",
     "@salesforce/dev-scripts": "^11.0.4",
     "@types/deep-equal-in-any-order": "^1.0.1",

METADATA_SUPPORT.md

@@ -193,6 +193,10 @@ export class MetadataApiDeploy extends MetadataTransfer<
     await connection.metadata.cancelDeploy(this.id);
   }
 
+  protected getZipSize(): number | undefined {
+    return this.zipSize;
+  }
+
   protected async pre(): Promise<AsyncResult> {
     const LifecycleInstance = Lifecycle.getInstance();
     const connection = await this.getConnection();

package.json

@@ -89,7 +89,7 @@ export abstract class MetadataTransfer<
 
   /**
    * Poll for the status of the metadata transfer request.
-   * Default frequency is 100 ms.
+   * Default frequency is 1000ms minimum, scaling with deploy size (zip bytes or component count).
    * Default timeout is 60 minutes.
    *
    * @param options Polling options; frequency, timeout, polling function.
@@ -98,7 +98,7 @@ export abstract class MetadataTransfer<
   public async pollStatus(options?: Partial<PollingClient.Options>): Promise<Result>;
   /**
    * Poll for the status of the metadata transfer request.
-   * Default frequency is based on the number of SourceComponents, n, in the transfer, it ranges from 100ms -> n
+   * Default frequency is 1000ms minimum, scaling with deploy size (zip bytes or component count, capped at 10s).
    * Default timeout is 60 minutes.
    *
    * @param frequency Polling frequency in milliseconds.
@@ -110,7 +110,12 @@ export abstract class MetadataTransfer<
     frequencyOrOptions?: number | Partial<PollingClient.Options>,
     timeout?: number
   ): Promise<Result | undefined> {
-    const normalizedOptions = normalizePollingInputs(frequencyOrOptions, timeout, sizeOfComponentSet(this.components));
+    const normalizedOptions = normalizePollingInputs(
+      frequencyOrOptions,
+      timeout,
+      sizeOfComponentSet(this.components),
+      this.getZipSize()
+    );
     // Initialize error retry tracking
     this.consecutiveErrorRetries = 0;
     this.errorRetryLimit = calculateErrorRetryLimit(this.logger);
@@ -204,6 +209,11 @@ export abstract class MetadataTransfer<
     this.event.on('error', subscriber);
   }
 
+  // eslint-disable-next-line class-methods-use-this
+  protected getZipSize(): number | undefined {
+    return undefined;
+  }
+
   protected async maybeSaveTempDirectory(target: SfdxFileFormat, cs?: ComponentSet): Promise<void> {
     if (this.mdapiTempDir) {
       await Lifecycle.getInstance().emitWarning(
@@ -367,10 +377,11 @@ const getConnectionNoHigherThanOrgAllows = async (conn: Connection, requestedVer
 export const normalizePollingInputs = (
   frequencyOrOptions?: number | Partial<PollingClient.Options>,
   timeout?: number,
-  componentSetSize = 0
+  componentSetSize = 0,
+  zipSize?: number
 ): Pick<PollingClient.Options, 'frequency' | 'timeout'> => {
   let pollingOptions: Pick<PollingClient.Options, 'frequency' | 'timeout'> = {
-    frequency: Duration.milliseconds(calculatePollingFrequency(componentSetSize)),
+    frequency: Duration.milliseconds(calculatePollingFrequency(componentSetSize, zipSize)),
     timeout: Duration.minutes(60),
   };
   if (isNumber(frequencyOrOptions)) {
@@ -383,7 +394,7 @@ export const normalizePollingInputs = (
   }
   // from the overloaded methods, there's a possibility frequency/timeout isn't set
   // guarantee frequency and timeout are set
-  pollingOptions.frequency ??= Duration.milliseconds(calculatePollingFrequency(componentSetSize));
+  pollingOptions.frequency ??= Duration.milliseconds(calculatePollingFrequency(componentSetSize, zipSize));
   pollingOptions.timeout ??= Duration.minutes(60);
 
   return pollingOptions;
@@ -392,21 +403,25 @@ export const normalizePollingInputs = (
 /** yeah, there's a size property on CS.  But we want the actual number of source components */
 const sizeOfComponentSet = (cs?: ComponentSet): number => cs?.getSourceComponents().toArray().length ?? 0;
 
-/** based on the size of the components, pick a reasonable polling frequency */
-export const calculatePollingFrequency = (size: number): number => {
-  if (size === 0) {
-    // no component set size is possible for retrieve
-    return 1000;
-  } else if (size <= 10) {
-    return 100;
-  } else if (size <= 50) {
-    return 250;
-  } else if (size <= 100) {
-    return 500;
-  } else if (size <= 1000) {
+/** based on the size of the deploy (zip bytes for large deploys, component count for small ones), pick a reasonable polling frequency */
+export const calculatePollingFrequency = (componentCount: number, zipSize?: number): number => {
+  // Use zip size only for large payloads where component count alone underestimates deploy time
+  if (zipSize !== undefined && zipSize > 1_000_000) {
+    const ONE_MB = 1_000_000;
+    if (zipSize <= 5 * ONE_MB) {
+      return 2000;
+    } else if (zipSize <= 15 * ONE_MB) {
+      return 5000;
+    } else {
+      // large deploys (15MB+ up to 39MB limit) — poll every 10s
+      return 10_000;
+    }
+  }
+
+  if (componentCount <= 1000) {
     return 1000;
   } else {
-    return size;
+    return Math.min(componentCount, 10_000);
   }
 };
 

src/client/metadataApiDeploy.ts

@@ -25,6 +25,7 @@ import { NonDecomposedMetadataTransformer } from './nonDecomposedMetadataTransfo
 import { LabelMetadataTransformer, LabelsMetadataTransformer } from './decomposeLabelsTransformer';
 import { DecomposedPermissionSetTransformer } from './decomposedPermissionSetTransformer';
 import { DecomposeExternalServiceRegistrationTransformer } from './decomposeExternalServiceRegistrationTransformer';
+import { UiBundleMetadataTransformer } from './uiBundleMetadataTransformer';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
@@ -57,6 +58,8 @@ export class MetadataTransformerFactory {
           : new LabelMetadataTransformer(this.registry, this.context);
       case 'decomposeExternalServiceRegistration':
         return new DecomposeExternalServiceRegistrationTransformer(this.registry, this.context);
+      case 'uiBundle':
+        return new UiBundleMetadataTransformer(this.registry, this.context);
       default:
         throw messages.createError('error_missing_transformer', [type.name, transformerId]);
     }

src/client/metadataTransfer.ts

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2026, Salesforce, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { SourceComponent } from '../../resolve/sourceComponent';
+import { validateUiBundleForDeploy } from '../../resolve/adapters/uiBundleValidation';
+import { WriteInfo } from '../types';
+import { DefaultMetadataTransformer } from './defaultMetadataTransformer';
+
+/**
+ * Transformer for UIBundle components.
+ *
+ * Behaves like the default transformer, but validates the bundle's ui-bundle.json descriptor
+ * when converting to metadata format for deploy. Retrieve (toSourceFormat) skips validation.
+ */
+export class UiBundleMetadataTransformer extends DefaultMetadataTransformer {
+  public async toMetadataFormat(component: SourceComponent): Promise<WriteInfo[]> {
+    if (component.content) {
+      validateUiBundleForDeploy(component.content, component.tree, component.getForceIgnore());
+    }
+    return super.toMetadataFormat(component);
+  }
+}

src/convert/transformers/metadataTransformerFactory.ts

@@ -71,7 +71,8 @@
     "waveTemplates": "wavetemplatebundle",
     "appTemplates": "appframeworktemplatebundle",
     "lightningTypes": "lightningtypebundle",
-    "uiBundles": "uibundle"
+    "uiBundles": "uibundle",
+    "uiWidgets": "uiwidgetbundle"
   },
   "suffixes": {
     "Canvas": "canvasmetadata",
@@ -602,7 +603,8 @@
     "cnfgItemTypeIdentRule": "cnfgitemtypeidentrule",
     "cnfgItemTypeRelationDef": "cnfgitemtyperelationdef",
     "cnfgMgmtRelationTypeDef": "cnfgmgmtrelationtypedef",
-    "meetingPlaybookDefinition": "meetingplaybookdefinition"
+    "meetingPlaybookDefinition": "meetingplaybookdefinition",
+    "idpConfiguration": "idpconfiguration"
   },
   "types": {
     "accesscontrolpolicy": {
@@ -4743,7 +4745,8 @@
       "name": "UIBundle",
       "suffix": "uibundle",
       "strategies": {
-        "adapter": "uiBundles"
+        "adapter": "uiBundles",
+        "transformer": "uiBundle"
       },
       "strictDirectoryName": true,
       "supportsPartialDelete": true
@@ -5371,6 +5374,26 @@
       "directoryName": "policyRuleDefinitionSets",
       "inFolder": false,
       "strictDirectoryName": false
+    },
+    "idpconfiguration": {
+      "id": "idpconfiguration",
+      "name": "IdpConfiguration",
+      "suffix": "idpConfiguration",
+      "directoryName": "idpConfigurations",
+      "inFolder": false,
+      "strictDirectoryName": false
+    },
+    "uiwidgetbundle": {
+      "id": "uiwidgetbundle",
+      "name": "UiWidgetBundle",
+      "directoryName": "uiWidgets",
+      "inFolder": false,
+      "strictDirectoryName": true,
+      "metaFileSuffix": "uiwidget-meta.xml",
+      "strategies": {
+        "adapter": "bundle"
+      },
+      "supportsPartialDelete": true
     }
   }
 }

src/convert/transformers/uiBundleMetadataTransformer.ts

@@ -164,7 +164,8 @@ export type MetadataType = {
       | 'standard'
       | 'decomposedLabels'
       | 'decomposedPermissionSet'
-      | 'decomposeExternalServiceRegistration';
+      | 'decomposeExternalServiceRegistration'
+      | 'uiBundle';
     decomposition?: 'topLevel' | 'folderPerType';
     recomposition?: 'startEmpty';
   };

src/registry/metadataRegistry.json

@@ -16,7 +16,8 @@
 import { join, resolve, sep } from 'node:path';
 import { Messages } from '@salesforce/core/messages';
 import { SfError } from '@salesforce/core/sfError';
-import type { TreeContainer } from '../treeContainers';
+import { NodeFSTreeContainer, type TreeContainer } from '../treeContainers';
+import type { ForceIgnore } from '../forceIgnore';
 import { SourcePath } from '../../common/types';
 
 Messages.importMessagesDirectory(__dirname);
@@ -146,6 +147,25 @@ function createFileError(message: string, actions?: string[]): SfError {
   return new SfError(message, 'ExpectedSourceFilesError', actions);
 }
 
+/** Validate a UI bundle's `ui-bundle.json` descriptor (if present) at deploy time. Only runs against a real filesystem. */
+export function validateUiBundleForDeploy(
+  contentPath: SourcePath,
+  tree: TreeContainer,
+  forceIgnore: ForceIgnore
+): void {
+  if (!(tree instanceof NodeFSTreeContainer)) {
+    return;
+  }
+
+  const descriptorPath = join(contentPath, 'ui-bundle.json');
+  if (!tree.exists(descriptorPath) || forceIgnore.denies(descriptorPath)) {
+    return;
+  }
+
+  const raw = tree.readFileSync(descriptorPath);
+  validateUiBundleJson(raw, descriptorPath, contentPath, tree);
+}
+
 /** Validate ui-bundle.json contents. Checks structure first, then schema, then file existence. */
 export function validateUiBundleJson(
   raw: Buffer,