openxiangda 1.0.186 → 1.0.188

package/lib/application-environments.js

@@ -363,7 +363,15 @@ function releaseExecutionPath(changeId, deploymentId, cwd = process.cwd()) {
 
 function withManagedReleaseForwardedFlags(stepId, args = [], flags = {}) {
   const forwarded = [...args];
-  if (stepId !== 'backend-stage' || !flags['adopt-online-baseline']) {
+  const baselineAdoptionStages = new Set([
+    'form-stage',
+    'backend-stage',
+    'workflow-stage',
+  ]);
+  if (
+    !baselineAdoptionStages.has(stepId) ||
+    !flags['adopt-online-baseline']
+  ) {
     return forwarded;
   }
   forwarded.push('--adopt-online-baseline');

package/lib/change-baseline.js

@@ -806,7 +806,8 @@ function assertTargetIdentity(target) {
     );
   }
   const boundAppType = normalizeOptionalString(target.bound.appType);
-  const stateBound = target.state.profiles?.[profile];
+  const managedStateBound = resolveManagedStateBinding(target, appType);
+  const stateBound = managedStateBound || target.state.profiles?.[profile];
   const stateAppType = normalizeOptionalString(stateBound?.appType);
   if (
     (boundAppType && boundAppType !== appType) ||
@@ -820,6 +821,26 @@ function assertTargetIdentity(target) {
   return { appType, profile };
 }
 
+function resolveManagedStateBinding(target, appType) {
+  const targetName = normalizeOptionalString(target?.targetName);
+  if (!targetName) return null;
+  const binding = target.state?.targets?.[targetName];
+  const bindingAppType = normalizeOptionalString(binding?.appType);
+  const environmentId = normalizeOptionalString(target.environmentId);
+  const bindingEnvironmentId = normalizeOptionalString(binding?.environmentId);
+  if (
+    !binding ||
+    bindingAppType !== appType ||
+    (environmentId && bindingEnvironmentId !== environmentId)
+  ) {
+    throw changeBaselineError(
+      'CHANGE_BASELINE_TARGET_INVALID',
+      `change baseline managed target ${targetName} 与 state.targets binding 不一致`
+    );
+  }
+  return binding;
+}
+
 function assertInputIdentity(input, identity) {
   const appType = normalizeOptionalString(input.appType);
   const profile = normalizeOptionalString(input.profile);
@@ -839,7 +860,11 @@ function assertInputIdentity(input, identity) {
 
 function persistTargetState(target, options) {
   target.bound.updatedAt = normalizeNow(options.now);
-  if (target.state.profiles?.[target.profileName]) {
+  const targetName = normalizeOptionalString(target.targetName);
+  if (targetName) {
+    target.state.targets ||= {};
+    target.state.targets[targetName] = target.bound;
+  } else if (target.state.profiles?.[target.profileName]) {
     target.state.profiles[target.profileName] = target.bound;
   }
   (options.saveState || saveProjectState)(

package/lib/publish-lease.js

@@ -63,9 +63,7 @@ function savePublishLease(target, input, options = {}) {
     publishLease: lease,
   };
   target.bound.updatedAt = new Date().toISOString();
-  if (target.state.profiles?.[target.profileName]) {
-    target.state.profiles[target.profileName] = target.bound;
-  }
+  persistTargetBinding(target);
   (options.saveState || saveProjectState)(target.state, options.cwd || process.cwd());
   return lease;
 }
@@ -80,13 +78,21 @@ function clearPublishLease(target, leaseId, options = {}) {
     delete target.bound.promotion;
   }
   target.bound.updatedAt = new Date().toISOString();
-  if (target.state.profiles?.[target.profileName]) {
-    target.state.profiles[target.profileName] = target.bound;
-  }
+  persistTargetBinding(target);
   (options.saveState || saveProjectState)(target.state, options.cwd || process.cwd());
   return true;
 }
 
+function persistTargetBinding(target) {
+  const targetName = String(target?.targetName || '').trim();
+  if (targetName) {
+    target.state.targets ||= {};
+    target.state.targets[targetName] = target.bound;
+  } else if (target.state.profiles?.[target.profileName]) {
+    target.state.profiles[target.profileName] = target.bound;
+  }
+}
+
 function normalizePublishLease(input, target) {
   const leaseId = String(input?.leaseId || '').trim();
   const expiresAt = normalizeDate(input?.expiresAt, 'expiresAt');

package/package.json

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