openxiangda 1.0.183 → 1.0.185

package/lib/application-environments.js

@@ -115,6 +115,33 @@ function normalizeManagedReleaseSourceRevision(
   };
 }
 
+function normalizeManagedChangeSourceBase(
+  target,
+  sourceBase,
+  releaseSourceRevision
+) {
+  const logicalApp = target?.logicalApp || target?.state?.logicalApp;
+  if (!logicalApp?.sourceRepositoryId) {
+    return cloneJsonValue(sourceBase);
+  }
+  return normalizeManagedReleaseSourceRevision(
+    target,
+    {
+      ...(sourceBase || {}),
+      repositoryId: sourceBase?.repo,
+      repoAliases: [
+        sourceBase?.repo,
+        releaseSourceRevision?.repo,
+        releaseSourceRevision?.repositoryId,
+        ...(Array.isArray(releaseSourceRevision?.repoAliases)
+          ? releaseSourceRevision.repoAliases
+          : []),
+      ],
+    },
+    { errorCode: 'RELEASE_SOURCE_BASE_REPOSITORY_MISMATCH' }
+  );
+}
+
 function hasStateResourceMappings(value) {
   if (Array.isArray(value)) return value.length > 0;
   if (!value || typeof value !== 'object') {
@@ -354,6 +381,7 @@ module.exports = {
   buildCandidateBundle,
   canonicalJson,
   normalizeEnvironmentKind,
+  normalizeManagedChangeSourceBase,
   normalizeManagedReleaseSourceRevision,
   normalizeTargetName,
   hasStateResourceMappings,

package/lib/cli.js

@@ -131,6 +131,7 @@ const {
   bindEnvironmentTarget,
   buildCandidateBundle,
   normalizeEnvironmentKind,
+  normalizeManagedChangeSourceBase,
   normalizeManagedReleaseSourceRevision,
   readCandidate,
   readJsonInput,
@@ -4921,7 +4922,6 @@ async function ensureChangeBaseline(
     return stored;
   }
   const activeLease = getUsableStoredPublishLease(target);
-  const sourceBase = resolveChangeSourceBase(changeId, flags);
   const releaseSourceRevision = normalizeManagedReleaseSourceRevision(
     target,
     prepareReleaseSourceRevision({
@@ -4929,6 +4929,11 @@ async function ensureChangeBaseline(
     }),
     { errorCode: 'RELEASE_SOURCE_REPOSITORY_MISMATCH' }
   );
+  const sourceBase = normalizeManagedChangeSourceBase(
+    target,
+    resolveChangeSourceBase(changeId, flags),
+    releaseSourceRevision
+  );
 
   const data = await requestWithAuth(
     config,
@@ -12894,7 +12899,7 @@ function saveRuntimeReleaseState(target, release) {
     updatedAt: new Date().toISOString(),
   };
   target.bound.updatedAt = new Date().toISOString();
-  if (target.state.profiles?.[target.profileName]) {
+  if (!target.targetName && target.state.profiles?.[target.profileName]) {
     target.state.profiles[target.profileName] = target.bound;
   }
   saveProjectState(target.state);
@@ -21171,7 +21176,7 @@ function removeStateResource(target, kind, code) {
   if (!bucket || !target.bound.resources?.[bucket]?.[code]) return;
   delete target.bound.resources[bucket][code];
   target.bound.updatedAt = new Date().toISOString();
-  if (target.state.profiles?.[target.profileName]) {
+  if (!target.targetName && target.state.profiles?.[target.profileName]) {
     target.state.profiles[target.profileName] = target.bound;
   }
   saveProjectState(target.state);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.183",
+  "version": "1.0.185",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {