fix(validate): fix incorrect override of diff packages in source mode

flxbl-io · Dec 19, 2023 · e1b48d7 · e1b48d7
1 parent 2cab0e8
commit e1b48d7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 25 deletions.
diff --git a/packages/sfpowerscripts-cli/package.json b/packages/sfpowerscripts-cli/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@dxatscale/sfpowerscripts",
     "description": "DX@Scale Toolkit",
-    "version": "25.6.0",
+    "version": "25.6.1",
     "license": "MIT",
     "author": "dxatscale",
     "release": "January 24",

diff --git a/packages/sfpowerscripts-cli/src/impl/validate/ValidateImpl.ts b/packages/sfpowerscripts-cli/src/impl/validate/ValidateImpl.ts
@@ -477,30 +477,27 @@ export default class ValidateImpl implements PostDeployHook, PreDeployHook {
 
 
 		function computePackageOverrides(props: ValidateProps): { [key: string]: PackageType } {
-			let overridedPackages: { [key: string]: PackageType } = {};
-			const allPackages = ProjectConfig.getAllPackages(null);
-			const projectConfig = ProjectConfig.getSFDXProjectConfig(null);
-			for (const pkg of allPackages) {
-
-				if (ProjectConfig.getPackageType(projectConfig, pkg) !== PackageType.Data) {
-					if (
-						props.validationMode ===
-						ValidationMode.FASTFEEDBACK_LIMITED_BY_RELEASE_CONFIG ||
-						props.validationMode ===
-						ValidationMode.FAST_FEEDBACK
-					) {
-						overridedPackages[pkg] = PackageType.Diff
-					}
-					else {
-						if (!props.disableSourcePackageOverride) {
-							if (ProjectConfig.getPackageType(projectConfig, pkg) != PackageType.Data || ProjectConfig.getPackageType(projectConfig, pkg) != PackageType.Diff)
-								overridedPackages[pkg] = PackageType.Source
-						}
-					}
-				}
-			}
-			return overridedPackages;
-		}
+            let overridedPackages: { [key: string]: PackageType } = {};
+            const allPackages = ProjectConfig.getAllPackages(null);
+            const projectConfig = ProjectConfig.getSFDXProjectConfig(null);
+            for (const pkg of allPackages) {
+                if (ProjectConfig.getPackageType(projectConfig, pkg) !== PackageType.Data) {
+                    if (
+                        props.validationMode === ValidationMode.FASTFEEDBACK_LIMITED_BY_RELEASE_CONFIG ||
+                        props.validationMode === ValidationMode.FAST_FEEDBACK
+                    ) {
+                        overridedPackages[pkg] = PackageType.Diff;
+                    } else {
+                        if (!props.disableSourcePackageOverride) {
+                            if (ProjectConfig.getPackageType(projectConfig, pkg) == PackageType.Unlocked) {
+                                overridedPackages[pkg] = PackageType.Source;
+                            }
+                        }
+                    }
+                }
+            }
+            return overridedPackages;
+        }
 
 		function fetchPackagesAsPerReleaseConfig(
 			logger: Logger,